Merge pull request #282 from bcgov/feature/validation-rework

[FIX][INSPECT-252, INSPECT-283] - Fix to Inspection Validation
bcgov · Jan 24, 2024 · 6d0e5de · 6d0e5de
2 parents 1a8d45c + 3ff55ec
commit 6d0e5de
Show file tree

Hide file tree

Showing 2 changed files with 520 additions and 300 deletions.
diff --git a/ipad/ViewControllers/Watercraft Inspections/Cells/Button/FormButtonCollectionViewCell.swift b/ipad/ViewControllers/Watercraft Inspections/Cells/Button/FormButtonCollectionViewCell.swift
@@ -52,15 +52,7 @@ class FormButtonCollectionViewCell: UICollectionViewCell, Theme {
     }
 
     var disableMajorCityButton: Bool {
-        if (dryStorageSwitch?.isOn ?? true) {
-            return false
-        } else if (unknownWaterBodySwitch?.isOn ?? true) {
-            return false
-        } else if (commercialManufacturerSwitch?.isOn ?? true) {
-            return false
-        } else {
-            return true
-        }
+        return false
     }
 
     var result: Result {
@@ -119,13 +111,12 @@ class FormButtonCollectionViewCell: UICollectionViewCell, Theme {
 
     func set(status: Bool) {
         self.button?.isEnabled = !status
-        self.majorCityButton?.isEnabled = status;
         if status {
             styleDisable(button: self.button)
             styleHollowButton(button: self.majorCityButton)
         } else {
             styleHollowButton(button: button)
-            styleDisable(button: majorCityButton)
+            styleHollowButton(button: self.majorCityButton)
         }
     }