Merge branch 'develop' into 'master'
Develop See merge request Cloud_Solution/doctor_app_flutter!44merge-requests/45/head
commit
96d3201ccc
@ -1,10 +1,13 @@
|
||||
const MAX_SMALL_SCREEN = 660;
|
||||
const BASE_URL = 'https://hmgwebservices.com/Services/';
|
||||
const ONLY_NUMBERS = "[0-9]";
|
||||
const ONLY_LETTERS = "[a-zA-Z]";
|
||||
const ONLY_DATE = "[0-9/]";
|
||||
|
||||
const BASE_URL = 'https://hmgwebservices.com/Services/';
|
||||
const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems";
|
||||
const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList";
|
||||
//*********change value to decode json from Dropdown ************
|
||||
var SERVICES_PATIANT = ["GetMyOutPatient", "GetMyInPatient", "GtMyDischargePatient","GtMyReferredPatient","GtMyDischargeReferralPatient","GtMyTomorrowPatient","GtMyReferralPatient"];
|
||||
var SERVICES_PATIANT2 = ["List_MyOutPatient", "List_MyInPatient","List_MyDischargePatient" ,"List_MyReferredPatient","List_MyDischargeReferralPatient","List_MyTomorrowPatient","List_MyReferralPatient"];
|
||||
var SERVICES_PATIANT_HEADER = ["OutPatient", "InPatient", "Discharge","Referred","Referral Discharge","Tomorrow","Referral"];
|
||||
//******************
|
||||
//******************
|
||||
|
@ -0,0 +1,67 @@
|
||||
|
||||
/*
|
||||
*@author: Ibrahim Albitar
|
||||
*@Date:27/4/2020
|
||||
*@param:
|
||||
*@return:
|
||||
*@desc:
|
||||
*/
|
||||
|
||||
class PharmaciesListRequestModel {
|
||||
|
||||
|
||||
int itemID;
|
||||
int languageID;
|
||||
String stamp;
|
||||
String ipAdress;
|
||||
double versionID;
|
||||
String tokenID;
|
||||
String sessionID;
|
||||
bool isLoginForDoctorApp;
|
||||
bool patientOutSA;
|
||||
int patientTypeID;
|
||||
int channel;
|
||||
|
||||
PharmaciesListRequestModel(
|
||||
{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 = '@dm!n',
|
||||
this.sessionID = 'e29zoooEJ4',
|
||||
this.isLoginForDoctorApp = true,
|
||||
this.channel = 9,
|
||||
this.patientOutSA = false});
|
||||
|
||||
PharmaciesListRequestModel.fromJson(Map<String, dynamic> json) {
|
||||
itemID = json['ItemID'];
|
||||
patientTypeID = json['PatientTypeID'];
|
||||
languageID = json['LanguageID'];
|
||||
stamp = json['stamp'];
|
||||
ipAdress = json['IPAdress'];
|
||||
versionID = json['VersionID'];
|
||||
tokenID = json['TokenID'];
|
||||
sessionID = json['SessionID'];
|
||||
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
|
||||
channel = json['Channel'];
|
||||
patientOutSA = json['PatientOutSA'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['ItemID'] = this.itemID;
|
||||
data['PatientTypeID'] = this.patientTypeID;
|
||||
data['LanguageID'] = this.languageID;
|
||||
data['stamp'] = this.stamp;
|
||||
data['IPAdress'] = this.ipAdress;
|
||||
data['VersionID'] = this.versionID;
|
||||
data['TokenID'] = this.tokenID;
|
||||
data['SessionID'] = this.sessionID;
|
||||
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
|
||||
data['PatientOutSA'] = this.patientOutSA;
|
||||
data['Channel'] = this.channel;
|
||||
return data;
|
||||
}
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
/*
|
||||
*@author: Ibrahim Albitar
|
||||
*@Date:27/4/2020
|
||||
*@param:
|
||||
*@return:
|
||||
*@desc:
|
||||
*/
|
||||
class PharmaciesItemsRequestModel {
|
||||
String phrItemName;
|
||||
int languageID;
|
||||
String stamp;
|
||||
String ipAdress;
|
||||
double versionID;
|
||||
String tokenID;
|
||||
String sessionID;
|
||||
bool isLoginForDoctorApp;
|
||||
bool patientOutSA;
|
||||
int patientTypeID;
|
||||
|
||||
PharmaciesItemsRequestModel(
|
||||
{this.phrItemName = '',
|
||||
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 = '@dm!n',
|
||||
this.sessionID = 'e29zoooEJ4',
|
||||
this.isLoginForDoctorApp = true,
|
||||
this.patientOutSA = false});
|
||||
|
||||
PharmaciesItemsRequestModel.fromJson(Map<String, dynamic> json) {
|
||||
phrItemName = json['PHR_itemName'];
|
||||
patientTypeID = json['PatientTypeID'];
|
||||
languageID = json['LanguageID'];
|
||||
stamp = json['stamp'];
|
||||
ipAdress = json['IPAdress'];
|
||||
versionID = json['VersionID'];
|
||||
tokenID = json['TokenID'];
|
||||
sessionID = json['SessionID'];
|
||||
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
|
||||
patientOutSA = json['PatientOutSA'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['PHR_itemName'] = this.phrItemName;
|
||||
data['PatientTypeID'] = this.patientTypeID;
|
||||
data['LanguageID'] = this.languageID;
|
||||
data['stamp'] = this.stamp;
|
||||
data['IPAdress'] = this.ipAdress;
|
||||
data['VersionID'] = this.versionID;
|
||||
data['TokenID'] = this.tokenID;
|
||||
data['SessionID'] = this.sessionID;
|
||||
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
|
||||
data['PatientOutSA'] = this.patientOutSA;
|
||||
return data;
|
||||
}
|
||||
}
|
@ -0,0 +1,91 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:doctor_app_flutter/client/app_client.dart';
|
||||
import 'package:doctor_app_flutter/config/config.dart';
|
||||
import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart';
|
||||
import 'package:doctor_app_flutter/models/pharmacies_items_request_model.dart';
|
||||
import 'package:doctor_app_flutter/util/helpers.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
|
||||
class MedicineProvider with ChangeNotifier {
|
||||
var pharmacyItemsList = [];
|
||||
var pharmaciesList = [];
|
||||
bool isFinished = false;
|
||||
bool hasError = false;
|
||||
String errorMsg = '';
|
||||
|
||||
PharmaciesItemsRequestModel _itemsRequestModel =PharmaciesItemsRequestModel();
|
||||
PharmaciesListRequestModel _listRequestModel = PharmaciesListRequestModel();
|
||||
|
||||
Future<String> getMedicineItem(String itemName) async {
|
||||
try {
|
||||
if (await Helpers.checkConnection()) {
|
||||
_itemsRequestModel.phrItemName = itemName;
|
||||
final response = await AppClient.post(PHARMACY_ITEMS_URL,
|
||||
body: json.encode(_itemsRequestModel.toJson()));
|
||||
final int statusCode = response.statusCode;
|
||||
if (statusCode < 200 || statusCode >= 400 || json == null) {
|
||||
isFinished = true;
|
||||
hasError = true;
|
||||
errorMsg = 'Error While Fetching data';
|
||||
} else {
|
||||
var parsed = json.decode(response.body.toString());
|
||||
if (parsed['MessageStatus'] == 1) {
|
||||
pharmacyItemsList = parsed['ListPharmcy'];
|
||||
hasError = false;
|
||||
isFinished = true;
|
||||
errorMsg = "Done";
|
||||
} else {
|
||||
hasError = true;
|
||||
errorMsg = parsed['ErrorMessage'] ?? parsed['ErrorEndUserMessage'];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
isFinished = true;
|
||||
hasError = true;
|
||||
errorMsg = 'Please Check The Internet Connection';
|
||||
}
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
return errorMsg;
|
||||
}
|
||||
|
||||
Future<String> getPharmaciesList(int itemId) async {
|
||||
try {
|
||||
if (await Helpers.checkConnection()) {
|
||||
_listRequestModel.itemID = itemId;
|
||||
final response = await AppClient.post(PHARMACY_LIST_URL,
|
||||
body: json.encode(_listRequestModel.toJson()));
|
||||
final int statusCode = response.statusCode;
|
||||
if (statusCode < 200 || statusCode >= 400 || json == null) {
|
||||
isFinished = true;
|
||||
hasError = true;
|
||||
errorMsg = 'Error While Fetching data';
|
||||
} else {
|
||||
var parsed = json.decode(response.body.toString());
|
||||
if (parsed['MessageStatus'] == 1) {
|
||||
pharmaciesList = parsed['PharmList'];
|
||||
hasError = false;
|
||||
isFinished = true;
|
||||
errorMsg = "Done";
|
||||
} else {
|
||||
hasError = true;
|
||||
errorMsg = parsed['ErrorMessage'] ?? parsed['ErrorEndUserMessage'];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
isFinished = true;
|
||||
hasError = true;
|
||||
errorMsg = 'Please Check The Internet Connection';
|
||||
}
|
||||
notifyListeners();
|
||||
} catch (error) {
|
||||
throw error;
|
||||
}
|
||||
|
||||
return errorMsg;
|
||||
}
|
||||
}
|
@ -1,9 +1,128 @@
|
||||
import 'package:doctor_app_flutter/config/config.dart';
|
||||
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||
import 'package:doctor_app_flutter/providers/medicine_provider.dart';
|
||||
import 'package:doctor_app_flutter/screens/medicine/pharmacies_list_screen.dart';
|
||||
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
|
||||
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
|
||||
import 'package:doctor_app_flutter/util/helpers.dart';
|
||||
import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/app_text_form_field.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
class MedicineSearchScreen extends StatelessWidget {
|
||||
import 'package:provider/provider.dart';
|
||||
import '../../util/extenstions.dart';
|
||||
|
||||
DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
|
||||
|
||||
class MedicineSearchScreen extends StatefulWidget with DrAppToastMsg {
|
||||
MedicineSearchScreen({this.changeLoadingStata});
|
||||
final Function changeLoadingStata;
|
||||
|
||||
@override
|
||||
_MedicineSearchState createState() => _MedicineSearchState();
|
||||
}
|
||||
|
||||
class _MedicineSearchState extends State<MedicineSearchScreen> {
|
||||
var data;
|
||||
final myController = TextEditingController();
|
||||
Helpers helpers = new Helpers();
|
||||
|
||||
MedicineProvider _medicineProvider;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Container(
|
||||
|
||||
);
|
||||
_medicineProvider = Provider.of(context);
|
||||
return AppScaffold(
|
||||
appBarTitle: "Search Medicine",
|
||||
body: Column(
|
||||
children: <Widget>[
|
||||
RoundedContainer(
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Icon(
|
||||
Icons.search,
|
||||
size: SizeConfig.imageSizeMultiplier * 15,
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(
|
||||
bottom: SizeConfig.heightMultiplier * 5,
|
||||
right: SizeConfig.heightMultiplier * 3,
|
||||
left: SizeConfig.heightMultiplier * 3,
|
||||
top: SizeConfig.heightMultiplier * 3),
|
||||
child: AppTextFormField(
|
||||
hintText: 'Type Medicine Name Here..',
|
||||
controller: myController,
|
||||
onSaved: (value) {},
|
||||
// validator: (value) {
|
||||
// return TextValidator().validateName(value);
|
||||
// },
|
||||
inputFormatter: ONLY_LETTERS),
|
||||
)
|
||||
],
|
||||
)),
|
||||
Container(
|
||||
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
|
||||
child: Wrap(
|
||||
alignment: WrapAlignment.center,
|
||||
children: <Widget>[
|
||||
AppButton(
|
||||
title: "Search",
|
||||
color: Color(0xff58434F),
|
||||
onPressed: () {
|
||||
searchMedicine(context);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
width: SizeConfig.screenWidth * 0.80,
|
||||
child: ListView.builder(
|
||||
scrollDirection: Axis.vertical,
|
||||
shrinkWrap: true,
|
||||
itemCount: data == null ? 0 : data.length,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
return InkWell(
|
||||
child: MedicineItemWidget(
|
||||
label: data[index]["ItemDescription"],
|
||||
),
|
||||
onTap: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => ChangeNotifierProvider(
|
||||
create: (_) => MedicineProvider(),
|
||||
child: PharmaciesListScreen(
|
||||
itemID: data[index]["ItemID"]),
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
searchMedicine(context) {
|
||||
FocusScope.of(context).unfocus();
|
||||
if (myController.text.isNullOrEmpty()) {
|
||||
this.setState(() {
|
||||
data = null;
|
||||
});
|
||||
helpers.showErrorToast("Type Medicine Name");
|
||||
return;
|
||||
}
|
||||
_medicineProvider.getMedicineItem(myController.text).then((str) {
|
||||
this.setState(() {
|
||||
data = _medicineProvider.pharmacyItemsList;
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,128 @@
|
||||
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||
import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart';
|
||||
import 'package:doctor_app_flutter/providers/medicine_provider.dart';
|
||||
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
|
||||
import 'package:doctor_app_flutter/util/helpers.dart';
|
||||
import 'package:doctor_app_flutter/widgets/medicine/medicine_item_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
|
||||
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
|
||||
|
||||
class PharmaciesListScreen extends StatefulWidget {
|
||||
final int itemID;
|
||||
|
||||
// In the constructor, require a item id.
|
||||
PharmaciesListScreen({Key key, @required this.itemID}) : super(key: key);
|
||||
|
||||
@override
|
||||
_PharmaciesListState createState() => _PharmaciesListState();
|
||||
}
|
||||
|
||||
class _PharmaciesListState extends State<PharmaciesListScreen> {
|
||||
var _data;
|
||||
Helpers helpers = new Helpers();
|
||||
MedicineProvider _medicineProvider;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_medicineProvider = Provider.of(context);
|
||||
pharmaciesList();
|
||||
return AppScaffold(
|
||||
appBarTitle: "Pharmacies List",
|
||||
body: Column(
|
||||
children: <Widget>[
|
||||
RoundedContainer(
|
||||
child: !_medicineProvider.isFinished
|
||||
? DrAppCircularProgressIndeicator()
|
||||
: _medicineProvider.hasError
|
||||
? Center(
|
||||
child: Text(
|
||||
_medicineProvider.errorMsg,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).errorColor),
|
||||
),
|
||||
)
|
||||
: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: <Widget>[
|
||||
AppText(
|
||||
"Description",
|
||||
margin: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
AppText(
|
||||
_data[0]["ItemDescription"],
|
||||
marginLeft: 10,
|
||||
marginTop: 0,
|
||||
marginRight: 10,
|
||||
marginBottom: 10,
|
||||
),
|
||||
AppText(
|
||||
"Price",
|
||||
margin: 10,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
AppText(
|
||||
_data[0]["SellingPrice"].toString(),
|
||||
marginLeft: 10,
|
||||
marginTop: 0,
|
||||
marginRight: 10,
|
||||
marginBottom: 10,
|
||||
),
|
||||
],
|
||||
)),
|
||||
Container(
|
||||
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
|
||||
child: Align(
|
||||
alignment: Alignment.centerLeft,
|
||||
child: AppText(
|
||||
"You can Find it in",
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: SizeConfig.textMultiplier * 3,
|
||||
))),
|
||||
Expanded(
|
||||
child: Container(
|
||||
width: SizeConfig.screenWidth * 0.80,
|
||||
child: ListView.builder(
|
||||
scrollDirection: Axis.vertical,
|
||||
shrinkWrap: true,
|
||||
itemCount: _data == null ? 0 : _data.length,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
return InkWell(
|
||||
child: MedicineItemWidget(
|
||||
label: _data[index]["LocationDescription"],
|
||||
),
|
||||
onTap: () {
|
||||
//Navigator.of(context).pushNamed(PHARMACIES_LIST);
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
builder: (context) => PharmaciesListScreen(
|
||||
itemID: _data[index]["ItemID"]),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
));
|
||||
}
|
||||
|
||||
Future<bool> pharmaciesList() async {
|
||||
_medicineProvider.getPharmaciesList(widget.itemID).then((result) {
|
||||
this.setState(() {
|
||||
_data = _medicineProvider.pharmaciesList;
|
||||
});
|
||||
});
|
||||
return true;
|
||||
}
|
||||
}
|
@ -0,0 +1,51 @@
|
||||
import 'package:doctor_app_flutter/config/size_config.dart';
|
||||
|
||||
import '../shared/rounded_container_widget.dart';
|
||||
import '../shared/app_texts_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
/*
|
||||
*@author: ibrahim albitar
|
||||
*@Date:28/4/2020
|
||||
*@param:
|
||||
*@return:
|
||||
*@desc:
|
||||
*/
|
||||
|
||||
class MedicineItemWidget extends StatefulWidget {
|
||||
|
||||
final String label;
|
||||
final Color backgroundColor;
|
||||
final bool showBorder;
|
||||
final Color borderColor;
|
||||
|
||||
MedicineItemWidget({ @required this.label, this.backgroundColor = Colors.white, this.showBorder = false, this.borderColor = Colors.white});
|
||||
@override
|
||||
_MedicineItemWidgetState createState() => _MedicineItemWidgetState();
|
||||
}
|
||||
|
||||
class _MedicineItemWidgetState extends State<MedicineItemWidget> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return new RoundedContainer(
|
||||
height: SizeConfig.heightMultiplier * 8,
|
||||
child:Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
RoundedContainer(
|
||||
width: SizeConfig.widthMultiplier * 2,
|
||||
backgroundColor: Colors.red,
|
||||
margin: 0,
|
||||
topLeft: 6,
|
||||
topRight: 0,
|
||||
bottomLeft: 6,
|
||||
bottomRight: 0,
|
||||
customCornerRaduis: true,
|
||||
child: SizedBox(width: SizeConfig.widthMultiplier, height: SizeConfig.heightMultiplier*3,),
|
||||
),
|
||||
Expanded(child: Padding( padding: EdgeInsets.all(5), child: Align( alignment: Alignment.centerLeft, child: AppText(widget.label))))
|
||||
],),
|
||||
backgroundColor: widget.backgroundColor, showBorder: widget.showBorder, borderColor: widget.borderColor, margin: 4, raduis: 10,);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue