From d0e6532814274d1c8f16a3b30cff513020cc449e Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Thu, 28 Oct 2021 14:33:03 +0300 Subject: [PATCH] admission orders changes --- lib/config/config.dart | 16 ++-- .../admission_orders_model.dart | 7 +- .../admission_orders_screen.dart | 77 +++---------------- 3 files changed, 24 insertions(+), 76 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 36be5e92..69be3d09 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = @@ -365,11 +365,13 @@ const GET_ADMISSION_ORDERS = "/Services/DoctorApplication.svc/REST/DoctorApp_GetAdmissionOrders"; ///Patient Registration Services -const CHECK_PATIENT_FOR_REGISTRATION = "Authentication.svc/REST/CheckPatientForRegisteration"; -const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE = "Authentication.svc/REST/SendActivationCodebyOTPNotificationType"; -const CHECK_ACTIVATION_CODE_FOR_PATIENT = "Authentication.svc/REST/CheckActivationCode"; -const PATIENT_REGISTRATION = "Authentication.svc/REST/PatientRegistration"; - +const CHECK_PATIENT_FOR_REGISTRATION = + "Authentication.svc/REST/CheckPatientForRegisteration"; +const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE = + "Authentication.svc/REST/SendActivationCodebyOTPNotificationType"; +const CHECK_ACTIVATION_CODE_FOR_PATIENT = + "Authentication.svc/REST/CheckActivationCode"; +const PATIENT_REGISTRATION = "Authentication.svc/REST/PatientRegistration"; var selectedPatientType = 1; diff --git a/lib/models/admisson_orders/admission_orders_model.dart b/lib/models/admisson_orders/admission_orders_model.dart index caea4d15..a0891a02 100644 --- a/lib/models/admisson_orders/admission_orders_model.dart +++ b/lib/models/admisson_orders/admission_orders_model.dart @@ -9,6 +9,7 @@ class AdmissionOrdersModel { int createdBy; String editedOn; int editedBy; + String createdByName; AdmissionOrdersModel( {this.procedureID, @@ -20,7 +21,8 @@ class AdmissionOrdersModel { this.createdOn, this.createdBy, this.editedOn, - this.editedBy}); + this.editedBy, + this.createdByName}); AdmissionOrdersModel.fromJson(Map json) { procedureID = json['ProcedureID']; @@ -33,6 +35,7 @@ class AdmissionOrdersModel { createdBy = json['CreatedBy']; editedOn = json['EditedOn']; editedBy = json['EditedBy']; + createdByName = json['CreatedByName']; } Map toJson() { @@ -47,6 +50,8 @@ class AdmissionOrdersModel { data['CreatedBy'] = this.createdBy; data['EditedOn'] = this.editedOn; data['EditedBy'] = this.editedBy; + data['CreatedByName'] = this.createdByName; + return data; } } diff --git a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart index e73e02de..f83117e2 100644 --- a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart +++ b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart @@ -38,8 +38,7 @@ class _AdmissionOrdersScreenState extends State { isDischargedPatient = routeArgs['isDischargedPatient']; return BaseView( onModelReady: (model) => model.getAdmissionOrders( - admissionNo: int.parse(patient.admissionNo), - patientId: patient.patientMRN), + admissionNo: 2014005178, patientId: patient.patientMRN), builder: (_, model, w) => AppScaffold( baseViewModel: model, backgroundColor: Theme.of(context).scaffoldBackgroundColor, @@ -91,43 +90,12 @@ class _AdmissionOrdersScreenState extends State { widthFactor: 0.95, child: CardWithBgWidget( hasBorder: false, - // bgColor: model.admissionOrderList[index] - // .status == - // 1 && - // authenticationViewModel - // .doctorProfile.doctorID != - // model - // .patientProgressNoteList[ - // index] - // .createdBy - // ? Color(0xFFCC9B14) - // : model.patientProgressNoteList[index] - // .status == - // 4 - // ? Colors.red.shade700 - // : model.patientProgressNoteList[index] - // .status == - // 2 - // ? Colors.green[600] - // : Color(0xFFCC9B14), widget: Column( children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - SizedBox( - width: 10, - ), - SizedBox( - width: 10, - ) - ], - ), SizedBox( height: 10, ), @@ -156,14 +124,14 @@ class _AdmissionOrdersScreenState extends State { context) .createdBy .toString(), - fontSize: 10, + fontSize: 13, ), Expanded( child: AppText( model .admissionOrderList[ index] - .createdBy + .createdByName .toString() ?? '', fontWeight: @@ -181,10 +149,11 @@ class _AdmissionOrdersScreenState extends State { children: [ AppText( TranslationBase.of( - context) - .procedureName - .toString(), - fontSize: 10, + context) + .procedureName + .toString() + + ": ", + fontSize: 13, ), Expanded( child: AppText( @@ -212,7 +181,7 @@ class _AdmissionOrdersScreenState extends State { context) .orderNo .toString(), - fontSize: 10, + fontSize: 13, ), Expanded( child: AppText( @@ -230,34 +199,6 @@ class _AdmissionOrdersScreenState extends State { ), ], ), - // Row( - // crossAxisAlignment: - // CrossAxisAlignment - // .start, - // children: [ - // AppText( - // TranslationBase.of( - // context) - // .createdBy - // .toString(), - // fontSize: 10, - // ), - // Expanded( - // child: AppText( - // model - // .admissionOrderList[ - // index] - // .createdBy - // .toString() ?? - // '', - // fontWeight: - // FontWeight.w600, - // fontSize: 12, - // isCopyable: true, - // ), - // ), - // ], - // ), ], ), ),