Merge branch 'fix-issues' into 'development'

Procedure update valdation See merge request Cloud_Solution/doctor_app_flutter!334
5 years ago · 68dc39eb94
parent 5a4b084446 24d13b06c5
commit 68dc39eb94
3 changed files with 15 additions and 5 deletions
--- a/lib/screens/prescription/update_prescription_form.dart
+++ b/lib/screens/prescription/update_prescription_form.dart
@ -731,6 +731,7 @@ class _UpdatePrescriptionFormState extends State<UpdatePrescriptionForm> {
                                                    "strength can't be more then 4 digits ");
                                                return;
                                              }
+                                              // if(units==null&& updatedDuration==null&&frequencyUpdate==null&&)
                                              updatePrescription(
                                                  newStartDate: selectedDate,
                                                  newDoseStreangth:
--- a/lib/screens/procedures/add-procedure-form.dart
+++ b/lib/screens/procedures/add-procedure-form.dart
@ -324,6 +324,13 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
                                        .addSelectedProcedures,
                                    onPressed: () {
                                      //print(entityList.toString());
+                                      onPressed:
+                                      if (entityList.isEmpty == true) {
+                                        DrAppToastMsg.showErrorToast(
+                                            "Fill the  mandatory procedure details");
+                                        return;
+                                      }
+
                                      Navigator.pop(context);
                                      postProcedure(
                                          orderType: selectedType.toString(),
--- a/lib/screens/procedures/update-procedure.dart
+++ b/lib/screens/procedures/update-procedure.dart
@ -299,11 +299,13 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
                                          .updateProcedure
                                          .toUpperCase(),
                                      onPressed: () {
-                                        // if (entityList.isEmpty == true) {
-                                        //   DrAppToastMsg.showErrorToast(
-                                        //       "Fill the  mandatory procedure details");
-                                        //   return;
-                                        // }
+                                        if (entityList.isEmpty == true &&
+                                            widget.remarksController.text ==
+                                                widget.remarks) {
+                                          DrAppToastMsg.showErrorToast(
+                                              "Fill the  mandatory procedure details");
+                                          return;
+                                        }
                                        Navigator.pop(context);
                                        updateProcedure(
                                            orderNo: widget.orderNo,