finish patient profile screen

lib/config/config.dart

@@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
 const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
-const BASE_URL = 'https://hmgwebservices.com/';
-//const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL =

lib/config/localized_values.dart

@@ -337,8 +337,8 @@ const Map<String, Map<String, String>> localizedValues = {
   'sameBranch': {'en': "Same Branch", 'ar': 'نفس الفرع'},
   'otherBranch': {'en': "Other Branch", 'ar': 'فرع آخر'},
   'dr': {'en': "DR.", 'ar': 'د.'},
-  'previewHealth': {'en': "Preview Health", 'ar': 'معاينة الصحة'},
-  'summaryReport': {'en': "Summary Report", 'ar': 'تقرير موجز'},
+  'previewHealth': {'en': "Health", 'ar': 'الصحة'},
+  'summaryReport': {'en': "Summary", 'ar': 'موجز'},
   'accept': {'en': "ACCEPT", 'ar': 'قبول'},
   'reject': {'en': "REJECT", 'ar': 'رفض'},
   'noAppointmentsErrorMsg': {
@@ -490,7 +490,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'significantSigns': {'en': "SIGNIFICANT SIGNS", 'ar': 'علامات مهمة'},
   'backAbdomen': {'en': "Back : Abdomen", 'ar': 'الظهر: البطن'},
   'reasons': {'en': "Reasons", 'ar': 'الأسباب'},
-  'createNew': {'en': "Create New", 'ar': 'انشاء '},
+  'createNew': {'en': "Create", 'ar': 'انشاء '},
   'episode': {'en': "Episode", 'ar': 'Episode'},
   'chiefComplaints': {'en': "Chief Complaints", 'ar': 'الشكاوى'},
   'addChiefComplaints': {'en': "Add Chief Complaints", 'ar': ' اضافه الشكاوى'},

lib/widgets/patients/profile/PatientProfileButton.dart

@@ -36,6 +36,7 @@ class PatientProfileButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return new Container(
       margin: new EdgeInsets.symmetric(horizontal: 4.0),
+      padding: EdgeInsets.fromLTRB(10, 10, 10, 5),
       child: InkWell(
         onTap: isDisable
             ? null
@@ -45,6 +46,14 @@ class PatientProfileButton extends StatelessWidget {
           navigator(context, this.route);
         },
         child: Column(children: <Widget>[
+          Container(
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: <Widget>[
+                  Container(
+                      child: new Image.asset(url + icon, width: 50, height: 50,))
+                ],
+              )),
           Container(
             alignment: Alignment.topLeft,
             padding: EdgeInsets.all(5),
@@ -53,33 +62,22 @@ class PatientProfileButton extends StatelessWidget {
               children: [
                 AppText(
                   this.nameLine1,
-                  color: Color(0xFFB9382C),
+                  color: Colors.black, /*Color(0xFFB9382C),*/
                   fontWeight: FontWeight.w600,
                   textAlign: TextAlign.left,
-                  fontSize: SizeConfig.textMultiplier * 2,
+                  fontSize: SizeConfig.textMultiplier * 1.5,
                 ),
                 AppText(
                   this.nameLine2,
                   color: Colors.black,
                   fontWeight: FontWeight.w600,
                   textAlign: TextAlign.left,
-                  fontSize: SizeConfig.textMultiplier * 2,
+                  fontSize: SizeConfig.textMultiplier * 1.5,
                 ),
                 if (isLoading) DrAppCircularProgressIndeicator()
               ],
             ),
           ),
-          Expanded(
-            child: Container(
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: <Widget>[
-                    Container(
-                        padding: EdgeInsets.all(10),
-                        child: new Image.asset(url + icon))
-                  ],
-                )),
-          )
         ]),
       ),
       decoration: BoxDecoration(
@@ -99,7 +97,6 @@ class PatientProfileButton extends StatelessWidget {
           ),
         ],
       ),
-      padding: EdgeInsets.fromLTRB(5, 10, 5, 5),
     );
   }
 

