From e09f4e7d536923794e1dcd3b85e116818d6539f6 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 6 Jun 2025 14:00:33 +0200 Subject: [PATCH] Add input error pop up on forms --- .../Example/package_tools/package_tool_one.dart | 5 ++++- .../authentication/forgot_password.dart | 4 ++++ .../lib/mih_packages/authentication/register.dart | 6 ++++++ .../authentication/reset_password.dart | 6 ++++++ .../lib/mih_packages/authentication/signin.dart | 14 ++++++++++++++ .../calendar/builder/build_appointment_list.dart | 4 ++++ .../calendar/package_tools/appointments.dart | 3 +++ .../builders/build_employee_list.dart | 3 +++ .../business_profile/builders/build_user_list.dart | 4 ++++ .../package_tools/mih_business_details.dart | 3 +++ .../package_tools/mih_my_business_user.dart | 3 +++ .../business_profile/profile_business_add.dart | 6 ++++++ .../package_tools/mih_personal_profile.dart | 3 +++ .../builder/build_loyalty_card_list.dart | 3 +++ .../mzansi_wallet/package_tools/mih_cards.dart | 3 +++ .../list_builders/build_my_patient_list_list.dart | 3 +++ .../pat_manager/package_tools/waiting_room.dart | 3 +++ .../components/Claim_Statement_Window.dart | 3 +++ .../package_tools/patient_consultation.dart | 3 +++ .../patient_profile/pat_profile/patient_add.dart | 5 +++++ .../patient_profile/pat_profile/patient_edit.dart | 5 +++++ 21 files changed, 91 insertions(+), 1 deletion(-) diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart index 7954db41..8716ffb2 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart @@ -2,6 +2,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -241,6 +242,8 @@ class _PackageToolOneState extends State { ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text("Input Valid")), ); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! @@ -249,7 +252,7 @@ class _PackageToolOneState extends State { elevation: 10, width: 300, child: Text( - "Click Me", + "Submit Form", style: TextStyle( color: MzanziInnovationHub.of(context)! .theme diff --git a/Frontend/lib/mih_packages/authentication/forgot_password.dart b/Frontend/lib/mih_packages/authentication/forgot_password.dart index 99282085..f9705008 100644 --- a/Frontend/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/lib/mih_packages/authentication/forgot_password.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; @@ -280,6 +281,9 @@ class _ForgotPasswordState extends State { onPressed: () { if (_formKey.currentState!.validate()) { prePassResteWarning(); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index c8421ca2..57adeeb6 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_install_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -310,6 +311,8 @@ class _RegisterState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitFormInput(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } }, @@ -423,6 +426,9 @@ class _RegisterState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitFormInput(); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/authentication/reset_password.dart b/Frontend/lib/mih_packages/authentication/reset_password.dart index 767ee600..a4ed515b 100644 --- a/Frontend/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/lib/mih_packages/authentication/reset_password.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; @@ -192,6 +193,8 @@ class _ResetPasswordState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitFormInput(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } }, @@ -303,6 +306,9 @@ class _ResetPasswordState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitFormInput(); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 4f896fd3..ec17413b 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_install_Services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -104,6 +105,8 @@ class _SignInState extends State { }); if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, tileName: "Patient", @@ -123,6 +126,8 @@ class _SignInState extends State { }); if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, tileName: "Doctor", @@ -143,6 +148,8 @@ class _SignInState extends State { }); if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, tileName: "Business", @@ -162,6 +169,8 @@ class _SignInState extends State { }); if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, tileName: "Test", @@ -371,6 +380,8 @@ class _SignInState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } }, @@ -493,6 +504,9 @@ class _SignInState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitSignInForm(); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart index ba9b0617..8b1abed4 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_calendar_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_date_input.dart'; @@ -482,6 +483,9 @@ class _BuildAppointmentListState extends State { onPressed: () { if (_formKey.currentState!.validate()) { updateAppointmentCall(index); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index e72c6717..f443d574 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -1,4 +1,5 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_calendar_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_date_input.dart'; @@ -178,6 +179,8 @@ class _PatientAccessRequestState extends State { onPressed: () { if (_formKey.currentState!.validate()) { addAppointmentCall(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart index 138a8033..8f907457 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; @@ -245,6 +246,8 @@ class _BuildEmployeeListState extends State { }, ); } + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart index 3ebb3792..c2709027 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; @@ -200,6 +201,9 @@ class _BuildUserListState extends State { }, ); } + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index 30f50114..0d2773cc 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -1,6 +1,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_business_details_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_location_api.dart'; @@ -418,6 +419,8 @@ class _MihBusinessDetailsState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 846a3445..06d64467 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -1,6 +1,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_my_business_user_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; @@ -366,6 +367,8 @@ class _MihMyBusinessUserState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart index 38fbfa8e..b746bdcb 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:http/http.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_business_details_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_location_api.dart'; @@ -309,6 +310,8 @@ class _ProfileBusinessAddState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } }, @@ -572,6 +575,9 @@ class _ProfileBusinessAddState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices() + .formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index d25763ea..973b1f92 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_file_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_user_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; @@ -362,6 +363,8 @@ class _MihPersonalProfileState extends State { //Add validation here if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart index 07ba37ae..a5296b72 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_wallet_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -136,6 +137,8 @@ class _BuildLoyaltyCardListState extends State { 0, ctxt, ); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index 7378d781..9459f3be 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_wallet_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; @@ -261,6 +262,8 @@ class _MihCardsState extends State { context, ); } + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart index 216583a6..273e31f0 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart @@ -1,4 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_api_calls.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_calendar_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; @@ -179,6 +180,8 @@ class _BuildPatientsListState extends State { }, ); } + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart index ef2d2bd1..bc5a283e 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_mzansi_calendar_apis.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_calendar.dart'; @@ -378,6 +379,8 @@ class _WaitingRoomState extends State { onPressed: () { if (_formKey.currentState!.validate()) { addAppointmentCall(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: MzanziInnovationHub.of(context)! diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart index ffd6732e..61e185c9 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/Claim_Statement_Window.dart @@ -1,6 +1,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_claim_statement_generation_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_icd10_code_api.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; @@ -357,6 +358,8 @@ class _ClaimStatementWindowState extends State { }, ); } + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart index 0f8abc55..9787984c 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -204,6 +205,8 @@ class _PatientConsultationState extends State { if (_formKey.currentState!.validate()) { addPatientNoteAPICall(); Navigator.pop(context); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart index e3a236c2..4afaabfa 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_action.dart'; @@ -412,6 +413,8 @@ class _AddPatientState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: @@ -479,6 +482,8 @@ class _AddPatientState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart index c86e420a..63dd4f86 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_apis/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_apis/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_action.dart'; @@ -626,6 +627,8 @@ class _EditPatientState extends State { onPressed: () { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } }, buttonColor: @@ -693,6 +696,8 @@ class _EditPatientState extends State { event.logicalKey == LogicalKeyboardKey.enter) { if (_formKey.currentState!.validate()) { submitForm(); + } else { + MihAlertServices().formNotFilledCompletely(context); } } },