From a8a0f3d6207a2fff8226151d352f23cf22fa3d30 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 10 Jul 2025 10:25:36 +0200 Subject: [PATCH] fix practice number requirement --- .../package_tools/mih_business_details.dart | 33 +++++--- .../profile_business_add.dart | 77 +++++++++++-------- 2 files changed, 69 insertions(+), 41 deletions(-) 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 10795ed2..5cb83d05 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 @@ -13,7 +13,6 @@ import 'package:mzansi_innovation_hub/mih_services/mih_location_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.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_dropdwn_field.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; @@ -270,17 +269,32 @@ class _MihBusinessDetailsState extends State { }, ), const SizedBox(height: 10), - MihDropdownField( + MihTextFormField( + fillColor: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + inputColor: MzanziInnovationHub.of(context)! + .theme + .primaryColor(), controller: typeController, + multiLineInput: false, + requiredText: true, hintText: "Business Type", - dropdownOptions: const ["Doctors Office", "Other"], - editable: true, - enableSearch: true, validator: (value) { return MihValidationServices().isEmpty(value); }, - requiredText: true, ), + // MihDropdownField( + // controller: typeController, + // hintText: "Business Type", + // dropdownOptions: const ["Doctors Office", "Other"], + // editable: true, + // enableSearch: true, + // validator: (value) { + // return MihValidationServices().isEmpty(value); + // }, + // requiredText: true, + // ), const SizedBox(height: 10), MihTextFormField( fillColor: MzanziInnovationHub.of(context)! @@ -409,8 +423,7 @@ class _MihBusinessDetailsState extends State { typeController.text == "Doctors Office", hintText: "Practice Number", validator: (validateValue) { - return MihValidationServices() - .isEmpty(validateValue); + return null; }, ), const SizedBox(height: 10), @@ -453,7 +466,9 @@ class _MihBusinessDetailsState extends State { showDialog( context: context, builder: (context) { - return const Mihloadingcircle(); + return const Mihloadingcircle( + message: "Getting your location", + ); }, ); MIHLocationAPI() 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 ce072c29..7d20fd8c 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_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; @@ -230,7 +231,7 @@ class _ProfileBusinessAddState extends State { headerAlignment: MainAxisAlignment.center, headerItems: [ Text( - "Add Business Profile", + "Set Up Business Profile", style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25, @@ -304,17 +305,32 @@ class _ProfileBusinessAddState extends State { }, ), const SizedBox(height: 10.0), - MihDropdownField( + MihTextFormField( + fillColor: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + inputColor: MzanziInnovationHub.of(context)! + .theme + .primaryColor(), controller: typeController, + multiLineInput: false, + requiredText: true, hintText: "Business Type", - dropdownOptions: const ["Doctors Office", "Other"], - editable: true, - enableSearch: true, validator: (value) { return MihValidationServices().isEmpty(value); }, - requiredText: true, ), + // MihDropdownField( + // controller: typeController, + // hintText: "Business Type", + // dropdownOptions: const ["Doctors Office", "Other"], + // editable: true, + // enableSearch: true, + // validator: (value) { + // return MihValidationServices().isEmpty(value); + // }, + // requiredText: true, + // ), const SizedBox(height: 10.0), MihTextFormField( fillColor: MzanziInnovationHub.of(context)! @@ -430,34 +446,22 @@ class _ProfileBusinessAddState extends State { }, ), const SizedBox(height: 10.0), - ValueListenableBuilder( - valueListenable: busType, - builder: (BuildContext context, String value, - Widget? child) { - return Visibility( - visible: value == "Doctors Office", - child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! - .theme - .primaryColor(), - controller: practiceNoController, - multiLineInput: false, - requiredText: true, - hintText: "Practice Number", - validator: (validateValue) { - if (value == "Doctors Office") { - return MihValidationServices() - .isEmpty(validateValue); - } - return null; - }, - ), - ); + MihTextFormField( + fillColor: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), + inputColor: MzanziInnovationHub.of(context)! + .theme + .primaryColor(), + controller: practiceNoController, + multiLineInput: false, + requiredText: false, + hintText: "Practice Number", + validator: (validateValue) { + return null; }, ), + const SizedBox(height: 10.0), MihTextFormField( fillColor: MzanziInnovationHub.of(context)! @@ -495,6 +499,14 @@ class _ProfileBusinessAddState extends State { const SizedBox(width: 10.0), MihButton( onPressed: () { + showDialog( + context: context, + builder: (context) { + return const Mihloadingcircle( + message: "Getting your location", + ); + }, + ); MIHLocationAPI() .getGPSPosition(context) .then((position) { @@ -504,6 +516,7 @@ class _ProfileBusinessAddState extends State { "${position.latitude}, ${position.longitude}"; }); } + Navigator.of(context).pop(); }); }, buttonColor: MzanziInnovationHub.of(context)!