diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 915ebaa6..2f0f6e82 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1865,5 +1865,5 @@ const Map localizedValues = { "enter-workplace-name": {"en": "Please enter your workplace name:", "ar": "رجاء إدخال مكان العمل:"}, "workplaceName": {"en": "Workplace name:", "ar": "مكان العمل:"}, "callLiveCareSupport": {"en": "Call LiveCare Support", "ar": "اتصل بدعم لايف كير"}, - "needApproval": {"en": "Your sick leave needs approval, please contact a medical report department.", "ar": "جازتك المرضيه تحتاج الى الموافقة, يرجى التواصل مع قسم التقارير الطبية.:"}, + "needApproval": {"en": "Your sick leave under process in medical administration, you will be notified once approved.", "ar": "جازتك المرضية تحت الإجراء في الإدارة الطبية ، سوف يتم إشعارك فور الموافقه عليها."}, }; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index bb6e4d96..38e63391 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -149,7 +149,7 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; - // body['PatientID'] = 870215; //3844083 + // body['PatientID'] = 3649158; //3844083 // body['TokenID'] = "@dm!n"; // Patient ID: 3027574 diff --git a/lib/core/service/medical/labs_service.dart b/lib/core/service/medical/labs_service.dart index a3274380..f12e4669 100644 --- a/lib/core/service/medical/labs_service.dart +++ b/lib/core/service/medical/labs_service.dart @@ -115,7 +115,7 @@ class LabsService extends BaseService { return Future.value(localRes); } - Future updateWorkplaceName(String workplaceName, int requestNumber, String setupID) async { + Future updateWorkplaceName(String workplaceName, int requestNumber, String setupID, int projectID) async { hasError = false; Map body = Map(); @@ -123,6 +123,9 @@ class LabsService extends BaseService { body['Placeofworkar'] = workplaceName; body['Req_ID'] = requestNumber; body['TargetSetupID'] = setupID; + body['ProjectID'] = projectID; + body['UserID'] = 102; + body['RequestType'] = 1; dynamic localRes; diff --git a/lib/pages/BookAppointment/DoctorProfile.dart b/lib/pages/BookAppointment/DoctorProfile.dart index 17f394a0..c806e818 100644 --- a/lib/pages/BookAppointment/DoctorProfile.dart +++ b/lib/pages/BookAppointment/DoctorProfile.dart @@ -492,7 +492,7 @@ class _DoctorProfileState extends State with TickerProviderStateM } void goToBookConfirm() async { - if (widget.isDoctorNameSearch) { + if (widget.isDoctorNameSearch && widget.doctor.clinicID == 17) { navigateToDentalComplaints(context); } else { if (DocAvailableAppointments.areSlotsAvailable) { diff --git a/lib/pages/medical/patient_sick_leave_page.dart b/lib/pages/medical/patient_sick_leave_page.dart index b68badd8..98518011 100644 --- a/lib/pages/medical/patient_sick_leave_page.dart +++ b/lib/pages/medical/patient_sick_leave_page.dart @@ -67,13 +67,13 @@ class _PatientSickLeavePageState extends State { } void showConfirmMessage(PatientSickLeaveViewMode model, int index) { - // if (model.sickLeaveList[index].status == 1) { - // openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo, model.sickLeaveList[index].setupID, model, index); - // } else if (model.sickLeaveList[index].status == 2) { + if (model.sickLeaveList[index].status == 1) { + openWorkPlaceUpdatePage(model.sickLeaveList[index].requestNo, model.sickLeaveList[index].setupID, model, index, model.sickLeaveList[index].projectID); + } else if (model.sickLeaveList[index].status == 2) { showEmailDialog(model, index); - // } else { - // showApprovalDialog(); - // } + } else { + showApprovalDialog(); + } } void showApprovalDialog() { @@ -102,15 +102,17 @@ class _PatientSickLeavePageState extends State { projectName: model.sickLeaveList[index].projectName, setupID: model.sickLeaveList[index].setupID, projectID: model.sickLeaveList[index].projectID); + model.getSickLeave(); }, ), ); } - void openWorkPlaceUpdatePage(int requestNumber, String setupID, PatientSickLeaveViewMode model, int index) { - Navigator.push(context, FadePage(page: WorkplaceUpdatePage(requestNumber: requestNumber, setupID: setupID))).then((value) { + void openWorkPlaceUpdatePage(int requestNumber, String setupID, PatientSickLeaveViewMode model, int index, int projectID) { + Navigator.push(context, FadePage(page: WorkplaceUpdatePage(requestNumber: requestNumber, setupID: setupID, projectID: projectID,))).then((value) { print(value); if (value != null && value == true) { + model.getSickLeave(); showEmailDialog(model, index); } }); diff --git a/lib/pages/medical/sickleave_workplace_update_page.dart b/lib/pages/medical/sickleave_workplace_update_page.dart index 4e17d1de..47ff2e1a 100644 --- a/lib/pages/medical/sickleave_workplace_update_page.dart +++ b/lib/pages/medical/sickleave_workplace_update_page.dart @@ -14,8 +14,9 @@ import 'package:provider/provider.dart'; class WorkplaceUpdatePage extends StatefulWidget { final int requestNumber; final String setupID; + final int projectID; - WorkplaceUpdatePage({@required this.requestNumber, @required this.setupID}); + WorkplaceUpdatePage({@required this.requestNumber, @required this.setupID, @required this.projectID}); @override _WorkplaceUpdatePageState createState() => _WorkplaceUpdatePageState(); @@ -221,7 +222,7 @@ class _WorkplaceUpdatePageState extends State { LabsService service = new LabsService(); GifLoaderDialogUtils.showMyDialog(context); - service.updateWorkplaceName(workplaceName.text, widget.requestNumber, widget.setupID).then((res) { + service.updateWorkplaceName(workplaceName.text, widget.requestNumber, widget.setupID, widget.projectID).then((res) { GifLoaderDialogUtils.hideDialog(context); Navigator.of(context).pop(true); }).catchError((err) {