Merge branch 'analytics_service' into 'development'

Analytics service

See merge request Cloud_Solution/doctor_app_flutter!774

android/app/build.gradle

@@ -108,6 +108,6 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
-
+    implementation 'com.google.firebase:firebase-analytics:17.4.1'
 }
 apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

@@ -1,34 +1,77 @@
 {
   "project_info": {
-    "project_number": "157373154094",
-    "project_id": "hmg-doctor-app-1553688619744",
-    "storage_bucket": "hmg-doctor-app-1553688619744.appspot.com"
+    "project_number": "934365232760",
+    "project_id": "hmg-dr-app",
+    "storage_bucket": "hmg-dr-app.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:157373154094:android:daeea3a4e1f4462a1bf0bf",
+        "mobilesdk_app_id": "1:934365232760:android:024b3569972f1c09f9778d",
+        "android_client_info": {
+          "package_name": "COM.HMG.HMGDR"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCpYwrmuntOBdZv6GV6KEnLj8nQRvEnZ6I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "934365232760-57v2ld1qqulc4nt4o5pgjfbpc47fj3qf.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "COM.HMG.HMGDR"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:934365232760:android:e0e185e68c0d7690f9778d",
         "android_client_info": {
           "package_name": "com.hmg.hmgDr"
         }
       },
       "oauth_client": [
         {
-          "client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com",
+          "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDX8RPwu00MyrpqC-T2zXtrUQvTQGRv1mM"
+          "current_key": "AIzaSyCpYwrmuntOBdZv6GV6KEnLj8nQRvEnZ6I"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com",
+              "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "934365232760-57v2ld1qqulc4nt4o5pgjfbpc47fj3qf.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "COM.HMG.HMGDR"
+              }
             }
           ]
         }

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.google.gms:google-services:4.3.3'
     }
 }
 

android/google-services.json

@@ -1,34 +1,77 @@
 {
   "project_info": {
-    "project_number": "1095694324958",
-    "project_id": "mobapp-bb272",
-    "storage_bucket": "mobapp-bb272.appspot.com"
+    "project_number": "934365232760",
+    "project_id": "hmg-dr-app",
+    "storage_bucket": "hmg-dr-app.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:1095694324958:android:70a42e30fcc98ea33fde4f",
+        "mobilesdk_app_id": "1:934365232760:android:024b3569972f1c09f9778d",
+        "android_client_info": {
+          "package_name": "COM.HMG.HMGDR"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCpYwrmuntOBdZv6GV6KEnLj8nQRvEnZ6I"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "934365232760-57v2ld1qqulc4nt4o5pgjfbpc47fj3qf.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "COM.HMG.HMGDR"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:934365232760:android:e0e185e68c0d7690f9778d",
         "android_client_info": {
           "package_name": "com.hmg.hmgDr"
         }
       },
       "oauth_client": [
         {
-          "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com",
+          "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyCuPtf1hTikWXrp5OQIVfqO-TJWubI-Vd8"
+          "current_key": "AIzaSyCpYwrmuntOBdZv6GV6KEnLj8nQRvEnZ6I"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com",
+              "client_id": "934365232760-bobv1r1sn222le020jeni6u1bdbjdu1v.apps.googleusercontent.com",
               "client_type": 3
+            },
+            {
+              "client_id": "934365232760-57v2ld1qqulc4nt4o5pgjfbpc47fj3qf.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "COM.HMG.HMGDR"
+              }
             }
           ]
         }
@@ -36,4 +79,4 @@
     }
   ],
   "configuration_version": "1"
-}
+}

ios/GoogleService-Info .plist

@@ -3,21 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre.apps.googleusercontent.com</string>
+	<string>934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre</string>
+	<string>com.googleusercontent.apps.934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5</string>
 	<key>API_KEY</key>
-	<string>AIzaSyAKPayaNaI-2RN6S4PH5W9wYExmEgoBUvo</string>
+	<string>AIzaSyBtA8-oCZ5T4gkuTG7CucGr_d_7lakp4MM</string>
 	<key>GCM_SENDER_ID</key>
-	<string>1097451043303</string>
+	<string>934365232760</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.hmg.doctorApp</string>
+	<string>com.hmg.hmgDr</string>
 	<key>PROJECT_ID</key>
