Merge branch 'update_flutter_3.16.0' of http://34.17.75.184/Haroon6138/doctor_app_flutter into update_flutter_3.16.0

lib/client/base_app_client.dart

@@ -121,8 +121,8 @@ class BaseAppClient {
 
       // print("ProjectID :");
       // print(body['ProjectID']);
-      debugPrint("URL : $url");
+      // debugPrint("URL : $url");
-      debugPrint("Body : ${json.encode(body)}");
+      // debugPrint("Body : ${json.encode(body)}");
       var asd = json.encode(body);
       var asd2;
       if (await Utils.checkConnection()) {

lib/config/config.dart

@@ -317,7 +317,7 @@ const TRANSACTION_NO = 0;
 const LANGUAGE_ID = 2;
 const STAMP = '2020-04-27T12:17:17.721Z';
 const IP_ADDRESS = '9.9.9.9';
-const VERSION_ID = 8.9;
+const VERSION_ID = 9.1;
 const CHANNEL = 9;
 const SESSION_ID = 'BlUSkYymTt';
 const IS_LOGIN_FOR_DOCTOR_APP = true;

lib/core/model/radiology/final_radiology.dart

@@ -141,7 +141,8 @@ class FinalRadiology {
       isRadMedicalReport = json['isRadMedicalReport'];
       isRecordFromVidaPlus = json['IsRecordFromVidaPlus'];
       invoiceType = json["InvoiceType"];
-    } catch (e) {
+    }
+    catch (e) {
       print(e);
     }
   }

lib/screens/patients/insurance_approval_screen_patient.dart

@@ -91,6 +91,7 @@ class _InsuranceApprovalScreenNewState
                                   },
                                   child: DoctorCardInsurance(
                                     patientOut: "In Patient",
+                                    onTap: (){},
                                     profileUrl: model
                                         .insuranceApprovalInPatient[index]
                                         .doctorImage!,

lib/screens/prescription/new_prescriptions_page.dart

@@ -27,9 +27,8 @@ class NewPrescriptionsPage extends StatelessWidget {
     bool isFromLiveCare = routeArgs['isFromLiveCare'];
     return BaseView<PrescriptionViewModel>(
       onModelReady: (model) async {
-       await model.getPrescriptionListNew(
+        await model.getPrescriptionListNew(mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : int.parse(patient.appointmentNo.toString()));
-            mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo);
+        await model.isPrincipalCovered(patient: patient);
-       await model.isPrincipalCovered(patient: patient);
       },
       builder: (_, model, w) => AppScaffold(
           baseViewModel: model,
@@ -48,8 +47,6 @@ class NewPrescriptionsPage extends StatelessWidget {
                   SizedBox(
                     height: 12,
                   ),
-
-
                   Padding(
                     padding: const EdgeInsets.all(8.0),
                     child: Column(
@@ -62,11 +59,18 @@ class NewPrescriptionsPage extends StatelessWidget {
                       ],
                     ),
                   ),
-                !model.isPrincipalCovered_ ?  Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: Colors.red, textAlign: TextAlign.center, )) :SizedBox(),
+                  !model.isPrincipalCovered_
-                  SizedBox(height: 20,),
+                      ? Center(
-                  if ((patient.patientStatusType != null &&
+                          child: AppText(
-                          patient.patientStatusType == 43) ||
+                          TranslationBase.of(context).principalCoveredOrNot,
-                      (isFromLiveCare && patient.appointmentNo != null))
+                          color: Colors.red,
+                          textAlign: TextAlign.center,
+                        ))
+                      : SizedBox(),
+                  SizedBox(
+                    height: 20,
+                  ),
+                  if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null))
                     AddNewOrder(
                       onTap: () {
                         Navigator.push(

pubspec.yaml

@@ -11,7 +11,7 @@ description: A new Flutter project.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 4.3.5+1
+version: 1.4.14+1
 
 
 environment:
@@ -23,7 +23,6 @@ environment:
 #dependency_overrides:
 #  intl: 0.17.0-nullsafety.2
 
-
 dependencies:
   flutter:
     sdk: flutter