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..e6560790 100644
--- a/android/app/google-services.json
+++ b/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"
+ }
}
]
}
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..e6560790 100644
--- a/android/google-services.json
+++ b/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"
-}
+}
\ No newline at end of file
diff --git a/ios/GoogleService-Info .plist b/ios/GoogleService-Info .plist
index 81c3af44..a29eac6d 100644
--- a/ios/GoogleService-Info .plist
+++ b/ios/GoogleService-Info .plist
@@ -3,21 +3,21 @@
CLIENT_ID
- 1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre.apps.googleusercontent.com
+ 934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre
+ com.googleusercontent.apps.934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5
API_KEY
- AIzaSyAKPayaNaI-2RN6S4PH5W9wYExmEgoBUvo
+ AIzaSyBtA8-oCZ5T4gkuTG7CucGr_d_7lakp4MM
GCM_SENDER_ID
- 1097451043303
+ 934365232760
PLIST_VERSION
1
BUNDLE_ID
- com.hmg.doctorApp
+ com.hmg.hmgDr
PROJECT_ID
- doctor-app-35ddc
+ hmg-dr-app
STORAGE_BUCKET
- doctor-app-35ddc.appspot.com
+ hmg-dr-app.appspot.com
IS_ADS_ENABLED
IS_ANALYTICS_ENABLED
@@ -29,6 +29,6 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:1097451043303:ios:0e9b87e77dcf397d866542
+ 1:934365232760:ios:61e01db91b41502bf9778d
\ No newline at end of file
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
index 81c3af44..a29eac6d 100644
--- a/ios/Runner/GoogleService-Info.plist
+++ b/ios/Runner/GoogleService-Info.plist
@@ -3,21 +3,21 @@
CLIENT_ID
- 1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre.apps.googleusercontent.com
+ 934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.1097451043303-ifgtu6ub88dlk5dmv5tm531a5s47gbre
+ com.googleusercontent.apps.934365232760-en86g42ch3fgu7odnv5ka6kec8irg8d5
API_KEY
- AIzaSyAKPayaNaI-2RN6S4PH5W9wYExmEgoBUvo
+ AIzaSyBtA8-oCZ5T4gkuTG7CucGr_d_7lakp4MM
GCM_SENDER_ID
- 1097451043303
+ 934365232760
PLIST_VERSION
1
BUNDLE_ID
- com.hmg.doctorApp
+ com.hmg.hmgDr
PROJECT_ID
- doctor-app-35ddc
+ hmg-dr-app
STORAGE_BUCKET
- doctor-app-35ddc.appspot.com
+ hmg-dr-app.appspot.com
IS_ADS_ENABLED
IS_ANALYTICS_ENABLED
@@ -29,6 +29,6 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:1097451043303:ios:0e9b87e77dcf397d866542
+ 1:934365232760:ios:61e01db91b41502bf9778d
\ 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 c6e4cd27..f83def0f 100644
--- a/lib/screens/medical-file/health_summary_page.dart
+++ b/lib/screens/medical-file/health_summary_page.dart
@@ -29,7 +29,9 @@ class _HealthSummaryPageState extends State {
bool isInpatient = routeArgs['isInpatient'];
return BaseView(
onModelReady: (model) => model.getMedicalFile(mrn: patient.patientId),
- builder: (BuildContext context, MedicalFileViewModel model, Widget child) => AppScaffold(
+ builder:
+ (BuildContext context, MedicalFileViewModel model, Widget child) =>
+ AppScaffold(
appBar: PatientProfileAppBar(
patient,
isInpatient: isInpatient,
@@ -43,7 +45,8 @@ class _HealthSummaryPageState extends State {
child: Column(
children: [
Padding(
- padding: EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+ padding:
+ EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
child: Container(
child: Padding(
padding: const EdgeInsets.all(8.0),
@@ -73,13 +76,15 @@ class _HealthSummaryPageState extends State {
),
),
),
- (model.medicalFileList != null && model.medicalFileList.length != 0)
+ (model.medicalFileList != null &&
+ model.medicalFileList.length != 0)
? ListView.builder(
//physics: ,
physics: NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
shrinkWrap: true,
- itemCount: model.medicalFileList[0].entityList[0].timelines.length,
+ itemCount: model.medicalFileList[0].entityList[0]
+ .timelines.length,
itemBuilder: (BuildContext ctxt, int index) {
return InkWell(
onTap: () async {
@@ -120,20 +125,38 @@ class _HealthSummaryPageState extends State {
.toString()
: "",
vistDate:
- model.medicalFileList[0].entityList[0].timelines[index].date.toString())),
- );
+ model.medicalFileList[0].entityList[0].timelines[index].date.toString()),
+ settings: RouteSettings(name: 'MedicalFileDetails'),),
+ );
},
child: DoctorCard(
- doctorName: model.medicalFileList[0].entityList[0].timelines[index].doctorName,
- clinic: model.medicalFileList[0].entityList[0].timelines[index].clinicName,
- branch: model.medicalFileList[0].entityList[0].timelines[index].projectName,
- profileUrl: model.medicalFileList[0].entityList[0].timelines[index].doctorImage,
- appointmentDate: AppDateUtils.getDateTimeFromServerFormat(
- model.medicalFileList[0].entityList[0].timelines[index].date,
+ doctorName: model
+ .medicalFileList[0]
+ .entityList[0]
+ .timelines[index]
+ .doctorName,
+ clinic: model.medicalFileList[0].entityList[0]
+ .timelines[index].clinicName,
+ branch: model.medicalFileList[0].entityList[0]
+ .timelines[index].projectName,
+ profileUrl: model
+ .medicalFileList[0]
+ .entityList[0]
+ .timelines[index]
+ .doctorImage,
+ appointmentDate:
+ AppDateUtils.getDateTimeFromServerFormat(
+ model.medicalFileList[0].entityList[0]
+ .timelines[index].date,
),
isPrescriptions: true,
- isShowEye: model.medicalFileList[0].entityList[0].timelines[index].timeLineEvents[0]
- .consulations.length !=
+ isShowEye: model
+ .medicalFileList[0]
+ .entityList[0]
+ .timelines[index]
+ .timeLineEvents[0]
+ .consulations
+ .length !=
0
? true
: false),
@@ -149,7 +172,8 @@ class _HealthSummaryPageState extends State {
Image.asset('assets/images/no-data.png'),
Padding(
padding: const EdgeInsets.all(8.0),
- child: AppText(TranslationBase.of(context).noMedicalFileFound),
+ child: AppText(TranslationBase.of(context)
+ .noMedicalFileFound),
)
],
),
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 3144ced9..9563ac0d 100644
--- a/lib/screens/patients/insurance_approval_screen_patient.dart
+++ b/lib/screens/patients/insurance_approval_screen_patient.dart
@@ -98,7 +98,7 @@ class _InsuranceApprovalScreenNewState extends State
patient: patient,
indexInsurance: index,
patientType: patientType,
- )),
+ ),settings: RouteSettings(name: 'InsuranceApprovalsDetails'),),
);
},
child: DoctorCardInsurance(
@@ -185,12 +185,11 @@ class _InsuranceApprovalScreenNewState extends State
Navigator.push(
context,
MaterialPageRoute(
- builder: (context) => InsuranceApprovalsDetails(
- patient: patient,
- indexInsurance: index,
- patientType: patientType,
- ),
- ),
+ builder: (context) => InsuranceApprovalsDetails(
+ 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 e4463bab..d96f25f2 100644
--- a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart
+++ b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart
@@ -94,8 +94,11 @@ class _MedicalReportPageState extends State {
arrivalType: arrivalType,
model: model,
status: MedicalReportStatus.ADD,
- )),
+ ),
+ settings: RouteSettings(name: 'AddVerifyMedicalReport'),
+ ),
);
+
},
label: TranslationBase.of(context).createNewMedicalReport,
),
@@ -115,8 +118,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: {
'patient': patient,
diff --git a/lib/screens/patients/profile/note/progress_note_screen.dart b/lib/screens/patients/profile/note/progress_note_screen.dart
index 8b3f4500..0e553587 100644
--- a/lib/screens/patients/profile/note/progress_note_screen.dart
+++ b/lib/screens/patients/profile/note/progress_note_screen.dart
@@ -45,7 +45,8 @@ class _ProgressNoteState extends State {
AuthenticationViewModel authenticationViewModel;
ProjectViewModel projectViewModel;
- getProgressNoteList(BuildContext context, PatientViewModel model, {bool isLocalBusy = false}) async {
+ getProgressNoteList(BuildContext context, PatientViewModel model,
+ {bool isLocalBusy = false}) async {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
String token = await sharedPref.getString(TOKEN);
@@ -60,7 +61,10 @@ class _ProgressNoteState extends State {
tokenID: token,
patientTypeID: patient.patientType,
languageID: 2);
- model.getPatientProgressNote(progressNoteRequest.toJson(), isLocalBusy: isLocalBusy).then((c) {
+ model
+ .getPatientProgressNote(progressNoteRequest.toJson(),
+ isLocalBusy: isLocalBusy)
+ .then((c) {
notesList = model.patientProgressNoteList;
});
}
@@ -69,10 +73,14 @@ class _ProgressNoteState extends State {
Widget build(BuildContext context) {
authenticationViewModel = Provider.of(context);
projectViewModel = Provider.of(context);
- final routeArgs = ModalRoute.of(context).settings.arguments as Map;
+ final routeArgs = ModalRoute
+ .of(context)
+ .settings
+ .arguments as Map;
PatiantInformtion patient = routeArgs['patient'];
String arrivalType = routeArgs['arrivalType'];
- if (routeArgs.containsKey('isDischargedPatient')) isDischargedPatient = routeArgs['isDischargedPatient'];
+ if (routeArgs.containsKey('isDischargedPatient'))
+ isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView(
onModelReady: (model) => getProgressNoteList(context, model),
builder: (_, model, w) => AppScaffold(
@@ -104,7 +112,7 @@ class _ProgressNoteState extends State {
patient: patient,
visitType: widget.visitType,
isUpdate: false,
- )),
+ ),settings: RouteSettings(name: 'UpdateNoteOrder'),),
);
},
label: widget.visitType == 3
@@ -145,35 +153,58 @@ class _ProgressNoteState extends State {
),
if (model.patientProgressNoteList[index].status == 4)
AppText(
- TranslationBase.of(context).noteCanceled,
+ TranslationBase
+ .of(context)
+ .noteCanceled,
fontWeight: FontWeight.bold,
color: Colors.red.shade700,
fontSize: 12,
),
- if (model.patientProgressNoteList[index].status == 2)
+ if (model
+ .patientProgressNoteList[
+ index]
+ .status ==
+ 2)
AppText(
- TranslationBase.of(context).noteVerified,
+ TranslationBase
+ .of(context)
+ .noteVerified,
fontWeight: FontWeight.bold,
color: Colors.green[600],
fontSize: 12,
),
if (model.patientProgressNoteList[index].status != 2 &&
- model.patientProgressNoteList[index].status != 4 &&
- authenticationViewModel.doctorProfile.doctorID ==
- model.patientProgressNoteList[index].createdBy)
+ model
+ .patientProgressNoteList[
+ index]
+ .status !=
+ 4 &&
+ authenticationViewModel
+ .doctorProfile.doctorID ==
+ model
+ .patientProgressNoteList[
+ index]
+ .createdBy)
Row(
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment:
+ CrossAxisAlignment.start,
children: [
InkWell(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
- builder: (context) => UpdateNoteOrder(
- note: model.patientProgressNoteList[index],
- patientModel: model,
- patient: patient,
- visitType: widget.visitType,
+ builder: (context) =>
+ UpdateNoteOrder(
+ note: model
+ .patientProgressNoteList[
+ index],
+ patientModel:
+ model,
+ patient:
+ patient,
+ visitType: widget
+ .visitType,
isUpdate: true,
)),
);
@@ -181,7 +212,9 @@ class _ProgressNoteState extends State {
child: Container(
decoration: BoxDecoration(
color: Colors.grey[600],
- borderRadius: BorderRadius.circular(10),
+ borderRadius:
+ BorderRadius.circular(
+ 10),
),
// color:Colors.red[600],
@@ -196,7 +229,10 @@ class _ProgressNoteState extends State {
width: 2,
),
AppText(
- TranslationBase.of(context).update,
+ TranslationBase
+ .of(
+ context)
+ .update,
fontSize: 10,
color: Colors.white,
),
@@ -214,33 +250,61 @@ class _ProgressNoteState extends State {
context: context,
actionName: "verify",
confirmFun: () async {
- GifLoaderDialogUtils.showMyDialog(context);
- UpdateNoteReqModel reqModel = UpdateNoteReqModel(
- admissionNo: int.parse(patient.admissionNo),
- cancelledNote: false,
- lineItemNo: model.patientProgressNoteList[index].lineItemNo,
- createdBy: model.patientProgressNoteList[index].createdBy,
- notes: model.patientProgressNoteList[index].notes,
+ GifLoaderDialogUtils
+ .showMyDialog(
+ context);
+ UpdateNoteReqModel
+ reqModel =
+ UpdateNoteReqModel(
+ admissionNo: int
+ .parse(patient
+ .admissionNo),
+ cancelledNote:
+ false,
+ lineItemNo: model
+ .patientProgressNoteList[
+ index]
+ .lineItemNo,
+ createdBy: model
+ .patientProgressNoteList[
+ index]
+ .createdBy,
+ notes: model
+ .patientProgressNoteList[
+ index]
+ .notes,
verifiedNote: true,
- patientTypeID: patient.patientType,
+ patientTypeID:
+ patient
+ .patientType,
patientOutSA: false,
);
- await model.updatePatientProgressNote(reqModel);
- await getProgressNoteList(context, model, isLocalBusy: true);
- GifLoaderDialogUtils.hideDialog(context);
+ await model
+ .updatePatientProgressNote(
+ reqModel);
+ await getProgressNoteList(
+ context, model,
+ isLocalBusy:
+ true);
+ GifLoaderDialogUtils
+ .hideDialog(
+ context);
});
},
child: Container(
decoration: BoxDecoration(
color: Colors.green[600],
- borderRadius: BorderRadius.circular(10),
+ borderRadius:
+ BorderRadius.circular(
+ 10),
),
// color:Colors.red[600],
child: Row(
children: [
Icon(
- FontAwesomeIcons.check,
+ FontAwesomeIcons
+ .check,
size: 12,
color: Colors.white,
),
@@ -248,7 +312,10 @@ class _ProgressNoteState extends State {
width: 2,
),
AppText(
- TranslationBase.of(context).noteVerify,
+ TranslationBase
+ .of(
+ context)
+ .noteVerify,
fontSize: 10,
color: Colors.white,
),
@@ -264,37 +331,67 @@ class _ProgressNoteState extends State {
onTap: () async {
showMyDialog(
context: context,
- actionName: TranslationBase.of(context).cancel,
+ actionName:
+ TranslationBase
+ .of(
+ context)
+ .cancel,
confirmFun: () async {
- GifLoaderDialogUtils.showMyDialog(
+ GifLoaderDialogUtils
+ .showMyDialog(
context,
);
- UpdateNoteReqModel reqModel = UpdateNoteReqModel(
- admissionNo: int.parse(patient.admissionNo),
+ UpdateNoteReqModel
+ reqModel =
+ UpdateNoteReqModel(
+ admissionNo: int
+ .parse(patient
+ .admissionNo),
cancelledNote: true,
- lineItemNo: model.patientProgressNoteList[index].lineItemNo,
- createdBy: model.patientProgressNoteList[index].createdBy,
- notes: model.patientProgressNoteList[index].notes,
+ lineItemNo: model
+ .patientProgressNoteList[
+ index]
+ .lineItemNo,
+ createdBy: model
+ .patientProgressNoteList[
+ index]
+ .createdBy,
+ notes: model
+ .patientProgressNoteList[
+ index]
+ .notes,
verifiedNote: false,
- patientTypeID: patient.patientType,
+ patientTypeID:
+ patient
+ .patientType,
patientOutSA: false,
);
- await model.updatePatientProgressNote(reqModel);
- await getProgressNoteList(context, model, isLocalBusy: true);
- GifLoaderDialogUtils.hideDialog(context);
+ await model
+ .updatePatientProgressNote(
+ reqModel);
+ await getProgressNoteList(
+ context, model,
+ isLocalBusy:
+ true);
+ GifLoaderDialogUtils
+ .hideDialog(
+ context);
});
},
child: Container(
decoration: BoxDecoration(
color: Colors.red[600],
- borderRadius: BorderRadius.circular(10),
+ borderRadius:
+ BorderRadius.circular(
+ 10),
),
// color:Colors.red[600],
child: Row(
children: [
Icon(
- FontAwesomeIcons.trash,
+ FontAwesomeIcons
+ .trash,
size: 12,
color: Colors.white,
),
@@ -320,25 +417,41 @@ class _ProgressNoteState extends State {
height: 10,
),
Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisAlignment:
+ MainAxisAlignment.spaceBetween,
+ crossAxisAlignment:
+ CrossAxisAlignment.start,
children: [
Container(
- width: MediaQuery.of(context).size.width * 0.60,
+ width: MediaQuery.of(context)
+ .size
+ .width *
+ 0.60,
child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment:
+ CrossAxisAlignment.start,
children: [
Row(
- crossAxisAlignment: CrossAxisAlignment.start,
+ crossAxisAlignment:
+ CrossAxisAlignment
+ .start,
children: [
AppText(
- TranslationBase.of(context).createdBy,
+ TranslationBase
+ .of(
+ context)
+ .createdBy,
fontSize: 10,
),
Expanded(
child: AppText(
- model.patientProgressNoteList[index].doctorName ?? '',
- fontWeight: FontWeight.w600,
+ model
+ .patientProgressNoteList[
+ index]
+ .doctorName ??
+ '',
+ fontWeight:
+ FontWeight.w600,
fontSize: 12,
),
),
@@ -350,55 +463,85 @@ class _ProgressNoteState extends State {
Column(
children: [
AppText(
- model.patientProgressNoteList[index].createdOn != null
+ model
+ .patientProgressNoteList[
+ index]
+ .createdOn !=
+ null
? AppDateUtils.getDayMonthYearDateFormatted(
- AppDateUtils.getDateTimeFromServerFormat(
- model.patientProgressNoteList[index].createdOn),
- isArabic: projectViewModel.isArabic)
- : AppDateUtils.getDayMonthYearDateFormatted(DateTime.now(),
- isArabic: projectViewModel.isArabic),
+ AppDateUtils
+ .getDateTimeFromServerFormat(
+ model
+ .patientProgressNoteList[
+ index]
+ .createdOn),
+ isArabic:
+ projectViewModel
+ .isArabic)
+ : AppDateUtils
+ .getDayMonthYearDateFormatted(
+ DateTime.now(),
+ isArabic:
+ projectViewModel
+ .isArabic),
fontWeight: FontWeight.w600,
fontSize: 14,
),
AppText(
- model.patientProgressNoteList[index].createdOn != null
- ? AppDateUtils.getHour(AppDateUtils.getDateTimeFromServerFormat(
- model.patientProgressNoteList[index].createdOn))
- : AppDateUtils.getHour(DateTime.now()),
+ model
+ .patientProgressNoteList[
+ index]
+ .createdOn !=
+ null
+ ? AppDateUtils.getHour(AppDateUtils
+ .getDateTimeFromServerFormat(
+ model
+ .patientProgressNoteList[
+ index]
+ .createdOn))
+ : AppDateUtils.getHour(
+ DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: 14,
),
],
- crossAxisAlignment: CrossAxisAlignment.end,
+ crossAxisAlignment:
+ CrossAxisAlignment.end,
)
],
),
SizedBox(
height: 8,
),
- Row(mainAxisAlignment: MainAxisAlignment.start, children: [
- Expanded(
- child: AppText(
- model.patientProgressNoteList[index].notes,
- fontSize: 10,
- ),
- ),
- ])
- ],
- ),
- SizedBox(
- height: 20,
- ),
- ],
- ),
+ Row(
+ mainAxisAlignment:
+ MainAxisAlignment.start,
+ children: [
+ Expanded(
+ child: AppText(
+ model
+ .patientProgressNoteList[
+ index]
+ .notes,
+ fontSize: 10,
+ ),
+ ),
+ ])
+ ],
+ ),
+ SizedBox(
+ height: 20,
+ ),
+ ],
),
- );
- }),
- ),
+ ),
+ );
+ }),
),
- ],
- ),
+ ),
+ ],
),
+ ),
),
);
}
@@ -407,92 +550,100 @@ class _ProgressNoteState extends State {
showDialog(
context: context,
builder: (ctx) => Center(
- child: Container(
- width: MediaQuery.of(context).size.width * 0.8,
- height: 200,
- child: AppScaffold(
- isShowAppBar: false,
- body: Container(
- color: Colors.white,
- child: Center(
- child: Column(
+ child: Container(
+ width: MediaQuery
+ .of(context)
+ .size
+ .width * 0.8,
+ height: 200,
+ child: AppScaffold(
+ isShowAppBar: false,
+ body: Container(
+ color: Colors.white,
+ child: Center(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ // SizedBox(height: 20,),
+ SizedBox(
+ height: 10,
+ ),
+ Row(
mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.center,
children: [
- // SizedBox(height: 20,),
- SizedBox(
- height: 10,
- ),
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- AppText(
- TranslationBase.of(context).noteConfirm,
- fontWeight: FontWeight.w600,
- color: Colors.black,
- fontSize: 16,
- ),
- ],
- ),
- SizedBox(
- height: 10,
- ),
- DividerWithSpacesAround(),
- SizedBox(
- height: 12,
+ AppText(
+ TranslationBase
+ .of(context)
+ .noteConfirm,
+ fontWeight: FontWeight.w600,
+ color: Colors.black,
+ fontSize: 16,
),
+ ],
+ ),
+ SizedBox(
+ height: 10,
+ ),
+ DividerWithSpacesAround(),
+ SizedBox(
+ height: 12,
+ ),
- Container(
- padding: EdgeInsets.all(20),
- color: Colors.white,
- child: AppText(
- projectViewModel.isArabic
- ? "هل أنت متأكد أنك تريد تنفيذ $actionName هذا الأمر؟"
- : 'Are you sure you want $actionName this order?',
- fontSize: 15,
- textAlign: TextAlign.center,
- ),
- ),
+ Container(
+ padding: EdgeInsets.all(20),
+ color: Colors.white,
+ child: AppText(
+ projectViewModel.isArabic?"هل أنت متأكد أنك تريد تنفيذ $actionName هذا الأمر؟":'Are you sure you want $actionName this order?',
+ fontSize: 15,
+ textAlign: TextAlign.center,
+ ),
+ ),
- SizedBox(
- height: 8,
- ),
- DividerWithSpacesAround(),
- FractionallySizedBox(
- widthFactor: 0.75,
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- FlatButton(
- child: AppText(
- TranslationBase.of(context).cancel,
- fontWeight: FontWeight.w600,
- color: Colors.black,
- fontSize: 16,
- ), //Text("Cancel"),
- onPressed: () {
- Navigator.of(context).pop();
- }),
- FlatButton(
- child: AppText(
- TranslationBase.of(context).noteConfirm,
- fontWeight: FontWeight.w600,
- color: Colors.red.shade700,
- fontSize: 16,
- ), //Text("Confirm", ),
- onPressed: () async {
- await confirmFun();
- Navigator.of(context).pop();
- })
- ],
- ),
- )
- ],
+ SizedBox(
+ height: 8,
),
- ),
+ DividerWithSpacesAround(),
+ FractionallySizedBox(
+ widthFactor: 0.75,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ FlatButton(
+ child: AppText(
+ TranslationBase
+ .of(context)
+ .cancel,
+ fontWeight: FontWeight.w600,
+ color: Colors.black,
+ fontSize: 16,
+ ), //Text("Cancel"),
+ onPressed: () {
+ Navigator.of(context).pop();
+ }),
+ FlatButton(
+ child: AppText(
+ TranslationBase
+ .of(context)
+ .noteConfirm,
+ fontWeight: FontWeight.w600,
+ color: Colors.red.shade700,
+ fontSize: 16,
+ ), //Text("Confirm", ),
+ onPressed: () async {
+ await confirmFun();
+ Navigator.of(context).pop();
+ })
+ ],
+ ),
+ )
+ ],
),
),
),
- ));
+ ),
+ ),
+ )
+ );
}
}
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 a225773c..a8b4e65b 100644
--- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
+++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
@@ -332,7 +332,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,