From a4654e9bcea40f9cee72ab4a73a7d809e503cfe4 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 3 Oct 2021 09:42:09 +0300 Subject: [PATCH 1/2] add isCopyable on progress note --- lib/screens/patients/profile/note/progress_note_screen.dart | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/screens/patients/profile/note/progress_note_screen.dart b/lib/screens/patients/profile/note/progress_note_screen.dart index 054817c2..fb31511d 100644 --- a/lib/screens/patients/profile/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/note/progress_note_screen.dart @@ -166,8 +166,10 @@ class _ProgressNoteState extends State { index] .createdBy) AppText( + TranslationBase.of(context) .notePending, + fontWeight: FontWeight.bold, color: Color(0xFFCC9B14), fontSize: 12, @@ -472,6 +474,7 @@ class _ProgressNoteState extends State { fontWeight: FontWeight.w600, fontSize: 12, + isCopyable:true, ), ), ], @@ -505,6 +508,7 @@ class _ProgressNoteState extends State { .isArabic), fontWeight: FontWeight.w600, fontSize: 14, + isCopyable:true, ), AppText( model @@ -522,6 +526,7 @@ class _ProgressNoteState extends State { DateTime.now()), fontWeight: FontWeight.w600, fontSize: 14, + isCopyable:true, ), ], crossAxisAlignment: @@ -543,6 +548,7 @@ class _ProgressNoteState extends State { index] .notes, fontSize: 10, + isCopyable:true, ), ), ]) From 96cfc3d65910fdcd0355ac61a65caa37d4549256 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 3 Oct 2021 12:51:49 +0300 Subject: [PATCH 2/2] fix specialClinic it suppose to be fixed --- lib/screens/patients/In_patient/InPatientHeader.dart | 2 +- .../patients/In_patient/in_patient_screen.dart | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/screens/patients/In_patient/InPatientHeader.dart b/lib/screens/patients/In_patient/InPatientHeader.dart index 3bb2afa5..11cc4dcc 100644 --- a/lib/screens/patients/In_patient/InPatientHeader.dart +++ b/lib/screens/patients/In_patient/InPatientHeader.dart @@ -58,7 +58,7 @@ class InPatientHeader extends StatelessWidget with PreferredSizeWidget { iconEnabledColor: Colors.black, isExpanded: true, value: selectedMapId == null - ? model.specialClinicalCareMappingList[0].nursingStationID + ? TranslationBase.of(context).all : selectedMapId, iconSize: 25, elevation: 16, diff --git a/lib/screens/patients/In_patient/in_patient_screen.dart b/lib/screens/patients/In_patient/in_patient_screen.dart index d7bd805a..9508a3cf 100644 --- a/lib/screens/patients/In_patient/in_patient_screen.dart +++ b/lib/screens/patients/In_patient/in_patient_screen.dart @@ -67,12 +67,12 @@ class _InPatientScreenState extends State return BaseView( onModelReady: (model) async { model.clearPatientList(); - if (widget.specialClinic != null) { - await model - .getSpecialClinicalCareMappingList(widget.specialClinic.clinicID); - requestModel.nursingStationID = - model.specialClinicalCareMappingList[0].nursingStationID; - } + // if (widget.specialClinic != null) { + // await model + // .getSpecialClinicalCareMappingList(widget.specialClinic.clinicID); + // requestModel.nursingStationID = + // model.specialClinicalCareMappingList[0].nursingStationID; + // } requestModel.clinicID = 0; await model.getInPatientList(requestModel); },