Fixing some issues in progress_note_screen and update_note

merge-requests/970/head
RoaaGhali98 3 years ago
parent f3b39906f5
commit dceefadc06

@ -1141,4 +1141,5 @@ const Map<String, Map<String, String>> localizedValues = {
"selectCondition": {"en": "Select Condition", "ar":"قم بتحديد الشرط"},
"yourOrderAddedSuccessfully": {"en": "Your Order Added Successfully", "ar":"تم إضافة طلبك بنجاح"},
"youCannotAddOnlySpaces": {"en": "You Can't Add Only Spaces", "ar":"تم إضافة طلبك بنجاح"},
"conditionDescription": {"en": "Condition Description", "ar":"وصف الحالة"},
};

@ -19,6 +19,8 @@ class NoteModel {
Null doctorClinicName;
String doctorName;
String visitTypeDesc;
int condition;
String conditionDescription;
NoteModel(
{this.setupID,
@ -40,7 +42,10 @@ class NoteModel {
this.admissionClinicName,
this.doctorClinicName,
this.doctorName,
this.visitTypeDesc});
this.visitTypeDesc,
this.condition,
this.conditionDescription,
});
NoteModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];
@ -63,6 +68,8 @@ class NoteModel {
doctorClinicName = json['DoctorClinicName'];
doctorName = json['DoctorName'];
visitTypeDesc = json['VisitTypeDesc'];
condition = json['Condition'];
conditionDescription = json['ConditionDescription'];
}
Map<String, dynamic> toJson() {
@ -87,6 +94,8 @@ class NoteModel {
data['DoctorClinicName'] = this.doctorClinicName;
data['DoctorName'] = this.doctorName;
data['VisitTypeDesc'] = this.visitTypeDesc;
data['Condition'] = this.condition;
data['ConditionDescription'] = this.conditionDescription;
return data;
}
}

@ -456,7 +456,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
AppText(
TranslationBase.of(
context)
.createdBy,
.createdBy + ' ',
fontSize: 10,
),
Expanded(
@ -474,6 +474,26 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
),
],
),
Row(
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
AppText(
TranslationBase.of(context).conditionDescription + ' : ',
fontSize: 10,
),
Expanded(
child: AppText(
model.patientProgressNoteList[index].conditionDescription ?? '',
fontWeight:
FontWeight.w600,
fontSize: 12,
isCopyable: true,
),
),
],
),
],
),
),

@ -91,6 +91,11 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
if (widget.note != null) {
progressNoteController.text = widget.note.notes;
if(selectValue==null)
selectValue={};
selectValue['parameterCode'] = widget.note.condition;
selectValue['description'] = widget.note.conditionDescription;
}
return BaseView<PatientViewModel>(

@ -1722,6 +1722,8 @@ class TranslationBase {
String get youCannotAddOnlySpaces => localizedValues['youCannotAddOnlySpaces'][locale.languageCode];
String get conditionDescription => localizedValues['conditionDescription'][locale.languageCode];
}

Loading…
Cancel
Save