-	<string>doctor-app-35ddc</string>
+	<string>hmg-dr-app</string>
 	<key>STORAGE_BUCKET</key>
-	<string>doctor-app-35ddc.appspot.com</string>
+	<string>hmg-dr-app.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -29,6 +29,6 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:1097451043303:ios:0e9b87e77dcf397d866542</string>
+	<string>1:934365232760:ios:61e01db91b41502bf9778d</string>
 </dict>
 </plist>

ios/Runner/GoogleService-Info.plist

@@ -3,21 +3,21 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre.apps.googleusercontent.com</string>
+	<string>934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre</string>
+	<string>com.googleusercontent.apps.934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5</string>
 	<key>API_KEY</key>
-	<string>AIzaSyAKPayaNaI-2RN6S4PH5W9wYExmEgoBUvo</string>
+	<string>AIzaSyBtA8-oCZ5T4gkuTG7CucGr_d_7lakp4MM</string>
 	<key>GCM_SENDER_ID</key>
-	<string>1097451043303</string>
+	<string>934365232760</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.hmg.doctorApp</string>
+	<string>com.hmg.hmgDr</string>
 	<key>PROJECT_ID</key>
-	<string>doctor-app-35ddc</string>
+	<string>hmg-dr-app</string>
 	<key>STORAGE_BUCKET</key>
-	<string>doctor-app-35ddc.appspot.com</string>
+	<string>hmg-dr-app.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -29,6 +29,6 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:1097451043303:ios:0e9b87e77dcf397d866542</string>
+	<string>1:934365232760:ios:61e01db91b41502bf9778d</string>
 </dict>
 </plist>

lib/config/config.dart

@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

lib/screens/doctor/doctor_reply_screen.dart

@@ -56,7 +56,7 @@ class DoctorReplyScreen extends StatelessWidget {
                                                 DoctorReplayChat(
                                                   reply: reply,
                                                   previousModel: model,
-                                                )));
+                                                ), settings: RouteSettings(name: 'DoctorReplayChat'),));
                                   },
                             child: DoctorReplyWidget(reply: reply),
                           );

lib/screens/home/home_screen.dart

@@ -405,7 +405,8 @@ class _HomeScreenState extends State<HomeScreen> {
                       from: date,
                       to: date,
                       doctorID:
-                          authenticationViewModel.doctorProfile.doctorID)),
+                          authenticationViewModel.doctorProfile.doctorID),),
+              settings: RouteSettings(name: 'OutPatientsScreen'),
             ));
       },
     ));
@@ -422,6 +423,7 @@ class _HomeScreenState extends State<HomeScreen> {
           context,
           MaterialPageRoute(
             builder: (context) => PatientReferralScreen(),
+            settings: RouteSettings(name: 'PatientReferralScreen'),
           ),
         );
       },
@@ -439,6 +441,7 @@ class _HomeScreenState extends State<HomeScreen> {
             context,
             MaterialPageRoute(
               builder: (context) => PatientSearchScreen(),
+              settings: RouteSettings(name: 'PatientSearchScreen'),
             ));
       },
     ));
@@ -455,6 +458,7 @@ class _HomeScreenState extends State<HomeScreen> {
             context,
             MaterialPageRoute(
               builder: (context) => MedicineSearchScreen(),
+              settings: RouteSettings(name: 'MedicineSearchScreen'),
             ));
       },
     ));

lib/screens/live_care/end_call_screen.dart

@@ -184,7 +184,8 @@ class _EndCallScreenState extends State<EndCallScreen> {
             context,
             MaterialPageRoute(
                 builder: (BuildContext context) =>
-                    LivaCareTransferToAdmin(patient: patient)));
+                    LivaCareTransferToAdmin(patient: patient),
+              settings: RouteSettings(name: 'LivaCareTransferToAdmin'),),);
       },
           isInPatient: isInpatient,
           isDartIcon: true,

lib/screens/medical-file/health_summary_page.dart

