Merge branch 'prescription_changes' into 'development'

procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691

lib/core/viewModel/procedure_View_model.dart

@@ -60,6 +60,8 @@ class ProcedureViewModel extends BaseViewModel {
 
   Future getProcedure({int mrn, String patientType}) async {
     hasError = false;
+    await getDoctorProfile();
+    doctorProfile.doctorID;
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.Busy);
     await _procedureService.getProcedure(mrn: mrn);
@@ -289,7 +291,6 @@ class ProcedureViewModel extends BaseViewModel {
     }
   }
 
-
   getPatientLabOrdersResults(
       {PatientLabOrders patientLabOrder,
       String procedure,

lib/screens/procedures/ProcedureCard.dart

@@ -28,6 +28,7 @@ class ProcedureCard extends StatelessWidget {
     this.patient,
     this.doctorID,
   }) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     ProjectViewModel projectViewModel = Provider.of(context);
@@ -253,8 +254,8 @@ class ProcedureCard extends StatelessWidget {
                                 fontSize: 12,
                               ),
                             ),
-                            if (entityList.categoryID == 2 ||
-                                entityList.categoryID == 4 &&
+                            if ((entityList.categoryID == 2 ||
+                                    entityList.categoryID == 4) &&
                                 doctorID == entityList.doctorID)
                               InkWell(
                                 child: Icon(DoctorApp.edit),

lib/screens/procedures/procedure_screen.dart

@@ -92,9 +92,7 @@ class ProcedureScreen extends StatelessWidget {
                           fontSize: 13,
                         ),
                         AppText(
-                          TranslationBase
-                              .of(context)
-                              .procedure,
+                          TranslationBase.of(context).procedure,
                           bold: true,
                           fontSize: 22,
                         ),
@@ -109,8 +107,7 @@ class ProcedureScreen extends StatelessWidget {
                       Navigator.push(
                         context,
                         MaterialPageRoute(
-                            builder: (context) =>
-                                AddProcedureHome(
+                            builder: (context) => AddProcedureHome(
                                   patient: patient,
                                   model: model,
                                 )),
@@ -192,7 +189,7 @@ class ProcedureScreen extends StatelessWidget {
                         //       'You Cant Update This Procedure');
                       },
                       patient: patient,
-                      doctorID: doctorNameP,
+                      doctorID: model.doctorProfile.doctorID,
                     ),
                   ),
                 if (model.state == ViewState.ErrorLocal ||