diff --git a/lib/config/config.dart b/lib/config/config.dart index 09a3fcf8..d1106773 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; +//const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = diff --git a/lib/models/pharmacies/pharmacies_items_request_model.dart b/lib/models/pharmacies/pharmacies_items_request_model.dart index a8cd82c3..a951e26f 100644 --- a/lib/models/pharmacies/pharmacies_items_request_model.dart +++ b/lib/models/pharmacies/pharmacies_items_request_model.dart @@ -59,6 +59,8 @@ class PharmaciesItemsRequestModel { data['SessionID'] = this.sessionID; data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; data['DeviceTypeID'] = this.deviceTypeID; + ///todo Elham* we need to talk to the backend + data['VersionID'] = "30"; return data; } } diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index 6713d1bc..0825d07d 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -187,40 +187,43 @@ class _MedicineSearchState extends State { height: 10, ), if (myController.text != '') - Container( - height: MediaQuery.of(context).size.height * 0.6, - child: ListView.builder( - padding: const EdgeInsets.only(top: 20), + FractionallySizedBox( + widthFactor: 0.9, + child: Container( + height: MediaQuery.of(context).size.height * 0.6, + child: ListView.builder( + padding: const EdgeInsets.only(top: 20), - scrollDirection: Axis.vertical, - // shrinkWrap: true, - itemCount: model.pharmacyItemsList == null - ? 0 - : model.pharmacyItemsList.length, - itemBuilder: (BuildContext context, int index) { - return InkWell( - child: MedicineItemWidget( - label: model.pharmacyItemsList[index] - ["ItemDescription"], - url: model.pharmacyItemsList[index] - ["ImageSRCUrl"], - ), - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => PharmaciesListScreen( - itemID: model.pharmacyItemsList[index] - ["ItemID"], - url: model.pharmacyItemsList[index] - ["ImageSRCUrl"]), - settings: RouteSettings( - name: 'PharmaciesListScreen'), - ), - ); - }, - ); - }, + scrollDirection: Axis.vertical, + // shrinkWrap: true, + itemCount: model.pharmacyItemsList == null + ? 0 + : model.pharmacyItemsList.length, + itemBuilder: (BuildContext context, int index) { + return InkWell( + child: MedicineItemWidget( + label: model.pharmacyItemsList[index] + ["ItemDescription"], + url: model.pharmacyItemsList[index] + ["ImageSRCUrl"], + ), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PharmaciesListScreen( + itemID: model.pharmacyItemsList[index] + ["ItemID"], + url: model.pharmacyItemsList[index] + ["ImageSRCUrl"]), + settings: RouteSettings( + name: 'PharmaciesListScreen'), + ), + ); + }, + ); + }, + ), ), ), ], diff --git a/lib/widgets/medicine/medicine_item_widget.dart b/lib/widgets/medicine/medicine_item_widget.dart index 482a251b..92facf9d 100644 --- a/lib/widgets/medicine/medicine_item_widget.dart +++ b/lib/widgets/medicine/medicine_item_widget.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/material.dart'; @@ -37,10 +38,53 @@ class MedicineItemWidget extends StatefulWidget { class _MedicineItemWidgetState extends State { @override Widget build(BuildContext context) { - return new RoundedContainer( - height: SizeConfig.heightMultiplier * 8, - child: Padding( - padding: const EdgeInsets.all(5.0), + return CardWithBgWidget( + padding: 0, + marginLeft: 10, + marginSymmetric: 10, + hasBorder: false, + bgColor: Colors.white, + widget: Container( + color: Colors.white, + padding: EdgeInsets.all(20), + child: InkWell( + child: Row( + // crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + if (widget.url != null) + Container( + height: 39, + width: 39, + child: ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(7)), + child: Image.network( + widget.url!, + height: SizeConfig.imageSizeMultiplier * 15, + width: SizeConfig.imageSizeMultiplier * 15, + fit: BoxFit.cover, + ), + ), + ), + Container( + child: Expanded( + child: Padding( + padding: EdgeInsets.all(5), + child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))), + ), + Icon(EvaIcons.eye) + ], + ), + ), + ), + ); + + + + + CardWithBgWidget( + widget: Container( + height: 100, child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.start, @@ -59,19 +103,17 @@ class _MedicineItemWidgetState extends State { ), ), ), - Expanded( - child: Padding( - padding: EdgeInsets.all(5), - child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))), + Container( + child: Expanded( + child: Padding( + padding: EdgeInsets.all(5), + child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))), + ), Icon(EvaIcons.eye) ], ), ), - backgroundColor: widget.backgroundColor, - showBorder: widget.showBorder, - borderColor: widget.borderColor, - margin: EdgeInsets.all(4), - raduis: 10, + bgColor:Colors.white, ); }