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

lib/controllers/providers/api/service_requests_provider.dart

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

lib/views/pages/user/requests/create_request.dart

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