Merge branch 'registration' into 'development'

translation and ui fixes

See merge request Cloud_Solution/doctor_app_flutter!904

lib/config/localized_values.dart

@@ -719,6 +719,9 @@ const Map<String, Map<String, String>> 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": " رقم الحجز :"},

lib/screens/patients/profile/admission-orders/admission_orders_screen.dart

@@ -39,7 +39,8 @@ class _AdmissionOrdersScreenState extends State<AdmissionOrdersScreen> {
       isDischargedPatient = routeArgs['isDischargedPatient'];
     return BaseView<PendingOrdersViewModel>(
       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<AdmissionOrdersScreen> {
                                 widthFactor: 0.95,
                                 child: CardWithBgWidget(
                                   hasBorder: false,
+                                  bgColor: Colors.white,
                                   widget: Column(
                                     children: [
                                       Column(

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,