@@ -149,7 +149,8 @@ class _HealthSummaryPageState extends State<HealthSummaryPage> {
                                             episode: model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations.isNotEmpty
                                                 ? model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations[0].episodeID.toString()
                                                 : "",
-                                            vistDate: model.medicalFileList[0].entityList[0].timelines[index].date.toString())),
+                                            vistDate: model.medicalFileList[0].entityList[0].timelines[index].date.toString()),
+                                      settings: RouteSettings(name: 'MedicalFileDetails'),),
                                   );
                               },
                               child: DoctorCard(

lib/screens/medicine/medicine_search_screen.dart

@@ -226,7 +226,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
                                           ["ItemID"],
                                       url: model.pharmacyItemsList[index]
                                           ["ImageSRCUrl"]),
-                                ),
+                                  settings: RouteSettings(name: 'PharmaciesListScreen'),),
                               );
                             },
                           );

lib/screens/patients/insurance_approval_screen_patient.dart

@@ -96,7 +96,7 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
                                                 patient: patient,
                                                 indexInsurance: index,
                                                 patientType: patientType,
-                                              )),
+                                              ),settings: RouteSettings(name: 'InsuranceApprovalsDetails'),),
                                     );
                                   },
                                   child: DoctorCardInsurance(
@@ -183,7 +183,7 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
                                                   patient: patient,
                                                   indexInsurance: index,
                                                   patientType: patientType,
-                                                )),
+                                                ),settings: RouteSettings(name: 'InsuranceApprovalsDetails'),),
                                       );
                                     },
                                     child: DoctorCardInsurance(

lib/screens/patients/out_patient/out_patient_screen.dart

@@ -223,7 +223,7 @@ class _OutPatientsScreenState extends State<OutPatientsScreen> {
                                               builder: (BuildContext context) => FilterDatePage(
                                                     outPatientFilterType: outPatientFilterType,
                                                     patientSearchViewModel: model,
-                                                  )));
+                                                  ),settings: RouteSettings(name: 'FilterOutPatentDateScreen'),));
                                     },
                             ),
                             onChanged: (String str) {

lib/screens/patients/patient_search/patient_search_screen.dart

@@ -208,6 +208,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
             searchKey: patientFileInfoController.text,
             isInpatient: false,
           ),
+          settings: RouteSettings(name: 'PatientsSearchResultScreen'),
         ),
       );
     }

lib/screens/patients/profile/lab_result/labs_home_page.dart

@@ -121,6 +121,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
                             model: model,
                             procedureType: ProcedureType.LAB_RESULT,
                           ),
+                          settings: RouteSettings(name: 'AddProcedureTabPage'),
                         ),
                       );
                     },

lib/screens/patients/profile/medical_report/MedicalReportPage.dart

@@ -89,7 +89,9 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
                               arrivalType: arrivalType,
                               model: model,
                               status: MedicalReportStatus.ADD,
-                            )),
+                            ),
+                      settings: RouteSettings(name: 'AddVerifyMedicalReport'),
+                    ),
                   );
 
                 },
@@ -111,7 +113,8 @@ class _MedicalReportPageState extends State<MedicalReportPage> {
                                     medicalReport: model.medicalReportList[index],
                                     model: model,
                                     medicalNote: model.medicalReportList[index].reportDataHtml,
-                                  )),
+                                  ),
+                              settings: RouteSettings(name: 'AddVerifyMedicalReport')),
                         );
                       } else {
                         Navigator.of(context).pushNamed(PATIENT_MEDICAL_REPORT_DETAIL, arguments: {

lib/screens/patients/profile/note/progress_note_screen.dart

@@ -114,7 +114,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
                                     patient: patient,
                                     visitType: widget.visitType,
                                     isUpdate: false,
-                                  )),
+                                  ),settings: RouteSettings(name: 'UpdateNoteOrder'),),
                         );
                       },
                       label: widget.visitType == 3
@@ -236,7 +236,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
                                                                 visitType: widget
                                                                     .visitType,
                                                                 isUpdate: true,
-                                                              )),
+                                                              ),settings: RouteSettings(name: 'UpdateNoteOrder'),),
                                                     );
                                                   },
                                                   child: Container(

lib/screens/patients/profile/profile_screen/patient_profile_screen.dart

@@ -323,7 +323,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen> with Single
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                        builder: (BuildContext context) => EndCallScreen(patient: patient)));
+                                        builder: (BuildContext context) => EndCallScreen(patient: patient),settings: RouteSettings(name: 'EndCallScreen'),),);
                               } else {
                                 GifLoaderDialogUtils.showMyDialog(context);
                                 await model.startCall(isReCall: false, vCID: patient.vcId);

lib/screens/patients/profile/radiology/radiology_home_page.dart

@@ -117,7 +117,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
                           patient: patient,
                           model: model,
                           procedureType: ProcedureType.RADIOLOGY,
-                        ),
+                        ), settings: RouteSettings(name: 'AddProcedureTabPage')
                       ),
                     );
                   },

