Merge branch 'clinic_list' into 'development'

Clinic list

See merge request Cloud_Solution/doctor_app_flutter!357

lib/widgets/patients/profile/profile_medical_info_widget_search.dart

@@ -1,20 +1,11 @@
-import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
-import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/routes.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
-import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:hexcolor/hexcolor.dart';
-
-import '../../../config/size_config.dart';
-import '../../shared/app_texts_widget.dart';
 
 class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
   String from;
@@ -35,15 +26,14 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
         crossAxisCount: 2,
         childAspectRatio: 1.5,
         children: [
+
           PatientProfileButton(
               key: key,
               patient: patient,
-              from: from,
-              to: to,
-              nameLine1: TranslationBase.of(context).vital,
-              nameLine2: TranslationBase.of(context).signs,
-              route: VITAL_SIGN_DETAILS,
-              icon: 'heartbeat.png'),
+              route: RADIOLOGY,
+              nameLine1: TranslationBase.of(context).radiology,
+              nameLine2: TranslationBase.of(context).service,
+              icon: 'radiology-1.png'),
           PatientProfileButton(
               key: key,
               patient: patient,
@@ -51,35 +41,47 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
               nameLine1: TranslationBase.of(context).insurance,
               nameLine2: TranslationBase.of(context).service,
               icon: 'lab.png'),
+
+          PatientProfileButton(
+              key: key,
+              patient: patient,
+              route: LAB_ORDERS,
+              nameLine1: TranslationBase.of(context).lab,
+              nameLine2: TranslationBase.of(context).result,
+              icon: 'lab.png'),
           PatientProfileButton(
               key: key,
               patient: patient,
-              route: PATIENT_ADMISSION_REQUEST,
-              nameLine1: TranslationBase.of(context).admission,
-              nameLine2: TranslationBase.of(context).request,
+              from: from,
+              to: to,
+              nameLine1: TranslationBase.of(context).vital,
+              nameLine2: TranslationBase.of(context).signs,
+              route: VITAL_SIGN_DETAILS,
               icon: 'heartbeat.png'),
-          (int.parse(patientType) == 7 || int.parse(patientType) == 6)
-              ? PatientProfileButton(
-                  key: key,
-                  patient: patient,
-                  route: ORDER_PRESCRIPTION,
-                  nameLine1: TranslationBase.of(context).orders,
-                  nameLine2: TranslationBase.of(context).prescription,
-                  icon: 'lab.png')
-              : PatientProfileButton(
-                  key: key,
-                  patient: patient,
-                  route: ORDER_PRESCRIPTION_HISTORY,
-                  nameLine1: TranslationBase.of(context).orders,
-                  nameLine2: TranslationBase.of(context).prescription,
-                  icon: 'lab.png'),
+
+          // PatientProfileButton(
+          //     key: key,
+          //     patient: patient,
+          //     route: PATIENT_ADMISSION_REQUEST,
+          //     nameLine1: TranslationBase.of(context).admission,
+          //     nameLine2: TranslationBase.of(context).request,
+          //     icon: 'heartbeat.png'),
+          // (int.parse(patientType) == 7 || int.parse(patientType) == 6)
+          //     ? PatientProfileButton(
+          //         key: key,
+          //         patient: patient,
+          //         route: ORDER_PRESCRIPTION,
+          //         nameLine1: TranslationBase.of(context).orders,
+          //         nameLine2: TranslationBase.of(context).prescription,
+          //         icon: 'lab.png')
+          //     :
           PatientProfileButton(
               key: key,
               patient: patient,
-              route: ADD_SICKLEAVE,
-              nameLine1: TranslationBase.of(context).patientSick,
-              nameLine2: TranslationBase.of(context).leave,
-              icon: 'sick_leaves_icons.png'),
+              route: ORDER_PRESCRIPTION_HISTORY,
+              nameLine1: TranslationBase.of(context).orders,
+              nameLine2: TranslationBase.of(context).prescription,
+              icon: 'lab.png'),
           PatientProfileButton(
               key: key,
               patient: patient,
@@ -101,6 +103,13 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
               nameLine1: TranslationBase.of(context).patientSick,
               nameLine2: TranslationBase.of(context).leave,
               icon: 'sick_leaves_icons.png'),
+          PatientProfileButton(
+              key: key,
+              patient: patient,
+              route: PROGRESS_NOTE,
+              nameLine1: TranslationBase.of(context).progress,
+              nameLine2: TranslationBase.of(context).note,
+              icon: 'heartbeat.png'),
         ],
       ),
     );