Merge branch 'registration' into 'development'

translation and ui fixes

See merge request Cloud_Solution/doctor_app_flutter!904
merge-requests/905/merge
Elham Ali 4 years ago
commit 83bea13b8d

@ -719,6 +719,9 @@ const Map<String, Map<String, String>> localizedValues = {
"healthID": {"en": "Health ID", "ar": "معرف الصحة"}, "healthID": {"en": "Health ID", "ar": "معرف الصحة"},
"identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"}, "identityNumber": {"en": "Identity Number", "ar": "رقم الهوية"},
"maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"}, "maritalStatus": {"en": "Marital Status", "ar": "الحالة الزوجية"},
"nursing": {"en": "Nursing", "ar": "تمريض"},
"diabetic": {"en": "Diabetic", "ar": "مرض السكري"},
"chart": {"en": "Chart", "ar": "جدول"},
"operationTimeStart": {"en": "Operation Time Start :", "ar": "بدء وقت العملية:"}, "operationTimeStart": {"en": "Operation Time Start :", "ar": "بدء وقت العملية:"},
"operationDate": {"en": "operation Date :", "ar": "تاريخ العملية:"}, "operationDate": {"en": "operation Date :", "ar": "تاريخ العملية:"},
"reservation": {"en": "Reservation Number :", "ar": " رقم الحجز :"}, "reservation": {"en": "Reservation Number :", "ar": " رقم الحجز :"},

@ -39,7 +39,8 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
isDischargedPatient = routeArgs['isDischargedPatient']; isDischargedPatient = routeArgs['isDischargedPatient'];
return BaseView<PendingOrdersViewModel>( return BaseView<PendingOrdersViewModel>(
onModelReady: (model) => model.getAdmissionOrders( onModelReady: (model) => model.getAdmissionOrders(
admissionNo: 2014005178, patientId: patient.patientMRN), admissionNo: int.parse(patient.admissionNo),
patientId: patient.patientMRN),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
@ -94,6 +95,7 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
widthFactor: 0.95, widthFactor: 0.95,
child: CardWithBgWidget( child: CardWithBgWidget(
hasBorder: false, hasBorder: false,
bgColor: Colors.white,
widget: Column( widget: Column(
children: [ children: [
Column( Column(

@ -113,12 +113,12 @@ class ProfileGridForInPatient extends StatelessWidget {
'patient/vital_signs.png', 'patient/vital_signs.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).discharge, TranslationBase.of(context).discharge,
TranslationBase.of(context).report, TranslationBase.of(context).report,
DISCHARGE_SUMMARY, DISCHARGE_SUMMARY,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient,) isInPatient: isInpatient,
, ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).patientSick, TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave, TranslationBase.of(context).leave,
@ -127,43 +127,43 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Operation", TranslationBase.of(context).operation,
"Report", TranslationBase.of(context).report,
GET_OPERATION_REPORT, GET_OPERATION_REPORT,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Pending", TranslationBase.of(context).pending,
"Orders", TranslationBase.of(context).orders,
PENDING_ORDERS, PENDING_ORDERS,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Admission", TranslationBase.of(context).admission,
"Orders", TranslationBase.of(context).orders,
ADMISSION_ORDERS, ADMISSION_ORDERS,
'patient/patient_sick_leave.png', 'patient/Progress_notes.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Nursing", "Nursing",
"Progress Note", TranslationBase.of(context).progressNote,
NURSING_PROGRESS_NOTE, NURSING_PROGRESS_NOTE,
'patient/patient_sick_leave.png', 'patient/Progress_notes.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Diagnosis", TranslationBase.of(context).diagnosis,
"", "",
DIAGNOSIS_FOR_IN_PATIENT, DIAGNOSIS_FOR_IN_PATIENT,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isInPatient: isInpatient,
), ),
PatientProfileCardModel( PatientProfileCardModel(
"Diabetic", TranslationBase.of(context).diabetic,
"Chart", TranslationBase.of(context).chart,
DIABETIC_CHART_VALUES, DIABETIC_CHART_VALUES,
'patient/patient_sick_leave.png', 'patient/patient_sick_leave.png',
isInPatient: isInpatient, isInPatient: isInpatient,

Loading…
Cancel
Save