lib/screens/prescription/prescriptions_page.dart

@@ -104,7 +104,7 @@ class PrescriptionsPage extends StatelessWidget {
                                           prescriptionModel: model,
                                           procedureType:
                                               ProcedureType.PRESCRIPTION,
-                                        )),
+                                        ),settings: RouteSettings(name: 'AddProcedureTabPage')),
                               );
                             },
                             label: TranslationBase.of(context)

lib/screens/procedures/add-favourite-procedure.dart

@@ -108,7 +108,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
                               patient: widget.patient,
                               model: widget.prescriptionModel,
                               groupProcedures: groupProcedures,
-                            ),
+                            ), settings: RouteSettings(name: 'PrescriptionCheckOutScreen')
                           ),
                         );
                       } else {
@@ -128,7 +128,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
                               patient: widget.patient,
                               addButtonTitle: widget.procedureType.getAddButtonTitle(context),
                               toolbarTitle: widget.procedureType.getToolbarLabel(context),
-                            ),
+                            ), settings: RouteSettings(name: 'ProcedureCheckOutScreen')
                           ),
                         );
                       }

lib/screens/procedures/procedure_screen.dart

@@ -110,7 +110,7 @@ class ProcedureScreen extends StatelessWidget {
                             patient: patient,
                             model: model,
                             procedureType: ProcedureType.PROCEDURE,
-                          ),
+                          ), settings: RouteSettings(name: 'AddProcedureTabPage')
                         ),
                       );
                     },

lib/screens/reschedule-leaves/reschedule_leave.dart

@@ -982,6 +982,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
           context,
           MaterialPageRoute(
             builder: (context) => AddRescheduleLeavScreen(),
+              settings: RouteSettings(name: 'AddRescheduleLeaveScreen')
             // MyReferredPatient(),
           ),
         );
@@ -1045,7 +1046,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
           context,
           MaterialPageRoute(
             builder: (context) => AddRescheduleLeavScreen(),
-            // MyReferredPatient(),
+              settings: RouteSettings(name: 'AddRescheduleLeaveScreen')
           ),
         );
       }

lib/widgets/patients/profile/prescription_out_patinets_widget.dart

@@ -71,6 +71,7 @@ class PrescriptionOutPatientWidget extends StatelessWidget {
                               prescriptionResModel:
                                   patientPrescriptionsList[index],
                             ),
+                              settings: RouteSettings(name: 'OutPatientPrescriptionDetailsScreen')
                           ),
                         );
                       },

lib/widgets/shared/app_drawer_widget.dart

@@ -118,6 +118,7 @@ class _AppDrawerState extends State<AppDrawer> {
                             context,
                             MaterialPageRoute(
                               builder: (context) => AddRescheduleLeavScreen(),
+                                settings: RouteSettings(name: 'AddRescheduleLeaveScreen')
                               // MyReferredPatient(),
                             ));
                       },

lib/widgets/transitions/fade_page.dart

@@ -7,6 +7,7 @@ class FadePage extends PageRouteBuilder {
   FadePage({this.page})
     : super(
     opaque: false,
+      settings: RouteSettings(name: page.runtimeType.toString()),
     fullscreenDialog: true,
     barrierDismissible: true,
     barrierColor: Colors.black.withOpacity(0.8),

lib/widgets/transitions/slide_up_page.dart

@@ -24,6 +24,7 @@ class SlideUpPageRoute extends PageRouteBuilder {
           opaque: opaque,
           barrierColor: Color.fromRGBO(0, 0, 0, 0.5),
           barrierDismissible: true,
+          settings: RouteSettings(name: widget.runtimeType.toString()),
           transitionDuration: Duration(milliseconds: 800),
           transitionsBuilder: ((BuildContext context,
               Animation<double> animation,