diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 6a536fae..bec329b1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -719,6 +719,9 @@ const Map> localizedValues = { "healthID": {"en": "Health ID", "ar": "معرف الصحة"}, "identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"}, "maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"}, + "nursing": {"en": "Nursing", "ar": "تمريض"}, + "diabetic": {"en": "Diabetic", "ar": "مرض السكري"}, + "chart": {"en": "Chart", "ar": "جدول"}, "operationTimeStart": {"en": "Operation Time Start :", "ar": "بدء وقت العملية:"}, "operationDate": {"en": "operation Date :", "ar": "تاريخ العملية:"}, "reservation": {"en": "Reservation Number :", "ar": " رقم الحجز :"}, diff --git a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart index bc5df139..9719b525 100644 --- a/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart +++ b/lib/screens/patients/profile/admission-orders/admission_orders_screen.dart @@ -39,7 +39,8 @@ class _AdmissionOrdersScreenState extends State { isDischargedPatient = routeArgs['isDischargedPatient']; return BaseView( onModelReady: (model) => model.getAdmissionOrders( - admissionNo: 2014005178, patientId: patient.patientMRN), + admissionNo: int.parse(patient.admissionNo), + patientId: patient.patientMRN), builder: (_, model, w) => AppScaffold( baseViewModel: model, backgroundColor: Theme.of(context).scaffoldBackgroundColor, @@ -94,6 +95,7 @@ class _AdmissionOrdersScreenState extends State { widthFactor: 0.95, child: CardWithBgWidget( hasBorder: false, + bgColor: Colors.white, widget: Column( children: [ Column( diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart index ca304986..53d16291 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart @@ -113,12 +113,12 @@ class ProfileGridForInPatient extends StatelessWidget { 'patient/vital_signs.png', isInPatient: isInpatient), PatientProfileCardModel( - TranslationBase.of(context).discharge, - TranslationBase.of(context).report, - DISCHARGE_SUMMARY, - 'patient/patient_sick_leave.png', - isInPatient: isInpatient,) - , + TranslationBase.of(context).discharge, + TranslationBase.of(context).report, + DISCHARGE_SUMMARY, + 'patient/patient_sick_leave.png', + isInPatient: isInpatient, + ), PatientProfileCardModel( TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, @@ -127,43 +127,43 @@ class ProfileGridForInPatient extends StatelessWidget { isInPatient: isInpatient, ), PatientProfileCardModel( - "Operation", - "Report", + TranslationBase.of(context).operation, + TranslationBase.of(context).report, GET_OPERATION_REPORT, 'patient/patient_sick_leave.png', isInPatient: isInpatient, ), PatientProfileCardModel( - "Pending", - "Orders", + TranslationBase.of(context).pending, + TranslationBase.of(context).orders, PENDING_ORDERS, 'patient/patient_sick_leave.png', isInPatient: isInpatient, ), PatientProfileCardModel( - "Admission", - "Orders", + TranslationBase.of(context).admission, + TranslationBase.of(context).orders, ADMISSION_ORDERS, - 'patient/patient_sick_leave.png', + 'patient/Progress_notes.png', isInPatient: isInpatient, ), PatientProfileCardModel( "Nursing", - "Progress Note", + TranslationBase.of(context).progressNote, NURSING_PROGRESS_NOTE, - 'patient/patient_sick_leave.png', + 'patient/Progress_notes.png', isInPatient: isInpatient, ), PatientProfileCardModel( - "Diagnosis", + TranslationBase.of(context).diagnosis, "", DIAGNOSIS_FOR_IN_PATIENT, 'patient/patient_sick_leave.png', isInPatient: isInpatient, ), PatientProfileCardModel( - "Diabetic", - "Chart", + TranslationBase.of(context).diabetic, + TranslationBase.of(context).chart, DIABETIC_CHART_VALUES, 'patient/patient_sick_leave.png', isInPatient: isInpatient,