lib/widgets/patients/profile/profile_medical_info_widget.dart

@@ -29,13 +29,15 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return BaseView<SOAPViewModel>(
       onModelReady: (model) async {},
-      builder: (_, model, w) => SliverGrid.count(
+      builder: (_, model, w) => GridView.count(
+        shrinkWrap: true,
+        physics: NeverScrollableScrollPhysics(),
         crossAxisSpacing: 10,
-        mainAxisSpacing: 20,
-        crossAxisCount: 2,
-        childAspectRatio: 1.5,
+        mainAxisSpacing: 10,
+        childAspectRatio: 1 / 1.0,
+        crossAxisCount: 3,
         children: [
-          if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
+          /*if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
                 patient: patient,
@@ -62,23 +64,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 nameLine1: TranslationBase.of(context).update,
                 nameLine2: TranslationBase.of(context).episode,
                 route: UPDATE_EPISODE,
-                icon: 'modilfy-episode.png'),
-          if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
-            PatientProfileButton(
-                key: key,
-                patient: patient,
-                route: RADIOLOGY,
-                nameLine1: TranslationBase.of(context).radiology,
-                nameLine2: TranslationBase.of(context).service,
-                icon: 'radiology-1.png'),
-          if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
-            PatientProfileButton(
-                key: key,
-                patient: patient,
-                route: PATIENT_INSURANCE_APPROVALS,
-                nameLine1: TranslationBase.of(context).insurance,
-                nameLine2: TranslationBase.of(context).service,
-                icon: 'lab.png'),
+                icon: 'modilfy-episode.png'),*/
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -87,11 +73,8 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 to: to,
                 nameLine1: TranslationBase.of(context).vital,
                 nameLine2: TranslationBase.of(context).signs,
-                route:
-                    VITAL_SIGN_DETAILS /* PATIENT_VITAL_SIGN
-                  */
-                ,
-                icon: 'heartbeat.png'),
+                route: VITAL_SIGN_DETAILS,
+                icon: 'patient/vital_signs.png'),
           if (selectedPatientType != 7)
             PatientProfileButton(
                 key: key,
@@ -99,14 +82,14 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: LAB_ORDERS,
                 nameLine1: TranslationBase.of(context).lab,
                 nameLine2: TranslationBase.of(context).result,
-                icon: 'lab.png'),
+                icon: 'patient/lab_results.png'),
           PatientProfileButton(
               key: key,
               patient: patient,
               route: MEDICAL_FILE,
               nameLine1: TranslationBase.of(context).previewHealth,
               nameLine2: TranslationBase.of(context).summaryReport,
-              icon: 'radiology-1.png'),
+              icon: 'patient/health_summary.png'),
           if (selectedPatientType != 0 &&
               selectedPatientType != 5 &&
               selectedPatientType != 7)
@@ -116,7 +99,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: PROGRESS_NOTE,
                 nameLine1: TranslationBase.of(context).progress,
                 nameLine2: TranslationBase.of(context).note,
-                icon: 'heartbeat.png'),
+                icon: 'patient/Progress_notes.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -124,7 +107,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: PATIENT_ADMISSION_REQUEST,
                 nameLine1: TranslationBase.of(context).admission,
                 nameLine2: TranslationBase.of(context).request,
-                icon: 'heartbeat.png'),
+                icon: 'patient/admission_req.png'),
           (int.parse(patientType) == 7 || int.parse(patientType) == 6)
               ? PatientProfileButton(
                   key: key,
@@ -132,14 +115,14 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                   route: ORDER_PRESCRIPTION,
                   nameLine1: TranslationBase.of(context).orders,
                   nameLine2: TranslationBase.of(context).prescription,
-                  icon: 'lab.png')
+                  icon: 'patient/order_prescription.png')
               : PatientProfileButton(
                   key: key,
                   patient: patient,
                   route: ORDER_PRESCRIPTION_HISTORY,
                   nameLine1: TranslationBase.of(context).orders,
                   nameLine2: TranslationBase.of(context).prescription,
-                  icon: 'lab.png'),
+                  icon: 'patient/order_prescription.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -147,7 +130,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: ORDER_PROCEDURE,
                 nameLine1: TranslationBase.of(context).orders,
                 nameLine2: TranslationBase.of(context).procedures,
