Fix add medication button

lib/screens/prescription/add_prescription/add_drug_widget.dart

@@ -8,7 +8,6 @@ import '../../../core/model/patient/patiant_info_model.dart';
 import '../../../core/model/search_drug/get_medication_response_model.dart';
 import '../../../core/viewModel/prescription_view_model.dart';
 import '../../../widgets/shared/buttons/app_buttons_widget.dart';
-import 'add_prescription_form.dart';
 import 'drugtodrug.dart';
 
 class AddDrugWidget extends StatefulWidget {
@@ -16,37 +15,30 @@ class AddDrugWidget extends StatefulWidget {
   final List<PrescriptionModel> prescriptionList;
   final MedicineViewModel medicineModel;
   final PrescriptionViewModel modelPrescription;
+  final dynamic units;
+  final dynamic route;
+  final dynamic frequency;
+  final dynamic duration;
+  final dynamic doseTime;
+  final dynamic uom;
+  final dynamic x;
+  final GetMedicationResponseModel selectedMedication;
+  final String strength;
+  final String indication;
+  final String instruction;
+  final DateTime selectedDate;
 
-
-
-
-  const AddDrugWidget({Key key, this.patient, this.prescriptionList, this.medicineModel, this.modelPrescription}) : super(key: key);
+  const AddDrugWidget({Key key, this.patient, this.prescriptionList, this.medicineModel,
+    this.modelPrescription, this.units, this.route, this.frequency, this.duration, this.doseTime,
+    this.uom, this.x, this.selectedMedication, this.strength, this.indication, this.instruction, this.selectedDate}) : super(key: key);
 
   @override
   _AddDrugWidgetState createState() => _AddDrugWidgetState();
 }
 
 class _AddDrugWidgetState extends State<AddDrugWidget> {
-
-  TextEditingController strengthController = TextEditingController();
-  dynamic route;
-  dynamic frequency;
-  dynamic duration;
-  dynamic doseTime;
-  dynamic indication;
-  dynamic units;
-  dynamic uom;
-  dynamic box;
-  dynamic x;
-
   @override
   Widget build(BuildContext context) {
-    GetMedicationResponseModel _selectedMedication;
-    TextEditingController indicationController = TextEditingController();
-    TextEditingController instructionController = TextEditingController();
-    DateTime selectedDate;
-
-
     return Container(
       height: SizeConfig.realScreenHeight * .8,
       width: SizeConfig.realScreenWidth,
@@ -66,7 +58,6 @@ class _AddDrugWidgetState extends State<AddDrugWidget> {
                     title: TranslationBase.of(context).addMedication,
                     onPressed: () {
                       Navigator.pop(context);
-
                       widget.medicineModel.postPrescription(
                         icdCode: widget.medicineModel.patientAssessmentList.isNotEmpty
                             ?  widget.medicineModel.patientAssessmentList[0].icdCode10ID
@@ -75,28 +66,28 @@ class _AddDrugWidgetState extends State<AddDrugWidget> {
                             :  widget.medicineModel.patientAssessmentList[0].icdCode10ID
                             .toString()
                             : "test",
-                        dose: strengthController.text,
+                        dose: widget.strength,
                         doseUnit:  widget.medicineModel.itemMedicineListUnit.length == 1
                             ?  widget.medicineModel.itemMedicineListUnit[0]['parameterCode']
                             .toString()
-                            : units['parameterCode'].toString(),
+                            : widget.units['parameterCode'].toString(),
                         patient: widget.patient,
-                        doseTimeIn: doseTime['id'].toString(),
+                        doseTimeIn: widget.doseTime['id'].toString(),
                         model: widget.modelPrescription,
-                        duration: duration['id'].toString(),
+                        duration: widget.duration['id'].toString(),
                         frequency: widget.medicineModel.itemMedicineList.length == 1
                             ?  widget.medicineModel.itemMedicineList[0]['parameterCode']
                             .toString()
-                            : frequency['parameterCode'].toString(),
+                            : widget.frequency['parameterCode'].toString(),
                         route:  widget.medicineModel.itemMedicineListRoute.length == 1
                             ?  widget.medicineModel.itemMedicineListRoute[0]['parameterCode']
                             .toString()
-                            : route['parameterCode'].toString(),
-                        drugId: _selectedMedication.itemId.toString(),
-                        strength: strengthController.text,
-                        indication: indicationController.text,
-                        instruction: instructionController.text,
-                        doseTime: selectedDate,
+                            : widget.route['parameterCode'].toString(),
+                        drugId: widget.selectedMedication.itemId.toString(),
+                        strength: widget.strength,
+                        indication: widget.indication,
+                        instruction: widget.instruction,
+                        doseTime: widget.selectedDate,
                       );
                     },
                   ))

lib/screens/prescription/add_prescription/add_prescription_form.dart

@@ -113,8 +113,6 @@ class _AddPrescriptionFormState extends State<AddPrescriptionForm> {
                             height: spaceBetweenTextFields,
                           ),
                           Container(
-                            child: Form(
-                              key: formKey,
                             child: Column(
                               children: [
                                 Visibility(
@@ -160,7 +158,6 @@ class _AddPrescriptionFormState extends State<AddPrescriptionForm> {
                               ],
                             ),
                           ),
-                          ),
                         ],
                       ),
                     ),

lib/screens/prescription/add_prescription/prescription_form_widget.dart

@@ -86,7 +86,6 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
   dynamic frequency;
   dynamic duration;
   dynamic doseTime;
-  dynamic indication;
   dynamic units;
   dynamic uom;
   dynamic box;
@@ -155,7 +154,9 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
   @override
   Widget build(BuildContext context) {
     final screenSize = MediaQuery.of(context).size;
-    return Column(
+    return Form(
+      key: formKey,
+      child: Column(
         children: [
           AppText(
             widget.selectedMedication?.description ?? "",
@@ -431,14 +432,13 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
                     duration != null &&
                     frequency != null &&
                     strengthController.text != null) {
-                widget.medicineViewModel.getBoxQuantity(
-                  freq: frequency['parameterCode'],
-                  duration: duration['id'],
-                  itemCode: widget.selectedMedication.itemId,
-                  strength: double.parse(strengthController.text),
-                );
+                  // widget.medicineViewModel.getBoxQuantity(
+                  //   freq: frequency['parameterCode'],
+                  //   duration: duration['id'],
+                  //   itemCode: widget.selectedMedication.itemId,
+                  //   strength: double.parse(strengthController.text),
+                  // );
                   box = widget.medicineViewModel.boxQuintity;
-
                   return;
                 }
               });
@@ -515,6 +515,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
             ),
           ),
         ],
+      ),
     );
   }
 
@@ -537,15 +538,27 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
   }
 
   openDrugToDrug(
-      MedicineViewModel model, PrescriptionViewModel modelPrescription) {
+      MedicineViewModel medicineViewModel, PrescriptionViewModel modelPrescription) {
     showModalBottomSheet(
         context: context,
         builder: (context) {
           return AddDrugWidget(
             patient: widget.patient,
-            medicineModel: model,
-            modelPrescription: modelPrescription,
+            medicineModel: widget.medicineViewModel,
+            modelPrescription: widget.prescriptionViewModel,
             prescriptionList: widget.prescriptionList,
+            route: route,
+            doseTime: doseTime,
+            duration: duration,
+            frequency: frequency,
+            units: units,
+            uom: uom,
+            x: x,
+            selectedMedication: widget.selectedMedication,
+            strength: strengthController.text,
+            indication: indicationController.text,
+            instruction: instructionController.text,
+            selectedDate: selectedDate,
           );
         });
   }
@@ -578,7 +591,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
 
       if (formKey.currentState.validate()) {
         Navigator.pop(context);
-        openDrugToDrug(model, widget.prescriptionViewModel);
+        openDrugToDrug(model, prescriptionViewModel);
       }
     } else {
       setState(() {