From 8d7fef3db93c1309361eb118c3ceb4f5d732ea2e Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Thu, 22 Apr 2021 17:03:25 +0300 Subject: [PATCH] fix some issue on progress_note_screen --- lib/core/viewModel/patient_view_model.dart | 2 + .../profile/note/progress_note_screen.dart | 68 +- .../patients/profile/note/update_note.dart | 343 +++++++--- .../profile/patient_profile_screen.dart | 589 ++---------------- lib/widgets/patients/PatientCard.dart | 4 +- .../profile/profile_medical_info_widget.dart | 4 +- ...rofile_medical_info_widget_in_patient.dart | 4 +- .../profile_medical_info_widget_search.dart | 4 +- 8 files changed, 341 insertions(+), 677 deletions(-) diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index aaa7364f..e06b0d9d 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -65,6 +65,8 @@ class PatientViewModel extends BaseViewModel { if (_patientService.hasError) { error = _patientService.error; setState(ViewState.Error); + } else{ + setState(ViewState.Idle); } return localRes; } diff --git a/lib/screens/patients/profile/note/progress_note_screen.dart b/lib/screens/patients/profile/note/progress_note_screen.dart index 786c11f3..fedbfc56 100644 --- a/lib/screens/patients/profile/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/note/progress_note_screen.dart @@ -91,7 +91,7 @@ class _ProgressNoteState extends State { isUpdate: false, )), ); - },label: 'Add a New Order',), + },label: widget.visitType ==3?'Add a New Order Sheet':'Create a New Progress Note',), Expanded( child: Container( @@ -123,20 +123,23 @@ class _ProgressNoteState extends State { Container( width: MediaQuery.of(context).size.width * 0.65, - child: Row( + child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - - child: AppText('Created By: ', - fontSize: 12, - ), - margin: EdgeInsets.only(top: 3), - ), - Expanded( - child: AppText( - notesList[index].doctorName??'',fontWeight: FontWeight.w600), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText('Created By: ', + fontSize: 10, + ), + Expanded( + child: AppText( + notesList[index].doctorName??'',fontWeight: FontWeight.w600,fontSize: 12,), + ), + ], ), + AppText( + notesList[index].status == 4?'Canceled':'',fontWeight: FontWeight.w600, color: Colors.red.shade700,fontSize: 12,), ], ), ), @@ -186,47 +189,6 @@ class _ProgressNoteState extends State { fontSize: 10, ), ), - InkWell( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => UpdateNoteOrder( - note: notesList[index], - patientModel: model, - patient: patient, - visitType: widget.visitType, - isUpdate: true, - - )), - ); - }, - child: Icon( - DoctorApp.edit, - size: 18, - )), - SizedBox(width: 10,), - InkWell( - onTap: () async { - GifLoaderDialogUtils.showMyDialog(context); - UpdateNoteReqModel reqModel = UpdateNoteReqModel( - admissionNo: int.parse(patient.admissionNo), - cancelledNote: true, - lineItemNo: 30, - createdBy: notesList[index].createdBy, - notes: notesList[index].notes, - verifiedNote: false, - patientTypeID: patient.patientType, - patientOutSA: false, - ); - await model.updatePatientProgressNote(reqModel); - GifLoaderDialogUtils.hideDialog(context); - - }, - child: Icon( - FontAwesomeIcons.trash, - size: 18, - )) ], ), ], diff --git a/lib/screens/patients/profile/note/update_note.dart b/lib/screens/patients/profile/note/update_note.dart index c3806b1a..3b429c97 100644 --- a/lib/screens/patients/profile/note/update_note.dart +++ b/lib/screens/patients/profile/note/update_note.dart @@ -36,10 +36,10 @@ class UpdateNoteOrder extends StatefulWidget { class _UpdateNoteOrderState extends State { int selectedType; + bool isSubmitted = false; TextEditingController progressNoteController = TextEditingController(); - setSelectedType(int val) { setState(() { selectedType = val; @@ -51,73 +51,85 @@ class _UpdateNoteOrderState extends State { if (widget.note != null) { progressNoteController.text = widget.note.notes; } - return BaseView( - builder: (BuildContext context, PatientViewModel model, Widget child) => - AppScaffold( - isShowAppBar: false, - backgroundColor: Theme - .of(context) - .scaffoldBackgroundColor, - body: SingleChildScrollView( - child: Container( - height: MediaQuery - .of(context) - .size - .height * 1.0, - child: Padding( - padding: EdgeInsets.all(0.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - BottomSheetTitle(title: 'Add Progress Note',), - SizedBox( - height: 10.0, - ), - - Center( - child: FractionallySizedBox( - widthFactor: 0.9, - child: Column( - children: [ - AppTextFieldCustom( - hintText: TranslationBase.of(context).addProgressNote, - controller: progressNoteController, - maxLines: 25, - minLines: 7, - hasBorder: true, - // validationError:complaintsController.text.isEmpty , - - ), - ], - ), - ), - ), - ], + return AppScaffold( + isShowAppBar: false, + backgroundColor: Theme + .of(context) + .scaffoldBackgroundColor, + body: SingleChildScrollView( + child: Container( + height: MediaQuery + .of(context) + .size + .height * 1.0, + child: Padding( + padding: EdgeInsets.all(0.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + BottomSheetTitle(title: widget.visitType == 3 + ? 'Add Order Sheet' + : 'Add Progress Note',), + SizedBox( + height: 10.0, + ), + + Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Column( + children: [ + AppTextFieldCustom( + hintText: widget.visitType == 3 + ? 'Add Order Sheet' + : 'Add Progress Note', + //TranslationBase.of(context).addProgressNote, + controller: progressNoteController, + maxLines: 25, + minLines: 10, + hasBorder: true, + validationError:progressNoteController.text.isEmpty&&isSubmitted?TranslationBase.of(context).emptyMessage:null , + + ), + ], + ), ), ), - ), + + ], ), - bottomSheet: Container( - margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), - child: Wrap( - alignment: WrapAlignment.center, - children: [ - AppButton( - title: 'Add Progress Note', + ), + ), + ), + bottomSheet: Container( + margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), + child: Wrap( + alignment: WrapAlignment.center, + children: [ + AppButton( + title: widget.visitType == 3 + ? 'Add Order Sheet' + : 'Add Progress Note', color: Color(0xff359846), // disabled: progressNoteController.text.isEmpty, fontWeight: FontWeight.w700, onPressed: () async { - GifLoaderDialogUtils.showMyDialog(context); - Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + setState(() { + isSubmitted = true; + }); + if (progressNoteController.text.isNotEmpty) { + GifLoaderDialogUtils.showMyDialog(context); + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + DoctorProfileModel doctorProfile = DoctorProfileModel + .fromJson(profile); - if (widget.isUpdate) { - UpdateNoteReqModel reqModel = UpdateNoteReqModel( - admissionNo: int.parse(widget.patient.admissionNo), + if (widget.isUpdate) { + UpdateNoteReqModel reqModel = UpdateNoteReqModel( + admissionNo: int.parse(widget.patient + .admissionNo), cancelledNote: false, lineItemNo: 30, createdBy: widget.note.createdBy, @@ -128,47 +140,186 @@ class _UpdateNoteOrderState extends State { patientTypeID: widget.patient.patientType, patientOutSA: false, - ); - await model.updatePatientProgressNote(reqModel); - } else { - CreateNoteModel reqModel = CreateNoteModel( - admissionNo: int.parse(widget.patient.admissionNo), - createdBy: doctorProfile.doctorID, - visitType: widget.visitType, - patientID: widget.patient.patientId, - nursingRemarks: ' ', - patientTypeID: widget.patient.patientType, - patientOutSA: false, - - notes: progressNoteController.text - ); - - await model.createPatientProgressNote(reqModel); - } + ); + await widget.patientModel.updatePatientProgressNote(reqModel); + } else { + CreateNoteModel reqModel = CreateNoteModel( + admissionNo: int.parse(widget.patient + .admissionNo), + createdBy: doctorProfile.doctorID, + visitType: widget.visitType, + patientID: widget.patient.patientId, + nursingRemarks: ' ', + patientTypeID: widget.patient.patientType, + patientOutSA: false, - if (model.state == ViewState.ErrorLocal) { - Helpers.showErrorToast("Error"); - } else { - ProgressNoteRequest progressNoteRequest = - ProgressNoteRequest( - visitType: widget.visitType, - // if equal 5 then this will return progress note - admissionNo: int.parse(widget.patient.admissionNo), - projectID: widget.patient.projectId, - patientTypeID: widget.patient.patientType, - languageID: 2); - await widget.patientModel.getPatientProgressNote( - progressNoteRequest.toJson()); - } - - GifLoaderDialogUtils.hideDialog(context); - Navigator.of(context).pop(); - }, - ), - ], - ), + notes: progressNoteController.text + ); + + await widget.patientModel.createPatientProgressNote(reqModel); + } + + if (widget.patientModel.state == ViewState.ErrorLocal) { + Helpers.showErrorToast( + Helpers.generateContactAdminMsg()); + } else { + ProgressNoteRequest progressNoteRequest = + ProgressNoteRequest( + visitType: widget.visitType, + // if equal 5 then this will return progress note + admissionNo: int.parse(widget.patient + .admissionNo), + projectID: widget.patient.projectId, + patientTypeID: widget.patient.patientType, + languageID: 2); + await widget.patientModel.getPatientProgressNote( + progressNoteRequest.toJson()); + } + + GifLoaderDialogUtils.hideDialog(context); + Navigator.of(context).pop(); + } + } ), - ), + ], + ), + ), ); + // return BaseView( + // builder: (BuildContext context, PatientViewModel model, Widget child) => + // AppScaffold( + // isShowAppBar: false, + // backgroundColor: Theme + // .of(context) + // .scaffoldBackgroundColor, + // body: SingleChildScrollView( + // child: Container( + // height: MediaQuery + // .of(context) + // .size + // .height * 1.0, + // child: Padding( + // padding: EdgeInsets.all(0.0), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // BottomSheetTitle(title: widget.visitType == 3 + // ? 'Add Order Sheet' + // : 'Add Progress Note',), + // SizedBox( + // height: 10.0, + // ), + // + // Center( + // child: FractionallySizedBox( + // widthFactor: 0.9, + // child: Column( + // children: [ + // AppTextFieldCustom( + // hintText: widget.visitType == 3 + // ? 'Add Order Sheet' + // : 'Add Progress Note', + // //TranslationBase.of(context).addProgressNote, + // controller: progressNoteController, + // maxLines: 25, + // minLines: 10, + // hasBorder: true, + // validationError:progressNoteController.text.isEmpty&&isSubmitted?TranslationBase.of(context).emptyMessage:null , + // + // ), + // ], + // ), + // ), + // ), + // + // ], + // ), + // ), + // ), + // ), + // bottomSheet: Container( + // margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), + // child: Wrap( + // alignment: WrapAlignment.center, + // children: [ + // AppButton( + // title: widget.visitType == 3 + // ? 'Add Order Sheet' + // : 'Add Progress Note', + // color: Color(0xff359846), + // // disabled: progressNoteController.text.isEmpty, + // fontWeight: FontWeight.w700, + // onPressed: () async { + // setState(() { + // isSubmitted = true; + // }); + // if (progressNoteController.text.isNotEmpty) { + // GifLoaderDialogUtils.showMyDialog(context); + // Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + // + // DoctorProfileModel doctorProfile = DoctorProfileModel + // .fromJson(profile); + // + // + // if (widget.isUpdate) { + // UpdateNoteReqModel reqModel = UpdateNoteReqModel( + // admissionNo: int.parse(widget.patient + // .admissionNo), + // cancelledNote: false, + // lineItemNo: 30, + // createdBy: widget.note.createdBy, + // notes: progressNoteController.text + // + // , + // verifiedNote: false, + // + // patientTypeID: widget.patient.patientType, + // patientOutSA: false, + // ); + // await model.updatePatientProgressNote(reqModel); + // } else { + // CreateNoteModel reqModel = CreateNoteModel( + // admissionNo: int.parse(widget.patient + // .admissionNo), + // createdBy: doctorProfile.doctorID, + // visitType: widget.visitType, + // patientID: widget.patient.patientId, + // nursingRemarks: ' ', + // patientTypeID: widget.patient.patientType, + // patientOutSA: false, + // + // notes: progressNoteController.text + // ); + // + // await model.createPatientProgressNote(reqModel); + // } + // + // if (model.state == ViewState.ErrorLocal) { + // Helpers.showErrorToast( + // Helpers.generateContactAdminMsg()); + // } else { + // ProgressNoteRequest progressNoteRequest = + // ProgressNoteRequest( + // visitType: widget.visitType, + // // if equal 5 then this will return progress note + // admissionNo: int.parse(widget.patient + // .admissionNo), + // projectID: widget.patient.projectId, + // patientTypeID: widget.patient.patientType, + // languageID: 2); + // await widget.patientModel.getPatientProgressNote( + // progressNoteRequest.toJson()); + // } + // + // GifLoaderDialogUtils.hideDialog(context); + // Navigator.of(context).pop(); + // } + // } + // ), + // ], + // ), + // ), + // ), + // ); } } diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart index eafbc049..59d10b25 100644 --- a/lib/screens/patients/profile/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -1,10 +1,13 @@ -import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; -import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart'; import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/models/patient/patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart'; @@ -13,7 +16,6 @@ import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info import 'package:doctor_app_flutter/widgets/patients/profile/profile_medical_info_widget_search.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; - import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -39,22 +41,62 @@ class PatientProfileScreen extends StatelessWidget { isFromSearch = routeArgs['isSearch']; } - return BaseView( - onModelReady: (model) async { - GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP( - patientMRN: patient.patientMRN ?? patient.patientId, - doctorID: '', - editedBy: ''); - await model.getPatientAllergy(generalGetReqForSOAP); - if (model.allergiesList.length == 0) { - await model.getMasterLookup(MasterKeysService.Allergies); - } - if (model.allergySeverityList.length == 0) { - await model.getMasterLookup(MasterKeysService.AllergySeverity); - } + return BaseView( + onModelReady: (patientViewModel) async { + PatientModel patientReq = PatientModel( + ProjectID: 0, + ClinicID: 0, + DoctorID: 0, + FirstName: "0", + MiddleName: "0", + LastName: "0", + PatientMobileNumber: "0", + PatientIdentificationID: "0", + PatientID: patient.patientId, + From: "0", + To: "0", + LanguageID: 2, + stamp: "2020-03-02T13:56:39.170Z", + IPAdress: "11.11.11.11", + VersionID: 1.2, + Channel: 9, + TokenID: "@dm!n", + SessionID: "5G0yXn0Jnq", + IsLoginForDoctorApp: true, + PatientOutSA: false); + + if(patient.patientType ==1) { + patientViewModel.getPatientList(patientReq, "1", isBusyLocal: false).then((response) { + if (response['MessageStatus'] == 1) { + + if (response['List_MyInPatient'] != null) { + + List patientList = + ModelResponse.fromJson(response['List_MyInPatient']) + .list; + patient.admissionNo = patientList[0].admissionNo; + patient.admissionDate = patientList[0].admissionDate; + } else { + + DrAppToastMsg.showErrorToast('No patient'); + } + + } + + }).catchError((error) { + // setState(() { + // isLoading = false; + // }); + Helpers.showErrorToast(error.message); + //DrAppToastMsg.showErrorToast(error); + }); + + + + } }, - builder: (_, model, w) => AppScaffold( - baseViewModel: model, + builder: (_, patientViewModel, w) => AppScaffold( + baseViewModel: patientViewModel, appBarTitle: TranslationBase.of(context).patientProfile, isShowAppBar: false, body: Container( @@ -67,9 +109,9 @@ class PatientProfileScreen extends StatelessWidget { children: [ !isFromSearch && patientType == "1" ? PatientProfileHeaderNewDesignInPatient( - patient, patientType, arrivalType) + patient, patientType, arrivalType) : PatientProfileHeaderNewDesign( - patient, patientType, arrivalType), + patient, patientType, arrivalType), Expanded( child: Padding( padding: const EdgeInsets.all(16.0), @@ -78,8 +120,8 @@ class PatientProfileScreen extends StatelessWidget { children: [ isFromSearch ? ProfileMedicalInfoWidgetSearch( - patient: patient, - patientType: patientType, + patient: patient, + patientType: patientType, arrivalType: arrivalType, from: from, to: to, @@ -109,7 +151,10 @@ class PatientProfileScreen extends StatelessWidget { ), if (int.parse(patientType) == 7 || int.parse(patientType) == 6) - Positioned( + BaseView( + onModelReady: (model) async { + }, + builder: (_, model, w) => Positioned( top: 175, left: 20, right: 20, @@ -179,7 +224,7 @@ class PatientProfileScreen extends StatelessWidget { }), ], ), - ), + )), ], ), ), @@ -210,499 +255,3 @@ class AvatarWidget extends StatelessWidget { } } -/* Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - decoration: BoxDecoration(boxShadow: [ - BoxShadow( - color: Colors.grey.shade300, - blurRadius: 10.0, - spreadRadius: 0, - offset: Offset(0, 10)), - ], color: Colors.white), - child: Column(children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - children: [ - AvatarWidget( - Icon( - patient.genderDescription == "Male" - ? DoctorApp.male - : DoctorApp.female_icon, - size: 70, - color: Colors.white, - ), - ), - SizedBox( - width: 20, - ), - Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - patient.firstName + - ' ' + - patient.lastName, - color: Colors.black, - fontWeight: FontWeight.bold, - ), - Row( - children: [ - AppText( - TranslationBase.of(context) - .fileNo, - color: Colors.black, - fontWeight: FontWeight.bold, - ), - SizedBox( - width: 4, - ), - AppText( - patient.patientId.toString(), - color: Colors.black, - fontWeight: FontWeight.normal, - ), - ], - ), - model.patientAllergiesList - .isNotEmpty && - model.getAllergicNames( - projectViewModel - .isArabic) != - '' - ? Container( - width: MediaQuery.of(context) - .size - .width * - 0.65, - child: Padding( - padding: const EdgeInsets - .symmetric(vertical: 8), - child: AppText( - TranslationBase.of( - context) - .allergicTO + - " : " + - model.getAllergicNames( - projectViewModel - .isArabic), - color: Color(0xFFB9382C), - fontWeight: - FontWeight.bold, - ), - ), - ) - : AppText(''), - ], - ) - ], - ), - ), - Container( - width: double.infinity, - height: 1, - color: Color(0xffCCCCCC), - ), - Container( - height: 11 * SizeConfig.textMultiplier, - child: Row( - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets.fromLTRB( - 16.0, 8.0, 8.0, 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).age, - fontWeight: FontWeight.bold, - fontSize: 2 * - SizeConfig.textMultiplier, - ), - SizedBox( - height: 4, - ), - AppText( - "${DateUtils.convertDateFromServerFormat(patient.dateofBirth, 'dd-MM-yyyy')} / ${DateUtils.getAgeByBirthday(patient.dateofBirth, context)}", - fontWeight: FontWeight.normal, - fontSize: 1.6 * - SizeConfig.textMultiplier, - ), - ], - ), - ), - ), - Container( - width: 1, - color: Color(0xffCCCCCC), - ), - Expanded( - child: Padding( - padding: const EdgeInsets.fromLTRB( - 16.0, 8.0, 8.0, 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .nationality, - fontWeight: FontWeight.bold, - fontSize: 2 * - SizeConfig.textMultiplier, - ), - SizedBox( - height: 4, - ), - AppText( - patient.nationalityName ?? - patient.nationality, - fontWeight: FontWeight.normal, - fontSize: 1.7 * - SizeConfig.textMultiplier, - ), - ], - ), - ), - ), - Container( - width: 1, - color: Color(0xffCCCCCC), - ), - Expanded( - child: Padding( - padding: const EdgeInsets.fromLTRB( - 16.0, 8.0, 8.0, 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .gender, - fontWeight: FontWeight.bold, - fontSize: 2 * - SizeConfig.textMultiplier, - ), - SizedBox( - height: 4, - ), - AppText( - patient.gender.toString() == '1' - ? 'Male' - : 'Female', - fontWeight: FontWeight.normal, - fontSize: 1.8 * - SizeConfig.textMultiplier, - ), - ], - ), - ), - ), - ], - ), - ), - Container( - width: double.infinity, - height: 1, - color: Color(0xffCCCCCC), - ), - ]), - ), - if (patient.admissionNo != null) - Container( - margin: EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .admissionDetail, - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 1.8 * SizeConfig.textMultiplier, - ), - SizedBox( - height: 4, - ), - Container( - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.rectangle, - borderRadius: BorderRadius.circular(8), - border: - Border.fromBorderSide(BorderSide( - color: Color(0xffBBBBBB), - width: 1, - )), - ), - child: Column( - children: [ - Padding( - padding: EdgeInsets.all(16), - child: Column( - children: [ - Row( - children: [ - Container( - width: 14 * - SizeConfig - .textMultiplier, - child: AppText( - TranslationBase.of( - context) - .dateTime, - color: Colors.black, - fontWeight: - FontWeight.bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ), - Expanded( - child: AppText( - patient.createdOn != - null - ? "${DateUtils.convertDateFromServerFormat(patient.createdOn, 'EEEE dd, MMMM yyyy hh:mm a')}" - : "", - color: Colors.black, - fontWeight: - FontWeight.normal, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ), - ], - ), - SizedBox( - height: 4, - ), - Row( - children: [ - Container( - width: 14 * - SizeConfig - .textMultiplier, - child: AppText( - TranslationBase.of( - context) - .admissionNo, - color: Colors.black, - fontWeight: - FontWeight.bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ), - AppText( - patient.admissionNo != - null - ? patient.admissionNo - : '', - color: Colors.black, - fontWeight: - FontWeight.normal, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ], - ), - SizedBox( - height: 4, - ), - Row( - children: [ - Container( - width: 14 * - SizeConfig - .textMultiplier, - child: AppText( - TranslationBase.of( - context) - .losNo, - color: Colors.black, - fontWeight: - FontWeight.bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ), - AppText( - patient.createdOn != null - ? DateUtils - .differenceBetweenServerDateAndCurrent( - patient - .createdOn, - context) - : "", - color: Colors.black, - fontWeight: - FontWeight.normal, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ], - ), - ], - ), - ), - const Divider( - color: Color(0xffCCCCCC), - height: 5, - thickness: 1, - indent: 0, - endIndent: 0, - ), - Container( - height: - 10 * SizeConfig.textMultiplier, - child: Row( - children: [ - Expanded( - child: Padding( - padding: const EdgeInsets - .fromLTRB( - 16.0, 8.0, 8.0, 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, - children: [ - AppText( - TranslationBase.of( - context) - .area, - fontWeight: - FontWeight.bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - SizedBox( - height: 4, - ), - AppText( - patient - .clinicDescription, - fontWeight: - FontWeight.normal, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ], - ), - ), - ), - Container( - width: 1, - color: Color(0xffCCCCCC), - ), - Expanded( - child: Padding( - padding: const EdgeInsets - .fromLTRB( - 16.0, 8.0, 8.0, 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment - .start, - mainAxisAlignment: - MainAxisAlignment - .spaceEvenly, - children: [ - Expanded( - child: Row( - crossAxisAlignment: - CrossAxisAlignment - .start, - children: [ - AppText( - TranslationBase.of( - context) - .room, - fontWeight: - FontWeight - .bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - SizedBox( - width: 4, - ), - Expanded( - child: AppText( - "${patient.nursingStationName}\n${patient.roomId}", - fontWeight: - FontWeight - .normal, - fontSize: 1.4 * - SizeConfig - .textMultiplier, - ), - ), - ], - ), - ), - SizedBox( - height: 4, - ), - Expanded( - child: Row( - crossAxisAlignment: - CrossAxisAlignment - .start, - children: [ - AppText( - TranslationBase.of( - context) - .bed, - fontWeight: - FontWeight - .bold, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - SizedBox( - width: 4, - ), - AppText( - "${patient.bedId}", - fontWeight: - FontWeight - .normal, - fontSize: 1.6 * - SizeConfig - .textMultiplier, - ), - ], - ), - ), - ], - ), - ), - ), - ], - ), - ) - ], - ), - ) - ], - ), - ), - ], - ),*/ diff --git a/lib/widgets/patients/PatientCard.dart b/lib/widgets/patients/PatientCard.dart index a1c913e2..cbc2adc5 100644 --- a/lib/widgets/patients/PatientCard.dart +++ b/lib/widgets/patients/PatientCard.dart @@ -252,12 +252,12 @@ class PatientCard extends StatelessWidget { ), children: [ new TextSpan( - text: TranslationBase.of(context) + text: patientInfo.admissionDate ==null?"":TranslationBase.of(context) .admissionDate + " : ", style: TextStyle(fontSize: 14)), new TextSpan( - text: + text:patientInfo.admissionDate ==null?"": "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}", style: TextStyle( fontWeight: FontWeight.w700, diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index f7046a4a..6d77c392 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -182,8 +182,8 @@ class ProfileMedicalInfoWidget extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: ORDER_NOTE, - nameLine1: 'Order',//TranslationBase.of(context).progress, - nameLine2: TranslationBase.of(context).note, + nameLine1:"Order", //"Text", + nameLine2: "Sheet", icon: 'patient/Progress_notes.png'), ], ), diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart index c1f746aa..99f41aa2 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart @@ -96,8 +96,8 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: ORDER_NOTE, - nameLine1: "Text", - nameLine2: TranslationBase.of(context).orders, + nameLine1:"Order", //"Text", + nameLine2: "Sheet",//TranslationBase.of(context).orders, icon: 'patient/Progress_notes.png'), PatientProfileButton( key: key, diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index 38cc598f..29ce4e04 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -145,8 +145,8 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: ORDER_NOTE, - nameLine1: 'Order',//TranslationBase.of(context).progress, - nameLine2: TranslationBase.of(context).note, + nameLine1:"Order", //"Text", + nameLine2: "Sheet", icon: 'patient/Progress_notes.png'), if (patientType == "1")