fix things

merge-requests/202/head
Elham Rababah 5 years ago
parent efee00c79e
commit 14955201a9

@ -308,19 +308,23 @@ class _AssessmentPageState extends State<AssessmentPage> {
} }
submitAssessment(SOAPViewModel model) async { submitAssessment(SOAPViewModel model) async {
if (widget.mySelectedAssessment.selectedDiagnosisCondition != null &&
widget.mySelectedAssessment.selectedDiagnosisType != null) {
PostAssessmentRequestModel postAssessmentRequestModel = PostAssessmentRequestModel postAssessmentRequestModel =
new PostAssessmentRequestModel( new PostAssessmentRequestModel(
patientMRN: 3120690, patientMRN: 3120690,
episodeId: 200012117, episodeId: 200012117,
appointmentNo: 2016054573, appointmentNo: 2016054573,
icdCodeDetails: [new IcdCodeDetails( icdCodeDetails: [
new IcdCodeDetails(
remarks: widget.mySelectedAssessment.remark, remarks: widget.mySelectedAssessment.remark,
complexDiagnosis: true, complexDiagnosis: true,
conditionId: widget.mySelectedAssessment.selectedDiagnosisCondition.id, conditionId:
diagnosisTypeId: widget.mySelectedAssessment.selectedDiagnosisType.id , widget.mySelectedAssessment.selectedDiagnosisCondition.id,
icdcode10Id: "1" diagnosisTypeId:
)] widget.mySelectedAssessment.selectedDiagnosisType.id,
); icdcode10Id: "1")
]);
await model.postAssessment(postAssessmentRequestModel); await model.postAssessment(postAssessmentRequestModel);
@ -329,7 +333,9 @@ class _AssessmentPageState extends State<AssessmentPage> {
} else { } else {
widget.changePageViewIndex(3); widget.changePageViewIndex(3);
} }
} else {
helpers.showErrorToast('Please add required field correctly');
}
} }
openAssessmentDialog(BuildContext context) { openAssessmentDialog(BuildContext context) {

@ -352,11 +352,12 @@ class _ObjectivePageState extends State<ObjectivePage> {
if (model.state == ViewState.ErrorLocal) { if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error); helpers.showErrorToast(model.error);
} else { } else {
widget.changePageViewIndex(2);
} }
} else {
helpers.showErrorToast('Please add required field correctly');
} }
// TODO move it back to else stat when it work.
widget.changePageViewIndex(2);
} }

@ -277,14 +277,46 @@ class _SubjectivePageState extends State<SubjectivePage> {
{SOAPViewModel model, {SOAPViewModel model,
List<MySelectedAllergy> myAllergiesList, List<MySelectedAllergy> myAllergiesList,
List<MasterKeyModel> myHistoryList}) async { List<MasterKeyModel> myHistoryList}) async {
formKey.currentState.save();
formKey.currentState.validate();
if(complaintsController.text.isNotEmpty && illnessController.text.isNotEmpty && complaintsController.text.length>25) {
await postChiefComplaint(model: model); await postChiefComplaint(model: model);
if (myHistoryList.length != 0) if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error);
} else {
if (myHistoryList.length != 0) {
await postHistories(model: model, myHistoryList: myHistoryList); await postHistories(model: model, myHistoryList: myHistoryList);
if (myAllergiesList.length != 0) if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error);
} else {
if (myAllergiesList.length != 0) {
await postAllergy(myAllergiesList: myAllergiesList, model: model); await postAllergy(myAllergiesList: myAllergiesList, model: model);
if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error);
} else {
widget.changePageViewIndex(1);
}
}
}
} else {
if (myAllergiesList.length != 0) {
await postAllergy(myAllergiesList: myAllergiesList, model: model);
if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error);
} else {
widget.changePageViewIndex(1);
}
} else {
widget.changePageViewIndex(1); widget.changePageViewIndex(1);
} }
}
}
} else {
helpers.showErrorToast('Please add required field correctly');
}
}
postAllergy( postAllergy(
{List<MySelectedAllergy> myAllergiesList, SOAPViewModel model}) async { {List<MySelectedAllergy> myAllergiesList, SOAPViewModel model}) async {
@ -362,9 +394,6 @@ class _SubjectivePageState extends State<SubjectivePage> {
await model.postChiefComplaint(postChiefComplaintRequestModel); await model.postChiefComplaint(postChiefComplaintRequestModel);
if (model.state == ViewState.ErrorLocal) {
helpers.showErrorToast(model.error);
}
} }
} }

Loading…
Cancel
Save