Merge branch 'sultan-patientapp' into 'development'

Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!295

lib/core/service/weather_service.dart

@@ -18,10 +18,9 @@ class WeatherService extends BaseService {
     var long = await sharedPref.getDouble(USER_LONG);
     body['Latitude'] = lat ?? 0;
     body['Longitude'] = long ?? 0;
-
+    weatherIndicatorData = [];
     await baseAppClient.post(WEATHER_INDICATOR,
         onSuccess: (dynamic response, int statusCode) {
-      weatherIndicatorData = [];
       response['GetCityInfo_List'].forEach((data) {
         weatherIndicatorData.add(GetCityInfoList.fromJson(data));
       });

lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart

@@ -1,6 +1,7 @@
 import 'package:diplomaticquarterapp/core/viewModels/ancillary_orders_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:flutter/material.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@@ -42,7 +43,31 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
                         getPatientInfo(model),
                         getInvoiceDetails(model),
                         getInsuranceDetails(model),
-                        getAncillaryDetails(model)
+                        getAncillaryDetails(model),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceAround,
+                          children: [
+                            Texts(
+                              TranslationBase.of(context).total,
+                              fontSize: 20,
+                              fontWeight: FontWeight.bold,
+                            ),
+                            Texts(
+                              getTotalValue(model),
+                              fontSize: 20,
+                              fontWeight: FontWeight.bold,
+                            )
+                          ],
+                        ),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          children: [
+                            Button(
+                              label: TranslationBase.of(context).payNow,
+                              onTap: () {},
+                            )
+                          ],
+                        )
                       ])
                     : SizedBox())));
   }
@@ -208,7 +233,9 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
       );
       list.add(Row(
         mainAxisAlignment: MainAxisAlignment.start,
-        children: [getLabDetails(value)],
+        children: [
+          getLabDetails(value),
+        ],
       ));
     });
 
@@ -218,6 +245,13 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
     );
   }
 
+  String getTotalValue(value) {
+    double total = 0.0;
+    value.ancillaryListsDetails[0].ancillaryOrderProcList
+        .forEach((result) => {total += result.companyShareWithTax});
+    return total.toStringAsFixed(2);
+  }
+
   getLabDetails(value) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,

lib/pages/DrawerPages/family/my-family.dart

@@ -660,14 +660,15 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
         okText: TranslationBase.of(context).confirm,
         cancelText: TranslationBase.of(context).cancel_nocaps,
         okFunction: () => {
-              removeFamily(family, context),
-              ConfirmDialog.closeAlertDialog(context)
+              ConfirmDialog.closeAlertDialog(context),
+              removeFamily(family, context)
             },
         cancelFunction: () => {});
     dialog.showAlertDialog(context);
   }
 
   removeFamily(GetAllSharedRecordsByStatusList family, context) {
+    GifLoaderDialogUtils.showMyDialog(context);
     this.userID = family.iD;
     Map<String, dynamic> request = {};
     request['ID'] = this.userID;
@@ -679,7 +680,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   }
 
   refreshFamily(context) {
-    //sharedPref.remove(FAMILY_FILE);
+    GifLoaderDialogUtils.hideDialog(context);
     setState(() {
       sharedPref.remove(FAMILY_FILE);
     });

lib/pages/login/welcome.dart

@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
+import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -41,20 +42,19 @@ class _WelcomeLogin extends State<WelcomeLogin> {
                       children: <Widget>[
                         Image.asset('assets/images/DQ/logo.png',
                             height: 90, width: 90),
-                        Text(
+                        AppText(
                           TranslationBase.of(context).welcome,
-                          style: TextStyle(
-                              fontSize: 30, fontWeight: FontWeight.bold),
-                          textAlign: TextAlign.start,
+                          fontSize: 30,
+                          fontWeight: FontWeight.bold,
                         ),
-                        Text(
+                        AppText(
                           TranslationBase.of(context).welcomeText,
-                          style: TextStyle(fontSize: 24),
+                          fontSize: 24,
                           textAlign: TextAlign.start,
                         ),
-                        Text(
+                        AppText(
                           TranslationBase.of(context).welcomeText2,
-                          style: TextStyle(fontSize: 24),
+                          fontSize: 24,
                           textAlign: TextAlign.start,
                         ),
                         SizedBox(

lib/services/authentication/auth_provider.dart

@@ -378,24 +378,24 @@ class AuthProvider with ChangeNotifier {
 
   Future<Map> sendPatientIDSMS(mobileNo, context) async {
     Map<String, dynamic> request;
-    var languageID =
-        await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
+    // var languageID =
+    //     await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar');
     Request req = appGlobal.getPublicRequest();
     request = {
-      "LanguageID": languageID == 'ar' ? 1 : 2,
-      "IPAdress": "10.20.10.20",
-      "VersionID": req.VersionID,
-      "Channel": req.Channel,
-      "generalid": 'Cs2020@2016\$2958',
-      "PatientOutSA": 0,
-      "PatientID": 0,
-      "TokenID": "",
+      // "LanguageID": languageID == 'ar' ? 1 : 2,
+      // "IPAdress": "10.20.10.20",
+      // "VersionID": req.VersionID,
+      // "Channel": req.Channel,
+      // "generalid": 'Cs2020@2016\$2958',
+      // "PatientOutSA": 0,
+      // "PatientID": 0,
+      // "TokenID": "",
       "PatientMobileNumber": mobileNo,
       "SearchType": 2,
-      "ZipCode": "966",
-      "PatientIdentificationID": "",
+      // "ZipCode": "966",
+      // "PatientIdentificationID": "",
       "DeviceTypeID": req.DeviceTypeID,
-      "SessionID": null
+      // "SessionID": null
     };
 
     dynamic localRes;

lib/widgets/drawer/app_drawer_widget.dart

@@ -195,6 +195,7 @@ class _AppDrawerState extends State<AppDrawer> {
                                                 sideArrow: true,
                                               ),
                                               onTap: () {
+                                                Navigator.of(context).pop();
                                                 Navigator.of(context).pushNamed(
                                                   MY_FAMILIY,
                                                 );