Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'elham' into 'master'

Browse Source 
handelCatcherrorCase

See merge request Cloud_Solution/doctor_app_flutter!59
merge-requests/60/head
Elham 6 years ago
parent a520e159e2 0748a569ac
commit 37f709b24b
8 changed files with 99 additions and 68 deletions
Show Stats Download Patch File Download Diff File

4
lib/models/patient/prescription_res_model.dart
Unescape Escape View File

@ -38,7 +38,7 @@ class PrescriptionResModel {
String nationalityFlagURL;
int noOfPatientsRate;
String qR;
List<String> speciality;
List<dynamic> speciality;
PrescriptionResModel(
{this.setupID,
@ -108,7 +108,7 @@ class PrescriptionResModel {
nationalityFlagURL = json['NationalityFlagURL'];
noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR'];
speciality = json['Speciality'].cast<String>();
speciality = json['Speciality'];
}
Map<String, dynamic> toJson() {

36
lib/providers/patients_provider.dart
Unescape Escape View File

@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/prescription_req_model.dart';
import 'package:doctor_app_flutter/models/patient/prescription_res_model.dart';
import 'package:doctor_app_flutter/models/patient/radiology_res_model.dart';
import 'package:doctor_app_flutter/widgets/auth/login_form.dart';
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart';
import 'package:http_interceptor/http_client_with_interceptor.dart';
@ -23,6 +24,7 @@ const GET_PATIENT_LAB_OREDERS =
const GET_PRESCRIPTION = BASE_URL + 'Patients.svc/REST/GetPrescriptionApptList';
const GET_RADIOLOGY =
BASE_URL + 'DoctorApplication.svc/REST/GetPatientRadResult';
Helpers helpers = Helpers();
class PatientsProvider with ChangeNotifier {
bool isLoading = false;
@ -77,8 +79,8 @@ class PatientsProvider with ChangeNotifier {
//***********************
return Future.value(json.decode(response.body));
} catch (error) {
throw error;
} catch (err) {
throw err;
}
}
@ -129,8 +131,8 @@ class PatientsProvider with ChangeNotifier {
error = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) {
throw error;
} catch (err) {
handelCatchErrorCase(err);
}
}
@ -183,8 +185,8 @@ class PatientsProvider with ChangeNotifier {
error = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) {
throw error;
} catch (err) {
handelCatchErrorCase(err);
}
}
@ -229,11 +231,25 @@ class PatientsProvider with ChangeNotifier {
error = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) {
throw error;
} catch (err) {
handelCatchErrorCase(err);
}
}
/*@author: Elham Rababah
*@Date:12/5/2020
*@param: patient
*@return:
*@desc: getPatientRadiology
*/
handelCatchErrorCase(err) {
isLoading = false;
isError = true;
error = helpers.generateContactAdminMsg(err);
notifyListeners();
throw err;
}
/*@author: Elham Rababah
*@Date:3/5/2020
*@param: patient
@ -273,8 +289,8 @@ class PatientsProvider with ChangeNotifier {
error = 'Please Check The Internet Connection';
}
notifyListeners();
} catch (error) {
throw error;
} catch (err) {
handelCatchErrorCase(err);
}
}
}

15
lib/screens/patients/profile/lab_result/lab_orders_screen.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -78,19 +79,9 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
body: patientsProv.isLoading
? DrAppCircularProgressIndeicator()
: patientsProv.isError
? Center(
child: Text(
patientsProv.error,
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientLabResultOrdersList.length == 0
? Center(
child: Text(
'You don\'t have any Orders',
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: 'You don\'t have any Orders')
: Container(
margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05,

16
lib/screens/patients/profile/prescriptions/prescriptions_screen.dart
Unescape Escape View File

@ -12,6 +12,7 @@ import '../../../../widgets/shared/app_texts_widget.dart';
import '../../../../widgets/shared/card_with_bg_widget.dart';
import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import '../../../../widgets/shared/profile_image_widget.dart';
import '../../../../widgets/shared/errors/dr_app_embedded_error.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -78,19 +79,10 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
body: patientsProv.isLoading
? DrAppCircularProgressIndeicator()
: patientsProv.isError
? Center(
child: Text(
patientsProv.error,
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientPrescriptionsList.length == 0
? Center(
child: Text(
'You don\'t have any Prescriptions',
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(
error: 'You don\'t have any Prescriptions')
: Container(
margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05,

27
lib/screens/patients/profile/radiology/radiology_screen.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -78,19 +79,9 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
body: patientsProv.isLoading
? DrAppCircularProgressIndeicator()
: patientsProv.isError
? Center(
child: Text(
patientsProv.error,
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientRadiologyList.length == 0
? Center(
child: Text(
'You don\'t have any Vital Sign',
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: 'You don\'t have any Vital Sign')
: Container(
margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05,
@ -120,11 +111,12 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
CrossAxisAlignment.start,
children: <Widget>[
AppText(
'${patientsProv.patientRadiologyList[index].doctorName}',
fontSize: 2.5 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold
),
'${patientsProv.patientRadiologyList[index].doctorName}',
fontSize: 2.5 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold),
SizedBox(
height: 8,
),
@ -132,7 +124,6 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
'Invoice No:${patientsProv.patientRadiologyList[index].invoiceNo}',
fontSize: 2 *
SizeConfig.textMultiplier,
),
SizedBox(
height: 8,

21
lib/screens/patients/profile/vital_sign/vital_sign_screen.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -81,19 +82,9 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
body: patientsProv.isLoading
? DrAppCircularProgressIndeicator()
: patientsProv.isError
? Center(
child: Text(
patientsProv.error,
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientVitalSignList.length == 0
? Center(
child: Text(
'You don\'t have any Vital Sign',
style: TextStyle(color: Theme.of(context).errorColor),
),
)
? DrAppEmbeddedError(error: 'You don\'t have any Vital Sign')
: Container(
margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05,
@ -151,7 +142,11 @@ class _VitalSignScreenState extends State<VitalSignScreen> {
),
),
onTap: () {
Navigator.of(context).pushNamed(VITAL_SIGN_DETAILS,arguments: {'vitalSing':patientsProv.patientVitalSignList[index]});
Navigator.of(context)
.pushNamed(VITAL_SIGN_DETAILS, arguments: {
'vitalSing':
patientsProv.patientVitalSignList[index]
});
},
);
}),

20
lib/util/helpers.dart
Unescape Escape View File

@ -70,7 +70,7 @@ class Helpers {
*@desc: showErrorToast
*/
showErrorToast([msg = null]) {
String localMsg = 'Something wrong happened, please contact the admin';
String localMsg = generateContactAdminMsg();
if (msg != null) {
localMsg = msg.toString();
@ -96,4 +96,22 @@ class Helpers {
return false;
}
}
/*
*@author: Elham Rababah
*@Date:12/5/2020
*@param:
*@return: String
*@desc: generate Contact Admin Msg
*/
generateContactAdminMsg([err = null]) {
String localMsg = 'Something wrong happened, please contact the admin';
if (err != null) {
localMsg = localMsg +'\n \n'+ err.toString();
}
return localMsg;
}
}

28
lib/widgets/shared/errors/dr_app_embedded_error.dart
Unescape Escape View File

@ -0,0 +1,28 @@
import 'package:flutter/material.dart';
/*
*@author: Elham Rababah
*@Date:12/5/2020
*@param: error
*@return: StatelessWidget
*@desc: DrAppEmbeddedError class
*/
class DrAppEmbeddedError extends StatelessWidget {
const DrAppEmbeddedError({
Key key,
@required this.error,
}) : super(key: key);
final String error;
@override
Widget build(BuildContext context) {
return Center(
child: Text(
error,
style: TextStyle(color: Theme.of(context).errorColor),
textAlign: TextAlign.center,
),
);
}
}
Write Preview
Loading…
Cancel
Save