Convert empty string checks to native property "isEmpty". simplify st…

…atus flow. convert status check for consistency
bcgov · Jun 13, 2024 · 70ddc06 · 70ddc06
1 parent ac927c8
commit 70ddc06
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 25 deletions.
diff --git a/ipad/ViewControllers/Shift/Cells/Inspections/BlowbyTableCollectionViewCell.swift b/ipad/ViewControllers/Shift/Cells/Inspections/BlowbyTableCollectionViewCell.swift
@@ -59,7 +59,7 @@ class BlowbyTableCollectionViewCell: BaseShiftOverviewCollectionViewCell {
         columns.append(TableViewColumnConfig(key: "", header: "Edit", type: .Button, buttonName: "Edit", showHeader: false))
 
         // Disable adding blowbys if not completed and hide delete button
-        if model.getStatus() != .Draft && model.getStatus() != .Errors {
+      if [.Draft, .Errors].contains(model.getStatus()) {
             columns.removeLast()
             blowByButton.alpha = 0
             blowByButton.isEnabled = false

diff --git a/ipad/ViewControllers/Shift/ShiftViewController.swift b/ipad/ViewControllers/Shift/ShiftViewController.swift
@@ -76,19 +76,15 @@ class ShiftViewController: BaseViewController {
         self.collectionView.reloadData()
         addListeners()
     }
-    /// Iterates through inspections checking formDidValidate. If any for
+    /// Iterates through inspections checking formDidValidate. If any form does validate, modifies all appropraite statuses to `.Errors`
     private func updateStatuses() {
       if(self.model!.status != "Completed"){
         if (self.model!.inspections.allSatisfy(){$0.formDidValidate}){
           self.model!.set(status: .Draft)
         } else {
           self.model!.set(status: .Draft)
           self.model!.inspections.forEach{ inspection in
-            if(inspection.formDidValidate){
-              inspection.set(status: .Draft);
-            } else {
-              inspection.set(status: .Errors);
-            }
+            inspection.set(status: inspection.formDidValidate ? .Draft : .Errors)
           }
         }
       }
@@ -277,19 +273,19 @@ class ShiftViewController: BaseViewController {
 
     // MARK: Validation
     func canSubmit() -> Bool {
-        return validationMessage() == ""
+        return validationMessage().isEmpty
     }
 
     func validationMessage() -> String {
         var message: String = ""
         guard let model = self.model else { return message }
         var counter = 1
-        if model.startTime == "" {
+        if model.startTime.isEmpty {
             message = "\(message)\n\(counter)- Missing Shift Start time."
             counter += 1
         }
 
-        if model.endTime == "" {
+        if model.endTime.isEmpty {
             message = "\(message)\n\(counter)- Missing Shift End time."
             counter += 1
         }
@@ -310,7 +306,7 @@ class ShiftViewController: BaseViewController {
         }
 
         for inspection in model.inspections {
-            if inspection.inspectionTime == "" {
+            if inspection.inspectionTime.isEmpty {
                 message = "\(message)\n\(counter)- Missing Time of Inspection."
                 counter += 1
             }

diff --git a/ipad/ViewControllers/Watercraft Inspections/WatercraftInspectionViewController.swift b/ipad/ViewControllers/Watercraft Inspections/WatercraftInspectionViewController.swift
@@ -243,7 +243,7 @@ class WatercraftInspectionViewController: BaseViewController {
     }
 
     func canSubmit() -> Bool {
-        return validationMessage() == ""
+        return validationMessage().isEmpty
     }
 
     /// Enum error cases grouped by sections for clarity
@@ -698,8 +698,8 @@ class WatercraftInspectionViewController: BaseViewController {
                 message += "\n"
             }
         }
-        model.set(value: message == "", for: "formDidValidate")
-        if (message == "") {
+        model.set(value: message.isEmpty, for: "formDidValidate")
+        if (message.isEmpty) {
           model.set(status: .Draft)
         }
 

diff --git a/ipad/Views/Form/Input Cells/InputItem.swift b/ipad/Views/Form/Input Cells/InputItem.swift
@@ -561,7 +561,7 @@ class TimeInput: InputItem {
 
     func getValue() -> Time? {
         let stringValue: String = self.value.get(type: self.type) as? String ?? ""
-        if stringValue == "" {return nil}
+        if stringValue.isEmpty {return nil}
         return Time(string: stringValue)
     }
 

diff --git a/ipad/Views/Input Modal/InputModal.swift b/ipad/Views/Input Modal/InputModal.swift
@@ -66,7 +66,7 @@ class InputModal: ModalView, Theme {
     }
 
     func validateInput(text: String) -> Bool {
-        if text.removeWhitespaces() == "" {
+        if text.removeWhitespaces().isEmpty {
             invalidInput(message: "Please enter a value")
             return false
         } else {

diff --git a/ipad/Views/Major Cities Picker/MajorCityPicker.swift b/ipad/Views/Major Cities Picker/MajorCityPicker.swift
@@ -94,7 +94,7 @@ class MajorCityPicker: UIView, Theme {
         self.searchBar.delegate = self
         self.tableView.reloadData()
         self.selectionsHeightConstraint.constant = 0
-        self.selectButton.isEnabled = !(self.selection.display == "")
+        self.selectButton.isEnabled = !(self.selection.display.isEmpty)
         searchBar.isAccessibilityElement = true
         searchBar.accessibilityLabel = "search-majorcities"
         searchBar.accessibilityValue = "search-majorcities"
@@ -142,12 +142,12 @@ class MajorCityPicker: UIView, Theme {
     }
 
     private func showOrHideSelectionsIfNeeded() {
-        let selectTitle = !(self.selection.display == "") ? "Select (1)" : "Select"
+        let selectTitle = !(self.selection.display.isEmpty) ? "Select (1)" : "Select"
         self.selectButton.setTitle(selectTitle, for: .normal)
-        self.selectButton.isEnabled = !(self.selection.display == "")
+        self.selectButton.isEnabled = !(self.selection.display.isEmpty)
         UIView.animate(withDuration: 0.3) {
-            self.selectionsHeightConstraint.constant = !(self.selection.display == "") ? 60 : 0
-            self.collectionView.alpha = !(self.selection.display == "") ? 1 : 0
+            self.selectionsHeightConstraint.constant = !(self.selection.display.isEmpty) ? 60 : 0
+            self.collectionView.alpha = !(self.selection.display.isEmpty) ? 1 : 0
             self.layoutIfNeeded()
         }
     }

diff --git a/ipad/Views/New Blowby Modal/NewBlowbyModal.swift b/ipad/Views/New Blowby Modal/NewBlowbyModal.swift
@@ -57,10 +57,10 @@ class NewBlowbyModal: ModalView, Theme {
 
         // If (Valid) Add Blowby, remove and return
         var invalidFields: [String] = []
-        if newBlowBy!.timeStamp == "" {
+        if newBlowBy!.timeStamp.isEmpty {
             invalidFields.append("Blowby Time")
         }
-        if newBlowBy!.watercraftComplexity == "" {
+        if newBlowBy!.watercraftComplexity.isEmpty {
             invalidFields.append("Watercraft Complexity")
         }
         if !invalidFields.isEmpty {

diff --git a/ipadTests/testShift.swift b/ipadTests/testShift.swift
@@ -59,7 +59,7 @@ class testShift: XCTestCase {
         vc.setup(model: shiftModel)
         shiftModel.inspections.append(createTestInspection())
         shiftModel.boatsInspected = false
-        XCTAssert(vc.canSubmit() == false && (shiftModel.startTime == "" || shiftModel.endTime == ""))
+        XCTAssert(vc.canSubmit() == false && (shiftModel.startTime.isEmpty || shiftModel.endTime.isEmpty))
     }
 
     func testValidShiftForSubmission() {
@@ -70,7 +70,7 @@ class testShift: XCTestCase {
         shiftModel.endTime = "18:00"
         shiftModel.inspections.append(createTestInspection())
         shiftModel.boatsInspected = true
-        XCTAssert(vc.canSubmit() == true && (shiftModel.startTime != "" || shiftModel.endTime != ""))
+        XCTAssert(vc.canSubmit() == true && (shiftModel.startTime.isEmpty || !shiftModel.endTime.isEmpty))
     }
 
 }