Merge branch 'main_latest_merged' into zaid_development_new

lib/controllers/providers/api/service_requests_provider.dart

@@ -336,7 +336,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
               },
             )
             ?.toList(),
-        "reviewComment": report.reviewComment ?? "",
+        "reviewComment": "",
         "comment": report.comment,
         "attachmentsWorkOrder": request.devicePhotos?.map((e) => {"name": e})?.toList(),
         "equipmentStatus": report.equipmentStatus?.toMap(),

lib/models/pantry/pentry.dart

@@ -101,8 +101,8 @@ class Pentry {
     map["vChecklists"] = ppmCheckLists.map((e) => e.toMap(visitId)).toList();
     map["vCalibrationTools"] = calibrationTools.map((e) => e.toMap(visitId)).toList();
     map["vKits"] = pmKits.map((e) => e.toMap(visitId)).toList();
-    map["nurseSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureNurse";
-    map["engSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureEngineer";
+    map["nurseSignature"] = signatureNurse;//"${DateTime.now().toIso8601String()}.png|$signatureNurse";
+    map["engSignature"] = signatureEngineer;//"${DateTime.now().toIso8601String()}.png|$signatureEngineer";
     return map;
   }
 

lib/views/pages/user/requests/report/create_service_report.dart

@@ -397,21 +397,21 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
                                   ),
                                 ],
                               ),
-                              if (_showCommentField)
-                                const SizedBox(
-                                  height: 8,
-                                ),
-                              if (_showCommentField)
-                                ATextFormField(
-                                  initialValue: _serviceReport?.reviewComment,
-                                  hintText: "Review Comment",
-                                  textAlign: TextAlign.center,
-                                  style: Theme.of(context).textTheme.titleMedium,
-                                  textInputType: TextInputType.multiline,
-                                  onSaved: (value) {
-                                    _serviceReport.reviewComment = value;
-                                  },
-                                ),
+                              // if (_showCommentField)
+                              //   const SizedBox(
+                              //     height: 8,
+                              //   ),
+                              // if (_showCommentField)
+                              //   ATextFormField(
+                              //     initialValue: _serviceReport?.reviewComment,
+                              //     hintText: "Review Comment",
+                              //     textAlign: TextAlign.center,
+                              //     style: Theme.of(context).textTheme.titleMedium,
+                              //     textInputType: TextInputType.multiline,
+                              //     onSaved: (value) {
+                              //       _serviceReport.reviewComment = value;
+                              //     },
+                              //   ),
                               SizedBox(
                                 height: 8 * AppStyle.getScaleFactor(context),
                               ),