[INSPECT-313] FEATURE** Further enhance inspection validation

ipad.xcodeproj/project.pbxproj

@@ -601,7 +601,7 @@
 			path = Shift;
 			sourceTree = "<group>";
 		};
-		2944BCD62433929700826F48 /* Waterfract Inspection */ = {
+		2944BCD62433929700826F48 /* Watercraft Inspection */ = {
 			isa = PBXGroup;
 			children = (
 				294D9A872379C62F00BD4928 /* WatercraftInspectionModel.swift */,
@@ -611,7 +611,7 @@
 				298BF7CD2395D57E0072AA28 /* DestinationWaterBodyModel.swift */,
 				2944BCD8243392F600826F48 /* Form Fields */,
 			);
-			path = "Waterfract Inspection";
+			path = "Watercraft Inspection";
 			sourceTree = "<group>";
 		};
 		2944BCD8243392F600826F48 /* Form Fields */ = {

ipad/Models/Shift/ShiftModel.swift

@@ -15,6 +15,7 @@ enum SyncableItemStatus {
     case Draft
     case PendingSync
     case Completed
+    case Errors
 }
 
 /// Represents a shift model for tracking inspection details and shift information.
@@ -184,6 +185,8 @@ class ShiftModel: Object, BaseRealmObject {
             newStatus = "Pending Sync"
         case .Completed:
             newStatus = "Completed"
+        case .Errors:
+            newStatus = "Contains Errors"
         }
         do {
             let realm = try Realm()
@@ -217,6 +220,8 @@ class ShiftModel: Object, BaseRealmObject {
             return .PendingSync
         case "completed":
             return .Completed
+        case "contains errors":
+            return .Errors
         default:
             return .Draft
         }

ipad/Models/Waterfract Inspection/WatercraftInspectionModel.swift → ipad/Models/Watercraft Inspection/WatercraftInspectionModel.swift

@@ -12,6 +12,7 @@ import Realm
 import RealmSwift
 
 class WatercraftInspectionModel: Object, BaseRealmObject {
+    @objc dynamic var formDidValidate: Bool = false
     @objc dynamic var userId: String = ""
     @objc dynamic var localId: String = {
         return UUID().uuidString
@@ -190,29 +191,34 @@ class WatercraftInspectionModel: Object, BaseRealmObject {
     }
 
     func set(shouldSync should: Bool) {
-        set(status: should ? .PendingSync : .Draft )
-        do {
-            let realm = try Realm()
-            try realm.write {
-                self.shouldSync = should
-                self.status = should ? "Pending Sync" : "Draft"
+        if (formDidValidate) {
+            do {
+                let realm = try Realm()
+                try realm.write {
+                    self.shouldSync = should
+                    self.status = should ? "Pending Sync" : "Draft"
+                }
+            } catch let error as NSError {
+                print("** REALM ERROR")
+                print(error)
             }
-        } catch let error as NSError {
-            print("** REALM ERROR")
-            print(error)
+        } else {
+            // If form isn't validated, force status to Errors
+            set(status: .Errors)
         }
-        set(status: should ? .PendingSync : .Draft )
     }
 
     func set(status statusEnum: SyncableItemStatus) {
         var newStatus = "\(statusEnum)"
         switch statusEnum {
         case .Draft:
-            newStatus = "Draft"
+            newStatus = formDidValidate ? "Draft" : "Not Validated"
         case .PendingSync:
-            newStatus = "Pending Sync"
+           newStatus = formDidValidate ? "Pending Sync" : "Not Validated"
         case .Completed:
             newStatus = "Completed"
+        case .Errors:
+            newStatus = "Not Validated"
         }
         do {
             let realm = try Realm()
@@ -270,6 +276,8 @@ class WatercraftInspectionModel: Object, BaseRealmObject {
             return .PendingSync
         case "completed":
             return .Completed
+        case "not validated":
+            return .Errors
         default:
             return .Draft
         }

ipad/Services/ShiftService.swift

@@ -68,6 +68,18 @@ class ShiftService {
     ///  - then: A closure that gets called once the shift has been submitted. It receives a boolean indicating whether the operation was successful.
     public func submit(shift: ShiftModel, then: @escaping (_ success: Bool) -> Void) {
         let shiftLocalId = shift.localId
+        if(!shift.inspections.allSatisfy(){item in return item.formDidValidate}) {
+          shift.set(shouldSync: false)
+          shift.set(status: .Errors)
+          shift.inspections.forEach(){inspection in
+            if (!inspection.formDidValidate){
+              inspection.set(shouldSync: false)
+              inspection.set(status: .Errors)
+            }
+          }
+          Alert.show(title: "Submission Error", message: "A shift contains non-validated inspections, please re-visit inspections and correct outstanding issues")
+          return then(false);
+        }
         // Post call
         post(shift: shift) { (shiftId) in
             guard let remoteId = shiftId, let refetchedShift = Storage.shared.shift(withLocalId: shiftLocalId) else {

ipad/Utilities/Status Color/StatusColor.swift

@@ -18,6 +18,8 @@ class StatusColor {
             return Colors.Status.Yellow
         case "completed":
             return Colors.Status.Green
+        case "contains errors", "not validated":
+            return Colors.Status.Red
         default:
             return Colors.Status.LightGray
         }

ipad/ViewControllers/Shift/Cells/Blowbys/ShiftBlowbysHeaderCollectionViewCell.swift

@@ -17,7 +17,7 @@ class ShiftBlowBysHeaderCollectionViewCell: BaseShiftOverviewCollectionViewCell
 
     override func autofill() {
         guard let model = self.model else {return}
-        if model.getStatus() != .Draft {
+      if [.Draft, .Errors].contains(model.getStatus()) {
             addBlowByButton.alpha = 0
             addBlowByButton.isEnabled = false
         }
@@ -49,6 +49,8 @@ class ShiftBlowBysHeaderCollectionViewCell: BaseShiftOverviewCollectionViewCell
             return Colors.Status.Green
         case .Draft:
             return Colors.Status.DarkGray
+        case .Errors:
+            return Colors.Status.Red
         }
     }
 }

ipad/ViewControllers/Shift/Cells/Header/ShifOverviewHeaderCollectionViewCell.swift

@@ -26,7 +26,7 @@ class ShifOverviewHeaderCollectionViewCell: BaseShiftOverviewCollectionViewCell
         self.locationLabel.text = model.station
         self.statusLabel.text = model.status
         self.statusIndicator.backgroundColor = StatusColor.color(for: model.status)
-        if model.getStatus() != .Draft {
+        if ![.Draft, .Errors].contains(model.getStatus()) {
             addInspectionButton.alpha = 0
             addInspectionButton.isEnabled = false
         }
@@ -65,6 +65,8 @@ class ShifOverviewHeaderCollectionViewCell: BaseShiftOverviewCollectionViewCell
             return Colors.Status.Green
         case .Draft:
             return Colors.Status.DarkGray
+        case .Errors:
+            return Colors.Status.Red
         }
     }
 }

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 {
+      if ![.Draft, .Errors].contains(model.getStatus()) {
             columns.removeLast()
             blowByButton.alpha = 0
             blowByButton.isEnabled = false

ipad/ViewControllers/Shift/Cells/Inspections/InspectionsTableCollectionViewCell.swift

@@ -47,7 +47,7 @@ class InspectionsTableCollectionViewCell: BaseShiftOverviewCollectionViewCell {
         tableHeightConstraint.constant = InspectionsTableCollectionViewCell.getTableHeight(for: model)
 
         var buttonName = "View"
-        if model.getStatus() == .Draft {
+        if [.Draft, .Errors].contains(model.getStatus()) {
             buttonName = "Edit"
         }
 

ipad/ViewControllers/Shift/ShiftViewController.swift

@@ -66,16 +66,32 @@ class ShiftViewController: BaseViewController {
     }
 
     override func viewWillDisappear(_ animated: Bool) {
-        print(self)
         NotificationCenter.default.removeObserver(self)
     }
 
     override func viewWillAppear(_ animated: Bool) {
+        self.updateStatuses();
         setupCollectionView()
         self.collectionView.reloadData()
         addListeners()
     }
-
+    /// Iterates through inspections checking formDidValidate. If any form does validate, modifies all appropraite statuses to `.Errors`
+    private func updateStatuses() {
+        guard let model = self.model else { return }
+        if(model.status != "Completed"){
+            if (model.inspections.allSatisfy(){$0.formDidValidate}){
+                model.set(status: .Draft)
+                model.inspections.forEach { inspection in
+                    inspection.set(status: .Draft)
+                }
+            } else {
+                model.set(status: .Errors)
+                model.inspections.forEach { inspection in
+                    inspection.set(status: inspection.formDidValidate ? .Draft : .Errors)
+                }
+            }
+        }
+    }
     private func addListeners() {
         NotificationCenter.default.removeObserver(self, name: .TableButtonClicked, object: nil)
         NotificationCenter.default.removeObserver(self, name: .InputItemValueChanged, object: nil)
@@ -96,7 +112,7 @@ class ShiftViewController: BaseViewController {
       blowbyModal.initialize(shift: currentShiftModel, delegate: self, onStart: { [weak self] (model) in
         guard self != nil else { return }
       }) {
-          // Canceled
+          // Cancelled
       }
   }
 
@@ -107,7 +123,7 @@ class ShiftViewController: BaseViewController {
 
     func setup(model: ShiftModel) {
         self.model = model
-        self.isEditable = model.getStatus() == .Draft ||  model.getStatus() == .PendingSync
+        self.isEditable = [.Draft, .PendingSync, .Errors].contains(model.getStatus())
         if model.getStatus() == .PendingSync {
             model.set(shouldSync: false)
             for inspection in model.inspections {
@@ -116,8 +132,8 @@ class ShiftViewController: BaseViewController {
             Alert.show(title: "Changed to draft", message: "Status changed to draft. tap submit when you've made your changes.")
         }
 
-        if model.getStatus() == .Draft {
-            // make sure inspections are editable. 
+      if [.Draft, .Errors].contains(model.getStatus()) {
+            // make sure inspections are editable.
             for inspection in model.inspections {
                 inspection.set(shouldSync: false)
             }
@@ -177,12 +193,14 @@ class ShiftViewController: BaseViewController {
     @objc func completeAction(sender: UIBarButtonItem) {
         guard let model = self.model else { return }
         self.dismissKeyboard()
+
+        self.updateStatuses()
         // if can submit
         var alertMessage = "This shift and the inspections will be uploaded when possible"
         if model.shiftStartDate < Calendar.current.startOfDay(for: Date()) {
             alertMessage += "\n\n You've entered a date that occurred before today. If this was intentional, no problem! Otherwise, please double-check the entered date: \n\(model.shiftStartDate.stringShort())"
         }
-        if canSubmit() {
+        if canSubmit() && model.inspections.allSatisfy({ $0.formDidValidate }) {
             Alert.show(title: "Are you sure?", message: alertMessage, yes: {[weak self] in
                 guard let strongSelf = self else { return }
                 model.set(shouldSync: true)
@@ -253,7 +271,7 @@ class ShiftViewController: BaseViewController {
         navigation.navigationBar.tintColor = .white
         navigation.navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white]
         setGradiantBackground(navigationBar: navigation.navigationBar)
-        if let model = self.model, model.getStatus() == .Draft {
+        if let model = self.model, [.Draft, .Errors].contains(model.getStatus()) {
             setRightNavButtons()
         }
     }
@@ -268,19 +286,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
         }
@@ -306,7 +324,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
             }
@@ -343,6 +361,17 @@ class ShiftViewController: BaseViewController {
                 }
             }
         }
+
+        // Check for invalid inspections
+        let invalidInspections = model.inspections.filter { !$0.formDidValidate }
+        if !invalidInspections.isEmpty {
+            message = "\(message)\n\(counter)- One or more inspections contain validation errors. Please review each inspection."
+            counter += 1
+        }
+
+        if !message.isEmpty {
+            model.set(status: .Errors)
+        }
 
         return message
     }

ipad/ViewControllers/Watercraft Inspections/WatercraftInspectionViewController.swift

@@ -94,8 +94,9 @@ class WatercraftInspectionViewController: BaseViewController {
 
     // MARK: Setup
     func setup(model: WatercraftInspectionModel) {
+        model.set(value: false, for: "formDidValidate")
         self.model = model
-        self.isEditable = model.getStatus() == .Draft
+        self.isEditable = [.Draft, .Errors].contains(model.getStatus())
         self.styleNavBar()
         if !model.isPassportHolder || model.launchedOutsideBC || model.isNewPassportIssued {
             self.showFullInspection = true
@@ -169,7 +170,7 @@ class WatercraftInspectionViewController: BaseViewController {
         navigation.navigationBar.tintColor = .white
         navigation.navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white]
         setGradiantBackground(navigationBar: navigation.navigationBar)
-        if let model = self.model, model.getStatus() == .Draft {
+        if let model = self.model, [.Draft, .Errors].contains(model.getStatus()) {
             setRightNavButtons()
             setLeftNavButtons()
         }
@@ -243,7 +244,7 @@ class WatercraftInspectionViewController: BaseViewController {
     }
 
     func canSubmit() -> Bool {
-        return validationMessage() == ""
+        return validationMessage().isEmpty
     }
 
     /// Enum error cases grouped by sections for clarity
@@ -698,7 +699,11 @@ class WatercraftInspectionViewController: BaseViewController {
                 message += "\n"
             }
         }
-
+        model.set(value: message.isEmpty, for: "formDidValidate")
+        if (message.isEmpty) {
+          model.set(status: .Draft)
+        }
+
         return message
     }
 

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)
     }
 

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 {