Merge remote-tracking branch 'origin/majd_development_new' into zaid_development_new

main_design2.0
zaid_daoud 3 years ago
commit 5f21d4e5c9

@ -152,10 +152,10 @@ class ServiceRequestsProvider extends ChangeNotifier {
"client": user.clientId, "client": user.clientId,
"callComments": serviceRequest.callComments, "callComments": serviceRequest.callComments,
if (serviceRequest.devicePhotos.isNotEmpty) "attachmentsCallRequest": serviceRequest.devicePhotos.map((e) => {"name": e}).toList(), if (serviceRequest.devicePhotos.isNotEmpty) "attachmentsCallRequest": serviceRequest.devicePhotos.map((e) => {"name": e}).toList(),
"priority": serviceRequest.priority.toMap(), "priority": serviceRequest.priority?.toMap(),
"defectType": serviceRequest.defectType.toMap(), "defectType": serviceRequest.defectType?.toMap(),
"typeofRequest": serviceRequest.type.toMap(), "typeofRequest": serviceRequest.type?.toMap(),
"requestedThrough": serviceRequest.requestedThrough.toMap(), "requestedThrough": serviceRequest.requestedThrough?.toMap(),
"reviewComment": null, "reviewComment": null,
if (serviceRequest.audio != null) "voiceNote": serviceRequest.audio, if (serviceRequest.audio != null) "voiceNote": serviceRequest.audio,
"callSiteContactPerson": [ "callSiteContactPerson": [

@ -189,7 +189,7 @@ class CreateRequestPageState extends State<CreateRequestPage> {
height: 4, height: 4,
), ),
ServiceRequestPriorityMenu( ServiceRequestPriorityMenu(
initialValue: widget.serviceRequest.priority, initialValue: widget.serviceRequest?.priority,
onSelect: (status) { onSelect: (status) {
_serviceRequest.priority = status; _serviceRequest.priority = status;
}, },
@ -341,7 +341,7 @@ class CreateRequestPageState extends State<CreateRequestPage> {
child: AButton( child: AButton(
text: widget.serviceRequest == null ? _subtitle.submit : _subtitle.update, text: widget.serviceRequest == null ? _subtitle.submit : _subtitle.update,
onPressed: () async { onPressed: () async {
//if (!_formKey.currentState.validate()) return; if (!_formKey.currentState.validate()) return;
if (_device?.id == null) { if (_device?.id == null) {
Fluttertoast.showToast(msg: _subtitle.pickDevice); Fluttertoast.showToast(msg: _subtitle.pickDevice);
return; return;

Loading…
Cancel
Save