dashboard changes

lib/client/base_app_client.dart

@@ -70,7 +70,7 @@ class BaseAppClient {
       body['Channel'] = CHANNEL;
       body['SessionID'] = SESSION_ID;
       body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
-      body['PatientOutSA'] = body['PatientOutSA']??0; // PATIENT_OUT_SA;
+      body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
       if (body['VidaAuthTokenID'] == null) {
         body['VidaAuthTokenID'] =
             await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
@@ -96,9 +96,12 @@ class BaseAppClient {
         } else {
           var parsed = json.decode(response.body.toString());
           if (!parsed['IsAuthenticated']) {
-            // onFailure(getError(parsed), statusCode);
+            if (body['OTP_SendType'] != null) {
-            await helpers.logout();
+              onFailure(getError(parsed), statusCode);
-            helpers.showErrorToast('Your session expired Please login agian');
+            } else {
+              await helpers.logout();
+              helpers.showErrorToast('Your session expired Please login agian');
+            }
           } else if (parsed['MessageStatus'] == 1) {
             if (!parsed['IsAuthenticated'])
               onFailure(getError(parsed), statusCode);

lib/config/localized_values.dart

@@ -29,7 +29,7 @@ const Map<String, Map<String, String>> localizedValues = {
     'en': 'Answer/Suggestions',
     'ar': 'ملاحضات وتفاصيل العيادة'
   },
-  'outPatients': {'en': 'Out-Patients', 'ar': 'المريض الخارجي'},
+  'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'},
   'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
   'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
   'patient': {'en': 'Patient', 'ar': ' مريض'},
@@ -44,7 +44,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
   'service': {'en': 'Service', 'ar': 'خدمة'},
   'referral': {'en': 'Referral', 'ar': 'االإحالة'},
-  'inPatient': {'en': 'In-Patient', 'ar': 'المريض الداخلي'},
+  'inPatient': {'en': 'In Patient', 'ar': 'المريض الداخلي'},
   'operations': {'en': 'Operations', 'ar': 'عمليات'},
   'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
   'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},
@@ -426,7 +426,10 @@ const Map<String, Map<String, String>> localizedValues = {
     'ar': 'تاريخ القبول المتوقع'
   },
   // 'emergencyAdmission': {'en': "EMERGENCY ADMISSION", 'ar': 'دخول الطوارئ'},
-  'isSickLeaveRequired': {'en': "Is Sick Leave Required", 'ar': 'هل الإجازة المرضية مطلوبة'},
+  'isSickLeaveRequired': {
+    'en': "Is Sick Leave Required",
+    'ar': 'هل الإجازة المرضية مطلوبة'
+  },
   'patientPregnant': {'en': "Patient Pregnant", 'ar': 'حمل المريض'},
   'treatmentLine': {
     'en': "Main line of treatment",
@@ -459,10 +462,7 @@ const Map<String, Map<String, String>> localizedValues = {
     'en': "POST PLANS & ESTIMATED COST",
     'ar': 'خطط البريد والتكلفة المقدرة'
   },
-  'postPlans': {
+  'postPlans': {'en': "POST PLANS", 'ar': 'خطط البريد'},
-    'en': "POST PLANS",
-    'ar': 'خطط البريد'
-  },
   'ucaf': {'en': "UCAF", 'ar': 'UCAF'},
   'emergencyCase': {'en': "Emergency Case", 'ar': 'حالة طارئة'},
   'durationOfIllness': {'en': "duration Of Illness", 'ar': 'مدة المرض'},
@@ -695,20 +695,41 @@ const Map<String, Map<String, String>> localizedValues = {
 
   'clinicSearch': {'en': "Search Clinic", 'ar': "بحث عن عيادة"},
   'doctorSearch': {'en': "Search Doctor", 'ar': "بحث عن طبيب"},
-  'referralResponse': {'en': "Referral Response : ", 'ar': " : استجابة الإحالة"},
+  'referralResponse': {
+    'en': "Referral Response : ",
+    'ar': " : استجابة الإحالة"
+  },
   'estimatedCost': {'en': "Estimated Cost", 'ar': "التكلفة المتوقعة"},
   'diagnosisDetail': {'en': "Diagnosis Detail : ", 'ar': "تفاصيل التشخيص"},
-  'referralSuccessMsgAccept': {'en': "Referral Accepted Successfully", 'ar': "تم قبول الإحالة بنجاح"},
+  'referralSuccessMsgAccept': {
-  'referralSuccessMsgReject': {'en': "Referral Rejected Successfully", 'ar': "تم رفض الإحالة بنجاح"},
+    'en': "Referral Accepted Successfully",
-  'sickLeaveComments': {'en': "Sick leave comments", 'ar': "تعليقات إجازة مرضية"},
+    'ar': "تم قبول الإحالة بنجاح"
+  },
+  'referralSuccessMsgReject': {
+    'en': "Referral Rejected Successfully",
+    'ar': "تم رفض الإحالة بنجاح"
+  },
+  'sickLeaveComments': {
+    'en': "Sick leave comments",
+    'ar': "تعليقات إجازة مرضية"
+  },
   'pastMedicalHistory': {'en': "Past medical history", 'ar': "التاريخ الطبي"},
-  'pastSurgicalHistory': {'en': "Past surgical history", 'ar': "التاريخ الجراحي"},
+  'pastSurgicalHistory': {
+    'en': "Past surgical history",
+    'ar': "التاريخ الجراحي"
+  },
   'complications': {'en': "Complications", 'ar': "المضاعفات"},
   'floor': {'en': "Floor", 'ar': "الطابق"},
   'roomCategory': {'en': "Room category", 'ar': "فئة الغرفة"},
-  'otherDepartmentsInterventions': {'en': "Other departments interventions", 'ar': "تدخلات الأقسام الأخرى"},
+  'otherDepartmentsInterventions': {
+    'en': "Other departments interventions",
+    'ar': "تدخلات الأقسام الأخرى"
+  },
   'otherProcedure': {'en': "Other procedure", 'ar': "إجراء آخر"},
-  'admissionRequestSuccessMsg': {'en': "Admission Request Created Successfully", 'ar': "تم إنشاء طلب القبول بنجاح"},
+  'admissionRequestSuccessMsg': {
+    'en': "Admission Request Created Successfully",
+    'ar': "تم إنشاء طلب القبول بنجاح"
+  },
   // 'icd': {'en': "ICD", 'ar': " "},
   'orderNo': {'en': "Order No : ", 'ar': "رقم الطلب"},
 };

lib/util/translations_delegate_base.dart

@@ -389,7 +389,7 @@ class TranslationBase {
 
   String get replay2 => localizedValues['replay2'][locale.languageCode];
 
-  String get outPatient => localizedValues['outPatient'][locale.languageCode];
+  String get outPatient => localizedValues['outPatients'][locale.languageCode];
 
   String get logout => localizedValues['logout'][locale.languageCode];
 
@@ -765,8 +765,7 @@ class TranslationBase {
 
   String get postPlansEstimatedCost =>
       localizedValues['postPlansEstimatedCost'][locale.languageCode];
-  String get postPlans =>
+  String get postPlans => localizedValues['postPlans'][locale.languageCode];
-      localizedValues['postPlans'][locale.languageCode];
 
   String get ucaf => localizedValues['ucaf'][locale.languageCode];
 
@@ -1085,25 +1084,39 @@ class TranslationBase {
       localizedValues['clinicSearch'][locale.languageCode];
   String get doctorSearch =>
       localizedValues['doctorSearch'][locale.languageCode];
-  String get referralResponse => localizedValues['referralResponse'][locale.languageCode];
+  String get referralResponse =>
-  String get estimatedCost => localizedValues['estimatedCost'][locale.languageCode];
+      localizedValues['referralResponse'][locale.languageCode];
-  String get diagnosisDetail => localizedValues['diagnosisDetail'][locale.languageCode];
+  String get estimatedCost =>
-  String get referralSuccessMsgAccept => localizedValues['referralSuccessMsgAccept'][locale.languageCode];
+      localizedValues['estimatedCost'][locale.languageCode];
-  String get referralSuccessMsgReject => localizedValues['referralSuccessMsgReject'][locale.languageCode];
+  String get diagnosisDetail =>
+      localizedValues['diagnosisDetail'][locale.languageCode];
+  String get referralSuccessMsgAccept =>
+      localizedValues['referralSuccessMsgAccept'][locale.languageCode];
+  String get referralSuccessMsgReject =>
+      localizedValues['referralSuccessMsgReject'][locale.languageCode];
 
   String get patientName =>
       localizedValues['patient-name'][locale.languageCode];
 
-  String get appointmentNumber => localizedValues['appointmentNumber'][locale.languageCode];
+  String get appointmentNumber =>
-  String get sickLeaveComments => localizedValues['sickLeaveComments'][locale.languageCode];
+      localizedValues['appointmentNumber'][locale.languageCode];
-  String get pastMedicalHistory => localizedValues['pastMedicalHistory'][locale.languageCode];
+  String get sickLeaveComments =>
-  String get pastSurgicalHistory => localizedValues['pastSurgicalHistory'][locale.languageCode];
+      localizedValues['sickLeaveComments'][locale.languageCode];
-  String get complications => localizedValues['complications'][locale.languageCode];
+  String get pastMedicalHistory =>
+      localizedValues['pastMedicalHistory'][locale.languageCode];
+  String get pastSurgicalHistory =>
+      localizedValues['pastSurgicalHistory'][locale.languageCode];
+  String get complications =>
+      localizedValues['complications'][locale.languageCode];
   String get floor => localizedValues['floor'][locale.languageCode];
-  String get roomCategory => localizedValues['roomCategory'][locale.languageCode];
+  String get roomCategory =>
-  String get otherDepartmentsInterventions => localizedValues['otherDepartmentsInterventions'][locale.languageCode];
+      localizedValues['roomCategory'][locale.languageCode];
-  String get otherProcedure => localizedValues['otherProcedure'][locale.languageCode];
+  String get otherDepartmentsInterventions =>
-  String get admissionRequestSuccessMsg => localizedValues['admissionRequestSuccessMsg'][locale.languageCode];
+      localizedValues['otherDepartmentsInterventions'][locale.languageCode];
+  String get otherProcedure =>
+      localizedValues['otherProcedure'][locale.languageCode];
+  String get admissionRequestSuccessMsg =>
+      localizedValues['admissionRequestSuccessMsg'][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/widgets/dashboard/guage_chart.dart

@@ -0,0 +1,54 @@
+import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:flutter/material.dart';
+import 'dart:math';
+
+class GaugeChart extends StatelessWidget {
+  final List<charts.Series> seriesList;
+  final bool animate;
+
+  GaugeChart(this.seriesList, {this.animate});
+
+  /// Creates a [PieChart] with sample data and no transition.
+  factory GaugeChart.withSampleData() {
+    return new GaugeChart(
+      _createSampleData(),
+      // Disable animations for image tests.
+      animate: false,
+    );
+  }
+  @override
+  Widget build(BuildContext context) {
+    return new charts.PieChart(seriesList,
+        animate: animate,
+        defaultRenderer: new charts.ArcRendererConfig(arcWidth: 10));
+    //);
+  }
+
+  static List<charts.Series<GaugeSegment, String>> _createSampleData() {
+    final data = [
+      new GaugeSegment('Low', 75, charts.MaterialPalette.blue.shadeDefault),
+      new GaugeSegment(
+          'Acceptable', 100, charts.MaterialPalette.blue.shadeDefault),
+      new GaugeSegment('High', 50, charts.MaterialPalette.blue.shadeDefault),
+      new GaugeSegment(
+          'Highly Unusual', 55, charts.MaterialPalette.blue.shadeDefault),
+    ];
+
+    return [
+      new charts.Series<GaugeSegment, String>(
+        id: 'Segments',
+        domainFn: (GaugeSegment segment, _) => segment.segment,
+        measureFn: (GaugeSegment segment, _) => segment.size,
+        data: data,
+      )
+    ];
+  }
+}
+
+/// Sample data type.
+class GaugeSegment {
+  final String segment;
+  final int size;
+  final charts.Color color;
+  GaugeSegment(this.segment, this.size, this.color);
+}