From b70c7d7d053d2d8970ce35be442f05be6f3b0b7a Mon Sep 17 00:00:00 2001 From: mosazaid Date: Mon, 15 Feb 2021 11:13:29 +0200 Subject: [PATCH] fix pharmacy auth --- lib/config/config.dart | 6 +++--- lib/config/localized_values.dart | 6 +++++- .../health-calculator/bariatrics-service.dart | 2 +- lib/core/service/parmacyModule/parmacy_module_service.dart | 1 + .../health-calculator/Bariatrics-viewmodel.dart | 2 +- lib/uitl/translations_delegate_base.dart | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 03f09dfc..be5dd440 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -12,8 +12,8 @@ const EXA_CART_API_BASE_URL = 'https://mdlaboratories.com/exacartapi'; const PACKAGES_CATEGORIES = '/api/categories'; const PACKAGES_PRODUCTS = '/api/products'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; //const BASE_PHARMACY_URL = 'http://swd-pharapp-01:7200/api/'; const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; @@ -227,7 +227,7 @@ const GET_PATIENT_HEALTH_STATS = 'Services/Patients.svc/REST/Med_GetTransactions const CHANNEL = 3; const GENERAL_ID = 'Cs2020@2016\$2958'; const IP_ADDRESS = '10.20.10.20'; -const VERSION_ID = 5.8; +const VERSION_ID = 6.1; const SETUP_ID = '91877'; const LANGUAGE = 2; const PATIENT_OUT_SA = 0; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index f165e3c7..a6b4d219 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1328,6 +1328,10 @@ const Map localizedValues = { "submitncontinue": {"en": "Submit and continue", "ar": "إرسال ومتابعة"}, "areyousure": {"en": "Are you sure you want to Add", "ar": "هل أنت متأكد أنك تريد إضافة"}, "preferredunit": {"en": "Select the preferred unit", "ar": "اختر الوحدة المفضلة"}, - "select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"} + "select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"}, + "app-update": { + "en": "UPDATE THE APP", + "ar": "تحديث التطبيق" + }, // "visit": {"en" : "Visit", "ar": "الزيارة"}, }; diff --git a/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart b/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart index d0e41321..b59eadac 100644 --- a/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart +++ b/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart index c400d788..3be9fe1a 100644 --- a/lib/core/service/parmacyModule/parmacy_module_service.dart +++ b/lib/core/service/parmacyModule/parmacy_module_service.dart @@ -67,6 +67,7 @@ class PharmacyModuleService extends BaseService { } Future generatePharmacyToken() async { + await getUser(); Map queryParams = { 'Filenumber':user.patientID.toString(), 'MobileNumber':user.mobileNumber, diff --git a/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart b/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart index 551245d4..9348c116 100644 --- a/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart +++ b/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart @@ -1,6 +1,6 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/diplomatic-quarter/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index a41bc11b..a3d67127 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -946,7 +946,7 @@ class TranslationBase { String get deletedChild => localizedValues['deleted-child'][locale.languageCode]; String get addInstructions => localizedValues['add-instructions'][locale.languageCode]; String get addedChild => localizedValues['added-child'][locale.languageCode]; - String get appUpdate => localizedValues['appUpdate'][locale.languageCode]; + String get appUpdate => localizedValues['app-update'][locale.languageCode]; String get ereferralSaveSuccess => localizedValues['ereferralSaveSuccess'][locale.languageCode]; String get year => localizedValues['Year'][locale.languageCode]; String get month => localizedValues['Month'][locale.languageCode];