From de683cb11c1dc7ba9d82e8156794ef9e64531237 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Tue, 28 Apr 2020 13:26:28 +0300 Subject: [PATCH] finish patient provider --- lib/providers/patients_provider.dart | 1 + lib/providers/schedule_provider.dart | 1 + .../patients/patient_search_screen.dart | 2 +- .../profile/vital_sign/vital_sign_screen.dart | 69 +++++++++++-------- 4 files changed, 44 insertions(+), 29 deletions(-) diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index 3d3d8e05..806d0b8e 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -99,6 +99,7 @@ class PatientsProvider with ChangeNotifier { isError = true; error = 'Please Check The Internet Connection'; } + notifyListeners(); } catch (error) { throw error; } diff --git a/lib/providers/schedule_provider.dart b/lib/providers/schedule_provider.dart index d9639da6..107675e2 100644 --- a/lib/providers/schedule_provider.dart +++ b/lib/providers/schedule_provider.dart @@ -62,6 +62,7 @@ class ScheduleProvider with ChangeNotifier { isError = true; error = 'Please Check The Internet Connection'; } + print('Heeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer'); notifyListeners(); } catch (error) { throw error; diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 8966fefc..5060d17c 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -67,7 +67,7 @@ class _PatientSearchScreenState extends State { sharedPref.getString(TOKEN).then((token) { print(token+"EEEEEE"); - _patientSearchFormValues.TokenID = token; + _patientSearchFormValues.TokenID = '@dm!n'; _patientSearchFormValues.ProjectID= 15; // print(_patientSearchFormValues.PatientMobileNumber+"dfdfdfddf"); Navigator.of(context).pushNamed(PATIENTS, arguments: { diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart index e92abf53..a61582a1 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart @@ -20,44 +20,57 @@ DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); *@return:VitalSignScreen *@desc: VitalSignScreen class */ + class VitalSignScreen extends StatefulWidget { @override _VitalSignScreenState createState() => _VitalSignScreenState(); } class _VitalSignScreenState extends State { - List litems = [ - "1", - "1", - "1", - ]; + PatientsProvider patientsProv; + var _isInit = true; - PatientsProvider getVitalSignList(context, PatientsProvider patientsProv) { + /* + *@author: Elham Rababah + *@Date:28/4/2020 + *@param: context + *@return: + *@desc: getVitalSignList Function + */ + getVitalSignList(context) { final routeArgs = ModalRoute.of(context).settings.arguments as Map; PatiantInformtion patient = routeArgs['patient']; sharedPref.getString(TOKEN).then((token) { VitalSignReqModel vitalSignReqModel = VitalSignReqModel( patientID: patient.patientId, projectID: patient.projectId, - tokenID: token, + tokenID: '@dm!n', patientTypeID: patient.patientType, inOutpatientType: 1, languageID: 2, transNo: patient.admissionNo != null ? int.parse(patient.admissionNo) : 0); patientsProv.getPatientVitalSign(vitalSignReqModel.toJson()); - return patientsProv; }); } @override - Widget build(BuildContext context) { - PatientsProvider patientsProv = Provider.of(context); + void didChangeDependencies() { + super.didChangeDependencies(); + if (_isInit) { + patientsProv = Provider.of(context); + getVitalSignList(context); + } + _isInit = false; + } - getVitalSignList(context, patientsProv); + @override + Widget build(BuildContext context) { return AppScaffold( appBarTitle: "VITAL SIGN", - body: patientsProv.isLoading?DrAppCircularProgressIndeicator():patientsProv.isError + body: patientsProv.isLoading + ? DrAppCircularProgressIndeicator() + : patientsProv.isError ? Center( child: Text( patientsProv.error, @@ -71,22 +84,22 @@ class _VitalSignScreenState extends State { style: TextStyle(color: Theme.of(context).errorColor), ), ) - :Container( - child: Column( - children: patientsProv.patientVitalSignList.map((item) { - return InkWell( - child: CardWithBgWidget( - line1Text: 'Fahad AlSlehm - 324599', - line2Text: '12/04/2020 - 02:00 PM', - heightPercentage: 0.15, - widthPercentage: 0.80), - onTap: () { - Navigator.of(context).pushNamed(VITAL_SIGN); - }, - ); - }).toList(), - ), - ), + : Container( + child: Column( + children: patientsProv.patientVitalSignList.map((item) { + return InkWell( + child: CardWithBgWidget( + line1Text: 'Fahad AlSlehm - 324599', + line2Text: '12/04/2020 - 02:00 PM', + heightPercentage: 0.15, + widthPercentage: 0.80), + onTap: () { + Navigator.of(context).pushNamed(VITAL_SIGN); + }, + ); + }).toList(), + ), + ), ); } }