Updates & fixes

lib/config/config.dart

@@ -345,7 +345,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
 var CHANNEL = 3;
 var GENERAL_ID = 'Cs2020@2016\$2958';
 var IP_ADDRESS = '10.20.10.20';
-var VERSION_ID = 12.3;
+var VERSION_ID = 12.4;
 var SETUP_ID = '91877';
 var LANGUAGE = 2;
 // var  PATIENT_OUT_SA = 0;

lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart

@@ -694,8 +694,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
       if (res["status"].toString().toLowerCase() == "success") {
         updateTamaraRequestStatus("success", "14", orderID, tamaraOrderID, num.parse(this.selectedInstallmentPlan), appo);
       } else {
-        updateTamaraRequestStatus(
-            "Failed", "00", Utils.getAppointmentTransID(appo.projectID, appo.clinicID, appo.appointmentNo), tamaraOrderID != null ? tamaraOrderID : "", num.parse(this.selectedInstallmentPlan), appo);
+        updateTamaraRequestStatus("Failed", "00", transID, tamaraOrderID != null ? tamaraOrderID : "", num.parse(this.selectedInstallmentPlan), appo);
       }
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
@@ -745,10 +744,6 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails> with SingleTic
   createAdvancePayment(res, AppoitmentAllHistoryResultList appo) {
     DoctorsListService service = new DoctorsListService();
     String paymentReference = res['Fort_id'].toString();
-    // List<AncillaryOrdersProcedureList> ancillaryOrdersProcedureList = [];
-    // selectedProcList.forEach((element) {
-    //   ancillaryOrdersProcedureList.add(new AncillaryOrdersProcedureList(procedureID: num.parse(element.procedureID), procedureDescription: element.procedureName));
-    // });
     service.HIS_createAdvancePayment(appo, widget.projectID.toString(), res['Amount'], res['Fort_id'], res['PaymentMethod'], projectViewModel.user.patientType,
             projectViewModel.user.firstName + " " + projectViewModel.user.lastName, projectViewModel.user.patientID, localContext,
             isAncillaryOrder: true)

lib/pages/BookAppointment/DentalComplaints.dart

@@ -263,7 +263,8 @@ class _DentalComplaintsState extends State<DentalComplaints> {
     getLanguageID();
     hasDentalPlan = false;
     ClinicListService service = new ClinicListService();
-    service.getChiefComplaintsList(widget.searchInfo.ClinicID, widget.searchInfo.ProjectID, languageID, false, context).then((res) {
+    int patientID = projectViewModel.isLogin ? projectViewModel.user.patientID : -1;
+    service.getChiefComplaintsList(patientID, widget.searchInfo.ClinicID, widget.searchInfo.ProjectID, languageID, false, context).then((res) {
       GifLoaderDialogUtils.hideDialog(context);
       if (res['MessageStatus'] == 1) {
         setState(() {

lib/pages/MyAppointments/MyAppointments.dart

@@ -334,6 +334,9 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
     _patientBookedAndConfirmedAppointmentListHospital.addAll(_patientBookedAppointmentListHospital);
     _patientBookedAndConfirmedAppointmentListClinic.addAll(_patientBookedAppointmentListClinic);
 
+    _patientBookedAndConfirmedAppointmentListHospital.addAll(_patientConfirmedAppointmentListHospital);
+    _patientBookedAndConfirmedAppointmentListClinic.addAll(_patientConfirmedAppointmentListClinic);
+
   }
 
   openAppointmentsTab() async {
@@ -360,7 +363,8 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
   }
 
   Widget getBookedAppointments() {
-    return _getAppointment(bookedAppoList.length, (filterType == FilterType.Clinic) ? _patientBookedAppointmentListClinic : _patientBookedAppointmentListHospital);
+    // return _getAppointment(bookedAppoList.length, (filterType == FilterType.Clinic) ? _patientBookedAppointmentListClinic : _patientBookedAppointmentListHospital);
+    return Container();
   }
 
   Widget getBookedAndConfirmedAppointments() {

lib/services/clinic_services/get_clinic_service.dart

@@ -61,7 +61,7 @@ class ClinicListService extends BaseService {
     return Future.value(localRes);
   }
 
-  Future<Map> getChiefComplaintsList(int clinicID, int projectID, int languageID, bool isContinueDentalPlan, BuildContext context, {doctorId}) async {
+  Future<Map> getChiefComplaintsList(int patientID, int clinicID, int projectID, int languageID, bool isContinueDentalPlan, BuildContext context, {doctorId}) async {
     //Utils.showProgressDialog(context);
     Map<String, dynamic> request;
 
@@ -86,7 +86,7 @@ class ClinicListService extends BaseService {
       "SessionID": null,
       "isDentalAllowedBackend": true,
       "DeviceTypeID": 1,
-      // "PatientID": 1,
+      "PatientID": patientID,
       "ContinueDentalPlan": isContinueDentalPlan,
       "IsSearchAppointmnetByClinicID": false,
       "DateofBirth": authUser.dateofBirth