Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan

4 years ago · 6b4bae7370
parent 827768e96d eb459010a9
commit 6b4bae7370
22 changed files with 126 additions and 104 deletions
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@ -1 +1 @@
-d69545ca05f0ca200eba92121a1458fb
+59a6c452ee075b50114918f17f1ad8f5
--- a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
@ -48,8 +48,8 @@ class EReferralIndexPage extends StatelessWidget {
                    width: MediaQuery.of(context).size.width * 0.50,
                    child: CarouselSlider(
                      imagesUrlList: [
-                        "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/0.png",
-                        "https://hmgwebservices.com/Images/MobileApp/images-info-home/referal/en/1.png"
+                        "https://hmgwebservices.com/Images/MobileAppDq/images-info-home/referal/en/0.png",
+                        "https://hmgwebservices.com/Images/MobileAppDq/images-info-home/referal/en/1.png"
                      ],
                    ),
                  ),
--- a/lib/pages/ContactUs/LiveChat/livechat_page.dart
+++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart
@ -23,9 +23,9 @@ class _LiveChatPageState extends State<LiveChatPage>
  @override
  void initState() {
    super.initState();
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/0.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/1.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/en/2.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/live-chat/ar/2.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/1.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/en/2.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/live-chat/ar/2.png'));

    _tabController = TabController(length: 2, vsync: this);
  }
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@ -72,17 +72,17 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
    imagesInfo.add(
      ImagesInfo(
          imageEn:
-              'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/0.png',
+              'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/en/0.png',
          imageAr:
-              'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/0.png'),
+              'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/ar/0.png'),
    );

    imagesInfo.add(
      ImagesInfo(
          imageEn:
-              'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png',
+              'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/en/1.png',
          imageAr:
-              'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'),
+              'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/family-file/ar/1.png'),
    );
    projectViewModel = Provider.of(context);
    return AppScaffold(
--- a/lib/pages/ErService/AmbulanceReq.dart
+++ b/lib/pages/ErService/AmbulanceReq.dart
@ -43,9 +43,9 @@ class _AmbulanceReqState extends State<AmbulanceReq>
  Widget build(BuildContext context) {
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/Ambulance/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/Ambulance/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/Ambulance/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/Ambulance/ar/0.png'));

    return BaseView<AmRequestViewModel>(
      onModelReady: (model) => model.getAmRequestOrders(),
--- a/lib/pages/MyAppointments/MyAppointments.dart
+++ b/lib/pages/MyAppointments/MyAppointments.dart
@ -60,14 +60,14 @@ class _MyAppointmentsState extends State<MyAppointments>
    });
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/ar/0.png'));
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/en/1.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/en/1.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/my-appointment/ar/1.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-appointment/ar/1.png'));
    super.initState();
  }

--- a/lib/pages/ToDoList/ToDo.dart
+++ b/lib/pages/ToDoList/ToDo.dart
@ -64,9 +64,9 @@ class _ToDoState extends State<ToDo> {
    super.initState();
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/todo/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/images-info-home/todo/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/todo/ar/0.png'));
    int endTime = DateTime.now().millisecondsSinceEpoch + 1000 * 30;
    controller = CountdownTimerController(endTime: endTime);
  }
