From efc5db9f5b65895341a2a00cc7e8bd1eabaf8c35 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Thu, 16 Jul 2020 16:51:29 +0300 Subject: [PATCH] versionID update --- lib/config/config.dart | 4 +-- .../pharmacies_List_request_model.dart | 9 ++---- .../pharmacies_items_request_model.dart | 3 +- .../medicine/medicine_search_screen.dart | 31 +++++++++++++------ 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 1054b1d0..613839f0 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -2,7 +2,7 @@ const MAX_SMALL_SCREEN = 660; const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; -//const BASE_URL = 'https://hmgwebservices.com/Services/'; +//const BASE_URL = 'https://hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; @@ -123,7 +123,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '11.11.11.11'; -const VERSION_ID = 1.2; +const VERSION_ID = 5.3; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/models/pharmacies/pharmacies_List_request_model.dart b/lib/models/pharmacies/pharmacies_List_request_model.dart index eea446dd..70cda5d1 100644 --- a/lib/models/pharmacies/pharmacies_List_request_model.dart +++ b/lib/models/pharmacies/pharmacies_List_request_model.dart @@ -1,4 +1,3 @@ - /* *@author: Ibrahim Albitar *@Date:27/4/2020 @@ -8,8 +7,6 @@ */ class PharmaciesListRequestModel { - - int itemID; int languageID; String stamp; @@ -23,13 +20,13 @@ class PharmaciesListRequestModel { int channel; PharmaciesListRequestModel( - {this.itemID , + {this.itemID, this.patientTypeID = 1, this.languageID = 2, this.stamp = '2020-04-23T21:01:21.492Z', this.ipAdress = '11.11.11.11', this.versionID = 1.2, - this.tokenID , + this.tokenID, this.sessionID = 'e29zoooEJ4', this.isLoginForDoctorApp = true, this.channel = 9, @@ -64,4 +61,4 @@ class PharmaciesListRequestModel { data['Channel'] = this.channel; return data; } -} \ No newline at end of file +} diff --git a/lib/models/pharmacies/pharmacies_items_request_model.dart b/lib/models/pharmacies/pharmacies_items_request_model.dart index 96df6da8..84fc56ce 100644 --- a/lib/models/pharmacies/pharmacies_items_request_model.dart +++ b/lib/models/pharmacies/pharmacies_items_request_model.dart @@ -6,7 +6,6 @@ *@desc: */ - class PharmaciesItemsRequestModel { String pHRItemName; int pageIndex = 0; @@ -66,4 +65,4 @@ class PharmaciesItemsRequestModel { data['DeviceTypeID'] = this.deviceTypeID; return data; } -} \ No newline at end of file +} diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index 67b4a651..af1eb11d 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -60,8 +60,8 @@ class _MedicineSearchState extends State { hintText: TranslationBase.of(context).searchMedicineNameHere, controller: myController, onSaved: (value) {}, - onFieldSubmitted: (value){ - searchMedicine(context); + onFieldSubmitted: (value) { + searchMedicine(context); }, textInputAction: TextInputAction.search, inputFormatter: ONLY_LETTERS), @@ -92,7 +92,10 @@ class _MedicineSearchState extends State { children: [ AppText( TranslationBase.of(context).youCanFind + - (_medicineProvider.pharmacyItemsList == null ? "0" : _medicineProvider.pharmacyItemsList.length.toString()) + + (_medicineProvider.pharmacyItemsList == null + ? "0" + : _medicineProvider.pharmacyItemsList.length + .toString()) + TranslationBase.of(context).itemsInSearch, fontWeight: FontWeight.bold, margin: 5, @@ -116,12 +119,19 @@ class _MedicineSearchState extends State { : ListView.builder( scrollDirection: Axis.vertical, shrinkWrap: true, - itemCount: _medicineProvider.pharmacyItemsList == null ? 0 : _medicineProvider.pharmacyItemsList.length, + itemCount: _medicineProvider.pharmacyItemsList == + null + ? 0 + : _medicineProvider.pharmacyItemsList.length, itemBuilder: (BuildContext context, int index) { return InkWell( child: MedicineItemWidget( - label: _medicineProvider.pharmacyItemsList[index]["ItemDescription"], - url: _medicineProvider.pharmacyItemsList[index]["ProductImageBase64"], + label: + _medicineProvider.pharmacyItemsList[index] + ["ItemDescription"], + url: + _medicineProvider.pharmacyItemsList[index] + ["ProductImageBase64"], ), onTap: () { Navigator.push( @@ -129,9 +139,12 @@ class _MedicineSearchState extends State { MaterialPageRoute( builder: (context) => PharmaciesListScreen( - itemID: _medicineProvider.pharmacyItemsList[index]["ItemID"], - url: _medicineProvider.pharmacyItemsList[index] - ["ProductImageBase64"]), + itemID: _medicineProvider + .pharmacyItemsList[index] + ["ItemID"], + url: _medicineProvider + .pharmacyItemsList[index] + ["ProductImageBase64"]), ), ); },