Sickleave CR done

merge-update-with-lab-changes
haroon amjad 3 years ago
parent e5e5bb5352
commit c8ec536267

@ -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": "جازتك المرضية تحت الإجراء في الإدارة الطبية ، سوف يتم إشعارك فور الموافقه عليها."},
};

@ -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

@ -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<String, dynamic> 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;

@ -492,7 +492,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
}
void goToBookConfirm() async {
if (widget.isDoctorNameSearch) {
if (widget.isDoctorNameSearch && widget.doctor.clinicID == 17) {
navigateToDentalComplaints(context);
} else {
if (DocAvailableAppointments.areSlotsAvailable) {

@ -67,13 +67,13 @@ class _PatientSickLeavePageState extends State<PatientSickLeavePage> {
}
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<PatientSickLeavePage> {
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);
}
});

@ -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<WorkplaceUpdatePage> {
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) {

Loading…
Cancel
Save