Add missing page tob google analytics

merge-requests/774/head
Mohammad Aljammal 5 years ago
parent 3ee0acbf6e
commit 5a61a3eaba

@ -108,6 +108,6 @@ dependencies {
implementation 'com.squareup.okhttp3:okhttp:4.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.6.2' implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' 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' apply plugin: 'com.google.gms.google-services'

@ -1,33 +1,33 @@
{ {
"project_info": { "project_info": {
"project_number": "157373154094", "project_number": "1095694324958",
"project_id": "hmg-doctor-app-1553688619744", "project_id": "mobapp-bb272",
"storage_bucket": "hmg-doctor-app-1553688619744.appspot.com" "storage_bucket": "mobapp-bb272.appspot.com"
}, },
"client": [ "client": [
{ {
"client_info": { "client_info": {
"mobilesdk_app_id": "1:157373154094:android:daeea3a4e1f4462a1bf0bf", "mobilesdk_app_id": "1:1095694324958:android:70a42e30fcc98ea33fde4f",
"android_client_info": { "android_client_info": {
"package_name": "com.hmg.hmgDr" "package_name": "com.hmg.hmgDr"
} }
}, },
"oauth_client": [ "oauth_client": [
{ {
"client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com", "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com",
"client_type": 3 "client_type": 3
} }
], ],
"api_key": [ "api_key": [
{ {
"current_key": "AIzaSyDX8RPwu00MyrpqC-T2zXtrUQvTQGRv1mM" "current_key": "AIzaSyCuPtf1hTikWXrp5OQIVfqO-TJWubI-Vd8"
} }
], ],
"services": { "services": {
"appinvite_service": { "appinvite_service": {
"other_platform_oauth_client": [ "other_platform_oauth_client": [
{ {
"client_id": "157373154094-egrhbfr861l7k722g3v2gd4a0opi3r1u.apps.googleusercontent.com", "client_id": "1095694324958-5psabq8tpbti0uqo8bt46atjtbas9uhr.apps.googleusercontent.com",
"client_type": 3 "client_type": 3
} }
] ]

@ -8,7 +8,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 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'
} }
} }

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

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

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

@ -149,7 +149,8 @@ class _HealthSummaryPageState extends State<HealthSummaryPage> {
episode: model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0].consulations.isNotEmpty 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() ? 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( child: DoctorCard(

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save