we fix issue in app drawer and admission-request-first-screen

merge-requests/932/head
RoaaGhali98 4 years ago
parent 283bad183d
commit 0719f00c51

@ -5,8 +5,8 @@ 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_LIVE_CARE = 'https://livecare.hmg.com/'; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const BASE_URL = 'https://hmgwebservices.com/'; //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_enh"; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = const PATIENT_PROGRESS_NOTE_URL =

@ -59,6 +59,8 @@ class PharmaciesItemsRequestModel {
data['SessionID'] = this.sessionID; data['SessionID'] = this.sessionID;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['DeviceTypeID'] = this.deviceTypeID; data['DeviceTypeID'] = this.deviceTypeID;
///todo Elham* we need to talk to the backend
data['VersionID'] = "30";
return data; return data;
} }
} }

@ -187,40 +187,43 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
height: 10, height: 10,
), ),
if (myController.text != '') if (myController.text != '')
Container( FractionallySizedBox(
height: MediaQuery.of(context).size.height * 0.6, widthFactor: 0.9,
child: ListView.builder( child: Container(
padding: const EdgeInsets.only(top: 20), height: MediaQuery.of(context).size.height * 0.6,
child: ListView.builder(
padding: const EdgeInsets.only(top: 20),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
// shrinkWrap: true, // shrinkWrap: true,
itemCount: model.pharmacyItemsList == null itemCount: model.pharmacyItemsList == null
? 0 ? 0
: model.pharmacyItemsList.length, : model.pharmacyItemsList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
child: MedicineItemWidget( child: MedicineItemWidget(
label: model.pharmacyItemsList[index] label: model.pharmacyItemsList[index]
["ItemDescription"], ["ItemDescription"],
url: model.pharmacyItemsList[index] url: model.pharmacyItemsList[index]
["ImageSRCUrl"], ["ImageSRCUrl"],
), ),
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PharmaciesListScreen( builder: (context) => PharmaciesListScreen(
itemID: model.pharmacyItemsList[index] itemID: model.pharmacyItemsList[index]
["ItemID"], ["ItemID"],
url: model.pharmacyItemsList[index] url: model.pharmacyItemsList[index]
["ImageSRCUrl"]), ["ImageSRCUrl"]),
settings: RouteSettings( settings: RouteSettings(
name: 'PharmaciesListScreen'), name: 'PharmaciesListScreen'),
), ),
); );
}, },
); );
}, },
),
), ),
), ),
], ],

@ -3,6 +3,7 @@ import 'dart:typed_data';
import 'package:doctor_app_flutter/config/size_config.dart'; 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/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:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -37,10 +38,53 @@ class MedicineItemWidget extends StatefulWidget {
class _MedicineItemWidgetState extends State<MedicineItemWidget> { class _MedicineItemWidgetState extends State<MedicineItemWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new RoundedContainer( return CardWithBgWidget(
height: SizeConfig.heightMultiplier * 8, padding: 0,
child: Padding( marginLeft: 10,
padding: const EdgeInsets.all(5.0), 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: <Widget>[
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( child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
@ -59,19 +103,17 @@ class _MedicineItemWidgetState extends State<MedicineItemWidget> {
), ),
), ),
), ),
Expanded( Container(
child: Padding( child: Expanded(
padding: EdgeInsets.all(5), child: Padding(
child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))), padding: EdgeInsets.all(5),
child: Align(alignment: Alignment.centerLeft, child: AppText(widget.label)))),
),
Icon(EvaIcons.eye) Icon(EvaIcons.eye)
], ],
), ),
), ),
backgroundColor: widget.backgroundColor, bgColor:Colors.white,
showBorder: widget.showBorder,
borderColor: widget.borderColor,
margin: EdgeInsets.all(4),
raduis: 10,
); );
} }

Loading…
Cancel
Save