--- a/lib/pages/insurance/insurance_approval_screen.dart
+++ b/lib/pages/insurance/insurance_approval_screen.dart
@ -26,14 +26,14 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
  Widget build(BuildContext context) {
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/ar/0.png'));
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/1.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/en/1.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/1.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/apporvals/ar/1.png'));
    return BaseView<InsuranceViewModel>(
      onModelReady: widget.appointmentNo != null
          ? (model) =>
--- a/lib/pages/insurance/insurance_card_screen.dart
+++ b/lib/pages/insurance/insurance_card_screen.dart
@ -34,9 +34,9 @@ class _InsuranceCardState extends State<InsuranceCard> {
  Widget build(BuildContext context) {
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/ar/0.png'));

    return BaseView<InsuranceViewModel>(
      onModelReady: (model) => model.getInsurance(),
--- a/lib/pages/insurance/insurance_update_screen.dart
+++ b/lib/pages/insurance/insurance_update_screen.dart
@ -32,7 +32,7 @@ class _InsuranceUpdateState extends State<InsuranceUpdate>
    super.initState();
    _tabController = TabController(length: 2, vsync: this);

-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/insurance-card/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/insurance-card/ar/0.png'));
  }

  void dispose() {
--- a/lib/pages/medical/allergies_page.dart
+++ b/lib/pages/medical/allergies_page.dart
@ -11,7 +11,7 @@ class AllergiesPage extends StatelessWidget {
  List<ImagesInfo> imagesInfo = List();
  @override
  Widget build(BuildContext context) {
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/alllergies/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/alllergies/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/alllergies/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/alllergies/ar/0.png'));
    return BaseView<AllergiesViewModel>(
      onModelReady: (model) => model.getAllergies(),
      builder: (_, model, w) => AppScaffold(
--- a/lib/pages/medical/balance/advance_payment_page.dart
+++ b/lib/pages/medical/balance/advance_payment_page.dart
@ -58,9 +58,9 @@ class _AdvancePaymentPageState extends State<AdvancePaymentPage> {
    getAuthUser();
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/advance-payment/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/images-info-home/advance-payment/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/advance-payment/ar/0.png'));
  }

  @override
--- a/lib/pages/medical/balance/my_balance_page.dart
+++ b/lib/pages/medical/balance/my_balance_page.dart
@ -18,7 +18,7 @@ class MyBalancePage extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/my-balance/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/my-balance/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/images-info-home/my-balance/ar/0.png'));
    return BaseView<MyBalanceViewModel>(
      onModelReady: (model) => model.getPatientAdvanceBalanceAmount(),
      builder: (_, model, w) => AppScaffold(
@ -27,7 +27,8 @@ class MyBalancePage extends StatelessWidget {
        appBarTitle: TranslationBase.of(context).myBalances,
        imagesInfo: imagesInfo,
        description: TranslationBase.of(context).infoMyBalance,
-        body: Container(
+        body: SingleChildScrollView(
+          child: Container(
            margin: EdgeInsets.all(12),
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
@ -93,11 +94,14 @@ class MyBalancePage extends StatelessWidget {
                    ),
                  ),
                ),
+                SizedBox(height: MediaQuery.of(context).size.height * 0.13 ,)
              ],
            ),
          ),
+        ),
        bottomSheet: Container(
-          height: MediaQuery.of(context).size.height * 0.1,
+          height: MediaQuery.of(context).size.height * 0.12,
+          color: Colors.white,
          width: double.infinity,
          padding: EdgeInsets.all(12),
          child: SecondaryButton(
--- a/lib/pages/medical/doctor/doctor_home_page.dart
+++ b/lib/pages/medical/doctor/doctor_home_page.dart
@ -19,8 +19,8 @@ class DoctorHomePage extends StatelessWidget {
  List<ImagesInfo> imagesInfo = List();
  @override
  Widget build(BuildContext context) {
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/ar/0.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-doctor/ar/1.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-doctor/ar/1.png'));
    return BaseView<MyDoctorViewModel>(
      onModelReady: (model) => model.getMyDoctor(),
      builder: (context, MyDoctorViewModel model, widget) => AppScaffold(
@ -48,7 +48,7 @@ class DoctorHomePage extends StatelessWidget {
                            leading: Radio(
                              value: FilterType.Clinic,
                              groupValue: model.filterType,
-                              activeColor: Colors.red[800],
+                              activeColor:Theme.of(context).primaryColor,
                              onChanged: (FilterType value) {
                                model.setFilterType(value);
                              },
@ -65,7 +65,7 @@ class DoctorHomePage extends StatelessWidget {
                            leading: Radio(
                              value: FilterType.Hospital,
                              groupValue: model.filterType,
-                              activeColor: Colors.red[800],
+                              activeColor: Theme.of(context).primaryColor,
                              onChanged: (FilterType value) =>
                                  model.setFilterType(value),
                            ),
--- a/lib/pages/medical/labs/labs_home_page.dart
+++ b/lib/pages/medical/labs/labs_home_page.dart
@ -21,7 +21,7 @@ class LabsHomePage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    ProjectViewModel projectViewModel = Provider.of(context);
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-lab/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-lab/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-lab/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-lab/ar/0.png'));
    return BaseView<LabsViewModel>(
      onModelReady: (model) => model.getLabs(),
      builder: (context, LabsViewModel model, widget) => AppScaffold(
--- a/lib/pages/medical/patient_sick_leave_page.dart
+++ b/lib/pages/medical/patient_sick_leave_page.dart
@ -23,8 +23,8 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
  @override
  void initState() {
    imagesInfo.add(ImagesInfo(
-        imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/sick-leaves/en/0.png',
-        imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/sick-leaves/ar/0.png'));
+        imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/sick-leaves/en/0.png',
+        imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/sick-leaves/ar/0.png'));
    super.initState();
  }

--- a/lib/pages/medical/prescriptions/prescriptions_home_page.dart
+++ b/lib/pages/medical/prescriptions/prescriptions_home_page.dart
@ -25,8 +25,8 @@ class _HomePrescriptionsPageState extends State<HomePrescriptionsPage>
  void initState() {
    super.initState();
    _tabController = TabController(length: 2, vsync: this);
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/0.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/1.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-prescriptions/ar/1.png'));
  }

  @override
--- a/lib/pages/medical/radiology/radiology_home_page.dart
+++ b/lib/pages/medical/radiology/radiology_home_page.dart
@ -19,8 +19,8 @@ class RadiologyHomePage extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    ProjectViewModel projectViewModel = Provider.of(context);
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/0.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-radiology/ar/1.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-radiology/ar/1.png'));
    return BaseView<RadiologyViewModel>(
      onModelReady: (model) => model.getPatientRadOrders(),
      builder: (_, model, widget) => AppScaffold(
--- a/lib/pages/medical/reports/report_home_page.dart
+++ b/lib/pages/medical/reports/report_home_page.dart
@ -39,19 +39,19 @@ class _HomeReportPageState extends State<HomeReportPage>
  Widget build(BuildContext context) {
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/0.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/0.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/0.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/0.png'));
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/1.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/1.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/1.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/1.png'));
    imagesInfo.add(ImagesInfo(
        imageEn:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/en/2.png',
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/en/2.png',
        imageAr:
-            'https://hmgwebservices.com/Images/MobileApp/imges-info/medical-reorts/ar/2.png'));
+            'https://hmgwebservices.com/Images/MobileAppDq/imges-info/medical-reorts/ar/2.png'));
    return BaseView<ReportsViewModel>(
      onModelReady: (model) => model.getReports(), //model.getPrescriptions(),
      builder: (_, model, widget) => AppScaffold(
--- a/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
+++ b/lib/pages/medical/vital_sign/vital_sign_details_screen.dart
@ -24,8 +24,8 @@ class VitalSignDetailsScreen extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/0.png'));
-    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-vital-signs/ar/1.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/ar/0.png'));
+    imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileAppDq/imges-info/my-vital-signs/ar/1.png'));
    return BaseView<VitalSignViewModel>(
      onModelReady: appointmentNo != null && projectID != null
          ? (model) => model.getPatientRadOrders(
--- a/lib/splashPage.dart
+++ b/lib/splashPage.dart
@ -1,10 +1,12 @@
 import 'dart:async';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
+import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

 import 'config/shared_pref_kay.dart';
+import 'config/size_config.dart';
 import 'core/service/AuthenticatedUserObject.dart';
 import 'core/viewModels/project_view_model.dart';
 import 'locator.dart';
@ -46,11 +48,27 @@ class _SplashScreenState extends State<SplashScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      backgroundColor: Colors.white,
-      body: Center(
-        child: Padding(
-          padding: const EdgeInsets.all(12.0),
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          SizedBox(height: MediaQuery.of(context).size.height * 0.35,),
+          Padding(
+            padding: const EdgeInsets.all(25.0),
            child: Image.asset('assets/images/DQ/DQ_logo.png'),
          ),
+          SizedBox(height: MediaQuery.of(context).size.height * 0.30,),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              Text(TranslationBase.of(context).poweredBy),
+              Image.asset(
+                'assets/images/cs_logo_container.png',
+                width: 80,
+              )
+            ],
+          )
+        ],
      ),
    );
  }
--- a/lib/widgets/data_display/medical/doctor_card.dart
+++ b/lib/widgets/data_display/medical/doctor_card.dart
@ -57,7 +57,7 @@ class DoctorCard extends StatelessWidget {
                  height: date == null ? projectViewModel.isArabic? 185 :100 : 180,
                  decoration: BoxDecoration(
                    color: !isInOutPatient
-                        ? Colors.red[900]
+                        ? Color(0xff404545)
                        : Theme.of(context).primaryColor,
                    borderRadius: BorderRadius.only(
                      topLeft: projectViewModel.isArabic