From fcdec6dbf77c7d34f11e9905de808e1af7314efb Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Sun, 6 Mar 2022 10:24:39 +0300 Subject: [PATCH 1/7] Fix some design issue in admission request screens --- .../admission-request-first-screen.dart | 198 +++++++++--------- .../admission-request-third-screen.dart | 31 +-- .../admission-request_second-screen.dart | 34 ++- .../text_fields/app-textfield-custom.dart | 3 +- 4 files changed, 124 insertions(+), 142 deletions(-) diff --git a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart index b0770e7a..25175ab3 100644 --- a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart @@ -9,6 +9,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -23,6 +24,7 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../../../routes.dart'; +import '../soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; class AdmissionRequestFirstScreen extends StatefulWidget { @override @@ -100,8 +102,7 @@ class _AdmissionRequestThirdScreenState Padding( padding: const EdgeInsets.all(5.0), child: AppText( - TranslationBase.of(context) - .specialityAndDoctorDetail, + Utils.convertToTitleCase(TranslationBase.of(context).specialityAndDoctorDetail), color: Color(0xFF2E303A), fontSize: SizeConfig.textMultiplier * 1.8, fontWeight: FontWeight.w700, @@ -360,6 +361,9 @@ class _AdmissionRequestThirdScreenState validationError: surgicalHistoryError, inputType: TextInputType.multiline, ), + SizedBox( + height: 100, + ), ], ), ), @@ -367,106 +371,102 @@ class _AdmissionRequestThirdScreenState ), ), ), - Container( - margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: AppButton( - title: TranslationBase.of(context).next, - color: HexColor("#D02127"), - onPressed: () async { - await locator().logEvent( - eventCategory: "Admission Request First Screen", - eventAction: "Go To Admission Request Two", - ); - model.admissionRequestData = AdmissionRequest(); - if (_selectedClinic != null && - _selectedDoctor != null && - _sickLeaveCommentsController.text != "" && - _postMedicalHistoryController.text != "" && - _postSurgicalHistoryController.text != "") { - model.admissionRequestData.patientMRN = - patient.patientMRN; - model.admissionRequestData.appointmentNo = - patient.appointmentNo; - model.admissionRequestData.episodeID = patient.episodeNo; - model.admissionRequestData.admissionRequestNo = 0; + ], + ), + ), + bottomSheet: BottomSheetDialogButton( + label: "${TranslationBase.of(context).next}", + onTap: () async { + await locator().logEvent( + eventCategory: "Admission Request First Screen", + eventAction: "Go To Admission Request Two", + ); + model.admissionRequestData = AdmissionRequest(); + if (_selectedClinic != null && + _selectedDoctor != null && + _sickLeaveCommentsController.text != "" && + _postMedicalHistoryController.text != "" && + _postSurgicalHistoryController.text != "") { + model.admissionRequestData.patientMRN = + patient.patientMRN; + model.admissionRequestData.appointmentNo = + patient.appointmentNo; + model.admissionRequestData.episodeID = patient.episodeNo; + model.admissionRequestData.admissionRequestNo = 0; - model.admissionRequestData.admitToClinic = - _selectedClinic['clinicID']; - model.admissionRequestData.mrpDoctorID = - _selectedDoctor['DoctorID']; + model.admissionRequestData.admitToClinic = + _selectedClinic['clinicID']; + model.admissionRequestData.mrpDoctorID = + _selectedDoctor['DoctorID']; - model.admissionRequestData.isPregnant = _patientPregnant; - model.admissionRequestData.isSickLeaveRequired = - _isSickLeaveRequired; - model.admissionRequestData.sickLeaveComments = - _sickLeaveCommentsController.text; - model.admissionRequestData.isDietType = - _selectedDietType != null ? true : false; - model.admissionRequestData.dietType = - _selectedDietType != null - ? _selectedDietType['id'] - : 0; - model.admissionRequestData.dietRemarks = - _dietTypeRemarksController.text; - model.admissionRequestData.pastMedicalHistory = - _postMedicalHistoryController.text; - model.admissionRequestData.pastSurgicalHistory = - _postSurgicalHistoryController.text; - Navigator.of(context) - .pushNamed(PATIENT_ADMISSION_REQUEST_2, arguments: { - 'patient': patient, - 'patientType': patientType, - 'arrivalType': arrivalType, - 'admission-data': model.admissionRequestData - }); - } else { - DrAppToastMsg.showErrorToast( - TranslationBase.of(context).pleaseFill); + model.admissionRequestData.isPregnant = _patientPregnant; + model.admissionRequestData.isSickLeaveRequired = + _isSickLeaveRequired; + model.admissionRequestData.sickLeaveComments = + _sickLeaveCommentsController.text; + model.admissionRequestData.isDietType = + _selectedDietType != null ? true : false; + model.admissionRequestData.dietType = + _selectedDietType != null + ? _selectedDietType['id'] + : 0; + model.admissionRequestData.dietRemarks = + _dietTypeRemarksController.text; + model.admissionRequestData.pastMedicalHistory = + _postMedicalHistoryController.text; + model.admissionRequestData.pastSurgicalHistory = + _postSurgicalHistoryController.text; + Navigator.of(context) + .pushNamed(PATIENT_ADMISSION_REQUEST_2, arguments: { + 'patient': patient, + 'patientType': patientType, + 'arrivalType': arrivalType, + 'admission-data': model.admissionRequestData + }); + } else { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context).pleaseFill); - setState(() { - if (_selectedClinic == null) { - clinicError = - TranslationBase.of(context).fieldRequired; - } else { - clinicError = null; - } - if (_selectedDoctor == null) { - doctorError = - TranslationBase.of(context).fieldRequired; - } else { - doctorError = null; - } - if (_sickLeaveCommentsController.text == "") { - sickLeaveCommentError = - TranslationBase.of(context).fieldRequired; - } else { - sickLeaveCommentError = null; - } - if (_selectedDietType == null) { - dietTypeError = - TranslationBase.of(context).fieldRequired; - } else { - dietTypeError = null; - } - if (_postMedicalHistoryController.text == "") { - medicalHistoryError = - TranslationBase.of(context).fieldRequired; - } else { - medicalHistoryError = null; - } - if (_postSurgicalHistoryController.text == "") { - surgicalHistoryError = - TranslationBase.of(context).fieldRequired; - } else { - surgicalHistoryError = null; - } - }); - } - }, - ), - ), - ], - ), + setState(() { + if (_selectedClinic == null) { + clinicError = + TranslationBase.of(context).fieldRequired; + } else { + clinicError = null; + } + if (_selectedDoctor == null) { + doctorError = + TranslationBase.of(context).fieldRequired; + } else { + doctorError = null; + } + if (_sickLeaveCommentsController.text == "") { + sickLeaveCommentError = + TranslationBase.of(context).fieldRequired; + } else { + sickLeaveCommentError = null; + } + if (_selectedDietType == null) { + dietTypeError = + TranslationBase.of(context).fieldRequired; + } else { + dietTypeError = null; + } + if (_postMedicalHistoryController.text == "") { + medicalHistoryError = + TranslationBase.of(context).fieldRequired; + } else { + medicalHistoryError = null; + } + if (_postSurgicalHistoryController.text == "") { + surgicalHistoryError = + TranslationBase.of(context).fieldRequired; + } else { + surgicalHistoryError = null; + } + }); + } + }, ), ), ); diff --git a/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart b/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart index 1290b84e..47d496d5 100644 --- a/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart @@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -43,8 +44,6 @@ class _AdmissionRequestThirdScreenState Widget build(BuildContext context) { final routeArgs = ModalRoute.of(context).settings.arguments as Map; PatiantInformtion patient = routeArgs['patient']; - String patientType = routeArgs['patientType']; - String arrivalType = routeArgs['arrivalType']; AdmissionRequest admissionRequest = routeArgs['admission-data']; final screenSize = MediaQuery.of(context).size; @@ -70,25 +69,15 @@ class _AdmissionRequestThirdScreenState child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - margin: EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "${TranslationBase.of(context).admission}", - fontSize: SizeConfig.textMultiplier * 1.6, - fontWeight: FontWeight.w700, - color: Color(0xFF2E303A), - ), - AppText( - TranslationBase.of(context).request, - fontSize: SizeConfig.textMultiplier * 3, - fontWeight: FontWeight.bold, - color: Color(0xFF2E303A), - ) - ], - ), + SizedBox( + height: 15, + ), + ServiceTitle( + title: "${TranslationBase.of(context).admission}", + subTitle: TranslationBase.of(context).request, + ), + SizedBox( + height: 15, ), Container( margin: EdgeInsets.symmetric(vertical: 0, horizontal: 16), diff --git a/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart b/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart index ed95e4ce..b00a76d6 100644 --- a/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart @@ -12,6 +12,8 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -92,25 +94,15 @@ class _AdmissionRequestSecondScreenState child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - margin: EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "${TranslationBase.of(context).admission}", - fontSize: SizeConfig.textMultiplier * 1.6, - fontWeight: FontWeight.w700, - color: Color(0xFF2E303A), - ), - AppText( - TranslationBase.of(context).request, - fontSize: SizeConfig.textMultiplier * 3, - fontWeight: FontWeight.bold, - color: Color(0xFF2E303A), - ) - ], - ), + SizedBox( + height: 15, + ), + ServiceTitle( + title: "${TranslationBase.of(context).admission}", + subTitle: TranslationBase.of(context).request, + ), + SizedBox( + height: 15, ), Container( margin: @@ -119,8 +111,8 @@ class _AdmissionRequestSecondScreenState crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - TranslationBase.of(context) - .postPlansEstimatedCost, + Utils.convertToTitleCase(TranslationBase.of(context) + .postPlansEstimatedCost,), color: Color(0xFF2E303A), fontSize: SizeConfig.textMultiplier * 1.8, fontWeight: FontWeight.w700, diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index 6bf15219..72d80823 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_field_error.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:flutter/material.dart'; @@ -183,7 +184,7 @@ class _AppTextFieldCustomState extends State { obscureText: widget.isSecure), ) : AppText( - widget.dropDownText, + Utils.convertToTitleCase(widget.dropDownText), fontFamily: 'Poppins', color: Color(0xFF575757), fontSize: SizeConfig.textMultiplier * 1.7, From 3f41ff267acd024daf155f76272af897c28932de Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Sun, 6 Mar 2022 16:05:24 +0300 Subject: [PATCH 2/7] Fix some design issue in admission request screens and make new component called two_bottom_sheet_dialog_buttons and use it in admission-request_second-screen.dart and admission-request-third-screen --- .../admission-request-first-screen.dart | 4 +- .../admission-request-third-screen.dart | 91 +++++ .../admission-request_second-screen.dart | 323 +++++++++--------- .../refer-patient-screen-in-patient.dart | 2 +- .../refer_details/refer-patient-screen.dart | 2 +- .../assessment/add_assessment_details.dart | 2 +- .../objective/add_examination_page.dart | 2 +- .../subjective/allergies/add_allergies.dart | 2 +- .../history/add_history_dialog.dart | 2 +- .../subjective/medication/add_medication.dart | 2 +- .../add_drug/add_drug_widget.dart | 2 +- .../procedures/add-favourite-procedure.dart | 2 +- .../bottom_sheet_dialog_button.dart | 2 +- .../two_bottom_sheet_dialog_buttons.dart | 50 +++ 14 files changed, 317 insertions(+), 171 deletions(-) rename lib/{screens/patients/profile/soap_update/shared_soap_widgets => widgets/bottom_sheet}/bottom_sheet_dialog_button.dart (96%) create mode 100644 lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart diff --git a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart index 25175ab3..6cbadd09 100644 --- a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart @@ -14,7 +14,6 @@ import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; @@ -22,9 +21,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; - import '../../../../routes.dart'; -import '../soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import '../../../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; class AdmissionRequestFirstScreen extends StatefulWidget { @override diff --git a/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart b/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart index 47d496d5..b0ecb8de 100644 --- a/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart @@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -341,6 +342,96 @@ class _AdmissionRequestThirdScreenState ], ), ), + bottomSheet: TwoBottomSheetDialogButtons( + widget: Row( + children: [ + Container( + width: MediaQuery.of(context).size.width * 0.4, + child: AppButton( + title: TranslationBase.of(context).previous, + color: HexColor("#EAEAEA"), + fontColor: Colors.black, + onPressed: () { + Navigator.pop(context); + }, + ), + ), + SizedBox(width: 10,), + Container( + width: MediaQuery.of(context).size.width * 0.4, + child: AppButton( + title: TranslationBase.of(context).submit, + color: HexColor("#359846"), + onPressed: () async { + await locator().logEvent( + eventCategory: "Admission Request Third Screen", + eventAction: "Submit Admission Request", + ); + if (_selectedDiagnosis != null && + _selectedIcd != null && + _selectedDiagnosisType != null) { + model.admissionRequestData = admissionRequest; + + dynamic admissionRequestDiagnoses = [ + { + 'diagnosisDescription': + _selectedDiagnosis['nameEn'], + 'diagnosisType': _selectedDiagnosis['id'], + 'icdCode': _selectedIcd['code'], + 'icdCodeDescription': + _selectedIcd['description'], + 'type': _selectedDiagnosisType['code'], + 'remarks': "", + 'isActive': true, + } + ]; + model.admissionRequestData + .admissionRequestDiagnoses = + admissionRequestDiagnoses; + + await model.makeAdmissionRequest(); + if (model.state == ViewState.ErrorLocal) { + DrAppToastMsg.showErrorToast(model.error); + } else { + DrAppToastMsg.showSuccesToast( + TranslationBase.of(context) + .admissionRequestSuccessMsg); + Navigator.popUntil(context, + ModalRoute.withName(PATIENTS_PROFILE)); + } + } else { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context).pleaseFill); + + setState(() { + if (_selectedDiagnosis == null) { + diagnosisError = + TranslationBase.of(context).fieldRequired; + } else { + diagnosisError = null; + } + + if (_selectedIcd == null) { + icdError = + TranslationBase.of(context).fieldRequired; + } else { + icdError = null; + } + + if (_selectedDiagnosisType == null) { + diagnosisTypeError = + TranslationBase.of(context).fieldRequired; + } else { + diagnosisTypeError = null; + } + }); + } + }, + ), + ), + ], + ) + ), ), ); } diff --git a/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart b/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart index b00a76d6..275c0d2c 100644 --- a/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart +++ b/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart @@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -456,6 +457,9 @@ class _AdmissionRequestSecondScreenState } }, ), + SizedBox( + height: 100, + ), ], ), ), @@ -463,184 +467,187 @@ class _AdmissionRequestSecondScreenState ), ), ), + ], + ), + ), + bottomSheet: TwoBottomSheetDialogButtons( + widget: Row( + children: [ Container( - margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Row( - children: [ - Expanded( - child: AppButton( - title: TranslationBase.of(context).previous, - color: Color(0xffEAEAEA), - fontColor: Colors.black, - onPressed: () { - Navigator.pop(context); - }, - ), - ), - SizedBox( - width: 10, - ), - Expanded( - child: AppButton( - title: TranslationBase.of(context).next, - color: HexColor("#D02127"), - onPressed: () async { - await locator().logEvent( - eventCategory: "Admission Request Second Screen", - eventAction: "Go To Admission Request Three", - ); - if (_estimatedCostController.text != "" && - _postPlansEstimatedCostController.text != "" && - _expectedDaysController.text != "" && - _expectedAdmissionDate != null && - _otherDepartmentsInterventionsController.text != - "" && - _selectedFloor != null && - _selectedRoomCategory != - null /*_selectedWard is not required*/ && - _treatmentLineController.text != "" && - _complicationsController.text != "" && - _otherProceduresController.text != "" && - _selectedAdmissionType != null) { - model.admissionRequestData = admissionRequest; + width: MediaQuery.of(context).size.width * 0.4, + child: AppButton( + title: TranslationBase.of(context).previous, + color: HexColor('#EFEFEF'), + fontColor: Colors.black, + onPressed: () { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 10, + ), + Container( + width: MediaQuery.of(context).size.width * 0.4, + child: AppButton( + title: TranslationBase.of(context).next, + color: AppGlobal.appRedColor, + fontColor: Colors.white, + onPressed: () async { + await locator().logEvent( + eventCategory: "Admission Request Second Screen", + eventAction: "Go To Admission Request Three", + ); + if (_estimatedCostController.text != "" && + _postPlansEstimatedCostController.text != "" && + _expectedDaysController.text != "" && + _expectedAdmissionDate != null && + _otherDepartmentsInterventionsController.text != + "" && + _selectedFloor != null && + _selectedRoomCategory != + null /*_selectedWard is not required*/ && + _treatmentLineController.text != "" && + _complicationsController.text != "" && + _otherProceduresController.text != "" && + _selectedAdmissionType != null) { + model.admissionRequestData = admissionRequest; - model.admissionRequestData.estimatedCost = - int.parse(_estimatedCostController.text); - model.admissionRequestData - .elementsForImprovement = - _postPlansEstimatedCostController.text; + model.admissionRequestData.estimatedCost = + int.parse(_estimatedCostController.text); + model.admissionRequestData + .elementsForImprovement = + _postPlansEstimatedCostController.text; - model.admissionRequestData.expectedDays = - int.parse(_expectedDaysController.text); - model.admissionRequestData.admissionDate = - _expectedAdmissionDate.toIso8601String(); - model.admissionRequestData - .otherDepartmentInterventions = - _otherDepartmentsInterventionsController.text; - model.admissionRequestData.admissionLocationID = - _selectedFloor['floorID']; - model.admissionRequestData.wardID = - _selectedWard != null - ? _selectedWard['nursingStationID'] - : 0; - model.admissionRequestData.roomCategoryID = - _selectedRoomCategory['categoryID']; + model.admissionRequestData.expectedDays = + int.parse(_expectedDaysController.text); + model.admissionRequestData.admissionDate = + _expectedAdmissionDate.toIso8601String(); + model.admissionRequestData + .otherDepartmentInterventions = + _otherDepartmentsInterventionsController.text; + model.admissionRequestData.admissionLocationID = + _selectedFloor['floorID']; + model.admissionRequestData.wardID = + _selectedWard != null + ? _selectedWard['nursingStationID'] + : 0; + model.admissionRequestData.roomCategoryID = + _selectedRoomCategory['categoryID']; - model.admissionRequestData - .admissionRequestProcedures = []; + model.admissionRequestData + .admissionRequestProcedures = []; - model.admissionRequestData.mainLineOfTreatment = - _treatmentLineController.text; - model.admissionRequestData.complications = - _complicationsController.text; - model.admissionRequestData.otherProcedures = - _otherProceduresController.text; - model.admissionRequestData.admissionType = - _selectedAdmissionType['id']; + model.admissionRequestData.mainLineOfTreatment = + _treatmentLineController.text; + model.admissionRequestData.complications = + _complicationsController.text; + model.admissionRequestData.otherProcedures = + _otherProceduresController.text; + model.admissionRequestData.admissionType = + _selectedAdmissionType['id']; - Navigator.of(context).pushNamed( - PATIENT_ADMISSION_REQUEST_3, - arguments: { - 'patient': patient, - 'patientType': patientType, - 'arrivalType': arrivalType, - 'admission-data': model.admissionRequestData - }); - } else { - DrAppToastMsg.showErrorToast( - TranslationBase.of(context).pleaseFill); + Navigator.of(context).pushNamed( + PATIENT_ADMISSION_REQUEST_3, + arguments: { + 'patient': patient, + 'patientType': patientType, + 'arrivalType': arrivalType, + 'admission-data': model.admissionRequestData + }); + } else { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context).pleaseFill); - setState(() { - if (_estimatedCostController.text == "") { - costError = - TranslationBase.of(context).fieldRequired; - } else { - costError = null; - } + setState(() { + if (_estimatedCostController.text == "") { + costError = + TranslationBase.of(context).fieldRequired; + } else { + costError = null; + } - if (_postPlansEstimatedCostController.text == - "") { - plansError = - TranslationBase.of(context).fieldRequired; - } else { - plansError = null; - } + if (_postPlansEstimatedCostController.text == + "") { + plansError = + TranslationBase.of(context).fieldRequired; + } else { + plansError = null; + } - if (_expectedDaysController.text == "") { - expectedDaysError = - TranslationBase.of(context).fieldRequired; - } else { - expectedDaysError = null; - } + if (_expectedDaysController.text == "") { + expectedDaysError = + TranslationBase.of(context).fieldRequired; + } else { + expectedDaysError = null; + } - if (_expectedAdmissionDate == null) { - expectedDatesError = - TranslationBase.of(context).fieldRequired; - } else { - expectedDatesError = null; - } + if (_expectedAdmissionDate == null) { + expectedDatesError = + TranslationBase.of(context).fieldRequired; + } else { + expectedDatesError = null; + } - if (_otherDepartmentsInterventionsController - .text == - "") { - otherInterventionsError = - TranslationBase.of(context).fieldRequired; - } else { - otherInterventionsError = null; - } + if (_otherDepartmentsInterventionsController + .text == + "") { + otherInterventionsError = + TranslationBase.of(context).fieldRequired; + } else { + otherInterventionsError = null; + } - if (_selectedFloor == null) { - floorError = - TranslationBase.of(context).fieldRequired; - } else { - floorError = null; - } + if (_selectedFloor == null) { + floorError = + TranslationBase.of(context).fieldRequired; + } else { + floorError = null; + } - if (_selectedRoomCategory == null) { - roomError = - TranslationBase.of(context).fieldRequired; - } else { - roomError = null; - } + if (_selectedRoomCategory == null) { + roomError = + TranslationBase.of(context).fieldRequired; + } else { + roomError = null; + } - if (_treatmentLineController.text == "") { - treatmentsError = - TranslationBase.of(context).fieldRequired; - } else { - treatmentsError = null; - } + if (_treatmentLineController.text == "") { + treatmentsError = + TranslationBase.of(context).fieldRequired; + } else { + treatmentsError = null; + } - if (_complicationsController.text == "") { - complicationsError = - TranslationBase.of(context).fieldRequired; - } else { - complicationsError = null; - } + if (_complicationsController.text == "") { + complicationsError = + TranslationBase.of(context).fieldRequired; + } else { + complicationsError = null; + } - if (_otherProceduresController.text == "") { - proceduresError = - TranslationBase.of(context).fieldRequired; - } else { - proceduresError = null; - } + if (_otherProceduresController.text == "") { + proceduresError = + TranslationBase.of(context).fieldRequired; + } else { + proceduresError = null; + } - if (_selectedAdmissionType == null) { - admissionTypeError = - TranslationBase.of(context).fieldRequired; - } else { - admissionTypeError = null; - } - }); - } - }, - ), - ), - ], + if (_selectedAdmissionType == null) { + admissionTypeError = + TranslationBase.of(context).fieldRequired; + } else { + admissionTypeError = null; + } + }); + } + }, ), ), ], - ), - )), + ) + ), + ), ); } diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart index dfdb6f3d..3a69d0b3 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart @@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dar import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart index fb336b42..bf9af33e 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dar import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 44a4fa73..0d98ff81 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -11,7 +11,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_as import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index 79d77f4f..bd1801ac 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart index 1f3978fa..226ec2f3 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart index b9cd5213..277dd23a 100644 --- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart +++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart @@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index dcca17a8..c9a07bb5 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart index aa7d3c57..6f593a82 100644 --- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart +++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index 298dde1b..a004fc15 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -14,7 +14,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; +import '../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'ProcedureType.dart'; class AddFavouriteProcedure extends StatefulWidget { diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart similarity index 96% rename from lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart rename to lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart index 440e1e3e..13354f22 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart +++ b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart @@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; -import '../../../../../config/config.dart'; +import '../../config/config.dart'; class BottomSheetDialogButton extends StatelessWidget { final Function onTap; diff --git a/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart b/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart new file mode 100644 index 00000000..20eb6525 --- /dev/null +++ b/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart @@ -0,0 +1,50 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; + +import '../../config/config.dart'; + +class TwoBottomSheetDialogButtons extends StatelessWidget { + final Function onTap; + final String label; + final Widget widget; + + double headerHeight = SizeConfig.heightMultiplier * 12; + + TwoBottomSheetDialogButtons({Key key, this.onTap, this.label, this.widget}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#EFEFEF'), width: 1), + ), + height: headerHeight, + width: double.infinity, + child: Column( + children: [ + Container( + margin: EdgeInsets.only( + top: headerHeight * (SizeConfig.isWidthLarge ? 0.3 : 0.2), left: SizeConfig.heightMultiplier*4.5 + ), + child: Center( + child: Row( + children: [ + widget, + ], + ) + ), + ), + SizedBox( + height: 5, + ), + ], + ), + ); + } +} From b7892fc18e89213cb95a30596d4165c807a9114c Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Sun, 6 Mar 2022 16:14:43 +0300 Subject: [PATCH 3/7] Rename to files name of admission request screens to match our standard --- .../admission_request_first_screen.dart} | 0 .../admission_request_second_screen.dart} | 0 .../admission_request_third_screen.dart} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename lib/screens/patients/profile/{admission-request/admission-request-first-screen.dart => admission_request/admission_request_first_screen.dart} (100%) rename lib/screens/patients/profile/{admission-request/admission-request_second-screen.dart => admission_request/admission_request_second_screen.dart} (100%) rename lib/screens/patients/profile/{admission-request/admission-request-third-screen.dart => admission_request/admission_request_third_screen.dart} (100%) diff --git a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart similarity index 100% rename from lib/screens/patients/profile/admission-request/admission-request-first-screen.dart rename to lib/screens/patients/profile/admission_request/admission_request_first_screen.dart diff --git a/lib/screens/patients/profile/admission-request/admission-request_second-screen.dart b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart similarity index 100% rename from lib/screens/patients/profile/admission-request/admission-request_second-screen.dart rename to lib/screens/patients/profile/admission_request/admission_request_second_screen.dart diff --git a/lib/screens/patients/profile/admission-request/admission-request-third-screen.dart b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart similarity index 100% rename from lib/screens/patients/profile/admission-request/admission-request-third-screen.dart rename to lib/screens/patients/profile/admission_request/admission_request_third_screen.dart From fa4e4b0dfdbdb9a33f83dc421ad075e02dae4c97 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Sun, 6 Mar 2022 16:15:47 +0300 Subject: [PATCH 4/7] Rename to files name of admission request screens to match our standard --- lib/routes.dart | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/routes.dart b/lib/routes.dart index b4d2c171..1e0d37c0 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -6,6 +6,9 @@ import 'package:doctor_app_flutter/screens/patient-sick-leave/patient_sick_leave import 'package:doctor_app_flutter/screens/patients/ECGPage.dart'; import 'package:doctor_app_flutter/screens/patients/insurance_approval_screen_patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/admission-orders/admission_orders_screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/admission_request/admission_request_first_screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/admission_request/admission_request_second_screen.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/admission_request/admission_request_third_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/diabetic_chart.dart'; import 'package:doctor_app_flutter/screens/patients/profile/diagnosis/diagnosis_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/discharge_summary/discharge_summary.dart'; @@ -27,14 +30,10 @@ import 'package:doctor_app_flutter/screens/patients/profile/vte_assessment/vte_a import 'package:doctor_app_flutter/screens/prescription/new_prescriptions_page.dart'; import 'package:doctor_app_flutter/screens/prescription/old_prescriptions_page.dart'; import 'package:doctor_app_flutter/screens/procedures/procedure_screen.dart'; - import './screens/auth/login_screen.dart'; import './screens/patients/profile/vital_sign/vital_sign_details_screen.dart'; import 'landing_page.dart'; import 'screens/patients/profile/UCAF/ucaf_pager_screen.dart'; -import 'screens/patients/profile/admission-request/admission-request-first-screen.dart'; -import 'screens/patients/profile/admission-request/admission-request-third-screen.dart'; -import 'screens/patients/profile/admission-request/admission-request_second-screen.dart'; import 'screens/patients/profile/profile_screen/patient_profile_screen.dart'; import 'screens/patients/profile/referral/referral_details/my-referral-detail-screen.dart'; import 'screens/patients/profile/referral/refer_details/refer-patient-screen.dart'; @@ -61,9 +60,9 @@ const String PATIENT_INSURANCE_APPROVALS_NEW = const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String CREATE_EPISODE = 'patients/create-episode'; const String UPDATE_EPISODE = 'patients/update-episode'; -const String PATIENT_ADMISSION_REQUEST = 'patients/admission-request'; -const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission-request-second'; -const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission-request-third'; +const String PATIENT_ADMISSION_REQUEST = 'patients/admission_request'; +const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request-second'; +const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request-third'; const String PATIENT_MEDICAL_REPORT = 'patients/medical-report'; const String PATIENT_MEDICAL_REPORT_INSERT = 'patients/medical-report-insert'; const String PATIENT_MEDICAL_REPORT_DETAIL = 'patients/medical-report-detail'; From 31cf229763e6bbe8e7adcd37ec48342459ee9c60 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Tue, 8 Mar 2022 12:22:57 +0300 Subject: [PATCH 5/7] Fixing the comments --- lib/routes.dart | 4 ++-- .../admission_request/admission_request_first_screen.dart | 2 +- .../refer_details/refer-patient-screen-in-patient.dart | 2 +- .../profile/referral/refer_details/refer-patient-screen.dart | 2 +- .../soap_update/assessment/add_assessment_details.dart | 2 +- .../profile/soap_update/objective/add_examination_page.dart | 2 +- .../soap_update/subjective/allergies/add_allergies.dart | 2 +- .../soap_update/subjective/history/add_history_dialog.dart | 2 +- .../soap_update/subjective/medication/add_medication.dart | 2 +- .../add_prescription/add_drug/add_drug_widget.dart | 2 +- lib/screens/procedures/add-favourite-procedure.dart | 2 +- lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/routes.dart b/lib/routes.dart index 1e0d37c0..53145bdc 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -61,8 +61,8 @@ const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String CREATE_EPISODE = 'patients/create-episode'; const String UPDATE_EPISODE = 'patients/update-episode'; const String PATIENT_ADMISSION_REQUEST = 'patients/admission_request'; -const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request-second'; -const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request-third'; +const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request_second'; +const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request_third'; const String PATIENT_MEDICAL_REPORT = 'patients/medical-report'; const String PATIENT_MEDICAL_REPORT_INSERT = 'patients/medical-report-insert'; const String PATIENT_MEDICAL_REPORT_DETAIL = 'patients/medical-report-detail'; diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart index 6cbadd09..e69faab8 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart @@ -372,7 +372,7 @@ class _AdmissionRequestThirdScreenState ], ), ), - bottomSheet: BottomSheetDialogButton( + bottomSheet: CustomBottomSheetContainer( label: "${TranslationBase.of(context).next}", onTap: () async { await locator().logEvent( diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart index 3a69d0b3..a68127c0 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart @@ -567,7 +567,7 @@ class _PatientMakeInPatientReferralScreenState extends State { ], ), if (model.patientReferral.length == 0) - BottomSheetDialogButton( + CustomBottomSheetContainer( label: "${TranslationBase.of(context).refer}", onTap: () async { await locator().logEvent( diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 0d98ff81..181560a6 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -399,7 +399,7 @@ class _AddAssessmentDetailsState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: (widget.isUpdate ? 'Update Assessment Details' : 'Add Assessment Details'), diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index bd1801ac..82dfb0da 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -102,7 +102,7 @@ class _AddExaminationPageState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: "${TranslationBase.of(context).addExamination}", onTap: () { widget diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart index 226ec2f3..026ca14a 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart @@ -118,7 +118,7 @@ class _AddAllergiesState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: TranslationBase.of(context).addAllergies, onTap: () { setState(() { diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart index 277dd23a..16bec79b 100644 --- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart +++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart @@ -165,7 +165,7 @@ class _AddHistoryDialogState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: TranslationBase.of(context).addSelectedHistories, onTap: () { widget.addSelectedHistories(); diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index c9a07bb5..0b92aef9 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -424,7 +424,7 @@ class _AddMedicationState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: TranslationBase.of(context).addMedication, onTap: () { setState(() { diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart index 6f593a82..8151eb90 100644 --- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart +++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart @@ -84,7 +84,7 @@ class _AddDrugWidgetState extends State { ? Container( height: 0, ) - : BottomSheetDialogButton( + : CustomBottomSheetContainer( label: TranslationBase.of(context).addMedication, onTap: () async { GifLoaderDialogUtils.showMyDialog(context); diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index a004fc15..5e7c9eb0 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -83,7 +83,7 @@ class _AddFavouriteProcedureState extends State { .youDoNotHaveFavoritePrescription, ), ]), - bottomSheet: BottomSheetDialogButton( + bottomSheet: CustomBottomSheetContainer( label: widget.procedureType.getAddButtonTitle(context) ?? TranslationBase.of(context).addSelectedProcedures, onTap: () async { diff --git a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart index 13354f22..af7d0a4c 100644 --- a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart +++ b/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart @@ -5,13 +5,13 @@ import 'package:hexcolor/hexcolor.dart'; import '../../config/config.dart'; -class BottomSheetDialogButton extends StatelessWidget { +class CustomBottomSheetContainer extends StatelessWidget { final Function onTap; final String label; double headerHeight = SizeConfig.heightMultiplier * 12; - BottomSheetDialogButton({Key key, this.onTap, this.label}) : super(key: key); + CustomBottomSheetContainer({Key key, this.onTap, this.label}) : super(key: key); @override Widget build(BuildContext context) { From e1c635a9116b7050576a45ef98487c8adf21cc96 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Wed, 9 Mar 2022 09:40:18 +0300 Subject: [PATCH 6/7] Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons --- lib/config/config.dart | 2 +- .../admission_request/admission_request_first_screen.dart | 2 +- .../admission_request/admission_request_second_screen.dart | 4 ++-- .../admission_request/admission_request_third_screen.dart | 4 ++-- .../refer_details/refer-patient-screen-in-patient.dart | 2 +- .../referral/refer_details/refer-patient-screen.dart | 7 +------ .../soap_update/assessment/add_assessment_details.dart | 2 +- .../soap_update/objective/add_examination_page.dart | 2 +- .../soap_update/subjective/allergies/add_allergies.dart | 2 +- .../soap_update/subjective/history/add_history_dialog.dart | 2 +- .../soap_update/subjective/medication/add_medication.dart | 2 +- .../add_prescription/add_drug/add_drug_widget.dart | 2 +- lib/screens/procedures/add-favourite-procedure.dart | 4 +--- ...eet_dialog_buttons.dart => bottom_sheet_container.dart} | 7 ++----- ...log_button.dart => custom_bottom_sheet_ container.dart} | 0 15 files changed, 17 insertions(+), 27 deletions(-) rename lib/widgets/bottom_sheet/{two_bottom_sheet_dialog_buttons.dart => bottom_sheet_container.dart} (80%) rename lib/widgets/bottom_sheet/{bottom_sheet_dialog_button.dart => custom_bottom_sheet_ container.dart} (100%) diff --git a/lib/config/config.dart b/lib/config/config.dart index 16628fda..f5825d2e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -434,7 +434,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 6.5; +const VERSION_ID = 6.8; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart index e69faab8..84eba0f6 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart @@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -22,7 +23,6 @@ import 'package:flutter/services.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../../../routes.dart'; -import '../../../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; class AdmissionRequestFirstScreen extends StatefulWidget { @override diff --git a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart index 275c0d2c..8d4f6a23 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart @@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -470,7 +470,7 @@ class _AdmissionRequestSecondScreenState ], ), ), - bottomSheet: TwoBottomSheetDialogButtons( + bottomSheet: BottomSheetContainer( widget: Row( children: [ Container( diff --git a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart index b0ecb8de..9099476f 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_third_screen.dart @@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -342,7 +342,7 @@ class _AdmissionRequestThirdScreenState ], ), ), - bottomSheet: TwoBottomSheetDialogButtons( + bottomSheet: BottomSheetContainer( widget: Row( children: [ Container( diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart index a68127c0..d3ec7893 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart @@ -6,10 +6,10 @@ import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dar import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart index ea9bfeb2..efc3dbcf 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart @@ -1,27 +1,22 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/service/AnalyticsService.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/dailog-list-select.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:hexcolor/hexcolor.dart'; class PatientMakeReferralScreen extends StatefulWidget { // previous design page is: ReferPatientScreen diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 181560a6..f9d4a8d3 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -11,10 +11,10 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_as import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index 82dfb0da..56744ce0 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart index 026ca14a..9e35a496 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart @@ -5,9 +5,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart index 16bec79b..c3acbbfa 100644 --- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart +++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart @@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index 0b92aef9..671bf597 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -7,9 +7,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart index 8151eb90..9be78781 100644 --- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart +++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart @@ -5,11 +5,11 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index 5e7c9eb0..33aaa1f5 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -1,4 +1,3 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; @@ -9,12 +8,11 @@ import 'package:doctor_app_flutter/screens/procedures/entity_list_fav_procedure. import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../widgets/bottom_sheet/bottom_sheet_dialog_button.dart'; import 'ProcedureType.dart'; class AddFavouriteProcedure extends StatefulWidget { diff --git a/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart b/lib/widgets/bottom_sheet/bottom_sheet_container.dart similarity index 80% rename from lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart rename to lib/widgets/bottom_sheet/bottom_sheet_container.dart index 20eb6525..31fee2b6 100644 --- a/lib/widgets/bottom_sheet/two_bottom_sheet_dialog_buttons.dart +++ b/lib/widgets/bottom_sheet/bottom_sheet_container.dart @@ -1,18 +1,15 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; -import '../../config/config.dart'; -class TwoBottomSheetDialogButtons extends StatelessWidget { +class BottomSheetContainer extends StatelessWidget { final Function onTap; final String label; final Widget widget; - double headerHeight = SizeConfig.heightMultiplier * 12; - TwoBottomSheetDialogButtons({Key key, this.onTap, this.label, this.widget}) : super(key: key); + BottomSheetContainer({Key key, this.onTap, this.label, this.widget}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart similarity index 100% rename from lib/widgets/bottom_sheet/bottom_sheet_dialog_button.dart rename to lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart From d743c2c99c5b18abacfcdfaf3035ad590c545415 Mon Sep 17 00:00:00 2001 From: RoaaGhali98 Date: Wed, 9 Mar 2022 12:02:32 +0300 Subject: [PATCH 7/7] Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons --- lib/routes.dart | 6 +++--- .../admission_request/admission_request_first_screen.dart | 2 +- .../refer_details/refer-patient-screen-in-patient.dart | 2 +- .../referral/refer_details/refer-patient-screen.dart | 2 +- .../soap_update/assessment/add_assessment_details.dart | 2 +- .../profile/soap_update/objective/add_examination_page.dart | 2 +- .../soap_update/subjective/allergies/add_allergies.dart | 2 +- .../soap_update/subjective/history/add_history_dialog.dart | 2 +- .../soap_update/subjective/medication/add_medication.dart | 2 +- .../add_prescription/add_drug/add_drug_widget.dart | 2 +- lib/screens/procedures/add-favourite-procedure.dart | 2 +- ...t_ container.dart => custom_bottom_sheet_container.dart} | 0 12 files changed, 13 insertions(+), 13 deletions(-) rename lib/widgets/bottom_sheet/{custom_bottom_sheet_ container.dart => custom_bottom_sheet_container.dart} (100%) diff --git a/lib/routes.dart b/lib/routes.dart index 53145bdc..bd81b0e7 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -60,9 +60,9 @@ const String PATIENT_INSURANCE_APPROVALS_NEW = const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String CREATE_EPISODE = 'patients/create-episode'; const String UPDATE_EPISODE = 'patients/update-episode'; -const String PATIENT_ADMISSION_REQUEST = 'patients/admission_request'; -const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission_request_second'; -const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission_request_third'; +const String PATIENT_ADMISSION_REQUEST = 'patients/admission-request'; +const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission-request-second'; +const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission-request-third'; const String PATIENT_MEDICAL_REPORT = 'patients/medical-report'; const String PATIENT_MEDICAL_REPORT_INSERT = 'patients/medical-report-insert'; const String PATIENT_MEDICAL_REPORT_DETAIL = 'patients/medical-report-detail'; diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart index 84eba0f6..e36a67ea 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart @@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart index d3ec7893..7959bcac 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart index efc3dbcf..54c85fb4 100644 --- a/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart +++ b/lib/screens/patients/profile/referral/refer_details/refer-patient-screen.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index f9d4a8d3..9873ac4f 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -14,7 +14,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index 56744ce0..da0587d8 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_ex import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart index 9e35a496..60a26dc0 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_al import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart index c3acbbfa..5ae5692b 100644 --- a/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart +++ b/lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart @@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_hi import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index 671bf597..133dae13 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; diff --git a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart index 9be78781..42b0e093 100644 --- a/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart +++ b/lib/screens/prescription/add_prescription/add_drug/add_drug_widget.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_s import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index 33aaa1f5..7b0d869a 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/screens/procedures/entity_list_fav_procedure. import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_%20container.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart similarity index 100% rename from lib/widgets/bottom_sheet/custom_bottom_sheet_ container.dart rename to lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart