diff --git a/lib/config/config.dart b/lib/config/config.dart index 59929f45..654f704a 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -247,7 +247,6 @@ const GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh'; const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList"; - var selectedPatientType = 1; //*********change value to decode json from Dropdown ************ diff --git a/lib/core/service/sickleave_service.dart b/lib/core/service/sickleave_service.dart index 8a5babd5..1ea8669a 100644 --- a/lib/core/service/sickleave_service.dart +++ b/lib/core/service/sickleave_service.dart @@ -136,8 +136,10 @@ class SickLeaveService extends BaseService { onSuccess: (dynamic response, int statusCode) { offTime = []; response['MasterLookUpList']['entityList'].forEach((item) => { - if (item['code'] == '1' || item['code'] == '2') - {offTime.add(item)} + //if (item['code'] == '1' || item['code'] == '2') + // { + offTime.add(item) + //}// }); }, onFailure: (String error, int statusCode) { diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 8714aaf8..b0c3bcde 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -801,7 +801,7 @@ class _DashboardScreenState extends State { MainAxisAlignment.start, children: [ AppText( - model.dashboardItemsList[4] + model.dashboardItemsList[6] .kPIName, fontSize: SizeConfig.textMultiplier * @@ -827,11 +827,11 @@ class _DashboardScreenState extends State { Axis.horizontal, children: new List.generate( model - .dashboardItemsList[4] + .dashboardItemsList[6] .summaryoptions .length, (int index) { return getActivityButton(model - .dashboardItemsList[4] + .dashboardItemsList[6] .summaryoptions[index]); }))) ], @@ -843,7 +843,7 @@ class _DashboardScreenState extends State { MainAxisAlignment.start, children: [ AppText( - model.dashboardItemsList[6] + model.dashboardItemsList[4] .kPIName, fontSize: SizeConfig.textMultiplier * @@ -869,11 +869,11 @@ class _DashboardScreenState extends State { Axis.horizontal, children: new List.generate( model - .dashboardItemsList[6] + .dashboardItemsList[4] .summaryoptions .length, (int index) { return getActivityButton(model - .dashboardItemsList[6] + .dashboardItemsList[4] .summaryoptions[index]); }))) ], @@ -1221,7 +1221,7 @@ class _DashboardScreenState extends State { Container( height: 150, margin: EdgeInsets.all(5), - width: ((SizeConfig.screenWidth * .55) / 5.3), + width: 40, child: SizedBox(), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), color: Colors.red[50]), @@ -1233,14 +1233,14 @@ class _DashboardScreenState extends State { margin: EdgeInsets.all(5), padding: EdgeInsets.all(10), height: max != 0 ? (150 * value.value) / max : 0, - width: ((SizeConfig.screenWidth * .55) / 5), + width: 40, decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), color: Colors.red[300]))), Container( height: 150, - margin: EdgeInsets.only(left: 10, top: 5), - padding: EdgeInsets.all(8), + margin: EdgeInsets.only(left: 5, top: 5), + padding: EdgeInsets.all(10), child: RotatedBox( quarterTurns: 1, child: Center( diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 28e4434f..62485f0d 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -226,11 +226,11 @@ class _PatientsScreenState extends State { Widget build(BuildContext context) { authProvider = Provider.of(context); _locations = [ - TranslationBase.of(context).all, TranslationBase.of(context).today, TranslationBase.of(context).tomorrow, TranslationBase.of(context).nextWeek, ]; + //TranslationBase.of(context).all, projectsProvider = Provider.of(context); final routeArgs = ModalRoute.of(context).settings.arguments as Map; @@ -449,18 +449,18 @@ class _PatientsScreenState extends State { }, )), Padding( - padding: EdgeInsets.only( - top: MediaQuery.of(context) - .size - .height * - 0.03), - child: _locationBar(context) - // child: SERVICES_PATIANT2[ - // int.parse(patientType)] == - // "List_MyOutPatient" - // ? _locationBar(context) - // : Container(), - ), + padding: EdgeInsets.only( + top: MediaQuery.of(context) + .size + .height * + 0.03), + // child: _locationBar(context) + child: SERVICES_PATIANT2[ + int.parse(patientType)] == + "patientArrivalList" + ? _locationBar(context) + : Container(), + ), // Row( // mainAxisAlignment: // MainAxisAlignment.spaceEvenly, diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index 7af6b72c..e2959c75 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -104,13 +104,19 @@ class _RescheduleLeaveScreen extends State { @override Widget build(BuildContext context) { projectsProvider = Provider.of(context); - + offTime = widget.updateData != null + ? widget.updateData.requisitionType.toString() + : offTime; return BaseView( onModelReady: (model) => model.getClinicsList(), builder: (_, model, w) => BaseView( onModelReady: (model2) => { model2.getOffTime(), - model2.getReasons(18), + model2.getReasons(offTime == '1' + ? 18 + : offTime == '2' + ? 19 + : 102), model2.getCoveringDoctors() }, builder: (_, model2, w) => GestureDetector(