refactoring code

merge-requests/44/head
unknown 6 years ago
parent ae524100f7
commit 734b7b2c99

@ -1,3 +1,4 @@
/* /*
*@author: Ibrahim Albitar *@author: Ibrahim Albitar
*@Date:27/4/2020 *@Date:27/4/2020
@ -5,42 +6,62 @@
*@return: *@return:
*@desc: *@desc:
*/ */
class PharmaciesListRequestModel { class PharmaciesListRequestModel {
// {"ItemID":90417,
// "LanguageID":2,
// "stamp":"2020-03-08T07:49:14.067Z",
// "IPAdress":"11.11.11.11",
// "VersionID":1.2,
// "Channel":9,
// "TokenID":"PpIU/OWJ40yxMHQtCXL0DA==",
// "SessionID":"dz1hqVj1Fk",
// "IsLoginForDoctorApp":true,
// "PatientOutSA":false,
// "PatientTypeID":1}
int ItemID; int itemID;
int LanguageID; int languageID;
String stamp; String stamp;
String IPAdress; String ipAdress;
double VersionID; double versionID;
String TokenID; String tokenID;
String SessionID; String sessionID;
bool IsLoginForDoctorApp; bool isLoginForDoctorApp;
bool PatientOutSA; bool patientOutSA;
int PatientTypeID; int patientTypeID;
int Channel; int channel;
PharmaciesListRequestModel( PharmaciesListRequestModel(
{this.ItemID, {this.itemID ,
this.PatientTypeID, this.patientTypeID = 1,
this.LanguageID, this.languageID = 2,
this.stamp, this.stamp = '2020-04-23T21:01:21.492Z',
this.IPAdress, this.ipAdress = '11.11.11.11',
this.VersionID, this.versionID = 1.2,
this.TokenID, this.tokenID = '@dm!n',
this.SessionID, this.sessionID = 'e29zoooEJ4',
this.IsLoginForDoctorApp, this.isLoginForDoctorApp = true,
this.Channel, this.channel = 9,
this.PatientOutSA}); 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;
}
} }

@ -6,26 +6,54 @@
*@desc: *@desc:
*/ */
class PharmaciesItemsRequestModel { class PharmaciesItemsRequestModel {
String PHR_itemName; String phrItemName;
int LanguageID; int languageID;
String stamp; String stamp;
String IPAdress; String ipAdress;
double VersionID; double versionID;
String TokenID; String tokenID;
String SessionID; String sessionID;
bool IsLoginForDoctorApp; bool isLoginForDoctorApp;
bool PatientOutSA; bool patientOutSA;
int PatientTypeID; int patientTypeID;
PharmaciesItemsRequestModel( PharmaciesItemsRequestModel(
{this.PHR_itemName, {this.phrItemName = '',
this.PatientTypeID, this.patientTypeID = 1,
this.LanguageID, this.languageID = 2,
this.stamp, this.stamp = '2020-04-23T21:01:21.492Z',
this.IPAdress, this.ipAdress = '11.11.11.11',
this.VersionID, this.versionID = 1.2,
this.TokenID, this.tokenID = '@dm!n',
this.SessionID, this.sessionID = 'e29zoooEJ4',
this.IsLoginForDoctorApp, this.isLoginForDoctorApp = true,
this.PatientOutSA}); 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;
}
} }

@ -4,51 +4,88 @@ import 'package:doctor_app_flutter/client/app_client.dart';
import 'package:doctor_app_flutter/config/config.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_List_request_model.dart';
import 'package:doctor_app_flutter/models/pharmacies_items_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'; import 'package:flutter/cupertino.dart';
class MedicineProvider with ChangeNotifier { class MedicineProvider with ChangeNotifier {
var pharmacyItemsList = [];
var pharmaciesList = [];
bool isFinished = false;
bool hasError = false;
String errorMsg = '';
Future<Map> getMedicineItem(PharmaciesItemsRequestModel medicine) async { PharmaciesItemsRequestModel _itemsRequestModel =PharmaciesItemsRequestModel();
PharmaciesListRequestModel _listRequestModel = PharmaciesListRequestModel();
Future<String> getMedicineItem(String itemName) async {
try { try {
if (await Helpers.checkConnection()) {
_itemsRequestModel.phrItemName = itemName;
final response = await AppClient.post(PHARMACY_ITEMS_URL, final response = await AppClient.post(PHARMACY_ITEMS_URL,
body: json.encode({ body: json.encode(_itemsRequestModel.toJson()));
"PHR_itemName": medicine.PHR_itemName, final int statusCode = response.statusCode;
"LanguageID": medicine.LanguageID, if (statusCode < 200 || statusCode >= 400 || json == null) {
"stamp": medicine.stamp, isFinished = true;
"IPAdress": medicine.IPAdress, hasError = true;
"VersionID": medicine.VersionID, errorMsg = 'Error While Fetching data';
"TokenID": medicine.TokenID, } else {
"SessionID": medicine.SessionID, var parsed = json.decode(response.body.toString());
"IsLoginForDoctorApp": medicine.IsLoginForDoctorApp, if (parsed['MessageStatus'] == 1) {
"PatientOutSA": medicine.PatientOutSA, pharmacyItemsList = parsed['ListPharmcy'];
"PatientTypeID": medicine.PatientTypeID hasError = false;
})); isFinished = true;
return Future.value(json.decode(response.body)); errorMsg = "Done";
} else {
hasError = true;
errorMsg = parsed['ErrorMessage'] ?? parsed['ErrorEndUserMessage'];
}
}
} else {
isFinished = true;
hasError = true;
errorMsg = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) { } catch (error) {
throw error; throw error;
} }
}
return errorMsg;
}
Future<Map> getPharmaciesList(PharmaciesListRequestModel pharmacy) async { Future<String> getPharmaciesList(int itemId) async {
try { try {
if (await Helpers.checkConnection()) {
_listRequestModel.itemID = itemId;
final response = await AppClient.post(PHARMACY_LIST_URL, final response = await AppClient.post(PHARMACY_LIST_URL,
body: json.encode({ body: json.encode(_listRequestModel.toJson()));
"ItemID": pharmacy.ItemID, final int statusCode = response.statusCode;
"LanguageID": pharmacy.LanguageID, if (statusCode < 200 || statusCode >= 400 || json == null) {
"stamp": pharmacy.stamp, isFinished = true;
"IPAdress": pharmacy.IPAdress, hasError = true;
"VersionID": pharmacy.VersionID, errorMsg = 'Error While Fetching data';
"TokenID": pharmacy.TokenID, } else {
"SessionID": pharmacy.SessionID, var parsed = json.decode(response.body.toString());
"IsLoginForDoctorApp": pharmacy.IsLoginForDoctorApp, if (parsed['MessageStatus'] == 1) {
"PatientOutSA": pharmacy.PatientOutSA, pharmaciesList = parsed['PharmList'];
"Channel": pharmacy.Channel, hasError = false;
"PatientTypeID": pharmacy.PatientTypeID isFinished = true;
})); errorMsg = "Done";
return Future.value(json.decode(response.body)); } else {
hasError = true;
errorMsg = parsed['ErrorMessage'] ?? parsed['ErrorEndUserMessage'];
}
}
} else {
isFinished = true;
hasError = true;
errorMsg = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) { } catch (error) {
throw error; throw error;
} }
return errorMsg;
} }
} }

@ -1,5 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart'; import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart';
import 'package:doctor_app_flutter/providers/medicine_provider.dart';
import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../routes.dart'; import '../routes.dart';
@ -212,7 +214,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 2, flex: 2,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
@ -242,13 +243,26 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
flex: 2, flex: 2,
child: new DashboardItemIconText( child: InkWell(
child: DashboardItemIconText(
DoctorApp.home_icon, DoctorApp.home_icon,
"", "",
"In Patient", "In Patient",
showBorder: false, showBorder: false,
backgroundColor: Colors.blueGrey[900], backgroundColor: Colors.blueGrey[900],
), ),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ChangeNotifierProvider(
create: (_) => MedicineProvider(),
child: MedicineSearchScreen(),
),
),
);
},
),
), ),
Expanded( Expanded(
flex: 2, flex: 2,

@ -1,6 +1,5 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/pharmacies_items_request_model.dart';
import 'package:doctor_app_flutter/providers/medicine_provider.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/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_shared_pref.dart';
@ -13,7 +12,6 @@ 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:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../routes.dart';
import '../../util/extenstions.dart'; import '../../util/extenstions.dart';
DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
@ -31,23 +29,12 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
final myController = TextEditingController(); final myController = TextEditingController();
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
var _medicineModel = PharmaciesItemsRequestModel( MedicineProvider _medicineProvider;
IsLoginForDoctorApp: true,
PatientOutSA: false,
PatientTypeID: 1,
LanguageID: 2,
IPAdress: "11.11.11.11",
VersionID: 1.2,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
stamp: "2020-04-23T21:01:21.492Z",
SessionID: "e29zoooEJ4");
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider( _medicineProvider = Provider.of(context);
create: (context) => MedicineProvider(), //change builder to create return AppScaffold(
child: Consumer<MedicineProvider>(
builder: (context, provider, child) => AppScaffold(
appBarTitle: "Search Medicine", appBarTitle: "Search Medicine",
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
@ -84,9 +71,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
title: "Search", title: "Search",
color: Color(0xff58434F), color: Color(0xff58434F),
onPressed: () { onPressed: () {
MedicineProvider medicineProvider = searchMedicine(context);
Provider.of<MedicineProvider>(context);
searchMedicine(context, medicineProvider);
}, },
), ),
], ],
@ -105,13 +90,15 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
label: data[index]["ItemDescription"], label: data[index]["ItemDescription"],
), ),
onTap: () { onTap: () {
//Navigator.of(context).pushNamed(PHARMACIES_LIST);
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PharmaciesListScreen( builder: (context) => ChangeNotifierProvider(
create: (_) => MedicineProvider(),
child: PharmaciesListScreen(
itemID: data[index]["ItemID"]), itemID: data[index]["ItemID"]),
), ),
),
); );
}, },
); );
@ -120,12 +107,11 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
), ),
), ),
], ],
)))); ));
} }
searchMedicine(context, MedicineProvider medicineProvider) { searchMedicine(context) {
FocusScope.of(context).unfocus(); FocusScope.of(context).unfocus();
if (myController.text.isNullOrEmpty()) { if (myController.text.isNullOrEmpty()) {
this.setState(() { this.setState(() {
data = null; data = null;
@ -133,29 +119,10 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
helpers.showErrorToast("Type Medicine Name"); helpers.showErrorToast("Type Medicine Name");
return; return;
} }
_medicineModel.PHR_itemName = myController.text; _medicineProvider.getMedicineItem(myController.text).then((str) {
medicineProvider.getMedicineItem(_medicineModel).then((res) {
if (res['MessageStatus'] == 1) {
print("ListMedicine " + res['ListPharmcy'].toString());
this.setState(() { this.setState(() {
data = res['ListPharmcy']; data = _medicineProvider.pharmacyItemsList;
});
//Navigator.of(context).pushNamed(PHARMACIES_LIST);
} else {
// handel error
this.setState(() {
data = null;
});
widget.showCenterShortLoadingToast("watting");
helpers.showErrorToast(res['ErrorEndUserMessage']);
}
// Navigator.of(context).pushNamed(HOME);
}).catchError((err) {
print('$err');
this.setState(() {
data = null;
}); });
helpers.showErrorToast();
}); });
} }
} }

@ -6,6 +6,7 @@ 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/medicine/medicine_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_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/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:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -23,33 +24,30 @@ class PharmaciesListScreen extends StatefulWidget {
} }
class _PharmaciesListState extends State<PharmaciesListScreen> { class _PharmaciesListState extends State<PharmaciesListScreen> {
var data; var _data;
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
MedicineProvider _medicineProvider;
var _pharmaciesModel = PharmaciesListRequestModel(
IsLoginForDoctorApp: true,
PatientOutSA: false,
PatientTypeID: 1,
LanguageID: 2,
IPAdress: "11.11.11.11",
VersionID: 1.2,
TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
stamp: "2020-04-23T21:01:21.492Z",
Channel: 9,
SessionID: "e29zoooEJ4");
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider( _medicineProvider = Provider.of(context);
create: (context) => MedicineProvider(), pharmaciesList();
//change builder to create return AppScaffold(
child: Consumer<MedicineProvider>(
builder: (context, provider, child) => AppScaffold(
appBarTitle: "Pharmacies List", appBarTitle: "Pharmacies List",
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
RoundedContainer( RoundedContainer(
child: Column( child: !_medicineProvider.isFinished
? DrAppCircularProgressIndeicator()
: _medicineProvider.hasError
? Center(
child: Text(
_medicineProvider.errorMsg,
style: TextStyle(
color: Theme.of(context).errorColor),
),
)
: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
@ -59,7 +57,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
"ItemDescription", _data[0]["ItemDescription"],
marginLeft: 10, marginLeft: 10,
marginTop: 0, marginTop: 0,
marginRight: 10, marginRight: 10,
@ -70,7 +68,8 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
margin: 10, margin: 10,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText("SellingPrice", AppText(
_data[0]["SellingPrice"].toString(),
marginLeft: 10, marginLeft: 10,
marginTop: 0, marginTop: 0,
marginRight: 10, marginRight: 10,
@ -93,11 +92,11 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: data == null ? 0 : data.length, itemCount: _data == null ? 0 : _data.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return InkWell( return InkWell(
child: MedicineItemWidget( child: MedicineItemWidget(
label: data[index]["ItemDescription"], label: _data[index]["LocationDescription"],
), ),
onTap: () { onTap: () {
//Navigator.of(context).pushNamed(PHARMACIES_LIST); //Navigator.of(context).pushNamed(PHARMACIES_LIST);
@ -105,7 +104,7 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => PharmaciesListScreen( builder: (context) => PharmaciesListScreen(
itemID: data[index]["ItemID"]), itemID: _data[index]["ItemID"]),
), ),
); );
}, },
@ -115,38 +114,15 @@ class _PharmaciesListState extends State<PharmaciesListScreen> {
), ),
), ),
], ],
) ));
// RaisedButton(
// onPressed: () {
//
// },
// )
)));
} }
pharmaciesList(context) { Future<bool> pharmaciesList() async {
_pharmaciesModel.ItemID = widget.itemID; _medicineProvider.getPharmaciesList(widget.itemID).then((result) {
MedicineProvider medicineProvider =
Provider.of<MedicineProvider>(context);
medicineProvider.getPharmaciesList(_pharmaciesModel).then((res) {
print(res.toString());
if (res['MessageStatus'] == 1) {
print("ListPharmcy " + res['PharmList'].toString());
this.setState(() { this.setState(() {
data = res['PharmList']; _data = _medicineProvider.pharmaciesList;
}); });
//Navigator.of(context).pushNamed();
} else {
// handel error
// widget.showCenterShortLoadingToast("watting");
//helpers.showErrorToast(res['ErrorEndUserMessage']);
print(res['MessageStatus'].toString());
}
// Navigator.of(context).pushNamed(HOME);
}).catchError((err) {
print('$err');
//helpers.showErrorToast();
}); });
return true;
} }
} }

Loading…
Cancel
Save