From 5a61a3eabae57a798e189bc2573e9deceb1322b8 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 13 Jul 2021 09:19:47 +0300 Subject: [PATCH] Add missing page tob google analytics --- android/app/build.gradle | 2 +- android/app/google-services.json | 14 +++++++------- android/build.gradle | 2 +- android/google-services.json | 2 +- lib/screens/doctor/doctor_reply_screen.dart | 2 +- lib/screens/home/home_screen.dart | 6 +++++- lib/screens/live_care/end_call_screen.dart | 3 ++- lib/screens/medical-file/health_summary_page.dart | 3 ++- lib/screens/medicine/medicine_search_screen.dart | 2 +- .../insurance_approval_screen_patient.dart | 4 ++-- .../patients/out_patient/out_patient_screen.dart | 2 +- .../patient_search/patient_search_screen.dart | 1 + .../profile/lab_result/labs_home_page.dart | 1 + .../profile/medical_report/MedicalReportPage.dart | 7 +++++-- .../profile/note/progress_note_screen.dart | 4 ++-- .../profile_screen/patient_profile_screen.dart | 2 +- .../profile/radiology/radiology_home_page.dart | 2 +- lib/screens/prescription/prescriptions_page.dart | 2 +- .../procedures/add-favourite-procedure.dart | 4 ++-- lib/screens/procedures/procedure_screen.dart | 2 +- .../reschedule-leaves/reschedule_leave.dart | 3 ++- .../profile/prescription_out_patinets_widget.dart | 1 + lib/widgets/shared/app_drawer_widget.dart | 1 + lib/widgets/transitions/fade_page.dart | 1 + lib/widgets/transitions/slide_up_page.dart | 1 + 25 files changed, 45 insertions(+), 29 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2e124398..e19addc9 100644 --- a/android/app/build.gradle +++ b/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' \ No newline at end of file diff --git a/android/app/google-services.json b/android/app/google-services.json index db548786..3afb6dca 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,33 +1,33 @@ { "project_info": { - "project_number": "157373154094", - "project_id": "hmg-doctor-app-1553688619744", - "storage_bucket": "hmg-doctor-app-1553688619744.appspot.com" + "project_number": "1095694324958", + "project_id": "mobapp-bb272", + "storage_bucket": "mobapp-bb272.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:157373154094:android:daeea3a4e1f4462a1bf0bf", + "mobilesdk_app_id": "1:1095694324958:android:70a42e30fcc98ea33fde4f", "android_client_info": { "package_name": "com.hmg.hmgDr" } }, "oauth_client": [ { - "client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com", + "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyDX8RPwu00MyrpqC-T2zXtrUQvTQGRv1mM" + "current_key": "AIzaSyCuPtf1hTikWXrp5OQIVfqO-TJWubI-Vd8" } ], "services": { "appinvite_service": { "other_platform_oauth_client": [ { - "client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com", + "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com", "client_type": 3 } ] diff --git a/android/build.gradle b/android/build.gradle index badc1b18..bf0f679d 100644 --- a/android/build.gradle +++ b/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' } } diff --git a/android/google-services.json b/android/google-services.json index 34a225b2..3afb6dca 100644 --- a/android/google-services.json +++ b/android/google-services.json @@ -36,4 +36,4 @@ } ], "configuration_version": "1" -} +} \ No newline at end of file diff --git a/lib/screens/doctor/doctor_reply_screen.dart b/lib/screens/doctor/doctor_reply_screen.dart index f522561f..b318f6a4 100644 --- a/lib/screens/doctor/doctor_reply_screen.dart +++ b/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), ); diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 568ad60f..3efd0243 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -405,7 +405,8 @@ class _HomeScreenState extends State { from: date, to: date, doctorID: - authenticationViewModel.doctorProfile.doctorID)), + authenticationViewModel.doctorProfile.doctorID),), + settings: RouteSettings(name: 'OutPatientsScreen'), )); }, )); @@ -422,6 +423,7 @@ class _HomeScreenState extends State { context, MaterialPageRoute( builder: (context) => PatientReferralScreen(), + settings: RouteSettings(name: 'PatientReferralScreen'), ), ); }, @@ -439,6 +441,7 @@ class _HomeScreenState extends State { context, MaterialPageRoute( builder: (context) => PatientSearchScreen(), + settings: RouteSettings(name: 'PatientSearchScreen'), )); }, )); @@ -455,6 +458,7 @@ class _HomeScreenState extends State { context, MaterialPageRoute( builder: (context) => MedicineSearchScreen(), + settings: RouteSettings(name: 'MedicineSearchScreen'), )); }, )); diff --git a/lib/screens/live_care/end_call_screen.dart b/lib/screens/live_care/end_call_screen.dart index 0e65182b..62b97f2d 100644 --- a/lib/screens/live_care/end_call_screen.dart +++ b/lib/screens/live_care/end_call_screen.dart @@ -184,7 +184,8 @@ class _EndCallScreenState extends State { context, MaterialPageRoute( builder: (BuildContext context) => - LivaCareTransferToAdmin(patient: patient))); + LivaCareTransferToAdmin(patient: patient), + settings: RouteSettings(name: 'LivaCareTransferToAdmin'),),); }, isInPatient: isInpatient, isDartIcon: true, diff --git a/lib/screens/medical-file/health_summary_page.dart b/lib/screens/medical-file/health_summary_page.dart index 6b4b066c..45b95de0 100644 --- a/lib/screens/medical-file/health_summary_page.dart +++ b/lib/screens/medical-file/health_summary_page.dart @@ -149,7 +149,8 @@ class _HealthSummaryPageState extends State { 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( diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index eeea51c5..c0289605 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -226,7 +226,7 @@ class _MedicineSearchState extends State { ["ItemID"], url: model.pharmacyItemsList[index] ["ImageSRCUrl"]), - ), + settings: RouteSettings(name: 'PharmaciesListScreen'),), ); }, ); diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index b9d3f57e..0cc5d5c3 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -96,7 +96,7 @@ class _InsuranceApprovalScreenNewState extends State patient: patient, indexInsurance: index, patientType: patientType, - )), + ),settings: RouteSettings(name: 'InsuranceApprovalsDetails'),), ); }, child: DoctorCardInsurance( @@ -183,7 +183,7 @@ class _InsuranceApprovalScreenNewState extends State patient: patient, indexInsurance: index, patientType: patientType, - )), + ),settings: RouteSettings(name: 'InsuranceApprovalsDetails'),), ); }, child: DoctorCardInsurance( diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 0037634d..fa96a191 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -223,7 +223,7 @@ class _OutPatientsScreenState extends State { builder: (BuildContext context) => FilterDatePage( outPatientFilterType: outPatientFilterType, patientSearchViewModel: model, - ))); + ),settings: RouteSettings(name: 'FilterOutPatentDateScreen'),)); }, ), onChanged: (String str) { diff --git a/lib/screens/patients/patient_search/patient_search_screen.dart b/lib/screens/patients/patient_search/patient_search_screen.dart index 2275cc09..2479910f 100644 --- a/lib/screens/patients/patient_search/patient_search_screen.dart +++ b/lib/screens/patients/patient_search/patient_search_screen.dart @@ -208,6 +208,7 @@ class _PatientSearchScreenState extends State { searchKey: patientFileInfoController.text, isInpatient: false, ), + settings: RouteSettings(name: 'PatientsSearchResultScreen'), ), ); } diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 7da55967..dfc1a1e8 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -121,6 +121,7 @@ class _LabsHomePageState extends State { model: model, procedureType: ProcedureType.LAB_RESULT, ), + settings: RouteSettings(name: 'AddProcedureTabPage'), ), ); }, diff --git a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart index a5c367de..4ebfdbf6 100644 --- a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart +++ b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart @@ -89,7 +89,9 @@ class _MedicalReportPageState extends State { arrivalType: arrivalType, model: model, status: MedicalReportStatus.ADD, - )), + ), + settings: RouteSettings(name: 'AddVerifyMedicalReport'), + ), ); }, @@ -111,7 +113,8 @@ class _MedicalReportPageState extends State { 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: { diff --git a/lib/screens/patients/profile/note/progress_note_screen.dart b/lib/screens/patients/profile/note/progress_note_screen.dart index 723ee75f..6b6e7c24 100644 --- a/lib/screens/patients/profile/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/note/progress_note_screen.dart @@ -114,7 +114,7 @@ class _ProgressNoteState extends State { patient: patient, visitType: widget.visitType, isUpdate: false, - )), + ),settings: RouteSettings(name: 'UpdateNoteOrder'),), ); }, label: widget.visitType == 3 @@ -236,7 +236,7 @@ class _ProgressNoteState extends State { visitType: widget .visitType, isUpdate: true, - )), + ),settings: RouteSettings(name: 'UpdateNoteOrder'),), ); }, child: Container( diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 1cbc67d8..412cf986 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -323,7 +323,7 @@ class _PatientProfileScreenState extends State 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); diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 3d8d527c..46b5ad28 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -117,7 +117,7 @@ class _RadiologyHomePageState extends State { patient: patient, model: model, procedureType: ProcedureType.RADIOLOGY, - ), + ), settings: RouteSettings(name: 'AddProcedureTabPage') ), ); }, diff --git a/lib/screens/prescription/prescriptions_page.dart b/lib/screens/prescription/prescriptions_page.dart index 1a99299b..4c9d986e 100644 --- a/lib/screens/prescription/prescriptions_page.dart +++ b/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) diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index 978fc2c5..236ec5e2 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -108,7 +108,7 @@ class _AddFavouriteProcedureState extends State { patient: widget.patient, model: widget.prescriptionModel, groupProcedures: groupProcedures, - ), + ), settings: RouteSettings(name: 'PrescriptionCheckOutScreen') ), ); } else { @@ -128,7 +128,7 @@ class _AddFavouriteProcedureState extends State { patient: widget.patient, addButtonTitle: widget.procedureType.getAddButtonTitle(context), toolbarTitle: widget.procedureType.getToolbarLabel(context), - ), + ), settings: RouteSettings(name: 'ProcedureCheckOutScreen') ), ); } diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 79371459..3ca6d25d 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/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') ), ); }, diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index dc3d0adf..98e9f9ec 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -982,6 +982,7 @@ class _RescheduleLeaveScreen extends State { context, MaterialPageRoute( builder: (context) => AddRescheduleLeavScreen(), + settings: RouteSettings(name: 'AddRescheduleLeaveScreen') // MyReferredPatient(), ), ); @@ -1045,7 +1046,7 @@ class _RescheduleLeaveScreen extends State { context, MaterialPageRoute( builder: (context) => AddRescheduleLeavScreen(), - // MyReferredPatient(), + settings: RouteSettings(name: 'AddRescheduleLeaveScreen') ), ); } diff --git a/lib/widgets/patients/profile/prescription_out_patinets_widget.dart b/lib/widgets/patients/profile/prescription_out_patinets_widget.dart index bd40c3ca..50afbdcf 100644 --- a/lib/widgets/patients/profile/prescription_out_patinets_widget.dart +++ b/lib/widgets/patients/profile/prescription_out_patinets_widget.dart @@ -71,6 +71,7 @@ class PrescriptionOutPatientWidget extends StatelessWidget { prescriptionResModel: patientPrescriptionsList[index], ), + settings: RouteSettings(name: 'OutPatientPrescriptionDetailsScreen') ), ); }, diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index b13a4f10..49f7d4e8 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -118,6 +118,7 @@ class _AppDrawerState extends State { context, MaterialPageRoute( builder: (context) => AddRescheduleLeavScreen(), + settings: RouteSettings(name: 'AddRescheduleLeaveScreen') // MyReferredPatient(), )); }, diff --git a/lib/widgets/transitions/fade_page.dart b/lib/widgets/transitions/fade_page.dart index 97a37ce1..7cd3826c 100644 --- a/lib/widgets/transitions/fade_page.dart +++ b/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), diff --git a/lib/widgets/transitions/slide_up_page.dart b/lib/widgets/transitions/slide_up_page.dart index 2c138b9e..f534e2a3 100644 --- a/lib/widgets/transitions/slide_up_page.dart +++ b/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 animation,