Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'roaa2.8_addnewmedicationservice' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice

Browse Source
merge-requests/953/head
RoaaGhali98 3 years ago
parent b38a153e22 694be7315b
commit de9dc0cb8c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
lib/core/viewModel/profile/intervention_medication_view_model.dart
Unescape Escape View File

@ -50,12 +50,12 @@ class InterventionMedicationViewModel extends BaseViewModel {
toDate: "\/Date(1635886800000)\/",//AppDateUtils.convertDateToServerFormat(toDate), toDate: "\/Date(1635886800000)\/",//AppDateUtils.convertDateToServerFormat(toDate),
); );
hasError = false; hasError = false;
setState(ViewState.BusyLocal); setState(ViewState.Busy);
await _interventionMedicationService.getInterventionMedication( await _interventionMedicationService.getInterventionMedication(
interventionMedicationReqModel: interventionMedicationReqModel); interventionMedicationReqModel: interventionMedicationReqModel);
if (_interventionMedicationService.hasError) { if (_interventionMedicationService.hasError) {
error = _interventionMedicationService.error; error = _interventionMedicationService.error;
setState(ViewState.ErrorLocal); setState(ViewState.Error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
@ -78,13 +78,13 @@ class InterventionMedicationViewModel extends BaseViewModel {
orderNo: 1171570, //orderNo, orderNo: 1171570, //orderNo,
); );
hasError = false; hasError = false;
setState(ViewState.BusyLocal); setState(ViewState.Busy);
await _interventionMedicationService.getInterventionMedicationHistory( await _interventionMedicationService.getInterventionMedicationHistory(
interventionMedicationHistoryReqModel: interventionMedicationHistoryReqModel:
interventionMedicationHistoryReqModel); interventionMedicationHistoryReqModel);
if (_interventionMedicationService.hasError) { if (_interventionMedicationService.hasError) {
error = _interventionMedicationService.error; error = _interventionMedicationService.error;
setState(ViewState.ErrorLocal); setState(ViewState.Error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }

2
lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart
Unescape Escape View File

@ -273,7 +273,7 @@ class _InterventionMedicationHistoryScreenState extends State<InterventionMedica
onTap: () async { onTap: () async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
model.setAcceptedOrRejected( await model.setAcceptedOrRejected(
remarks: "Rejected", remarks: "Rejected",
memberId: model.allInterventionHistoryList[index].commentedBy, memberId: model.allInterventionHistoryList[index].commentedBy,
prescriptionNo: model.allInterventionHistoryList[index].prescriptionId, prescriptionNo: model.allInterventionHistoryList[index].prescriptionId,

Write Preview
Loading…
Cancel
Save