diff --git a/lib/core/service/AlHabibMedicalService/cmc_service.dart b/lib/core/service/AlHabibMedicalService/cmc_service.dart index 9b644518..ddaaf969 100644 --- a/lib/core/service/AlHabibMedicalService/cmc_service.dart +++ b/lib/core/service/AlHabibMedicalService/cmc_service.dart @@ -24,7 +24,7 @@ class CMCService extends BaseService { Future getCMCAllServices() async { GetCMCServicesRequestModel getCMCServicesRequestModel = - new GetCMCServicesRequestModel(genderID: authenticatedUserObject.user.gender, identificationNo: authenticatedUserObject.user.patientIdentificationNo); + new GetCMCServicesRequestModel(genderID: authenticatedUserObject.user!.gender, identificationNo: authenticatedUserObject.user!.patientIdentificationNo); hasError = false; // RC IMPLEMENTATION diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart index 6cbdc5c3..7f8a92a9 100644 --- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart +++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart @@ -12,17 +12,17 @@ class CustomerAddressesService extends BaseService { Future addAddressInfo({AddNewAddressRequestModel? addNewAddressRequestModel}) async { var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); - addNewAddressRequestModel!.customer.email = addNewAddressRequestModel.customer.addresses[0].email; - addNewAddressRequestModel.customer.id = customerId; - addNewAddressRequestModel.customer.roleIds = [3]; - addNewAddressRequestModel.customer.addresses[0].phoneNumber = addNewAddressRequestModel.customer.addresses[0].phoneNumber; - addNewAddressRequestModel.customer.addresses[0].firstName = authenticatedUserObject.user.firstName; - addNewAddressRequestModel.customer.addresses[0].lastName = authenticatedUserObject.user.lastName; - addNewAddressRequestModel.customer.addresses[0].countryId = 69; + addNewAddressRequestModel!.customer!.email = addNewAddressRequestModel.customer!.addresses![0].email; + addNewAddressRequestModel.customer!.id = customerId; + addNewAddressRequestModel.customer!.roleIds = [3]; + addNewAddressRequestModel.customer!.addresses![0].phoneNumber = addNewAddressRequestModel.customer!.addresses![0].phoneNumber; + addNewAddressRequestModel.customer!.addresses![0].firstName = authenticatedUserObject.user!.firstName; + addNewAddressRequestModel.customer!.addresses![0].lastName = authenticatedUserObject.user!.lastName; + addNewAddressRequestModel.customer!.addresses![0].countryId = 69; var f = DateFormat('E, d MMM yyyy HH:mm:ss'); var date = f.format(DateTime.now().toUtc()) + " GMT"; - addNewAddressRequestModel.customer.addresses[0].createdOnUtc = date; + addNewAddressRequestModel.customer!.addresses![0].createdOnUtc = date; hasError = false; await baseAppClient.postPharmacy(ADD_ADDRESS_INFO, onSuccess: (dynamic response, int statusCode) { addressesList.clear(); @@ -52,7 +52,7 @@ class CustomerAddressesService extends BaseService { } Future getCustomerInfo() async { - Map queryParams = {'FileNumber': '${authenticatedUserObject.user.patientID}'}; + Map queryParams = {'FileNumber': '${authenticatedUserObject.user!.patientID}'}; hasError = false; await baseAppClient.getPharmacy(BASE_PHARMACY_URL + GET_CUSTOMER_INFO, onSuccess: (dynamic response, int statusCode) { diff --git a/lib/core/service/medical/vital_sign_service.dart b/lib/core/service/medical/vital_sign_service.dart index 0d2f051c..054843de 100644 --- a/lib/core/service/medical/vital_sign_service.dart +++ b/lib/core/service/medical/vital_sign_service.dart @@ -10,7 +10,7 @@ class VitalSignService extends BaseService { String heightCm = ""; String bloadType = ""; - Future getPatientRadOrders({required int appointmentNo, required int projectID}) async { + Future getPatientRadOrders({ int? appointmentNo, int? projectID}) async { hasError = false; Map body = Map(); if (appointmentNo != null && projectID != null) { diff --git a/lib/core/viewModels/medical/ActiveMedicationsViewModel.dart b/lib/core/viewModels/medical/ActiveMedicationsViewModel.dart index ee4f37c5..23a6a33e 100644 --- a/lib/core/viewModels/medical/ActiveMedicationsViewModel.dart +++ b/lib/core/viewModels/medical/ActiveMedicationsViewModel.dart @@ -15,7 +15,7 @@ class ActiveMedicationsViewModel extends BaseViewModel { setState(ViewState.Busy); await _activeMedicationsService.getActiveMedication(); if (_activeMedicationsService.hasError) { - error = _activeMedicationsService.error; + error = _activeMedicationsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/AllergiesViewModel.dart b/lib/core/viewModels/medical/AllergiesViewModel.dart index bc4666bc..f3b19a2c 100644 --- a/lib/core/viewModels/medical/AllergiesViewModel.dart +++ b/lib/core/viewModels/medical/AllergiesViewModel.dart @@ -13,7 +13,7 @@ class AllergiesViewModel extends BaseViewModel { setState(ViewState.Busy); await _allergiesService.getAllergies(); if (_allergiesService.hasError) { - error = _allergiesService.error; + error = _allergiesService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/EyeViewModel.dart b/lib/core/viewModels/medical/EyeViewModel.dart index c6587c68..4c5af31d 100644 --- a/lib/core/viewModels/medical/EyeViewModel.dart +++ b/lib/core/viewModels/medical/EyeViewModel.dart @@ -18,7 +18,7 @@ class EyeViewModel extends BaseViewModel { setState(ViewState.Busy); await _eyeService.getEyeMeasurement(); if (_eyeService.hasError) { - error = _eyeService.error; + error = _eyeService.error!; setState(ViewState.Error); } else { if (_eyeService.appoimentAllHistoryResultList.length == 0) { @@ -39,7 +39,7 @@ class EyeViewModel extends BaseViewModel { } else { appointmentFilter.add(AppointmentFilter( element, - element.projectName, + element.projectName!, )); } }); @@ -49,14 +49,14 @@ class EyeViewModel extends BaseViewModel { } sendGlassesPrescriptionEmail( - {int appointmentNo, String projectName, int projectID}) async { + {required int appointmentNo, required String projectName, required int projectID}) async { setState(ViewState.Busy); await _eyeService.sendGlassesPrescriptionEmail( appointmentNo: appointmentNo, projectID: projectID, projectName: projectName); if (_eyeService.hasError) { - error = _eyeService.error; + error = _eyeService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -64,14 +64,14 @@ class EyeViewModel extends BaseViewModel { } sendContactLensPrescriptionEmail( - {int appointmentNo, String projectName, int projectID}) async { + {required int appointmentNo, required String projectName, required int projectID}) async { setState(ViewState.Busy); await _eyeService.sendContactLensPrescriptionEmail( appointmentNo: appointmentNo, projectID: projectID, projectName: projectName); if (_eyeService.hasError) { - error = _eyeService.error; + error = _eyeService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart b/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart index c108d20b..d8b59ef7 100644 --- a/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart +++ b/lib/core/viewModels/medical/PrescriptionDeliveryViewModel.dart @@ -23,19 +23,19 @@ class PrescriptionDeliveryViewModel extends BaseViewModel { }); }); if (_customerAddressesService.hasError) { - error = _customerAddressesService.error; + error = _customerAddressesService.error!; setState(ViewState.ErrorLocal); } else {} } - Future insertDeliveryOrder({int lineItemNo, double latitude, double longitude, int appointmentNo, int createdBy, int dischargeID, int projectID}) async { + Future insertDeliveryOrder({int? lineItemNo, double? latitude, double? longitude, int? appointmentNo, int? createdBy, int? dischargeID, int? projectID}) async { setState(ViewState.BusyLocal); // await _prescriptionDeliveryService.insertDeliveryOrder( // lineItemNo: lineItemNo, latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID); await _prescriptionDeliveryService.insertDeliveryOrderRC( latitude: latitude, longitude: longitude, appointmentNo: appointmentNo, createdBy: createdBy, dischargeID: dischargeID, projectID: projectID); if (_prescriptionDeliveryService.hasError) { - error = _prescriptionDeliveryService.error; + error = _prescriptionDeliveryService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -46,7 +46,7 @@ class PrescriptionDeliveryViewModel extends BaseViewModel { setState(ViewState.Busy); await _customerAddressesService.getCustomerAddresses(); if (_customerAddressesService.hasError) { - error = _customerAddressesService.error; + error = _customerAddressesService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/ask_doctor_view_model.dart b/lib/core/viewModels/medical/ask_doctor_view_model.dart index 7cdbc6e1..573c375a 100644 --- a/lib/core/viewModels/medical/ask_doctor_view_model.dart +++ b/lib/core/viewModels/medical/ask_doctor_view_model.dart @@ -24,7 +24,7 @@ class AskDoctorViewModel extends BaseViewModel { setState(ViewState.Busy); await _myDoctorService.getPatientDoctorAppointmentList(top: 25, beforeDays: 15); if (_myDoctorService.hasError) { - error = _myDoctorService.error; + error = _myDoctorService.error!; setState(ViewState.Error); } else if (_myDoctorService.patientDoctorAppointmentList.length != 0) { _myDoctorService.patientDoctorAppointmentList.forEach((element) { @@ -47,7 +47,7 @@ class AskDoctorViewModel extends BaseViewModel { setState(ViewState.Busy); await _askDoctorService.getCallRequestTypeLOV(); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else @@ -58,18 +58,18 @@ class AskDoctorViewModel extends BaseViewModel { setState(ViewState.Busy); await _askDoctorService.getQuestionTypes(); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else setState(ViewState.Idle); } - Future getCallInfoHoursResult({int projectId, int doctorId}) async { + Future getCallInfoHoursResult({required int projectId, required int doctorId}) async { setState(ViewState.Busy); await _askDoctorService.getCallInfoHoursResult(projectId: projectId, doctorId: doctorId); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -79,27 +79,27 @@ class AskDoctorViewModel extends BaseViewModel { setState(ViewState.Busy); await _askDoctorService.getDoctorResponse(); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - Future updateReadStatus({int transactionNo}) async { + Future updateReadStatus({required int transactionNo}) async { setState(ViewState.Busy); await _askDoctorService.updateReadStatus(transactionNo: transactionNo); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - Future sendRequestLOV({DoctorList doctorList, String requestType, String remark}) async { + Future sendRequestLOV({required DoctorList doctorList, required String requestType, required String remark}) async { setState(ViewState.BusyLocal); await _askDoctorService.sendRequestLOV(doctorList: doctorList, requestType: requestType, remark: remark); if (_askDoctorService.hasError) { - error = _askDoctorService.error; + error = _askDoctorService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else diff --git a/lib/core/viewModels/medical/blood_pressure_view_model.dart b/lib/core/viewModels/medical/blood_pressure_view_model.dart index 548f4b62..b3c0f8a9 100644 --- a/lib/core/viewModels/medical/blood_pressure_view_model.dart +++ b/lib/core/viewModels/medical/blood_pressure_view_model.dart @@ -29,26 +29,28 @@ class BloodPressureViewMode extends BaseViewModel { await bloodPressureService.getBloodSugar(); await bloodPressureService.getDiabtecResults(); if (bloodPressureService.hasError) { - error = bloodPressureService.error; + error = bloodPressureService.error!; setState(ViewState.ErrorLocal); } else { clearDate(); bloodPressureService.weekDiabtectResultAverageList.forEach((element) { - weightWeekTimeSeriesDataTop.add(TimeSeriesSales2(element.bloodPressureDate, element.dailyDiastolicPressureAverageResult.toDouble())); - weightWeekTimeSeriesDataLow.add(TimeSeriesSales2(element.bloodPressureDate, element.dailySystolicePressureAverageResult.toDouble())); + weightWeekTimeSeriesDataTop.add(TimeSeriesSales2(element.bloodPressureDate!, element.dailyDiastolicPressureAverageResult!.toDouble())); + weightWeekTimeSeriesDataLow.add(TimeSeriesSales2(element.bloodPressureDate!, element.dailySystolicePressureAverageResult!.toDouble())); }); for (int index = 0; index < bloodPressureService.monthDiabtectResultAverageList.length; index++) { // weighMonthTimeSeriesDataTop.add(TimeSeriesSales3("Week " + (index + 1).toString(), bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble())); // weighMonthTimeSeriesDataLow.add(TimeSeriesSales3("Week " + (index + 1).toString(), bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble())); - weighMonthTimeSeriesDataTop.add(TimeSeriesSales3(bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble())); - weighMonthTimeSeriesDataLow.add(TimeSeriesSales3(bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble())); + weighMonthTimeSeriesDataTop.add(TimeSeriesSales3( + bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult!.toDouble())); + weighMonthTimeSeriesDataLow.add(TimeSeriesSales3( + bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult!.toDouble())); } bloodPressureService.yearDiabtecResultAverageList.forEach((element) { - weightYearTimeSeriesDataTop.add(TimeSeriesSales2(element.date, element.monthSystolicePressureAverageResult.toDouble())); + weightYearTimeSeriesDataTop.add(TimeSeriesSales2(element.date!, element.monthSystolicePressureAverageResult!.toDouble())); - weightYearTimeSeriesDataLow.add(TimeSeriesSales2(element.date, element.monthDiastolicPressureAverageResult.toDouble())); + weightYearTimeSeriesDataLow.add(TimeSeriesSales2(element.date!, element.monthDiastolicPressureAverageResult!.toDouble())); }); setState(ViewState.Idle); @@ -69,21 +71,22 @@ class BloodPressureViewMode extends BaseViewModel { await bloodPressureService.sendReportByEmail(); if (bloodPressureService.hasError) { - error = bloodPressureService.error; + error = bloodPressureService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); } } - Future addORUpdateDiabtecResult({String bloodPressureDate, String diastolicPressure, String systolicePressure, int measuredArm, int lineItemNo, bool isUpdate = false}) async { + Future addORUpdateDiabtecResult({String? bloodPressureDate, String? diastolicPressure, String? systolicePressure, int? measuredArm, int? lineItemNo, bool isUpdate = false}) async { setState(ViewState.BusyLocal); if (!isUpdate) await bloodPressureService.addDiabtecResult(bloodPressureDate: bloodPressureDate, diastolicPressure: diastolicPressure, systolicePressure: systolicePressure, measuredArm: measuredArm); else - await bloodPressureService.updateDiabtecResult(bloodPressureDate: bloodPressureDate, diastolicPressure: diastolicPressure, systolicePressure: systolicePressure, measuredArm: measuredArm, lineItemNo: lineItemNo); + await bloodPressureService.updateDiabtecResult( + bloodPressureDate: bloodPressureDate, diastolicPressure: diastolicPressure, systolicePressure: systolicePressure, measuredArm: measuredArm, lineItemNo: lineItemNo); if (bloodPressureService.hasError) { - error = bloodPressureService.error; + error = bloodPressureService.error!; setState(ViewState.ErrorLocal); } else { // await getBloodPressure(); @@ -91,12 +94,12 @@ class BloodPressureViewMode extends BaseViewModel { } } - Future deactivateDiabeticStatus({int lineItemNo}) async { + Future deactivateDiabeticStatus({required int lineItemNo}) async { setState(ViewState.BusyLocal); await bloodPressureService.deactivateDiabeticStatus(lineItemNo: lineItemNo); if (bloodPressureService.hasError) { - error = bloodPressureService.error; + error = bloodPressureService.error!; setState(ViewState.ErrorLocal); } else { await getBloodPressure(); diff --git a/lib/core/viewModels/medical/blood_sugar_view_model.dart b/lib/core/viewModels/medical/blood_sugar_view_model.dart index 29b9cfe2..5b9c4077 100644 --- a/lib/core/viewModels/medical/blood_sugar_view_model.dart +++ b/lib/core/viewModels/medical/blood_sugar_view_model.dart @@ -27,12 +27,12 @@ class BloodSugarViewMode extends BaseViewModel { await bloodSugarService.getBloodSugar(); await bloodSugarService.getDiabtecResults(); if (bloodSugarService.hasError) { - error = bloodSugarService.error; + error = bloodSugarService.error!; setState(ViewState.Error); } else { bloodSugarService.weekDiabtectResultAverageList.forEach((element) { bloodWeekTimeSeriesData.add(TimeSeriesSales2( - element.dateChart, + element.dateChart!, element.dailyAverageResult.toDouble(), )); }); @@ -53,7 +53,7 @@ class BloodSugarViewMode extends BaseViewModel { bloodSugarService.yearDiabtecResultAverageList.forEach((element) { yearTimeSeriesData.add(TimeSeriesSales2( - element.date, + element.date!, element.monthAverageResult.toDouble(), )); }); @@ -63,10 +63,10 @@ class BloodSugarViewMode extends BaseViewModel { } Future addDiabtecResult( - {String bloodSugerDateChart, - String bloodSugerResult, - String diabtecUnit, - int measuredTime}) async { + {String? bloodSugerDateChart, + String? bloodSugerResult, + String? diabtecUnit, + int? measuredTime}) async { setState(ViewState.BusyLocal); await bloodSugarService.addDiabtecResult( bloodSugerDateChart: bloodSugerDateChart, @@ -74,7 +74,7 @@ class BloodSugarViewMode extends BaseViewModel { diabtecUnit: diabtecUnit, measuredTime: measuredTime); if (bloodSugarService.hasError) { - error = bloodSugarService.error; + error = bloodSugarService.error!; setState(ViewState.Error); } else { await getBloodSugar(); @@ -83,12 +83,12 @@ class BloodSugarViewMode extends BaseViewModel { } Future updateDiabtecResult( - {DateTime month, - DateTime hour, - String bloodSugerResult, - String diabtecUnit, - int measuredTime, - int lineItemNo}) async { + {DateTime? month, + DateTime? hour, + String? bloodSugerResult, + String? diabtecUnit, + int? measuredTime, + int? lineItemNo}) async { setState(ViewState.BusyLocal); await bloodSugarService.updateDiabtecResult( @@ -99,7 +99,7 @@ class BloodSugarViewMode extends BaseViewModel { lineItemNo: lineItemNo, month: month); if (bloodSugarService.hasError) { - error = bloodSugarService.error; + error = bloodSugarService.error!; setState(ViewState.ErrorLocal); } else { await getBloodSugar(); @@ -112,19 +112,19 @@ class BloodSugarViewMode extends BaseViewModel { await bloodSugarService.sendReportByEmail(); if (bloodSugarService.hasError) { - error = bloodSugarService.error; + error = bloodSugarService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); } } - Future deactivateDiabeticStatus({int lineItemNo}) async { + Future deactivateDiabeticStatus({required int lineItemNo}) async { setState(ViewState.BusyLocal); await bloodSugarService.deactivateDiabeticStatus(lineItemNo: lineItemNo); if (bloodSugarService.hasError) { - error = bloodSugarService.error; + error = bloodSugarService.error!; setState(ViewState.ErrorLocal); } else { await getBloodSugar(); diff --git a/lib/core/viewModels/medical/labs_view_model.dart b/lib/core/viewModels/medical/labs_view_model.dart index fec764ee..cafb5221 100644 --- a/lib/core/viewModels/medical/labs_view_model.dart +++ b/lib/core/viewModels/medical/labs_view_model.dart @@ -32,7 +32,7 @@ class LabsViewModel extends BaseViewModel { setState(ViewState.Busy); await _labsService.getPatientLabOrdersList(); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { _labsService.patientLabOrdersList.forEach((element) { @@ -74,7 +74,7 @@ class LabsViewModel extends BaseViewModel { List labResultLists =[]; - getLaboratoryResult({String projectID, int clinicID, String invoiceNo, String orderNo, String setupID, bool isVidaPlus}) async { + getLaboratoryResult({required String projectID, required int clinicID, required String invoiceNo, required String orderNo, required String setupID, required bool isVidaPlus}) async { setState(ViewState.Busy); await _labsService.getLaboratoryResult(invoiceNo: invoiceNo, orderNo: orderNo, @@ -83,18 +83,18 @@ class LabsViewModel extends BaseViewModel { setupID: setupID, isVidaPlus: isVidaPlus); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); } } - getPatientLabResult({PatientLabOrders patientLabOrder, bool isVidaPlus}) async { + getPatientLabResult({required PatientLabOrders patientLabOrder, required bool isVidaPlus}) async { setState(ViewState.Busy); await _labsService.getPatientLabResult(patientLabOrder: patientLabOrder, isVidaPlus: isVidaPlus); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { _labsService.labResultList.forEach((element) { @@ -102,10 +102,10 @@ class LabsViewModel extends BaseViewModel { if (patientLabOrdersClinic.length != 0) { var value = labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])] - .patientLabResultList + .patientLabResultList! .where((e) => e.sampleCollectedOn == element.sampleCollectedOn && e.resultValue == element.resultValue) .toList(); - if (value.isEmpty) labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList.add(element); + if (value.isEmpty) labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList!.add(element); } else { labResultLists.add(LabResultList(filterName: element.testCode, lab: element)); } @@ -114,11 +114,11 @@ class LabsViewModel extends BaseViewModel { } } - getPatientLabOrdersResults({PatientLabOrders patientLabOrder, String procedure}) async { + getPatientLabOrdersResults({required PatientLabOrders patientLabOrder, required String procedure}) async { setState(ViewState.Busy); await _labsService.getPatientLabOrdersResults(patientLabOrder: patientLabOrder, procedure: procedure); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { /// commented out based on PAP-304 @@ -135,20 +135,20 @@ class LabsViewModel extends BaseViewModel { _labsService.labOrdersResultsList.forEach((element) { try { - timeSeries.add(new TimeSeriesSales2(DateUtil.convertStringToDate(element.verifiedOnDateTime), double.parse(element.resultValue))); + timeSeries.add(new TimeSeriesSales2(DateUtil.convertStringToDate(element.verifiedOnDateTime!), double.parse(element.resultValue!))); } catch (e) {} }); setState(ViewState.Idle); } } - sendLabReportEmail({PatientLabOrders patientLabOrder, String mes, AuthenticatedUser userObj, bool isVidaPlus, bool isDownload = false}) async { + sendLabReportEmail({PatientLabOrders? patientLabOrder, String? mes, AuthenticatedUser? userObj, required bool isVidaPlus, bool isDownload = false}) async { await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder, userObj: userObj, isVidaPlus: isVidaPlus, isDownload: isDownload); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; } else { if (isDownload) {} else { - AppToast.showSuccessToast(message: mes); + AppToast.showSuccessToast(message: mes!); } } } diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index 004f368b..e2cc2520 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -17,7 +17,7 @@ class MedicalViewModel extends BaseViewModel { setState(ViewState.Busy); await _medicalService.getAppointmentHistory(); if (_medicalService.hasError) { - error = _medicalService.error; + error = _medicalService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -29,7 +29,7 @@ class MedicalViewModel extends BaseViewModel { setState(ViewState.Busy); await _medicalService.getSchedule(doctorRequest); if (_medicalService.hasError) { - error = _medicalService.error; + error = _medicalService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -41,7 +41,7 @@ class MedicalViewModel extends BaseViewModel { setState(ViewState.Busy); await _medicalService.getFreeSlot(doctorRequest); if (_medicalService.hasError) { - error = _medicalService.error; + error = _medicalService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/my_balance_view_model.dart b/lib/core/viewModels/medical/my_balance_view_model.dart index 4166a4b3..1b0df143 100644 --- a/lib/core/viewModels/medical/my_balance_view_model.dart +++ b/lib/core/viewModels/medical/my_balance_view_model.dart @@ -50,20 +50,20 @@ class MyBalanceViewModel extends BaseViewModel { List get patientInfoList => _myBalanceService.patientInfoList; PatientInfoAndMobileNumber get patientInfoAndMobileNumber => - _myBalanceService.patientInfoAndMobileNumber; + _myBalanceService.patientInfoAndMobileNumber!; List get bloodModelList => _bloodDetailsService.BloodModelList; - String get logInTokenID => _myBalanceService.logInTokenID; + String get logInTokenID => _myBalanceService.logInTokenID!; - String get verificationCode => _myBalanceService.verificationCode; + String get verificationCode => _myBalanceService.verificationCode!; getPatientAdvanceBalanceAmount() async { setState(ViewState.Busy); await _myBalanceService.getPatientAdvanceBalanceAmount(); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -74,7 +74,7 @@ class MyBalanceViewModel extends BaseViewModel { setState(ViewState.Busy); await _hospitalService.getHospitals(isAdvancePayment: isAdvancePayment); if (_hospitalService.hasError) { - error = _hospitalService.error; + error = _hospitalService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -85,7 +85,7 @@ class MyBalanceViewModel extends BaseViewModel { setState(ViewState.Busy); await _bloodDonationService.getAllCitiesOrders(); if (_bloodDonationService.hasError) { - error = _bloodDonationService.error; + error = _bloodDonationService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -96,17 +96,17 @@ class MyBalanceViewModel extends BaseViewModel { setState(ViewState.Busy); await _bloodDetailsService.getAllBloodOrders(); if (_bloodDetailsService.hasError) { - error = _bloodDetailsService.error; + error = _bloodDetailsService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - Future getPatientInfoByPatientID({String id}) async { + Future getPatientInfoByPatientID({required String id}) async { setState(ViewState.Busy); await _myBalanceService.getPatientInfoByPatientID(id: id); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { @@ -120,7 +120,7 @@ class MyBalanceViewModel extends BaseViewModel { await _myBalanceService .getPatientInfoByPatientIDAndMobileNumber(advanceModel); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { @@ -129,12 +129,12 @@ class MyBalanceViewModel extends BaseViewModel { } Future sendActivationCodeForAdvancePayment( - {int patientID, int projectID}) async { + {required int patientID, required int projectID}) async { setState(ViewState.Busy); await _myBalanceService.sendActivationCodeForAdvancePayment( patientID: patientID, projectID: projectID); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { @@ -143,12 +143,12 @@ class MyBalanceViewModel extends BaseViewModel { } Future checkActivationCodeForAdvancePayment( - {String activationCode, String patientMobileNumber}) async { + {required String activationCode, required String patientMobileNumber}) async { setState(ViewState.Busy); await _myBalanceService.checkActivationCodeForAdvancePayment( activationCode: activationCode); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -159,7 +159,7 @@ class MyBalanceViewModel extends BaseViewModel { setState(ViewState.Busy); await _myBalanceService.getFamilyFiles(); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { @@ -171,7 +171,7 @@ class MyBalanceViewModel extends BaseViewModel { setState(ViewState.Busy); await _myBalanceService.updateBloodGroup(detailsModel); if (_myBalanceService.hasError) { - error = _myBalanceService.error; + error = _myBalanceService.error!; setState(ViewState.ErrorLocal); } else { await _myBalanceService.addUserAgreementForBloodDonation(); diff --git a/lib/core/viewModels/medical/my_doctor_view_model.dart b/lib/core/viewModels/medical/my_doctor_view_model.dart index da709fdb..2a884455 100644 --- a/lib/core/viewModels/medical/my_doctor_view_model.dart +++ b/lib/core/viewModels/medical/my_doctor_view_model.dart @@ -22,17 +22,17 @@ class MyDoctorViewModel extends BaseViewModel { ? _patientDoctorAppointmentListClinic : _patientDoctorAppointmentListHospital; - DoctorList get doctorList=> _myDoctorService.doctorList; + DoctorList get doctorList=> _myDoctorService.doctorList!; - DoctorProfile get doctorProfile => _myDoctorService.doctorProfile; + DoctorProfile get doctorProfile => _myDoctorService.doctorProfile!; DoctorRating get doctorRating => _myDoctorService.doctorRating; void getMyDoctor() async { setState(ViewState.Busy); await _myDoctorService.getPatientDoctorAppointmentList(); if (_myDoctorService.hasError) { - error = _myDoctorService.error; + error = _myDoctorService.error!; setState(ViewState.Error); } else { _myDoctorService.patientDoctorAppointmentList.forEach((element) { @@ -84,11 +84,11 @@ class MyDoctorViewModel extends BaseViewModel { notifyListeners(); } - Future getDoctorProfileAndRating({int doctorId,int clinicID,int projectID }) async { + Future getDoctorProfileAndRating({required int doctorId,required int clinicID,required int projectID }) async { setState(ViewState.Busy); await _myDoctorService.getDoctorProfileAndRating(doctorId: doctorId,clinicID: clinicID,projectID: projectID); if (_myDoctorService.hasError) { - error = _myDoctorService.error; + error = _myDoctorService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/patient_sick_leave_view_model.dart b/lib/core/viewModels/medical/patient_sick_leave_view_model.dart index 6addf833..22ed9f0f 100644 --- a/lib/core/viewModels/medical/patient_sick_leave_view_model.dart +++ b/lib/core/viewModels/medical/patient_sick_leave_view_model.dart @@ -6,8 +6,7 @@ import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; class PatientSickLeaveViewMode extends BaseViewModel { - PatientSickLeaveService _patientSickLeaveService = - locator(); + PatientSickLeaveService _patientSickLeaveService = locator(); List get sickLeaveList => _patientSickLeaveService.sickLeaveList; @@ -15,23 +14,18 @@ class PatientSickLeaveViewMode extends BaseViewModel { setState(ViewState.Busy); await _patientSickLeaveService.getSickLeave(); if (_patientSickLeaveService.hasError) { - error = _patientSickLeaveService.error; + error = _patientSickLeaveService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); } } - Future sendSickLeaveEmail( - {String message, - int requestNo, - String projectName, - String doctorName,int projectID,String setupID}) async { + Future sendSickLeaveEmail({required String message, required int requestNo, required String projectName, required String doctorName, required int projectID, required String setupID}) async { setState(ViewState.Busy); - await _patientSickLeaveService.sendSickLeaveEmail( - requestNo: requestNo, projectName: projectName, doctorName: doctorName,projectID: projectID,setupID: setupID); + await _patientSickLeaveService.sendSickLeaveEmail(requestNo: requestNo, projectName: projectName, doctorName: doctorName, projectID: projectID, setupID: setupID); if (_patientSickLeaveService.hasError) { - error = _patientSickLeaveService.error; + error = _patientSickLeaveService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { diff --git a/lib/core/viewModels/medical/prescriptions_view_model.dart b/lib/core/viewModels/medical/prescriptions_view_model.dart index afbee507..a3816d92 100644 --- a/lib/core/viewModels/medical/prescriptions_view_model.dart +++ b/lib/core/viewModels/medical/prescriptions_view_model.dart @@ -49,7 +49,7 @@ class PrescriptionsViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionsService.getPrescriptions(); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.Error); } else { _filterList(); @@ -64,7 +64,7 @@ class PrescriptionsViewModel extends BaseViewModel { List prescriptionsByClinic = _prescriptionsOrderListClinic.where((elementClinic) => elementClinic.filterName == element.clinicDescription).toList(); if (prescriptionsByClinic.length != 0) { - _prescriptionsOrderListClinic[_prescriptionsOrderListClinic.indexOf(prescriptionsByClinic[0])].prescriptionsList.add(element); + _prescriptionsOrderListClinic[_prescriptionsOrderListClinic.indexOf(prescriptionsByClinic[0])].prescriptionsList!.add(element); } else { _prescriptionsOrderListClinic.add(PrescriptionsList(filterName: element.clinicDescription, prescriptions: element)); } @@ -77,7 +77,7 @@ class PrescriptionsViewModel extends BaseViewModel { .toList(); if (prescriptionsByHospital.length != 0) { - _prescriptionsOrderListHospital[_prescriptionsOrderListHospital.indexOf(prescriptionsByHospital[0])].prescriptionsList.add(element); + _prescriptionsOrderListHospital[_prescriptionsOrderListHospital.indexOf(prescriptionsByHospital[0])].prescriptionsList!.add(element); } else { _prescriptionsOrderListHospital.add(PrescriptionsList(filterName: element.name, prescriptions: element)); } @@ -90,7 +90,7 @@ class PrescriptionsViewModel extends BaseViewModel { // await _prescriptionsService.getPrescriptionsOrders(); await _prescriptionsService.getPrescriptionsOrdersRC(); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -103,22 +103,22 @@ class PrescriptionsViewModel extends BaseViewModel { notifyListeners(); } - getPrescriptionReport({Prescriptions prescriptions}) async { + getPrescriptionReport({required Prescriptions prescriptions}) async { setState(ViewState.Busy); await _prescriptionsService.getPrescriptionReport(prescriptions: prescriptions); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); } } - sendPrescriptionEmail({String appointmentDate, int patientID, String clinicName, String doctorName, int doctorID, String mes, int projectID}) async { + sendPrescriptionEmail({required String appointmentDate, required int patientID, required String clinicName, required String doctorName, required int doctorID, required String mes, required int projectID}) async { setState(ViewState.BusyLocal); await _prescriptionsService.sendPrescriptionEmail(appointmentDate, patientID, clinicName, doctorName, doctorID, projectID); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.ErrorLocal); AppToast.showErrorToast(message: error); } else { @@ -127,22 +127,22 @@ class PrescriptionsViewModel extends BaseViewModel { } } - getListPharmacyForPrescriptions({int itemId}) async { + getListPharmacyForPrescriptions({required int itemId}) async { setState(ViewState.Busy); await _prescriptionsService.getListPharmacyForPrescriptions(itemId: itemId); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); } } - getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder}) async { + getPrescriptionReportEnh({required PrescriptionsOrder prescriptionsOrder}) async { setState(ViewState.Busy); await _prescriptionsService.getPrescriptionReportEnh(prescriptionsOrder: prescriptionsOrder); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -153,19 +153,19 @@ class PrescriptionsViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionsService.getPrescriptionsInfoRC(orderID, patientID); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); } } - Future updatePressOrder({@required int presOrderID}) async { + Future updatePressOrder({required int presOrderID}) async { setState(ViewState.Busy); // await _prescriptionsService.updatePressOrder(presOrderID: presOrderID); await _prescriptionsService.updatePressOrderRC(presOrderID: presOrderID); if (_prescriptionsService.hasError) { - error = _prescriptionsService.error; + error = _prescriptionsService.error!; setState(ViewState.Error); } else { await getPrescriptions(); diff --git a/lib/core/viewModels/medical/radiology_view_model.dart b/lib/core/viewModels/medical/radiology_view_model.dart index 55faad77..a8ead482 100644 --- a/lib/core/viewModels/medical/radiology_view_model.dart +++ b/lib/core/viewModels/medical/radiology_view_model.dart @@ -27,7 +27,7 @@ class RadiologyViewModel extends BaseViewModel { await _radiologyService.getPatientRadOrders(); _isRadiologyVIDAPlus = _radiologyService.isRadiologyVIDAPlus; if (_radiologyService.hasError) { - error = _radiologyService.error; + error = _radiologyService.error!; setState(ViewState.Error); } else { //Clinic Sorting @@ -48,21 +48,21 @@ class RadiologyViewModel extends BaseViewModel { String get radImageURL => _radiologyService.url; - getRadImageURL({int invoiceNo, int lineItem, int projectId, bool isVidaPlus}) async { + getRadImageURL({required int invoiceNo, required int lineItem, required int projectId, required bool isVidaPlus}) async { setState(ViewState.Busy); await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus); if (_radiologyService.hasError) { - error = _radiologyService.error; + error = _radiologyService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - sendRadReportEmail({FinalRadiology finalRadiology, String mes, AuthenticatedUser userObj}) async { + sendRadReportEmail({required FinalRadiology finalRadiology, required String mes, required AuthenticatedUser userObj}) async { setState(ViewState.BusyLocal); await _radiologyService.sendRadReportEmail(finalRadiology: finalRadiology, userObj: userObj); if (_radiologyService.hasError) { - error = _radiologyService.error; + error = _radiologyService.error!; AppToast.showErrorToast(message: error); } else { AppToast.showSuccessToast(message: mes); diff --git a/lib/core/viewModels/medical/reports_monthly_view_model.dart b/lib/core/viewModels/medical/reports_monthly_view_model.dart index a9117172..6685c3eb 100644 --- a/lib/core/viewModels/medical/reports_monthly_view_model.dart +++ b/lib/core/viewModels/medical/reports_monthly_view_model.dart @@ -21,25 +21,25 @@ class ReportsMonthlyViewModel extends BaseViewModel { setState(ViewState.Busy); await _reportsService.getUserTermsAndConditions(); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); } } - updatePatientHealthSummaryReport({String message, bool isSummary, bool isUpdateEmail = false, String email}) async { + updatePatientHealthSummaryReport({required String message, required bool isSummary, bool isUpdateEmail = false, required String email}) async { setState(ViewState.BusyLocal); await _reportsService.updatePatientHealthSummaryReport(isSummary: isSummary); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; AppToast.showErrorToast(message: error); setState(ViewState.ErrorLocal); } else { if (isUpdateEmail) { await _reportsService.updateEmail(email: email); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; AppToast.showErrorToast(message: error); setState(ViewState.ErrorLocal); } else { diff --git a/lib/core/viewModels/medical/reports_view_model.dart b/lib/core/viewModels/medical/reports_view_model.dart index 4840a787..9a04650f 100644 --- a/lib/core/viewModels/medical/reports_view_model.dart +++ b/lib/core/viewModels/medical/reports_view_model.dart @@ -33,7 +33,7 @@ class ReportsViewModel extends BaseViewModel { reportsOrderCanceledList.clear(); await _reportsService.getReports(); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; setState(ViewState.Error); } else { _filterList(); @@ -49,7 +49,7 @@ class ReportsViewModel extends BaseViewModel { reportsInPatientOrderCanceledList.clear(); await _reportsService.getInPatientReports(); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; setState(ViewState.Error); } else { _filterInPatientList(); @@ -61,7 +61,7 @@ class ReportsViewModel extends BaseViewModel { setState(ViewState.Busy); await _reportsService.getPatentAppointmentHistory(); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -106,7 +106,7 @@ class ReportsViewModel extends BaseViewModel { setState(ViewState.Busy); await _reportsService.insertRequestForMedicalReport(appointmentHistory); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; AppToast.showErrorToast(message: error); setState(ViewState.ErrorLocal); } else { @@ -120,7 +120,7 @@ class ReportsViewModel extends BaseViewModel { setState(ViewState.Busy); await _reportsService.insertRequestForInPatientMedicalReport(clinicID, doctorID, setupID, admissionNo, projectID); if (_reportsService.hasError) { - error = _reportsService.error; + error = _reportsService.error!; AppToast.showErrorToast(message: error); setState(ViewState.ErrorLocal); } else { diff --git a/lib/core/viewModels/medical/vital_sign_view_model.dart b/lib/core/viewModels/medical/vital_sign_view_model.dart index b2110187..b669c693 100644 --- a/lib/core/viewModels/medical/vital_sign_view_model.dart +++ b/lib/core/viewModels/medical/vital_sign_view_model.dart @@ -19,7 +19,7 @@ class VitalSignViewModel extends BaseViewModel { String respirationBeatPerMinute = "0"; String bloodPressure = "0 / 0"; - getPatientVitalSign({int appointmentNo, int projectID}) async { + getPatientVitalSign({int? appointmentNo, required int projectID}) async { setState(ViewState.Busy); if (appointmentNo != null && projectID != null) { @@ -29,7 +29,7 @@ class VitalSignViewModel extends BaseViewModel { await _vitalSignService.getPatientRadOrders(); } if (_vitalSignService.hasError) { - error = _vitalSignService.error; + error = _vitalSignService.error!; setState(ViewState.Error); } else { _vitalSignService.vitalSignResModelList.forEach((element) { diff --git a/lib/core/viewModels/medical/weight_pressure_view_model.dart b/lib/core/viewModels/medical/weight_pressure_view_model.dart index 11684472..8a689786 100644 --- a/lib/core/viewModels/medical/weight_pressure_view_model.dart +++ b/lib/core/viewModels/medical/weight_pressure_view_model.dart @@ -24,12 +24,12 @@ class WeightPressureViewModel extends BaseViewModel { await weightService.getWeightAverage(); await weightService.getWeightMeasurementResult(); if (weightService.hasError) { - error = weightService.error; + error = weightService.error!; setState(ViewState.ErrorLocal); } else { weightService.weekWeightMeasurementResultAverage.forEach((element) { weightWeekTimeSeriesData.add(TimeSeriesSales2( - element.weightDate, + element.weightDate!, element.dailyAverageResult.toDouble(), )); }); @@ -43,7 +43,7 @@ class WeightPressureViewModel extends BaseViewModel { weightService.yearWeightMeasurementResultAverage.forEach((element) { weightYearTimeSeriesData.add(TimeSeriesSales2( - element.date, + element.date!, element.monthAverageResult.toDouble(), )); }); @@ -52,7 +52,7 @@ class WeightPressureViewModel extends BaseViewModel { } } - addWeightResult({String weightDate, String weightMeasured, int weightUnit}) async { + addWeightResult({required String weightDate, required String weightMeasured, required int weightUnit}) async { setState(ViewState.BusyLocal); await weightService.addWeightResult( weightDate: weightDate, @@ -60,7 +60,7 @@ class WeightPressureViewModel extends BaseViewModel { weightUnit: weightUnit, ); if (weightService.hasError) { - error = weightService.error; + error = weightService.error!; setState(ViewState.Error); } else { await getWeight(); @@ -73,19 +73,18 @@ class WeightPressureViewModel extends BaseViewModel { await weightService.sendReportByEmail(); if (weightService.hasError) { - error = weightService.error; + error = weightService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); } } - updateWeightResult({int lineItemNo, int weightUnit, String weightMeasured, String weightDate}) async { + updateWeightResult({required int lineItemNo, required int weightUnit, required String weightMeasured, required String weightDate}) async { setState(ViewState.BusyLocal); - await weightService.updateWeightResult( - lineItemNo: lineItemNo, weightMeasured: weightMeasured, weightUnit: weightUnit, weightDate: weightDate); + await weightService.updateWeightResult(lineItemNo: lineItemNo, weightMeasured: weightMeasured, weightUnit: weightUnit, weightDate: weightDate); if (weightService.hasError) { - error = weightService.error; + error = weightService.error!; setState(ViewState.Error); } else { await getWeight(); @@ -94,14 +93,14 @@ class WeightPressureViewModel extends BaseViewModel { } deleteWeightResult({ - int lineItemNo, + required int lineItemNo, }) async { setState(ViewState.BusyLocal); await weightService.deleteWeightResult( lineItemNo: lineItemNo, ); if (weightService.hasError) { - error = weightService.error; + error = weightService.error!; setState(ViewState.Error); } else { await getWeight(); diff --git a/lib/core/viewModels/packages_offers/PackagesOffersViewModel.dart b/lib/core/viewModels/packages_offers/PackagesOffersViewModel.dart index b1fcc1d1..64f76b68 100644 --- a/lib/core/viewModels/packages_offers/PackagesOffersViewModel.dart +++ b/lib/core/viewModels/packages_offers/PackagesOffersViewModel.dart @@ -35,7 +35,7 @@ class PackagesViewModel extends BaseViewModel { illegible = false; else{ tamara_options.forEach((element) { - final ill = (amount >= element.minLimit && amount <= element.maxLimit); + final ill = (amount >= element.minLimit! && amount <= element.maxLimit!); element.enable = ill; illegible = illegible || ill; });