diff --git a/Frontend/patient_manager/lib/components/prescipInput.dart b/Frontend/patient_manager/lib/components/prescipInput.dart index 41514392..65452026 100644 --- a/Frontend/patient_manager/lib/components/prescipInput.dart +++ b/Frontend/patient_manager/lib/components/prescipInput.dart @@ -145,6 +145,7 @@ class _PrescripInputState extends State { hintText: "Quantity", dropdownOptions: numberOptions, required: true, + editable: true, ), ), const SizedBox(height: 25.0), @@ -155,6 +156,7 @@ class _PrescripInputState extends State { hintText: "Dosage", dropdownOptions: numberOptions, required: true, + editable: true, ), ), const SizedBox(height: 25.0), @@ -165,6 +167,7 @@ class _PrescripInputState extends State { hintText: "Times Daily", dropdownOptions: numberOptions, required: true, + editable: true, ), ), const SizedBox(height: 25.0), @@ -175,6 +178,7 @@ class _PrescripInputState extends State { hintText: "No. Days", dropdownOptions: numberOptions, required: true, + editable: true, ), ), const SizedBox(height: 25.0), @@ -185,6 +189,7 @@ class _PrescripInputState extends State { hintText: "No. Repeats", dropdownOptions: numberOptions, required: true, + editable: true, ), ), SizedBox( diff --git a/Frontend/patient_manager/lib/pages/patientAdd.dart b/Frontend/patient_manager/lib/pages/patientAdd.dart index 0f789c10..3114d6d8 100644 --- a/Frontend/patient_manager/lib/pages/patientAdd.dart +++ b/Frontend/patient_manager/lib/pages/patientAdd.dart @@ -261,8 +261,8 @@ class _AddPatientState extends State { Expanded( child: MyDropdownField( controller: medAidController, - hintText: "Has Medical Aid", - //editable: true, + hintText: "Medical Aid", + editable: true, onSelect: (_) { isRequired(); }, @@ -279,7 +279,7 @@ class _AddPatientState extends State { child: MyDropdownField( controller: medMainMemController, hintText: "Main Member", - //editable: true, + editable: medRequired, required: medRequired, dropdownOptions: const ["Yes", "No"], ), diff --git a/Frontend/patient_manager/lib/pages/patientEdit.dart b/Frontend/patient_manager/lib/pages/patientEdit.dart index e490a6b1..c6dd2f96 100644 --- a/Frontend/patient_manager/lib/pages/patientEdit.dart +++ b/Frontend/patient_manager/lib/pages/patientEdit.dart @@ -473,11 +473,19 @@ class _EditPatientState extends State { Expanded( child: MyDropdownField( controller: medAidController, - hintText: "Has Medical Aid", - onSelect: (_) { - isRequired(); + hintText: "Medical Aid", + onSelect: (selected) { + if (selected == "Yes") { + setState(() { + medRequired = true; + }); + } else { + setState(() { + medRequired = false; + }); + } }, - //editable: true, + editable: true, required: true, dropdownOptions: const ["Yes", "No"], ), @@ -491,7 +499,7 @@ class _EditPatientState extends State { child: MyDropdownField( controller: medMainMemController, hintText: "Main Member.", - //editable: true, + editable: medRequired, required: medRequired, dropdownOptions: const ["Yes", "No"], ), @@ -505,7 +513,7 @@ class _EditPatientState extends State { child: MyTextField( controller: medNoController, hintText: "Medical Aid No.", - editable: true, + editable: medRequired, required: medRequired, ), ), @@ -518,7 +526,7 @@ class _EditPatientState extends State { child: MyTextField( controller: medAidCodeController, hintText: "Medical Aid Code", - editable: true, + editable: medRequired, required: medRequired, ), ), @@ -531,7 +539,7 @@ class _EditPatientState extends State { child: MyTextField( controller: medNameController, hintText: "Medical Aid Name", - editable: true, + editable: medRequired, required: medRequired, ), ), @@ -544,7 +552,7 @@ class _EditPatientState extends State { child: MyTextField( controller: medSchemeController, hintText: "Medical Aid Scheme", - editable: true, + editable: medRequired, required: medRequired, ), ),