-                icon: 'lab.png'),
+                icon: 'patient/Order_Procedures.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -155,7 +138,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: REFER_PATIENT_TO_DOCTOR,
                 nameLine1: TranslationBase.of(context).myReferral,
                 nameLine2: TranslationBase.of(context).patient,
-                icon: 'note.png'),
+                icon: 'patient/refer_patient.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -163,7 +146,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: ADD_SICKLEAVE,
                 nameLine1: TranslationBase.of(context).patientSick,
                 nameLine2: TranslationBase.of(context).leave,
-                icon: 'sick_leaves_icons.png'),
+                icon: 'patient/patient_sick_leave.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -171,7 +154,23 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 route: PATIENT_UCAF_REQUEST,
                 nameLine1: TranslationBase.of(context).patient,
                 nameLine2: TranslationBase.of(context).ucaf,
-                icon: 'lab.png'),
+                icon: 'patient/ucaf.png'),
+          if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
+            PatientProfileButton(
+                key: key,
+                patient: patient,
+                route: RADIOLOGY,
+                nameLine1: TranslationBase.of(context).radiology,
+                nameLine2: TranslationBase.of(context).service,
+                icon: 'patient/health_summary.png'),
+          if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
+            PatientProfileButton(
+                key: key,
+                patient: patient,
+                route: PATIENT_INSURANCE_APPROVALS,
+                nameLine1: TranslationBase.of(context).insurance,
+                nameLine2: TranslationBase.of(context).service,
+                icon: 'patient/vital_signs.png'),
         ],
       ),
     );

lib/widgets/patients/profile/profile_medical_info_widget_search.dart

@@ -20,7 +20,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
   Widget build(BuildContext context) {
     return BaseView<SOAPViewModel>(
       onModelReady: (model) async {},
-      builder: (_, model, w) => SliverGrid.count(
+      builder: (_, model, w) => GridView.count(
         crossAxisSpacing: 10,
         mainAxisSpacing: 20,
         crossAxisCount: 2,

lib/widgets/shared/borderedButton.dart

@@ -16,6 +16,7 @@ class BorderedButton extends StatelessWidget {
   final double rPadding;
   final double bPadding;
   final double fontSize;
+  final String fontFamily;
   final Widget icon;
   final FontWeight fontWeight;
 
@@ -34,6 +35,7 @@ class BorderedButton extends StatelessWidget {
     this.rPadding = 4.0,
     this.bPadding = 0.0,
     this.fontSize = 0,
+    this.fontFamily = 'WorkSans',
     this.icon,
     this.fontWeight,
   });
@@ -55,22 +57,24 @@ class BorderedButton extends StatelessWidget {
           )),
         ),
         child: Container(
+          padding: (hPadding > 0 || vPadding > 0)
+              ? EdgeInsets.symmetric(
+              vertical: vPadding, horizontal: hPadding)
+              : EdgeInsets.fromLTRB(
+              lPadding, tPadding, rPadding, bPadding),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               icon != null ? icon : Container(),
               Container(
-                padding: (hPadding > 0 || vPadding > 0)
-                    ? EdgeInsets.symmetric(
-                        vertical: vPadding, horizontal: hPadding)
-                    : EdgeInsets.fromLTRB(
-                        lPadding, tPadding, rPadding, bPadding),
+                margin: EdgeInsets.symmetric(horizontal: 2),
                 child: Text(
                   text,
                   textAlign: TextAlign.center,
                   style: TextStyle(
                       fontSize: fontSize == 0 ? SizeConfig.textMultiplier * 1.6 : fontSize,
                       fontWeight: fontWeight != null ? fontWeight : FontWeight.normal,
+                      fontFamily: fontFamily,
                       color: textColor ?? Color(0xffc4aa54)),
                 ),
               ),