From 4f8047f75119f08154706414f89a56ed7a33ab51 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Tue, 6 Apr 2021 09:37:05 +0300 Subject: [PATCH 1/3] fix small thing on design in schedule --- lib/widgets/doctor/my_schedule_widget.dart | 64 ++++++++++------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index fca0e0b4..c1ba098e 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -21,31 +21,32 @@ class MyScheduleWidget extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 10, - ), - AppText( - workingHoursTable.dayName, - fontSize: 2.5 * SizeConfig.textMultiplier, - fontFamily: 'Poppins', - // fontSize: 18 - ), - SizedBox( - height: 10, - ), - AppText( - ' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', - fontSize: 2.5 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w700, - - fontFamily: 'Poppins', - // fontSize: 18 - ), - ], + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 10, + ), + AppText( + workingHoursTable.dayName, + fontSize: 2.5 * SizeConfig.textMultiplier, + fontFamily: 'Poppins', + // fontSize: 18 + ), + SizedBox( + height: 10, + ), + AppText( + ' ${workingHoursTable.date.day} ${(DateUtils.getMonth(workingHoursTable.date.month).toString().substring(0, 3))}', + fontSize: 2.5 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w700, + fontFamily: 'Poppins', + // fontSize: 18 + ), + ], + ), ), Container( width: MediaQuery.of(context).size.width * 0.55, @@ -80,15 +81,10 @@ class MyScheduleWidget extends StatelessWidget { ), Container( width: MediaQuery.of(context).size.width*0.55, - child: Expanded( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: AppText( - work.from + ' - ' + work.to, - fontSize: 15, - fontWeight: FontWeight.w300, - ), - ), + child: AppText( + '${work.from} - ${work.to}', + fontSize: 15, + fontWeight: FontWeight.w300, ), ) ], From 6ca4797c9129cc56f449b671c567035c967811f5 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 6 Apr 2021 09:45:30 +0300 Subject: [PATCH 2/3] hot fixes --- lib/client/base_app_client.dart | 4 ++++ lib/core/model/medical_file_request_model.dart | 4 +++- lib/core/service/medical_file_service.dart | 1 + lib/screens/patients/insurance_approval_screen_patient.dart | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 77545340..ac5846fa 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -68,6 +68,7 @@ class BaseAppClient { body['LanguageID'] = 2; body['stamp'] = STAMP; + if(!body.containsKey("IPAdress")) body['IPAdress'] = IP_ADDRESS; body['VersionID'] = VERSION_ID; body['Channel'] = CHANNEL; @@ -85,6 +86,9 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); + String bodyData= json.encode(body); + + if (await Helpers.checkConnection()) { final response = await http.post(url, diff --git a/lib/core/model/medical_file_request_model.dart b/lib/core/model/medical_file_request_model.dart index c5a40bb7..8703141a 100644 --- a/lib/core/model/medical_file_request_model.dart +++ b/lib/core/model/medical_file_request_model.dart @@ -1,8 +1,9 @@ class MedicalFileRequestModel { int patientMRN; String vidaAuthTokenID; + String iPAdress; - MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID}); + MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID,this.iPAdress}); MedicalFileRequestModel.fromJson(Map json) { patientMRN = json['PatientMRN']; @@ -13,6 +14,7 @@ class MedicalFileRequestModel { final Map data = new Map(); data['PatientMRN'] = this.patientMRN; data['VidaAuthTokenID'] = this.vidaAuthTokenID; + data['IPAdress'] = this.iPAdress; return data; } } diff --git a/lib/core/service/medical_file_service.dart b/lib/core/service/medical_file_service.dart index f1ab6dcd..fb6c2449 100644 --- a/lib/core/service/medical_file_service.dart +++ b/lib/core/service/medical_file_service.dart @@ -16,6 +16,7 @@ class MedicalFileService extends BaseService { Future getMedicalFile({int mrn}) async { _fileRequestModel = MedicalFileRequestModel(patientMRN: mrn); + _fileRequestModel.iPAdress = "9.9.9.9"; hasError = false; _medicalFileList.clear(); await baseAppClient.post(GET_MEDICAL_FILE, diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index 0eb3da80..cb0be61c 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -147,7 +147,7 @@ class _InsuranceApprovalScreenNewState .toString(), isPrescriptions: true, approvalStatus: model.insuranceApproval[index] - .approvalDetails.status, + .approvalDetails?.status??'', ), ), ), From e6cad64cf0a618678926f5407a7b9a4d77b849b5 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 6 Apr 2021 12:59:22 +0300 Subject: [PATCH 3/3] fix PatientArrivalList --- lib/client/base_app_client.dart | 4 ++-- lib/config/config.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index ac5846fa..31f3be0d 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -68,7 +68,7 @@ class BaseAppClient { body['LanguageID'] = 2; body['stamp'] = STAMP; - if(!body.containsKey("IPAdress")) + // if(!body.containsKey("IPAdress")) body['IPAdress'] = IP_ADDRESS; body['VersionID'] = VERSION_ID; body['Channel'] = CHANNEL; @@ -87,7 +87,7 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); String bodyData= json.encode(body); - + var asd=""; if (await Helpers.checkConnection()) { diff --git a/lib/config/config.dart b/lib/config/config.dart index a8f7ef6e..c8b4e8e4 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -121,7 +121,7 @@ const GET_DASHBOARD = const GET_SICKLEAVE_STATISTIC = 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics'; const ARRIVED_PATIENT_URL = - 'Services/DoctorApplication.svc/REST/PatientArrivalList​'; + 'Services/DoctorApplication.svc/REST/PatientArrivalList'; const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';