Merge branch 'hussam' into 'development'

Hussam

See merge request Cloud_Solution/doctor_app_flutter!155
pull/157/head
Elham 6 years ago
commit 9f1b04512b

@ -2,7 +2,7 @@ const MAX_SMALL_SCREEN = 660;
const ONLY_NUMBERS = "[0-9]"; const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]"; 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 BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region"; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
@ -123,7 +123,7 @@ const TRANSACTION_NO = 0;
const LANGUAGE_ID = 2; const LANGUAGE_ID = 2;
const STAMP = '2020-04-27T12:17:17.721Z'; const STAMP = '2020-04-27T12:17:17.721Z';
const IP_ADDRESS = '11.11.11.11'; const IP_ADDRESS = '11.11.11.11';
const VERSION_ID = 1.2; const VERSION_ID = 5.3;
const CHANNEL = 9; const CHANNEL = 9;
const SESSION_ID = 'BlUSkYymTt'; const SESSION_ID = 'BlUSkYymTt';
const IS_LOGIN_FOR_DOCTOR_APP = true; const IS_LOGIN_FOR_DOCTOR_APP = true;

@ -1,4 +1,3 @@
/* /*
*@author: Ibrahim Albitar *@author: Ibrahim Albitar
*@Date:27/4/2020 *@Date:27/4/2020
@ -8,8 +7,6 @@
*/ */
class PharmaciesListRequestModel { class PharmaciesListRequestModel {
int itemID; int itemID;
int languageID; int languageID;
String stamp; String stamp;
@ -23,13 +20,13 @@ class PharmaciesListRequestModel {
int channel; int channel;
PharmaciesListRequestModel( PharmaciesListRequestModel(
{this.itemID , {this.itemID,
this.patientTypeID = 1, this.patientTypeID = 1,
this.languageID = 2, this.languageID = 2,
this.stamp = '2020-04-23T21:01:21.492Z', this.stamp = '2020-04-23T21:01:21.492Z',
this.ipAdress = '11.11.11.11', this.ipAdress = '11.11.11.11',
this.versionID = 1.2, this.versionID = 1.2,
this.tokenID , this.tokenID,
this.sessionID = 'e29zoooEJ4', this.sessionID = 'e29zoooEJ4',
this.isLoginForDoctorApp = true, this.isLoginForDoctorApp = true,
this.channel = 9, this.channel = 9,

@ -6,7 +6,6 @@
*@desc: *@desc:
*/ */
class PharmaciesItemsRequestModel { class PharmaciesItemsRequestModel {
String pHRItemName; String pHRItemName;
int pageIndex = 0; int pageIndex = 0;

@ -60,8 +60,8 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
hintText: TranslationBase.of(context).searchMedicineNameHere, hintText: TranslationBase.of(context).searchMedicineNameHere,
controller: myController, controller: myController,
onSaved: (value) {}, onSaved: (value) {},
onFieldSubmitted: (value){ onFieldSubmitted: (value) {
searchMedicine(context); searchMedicine(context);
}, },
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
inputFormatter: ONLY_LETTERS), inputFormatter: ONLY_LETTERS),
@ -92,7 +92,10 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).youCanFind + TranslationBase.of(context).youCanFind +
(_medicineProvider.pharmacyItemsList == null ? "0" : _medicineProvider.pharmacyItemsList.length.toString()) + (_medicineProvider.pharmacyItemsList == null
? "0"
: _medicineProvider.pharmacyItemsList.length
.toString()) +
TranslationBase.of(context).itemsInSearch, TranslationBase.of(context).itemsInSearch,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
margin: 5, margin: 5,
@ -116,12 +119,19 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
: ListView.builder( : ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: _medicineProvider.pharmacyItemsList == null ? 0 : _medicineProvider.pharmacyItemsList.length, itemCount: _medicineProvider.pharmacyItemsList ==
null
? 0
: _medicineProvider.pharmacyItemsList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
child: MedicineItemWidget( child: MedicineItemWidget(
label: _medicineProvider.pharmacyItemsList[index]["ItemDescription"], label:
url: _medicineProvider.pharmacyItemsList[index]["ProductImageBase64"], _medicineProvider.pharmacyItemsList[index]
["ItemDescription"],
url:
_medicineProvider.pharmacyItemsList[index]
["ProductImageBase64"],
), ),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
@ -129,9 +139,12 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
PharmaciesListScreen( PharmaciesListScreen(
itemID: _medicineProvider.pharmacyItemsList[index]["ItemID"], itemID: _medicineProvider
url: _medicineProvider.pharmacyItemsList[index] .pharmacyItemsList[index]
["ProductImageBase64"]), ["ItemID"],
url: _medicineProvider
.pharmacyItemsList[index]
["ProductImageBase64"]),
), ),
); );
}, },

Loading…
Cancel
Save