Merge branch 'special_clinic_fixes' into 'development'

Special clinic fixes

See merge request Cloud_Solution/doctor_app_flutter!855
merge-requests/856/merge
Mohammad Aljammal 4 years ago
commit e15be3f09d

@ -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,

@ -67,12 +67,12 @@ class _InPatientScreenState extends State<InPatientScreen>
return BaseView<PatientSearchViewModel>(
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);
},

@ -166,8 +166,10 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
index]
.createdBy)
AppText(
TranslationBase.of(context)
.notePending,
fontWeight: FontWeight.bold,
color: Color(0xFFCC9B14),
fontSize: 12,
@ -472,6 +474,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
fontWeight:
FontWeight.w600,
fontSize: 12,
isCopyable:true,
),
),
],
@ -505,6 +508,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.isArabic),
fontWeight: FontWeight.w600,
fontSize: 14,
isCopyable:true,
),
AppText(
model
@ -522,6 +526,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
DateTime.now()),
fontWeight: FontWeight.w600,
fontSize: 14,
isCopyable:true,
),
],
crossAxisAlignment:
@ -543,6 +548,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
index]
.notes,
fontSize: 10,
isCopyable:true,
),
),
])

Loading…
Cancel
Save