Merge pull request #291 from TaskarCenterAtUW/task-2367-longform-3-0-0

Task 2367 longform 3 0 0

Author: srikanth-vg

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -2918,7 +2918,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-l\"c++\"",
@@ -2982,7 +2982,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-l\"c++\"",

GoInfoGame/GoInfoGame/quests/LongQuests/Components/QuestOptions.swift

@@ -35,6 +35,10 @@ struct QuestOptions: View {
             NumericInputView(
                 selectedChoice: $selectedChoice
             )
+        case .textEntry:
+            TextEntryView(
+                selectedChoice: $selectedChoice
+            )
         }
     }
 }
@@ -217,6 +221,41 @@ private extension QuestOptions {
             }
         }
     }
+    
+    struct TextEntryView: View {
+        @Binding var selectedChoice: QuestAnswerChoice?
+        let maxLenth: Int = 255
+        
+        private var currentValue: String {
+            selectedChoice?.value ?? ""
+        }
+        
+        var body: some View {
+            ZStack(alignment: .bottomTrailing) {
+                TextEditor(text: Binding(
+                    get: { selectedChoice?.value ?? "" },
+                    set: { newValue in
+                        let truncatedValue = String(newValue.prefix(maxLenth))
+                        if truncatedValue.isEmpty {
+                            selectedChoice = nil
+                        } else {
+                            let answer = QuestAnswerChoice(value: truncatedValue, choiceText: truncatedValue, imageURL: nil, choiceFollowUp: nil)
+                            selectedChoice = answer
+                        }
+                    }
+                ))
+                .frame(height: 100)
+                .keyboardType(UIKeyboardType.default)
+                .border(Color.gray)
+                
+                Text("\(currentValue.count) / \(maxLenth)")
+                    .font(.caption)
+                    .foregroundColor(.gray)
+                    .padding(5)
+                    .background(Color.white.opacity(0.5))
+            }
+        }
+    }
 
     struct ExpandedImageView: View {
         let imageUrl: String

GoInfoGame/GoInfoGame/quests/LongQuests/Model/LongFormModel.swift

@@ -69,7 +69,7 @@ struct LongQuest: Codable, Identifiable {
     var questAnswerChoices: [QuestAnswerChoice]?
     var questImageURL: String?
     var questAnswerValidation: QuestAnswerValidation?
-    var questAnswerDependency: QuestAnswerDependency?
+    var questAnswerDependency: [QuestAnswerDependency]?
     var questUserAnswer : String?
 
     func getFormValue() ->[String:String?] {
@@ -87,6 +87,27 @@ struct LongQuest: Codable, Identifiable {
         case questAnswerValidation = "quest_answer_validation"
         case questAnswerDependency = "quest_answer_dependency"
     }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        questID = try container.decode(Int.self, forKey: .questID)
+        questTitle = try container.decode(String.self, forKey: .questTitle)
+        questDescription = try container.decode(String.self, forKey: .questDescription)
+        questType = try container.decode(QuestType.self, forKey: .questType)
+        questTag = try container.decode(String.self, forKey: .questTag)
+        questAnswerChoices = try container.decodeIfPresent([QuestAnswerChoice].self, forKey: .questAnswerChoices)
+        questImageURL = try container.decodeIfPresent(String.self, forKey: .questImageURL)
+        questAnswerValidation = try container.decodeIfPresent(QuestAnswerValidation.self, forKey: .questAnswerValidation)
+        
+        // Handle questAnswerDependency which can be an object or an array
+        if let singleDependency = try? container.decodeIfPresent(QuestAnswerDependency.self, forKey: .questAnswerDependency) {
+            questAnswerDependency = [singleDependency]
+        } else if let multipleDependencies = try? container.decodeIfPresent([QuestAnswerDependency].self, forKey: .questAnswerDependency) {
+            questAnswerDependency = multipleDependencies
+        } else {
+            questAnswerDependency = nil
+        }
+    }
 
     func getQtype() -> QuestType {
         if (self.questType == .exclusiveChoice) {
@@ -136,6 +157,7 @@ enum QuestType: String, Codable {
     case exclusiveChoice = "ExclusiveChoice"
     case numeric = "Numeric"
     case multipleChoice = "MultipleChoice"
+    case textEntry = "TextEntry"
 //    case excWithImg = "ExclusiveChoiceWithImg"
 }
 

GoInfoGame/GoInfoGame/quests/LongQuests/View/LongForm.swift

@@ -161,7 +161,7 @@ struct LongForm: View, QuestForm {
 
                 VStack {
                     List {
-                        if let quests = questsForLongForm() {
+                        if let quests = questsForLongForm()?.quests {
                             ForEach(quests, id: \.questID) { quest in
                                 if viewModel.shouldShowQuest(quest) {
                                     LongQuestView(quest: quest, selectedChoice: binding(for: quest), uploadPhoto:  { result in
@@ -324,8 +324,10 @@ struct LongForm: View, QuestForm {
         })
     }
 
-    func questsForLongForm() -> [LongQuest]? {
-        return QuestsRepository.shared.questsForQuery(query ?? "")       
+    func questsForLongForm() -> LongFormElement? {
+        let element = QuestsRepository.shared.questElementForQuery(query ?? "")
+        viewModel.longForm = element
+        return element
     }
 
     private func binding(for quest: LongQuest) -> Binding<QuestAnswerChoice?> {
@@ -339,13 +341,110 @@ struct LongForm: View, QuestForm {
 }
 
 #Preview {
-    let quest = LongFormElement(elementType: "Sidewalks", questQuery: "ways with (highway=footway and footway=sidewalk)", elementTypeIcon: "icon", quests: [LongQuest(questID: 14,
-                                                                                                                           questTitle: "Does the length of this crossing allow for safe navigation?",
-                                                                                                                           questDescription: "Determine whether this crossing is short enough to cross safely.",
-                                                                                                                           questType: .exclusiveChoice,
-                                                                                                                           questTag: "ext:crossing_adequate_length",
-                                                                                                                           questAnswerChoices: [QuestAnswerChoice(value: "yes", choiceText: "Yes, this roadway can be crossed safely. this is to test the line limit functionlity. want to see the max capability of this feature. the max lines should be 10. this is for our obervations only. till now it is able to render 10 lines with out any issue.", imageURL: nil, choiceFollowUp: nil),
-                                                                                                                                                QuestAnswerChoice(value: "no", choiceText: "No, this roadway is too wide to cross safely.", imageURL: nil, choiceFollowUp: nil)], questImageURL: nil, questAnswerValidation: nil, questAnswerDependency: nil, questUserAnswer: nil)])
+    let jsonString = """
+        {
+              "element_type": "Crossings",
+              "element_type_icon": "pedestrian_crossing",
+              "quest_query": "ways with (highway=footway and footway=crossing)",
+              "quests": [
+                {
+                  "quest_id": 201,
+                  "quest_title": "Does this crossing have markings on the roadway?",
+                  "quest_description": "Check if there are roadway markings present at this crossing.",
+                  "quest_type": "ExclusiveChoice",
+                  "quest_tag": "crossing:markings",
+                  "quest_answer_choices": [
+                    {
+                      "value": "no",
+                      "choice_text": "No",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/markings/no_square.png"
+                    },
+                    {
+                      "value": "yes",
+                      "choice_text": "Yes",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/markings/zebra_square.png"
+                    }
+                  ]
+                },
+                {
+                  "quest_id": 202,
+                  "quest_title": "Does this crossing have signals for pedestrians?",
+                  "quest_description": "Indicate whether this crossing has pedestrian signals.",
+                  "quest_type": "ExclusiveChoice",
+                  "quest_tag": "ext:crossing:signals",
+                  "quest_answer_choices": [
+                    {
+                      "value": "no",
+                      "choice_text": "No",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/markings/no_2_square.png"
+                    },
+                    {
+                      "value": "yes",
+                      "choice_text": "Yes",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/signals/arrow/yes_square.png"
+                    }
+                  ]
+                },
+                {
+                  "quest_id": 203,
+                  "quest_title": "What accessibility features are present at this signalized crossing?",
+                  "quest_description": "Select all accessibility features present at this signalized crossing.",
+                  "quest_type": "MultipleChoice",
+                  "quest_tag": "ext:crossing:signals:features",
+                  "quest_answer_dependency": [
+                    {
+                      "question_id": 202,
+                      "required_value": "yes"
+                    }
+                  ],
+                  "quest_answer_choices": [
+                    {
+                      "value": "button",
+                      "choice_text": "Button",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/signals/arrow/yes_square.png"
+                    },
+                    {
+                      "value": "arrow",
+                      "choice_text": "Tactile Arrow",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/signals/arrow/yes_square.png"
+                    },
+                    {
+                      "value": "sound",
+                      "choice_text": "Sound",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/signals/sound/yes_square.png"
+                    },
+                    {
+                      "value": "vibration",
+                      "choice_text": "Tactile Vibration",
+                      "image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/crossing/signals/vibration/yes_square.png"
+                    }
+                  ]
+                },
+                {
+                  "quest_id": 204,
+                  "quest_title": "How many lanes are crossed at this crossing?",
+                  "quest_description": "Count the total number of traffic lanes crossed at this crossing.",
+                  "quest_type": "Numeric",
+                  "quest_tag": "ext:crossing:count_lanes_crossed",
+                  "quest_answer_validation": {
+                    "min": 1,
+                    "max": 10
+                  }
+                },
+                {
+                  "quest_id": 205,
+                  "quest_title": "Additional crossing notes...",
+                  "quest_description": "Add any additional observations you'd like to record about this crossing",
+                  "quest_type": "TextEntry",
+                  "quest_tag": "ext:crossing:description"
+                }
+              ]
+            }
+        """
+    
+    guard let quest = try? JSONDecoder().decode(LongFormElement.self, from: jsonString.data(using: .utf8)!) else {
+        return Text("Error parsing JSON")
+    }
     QuestsRepository.shared.longQuestModels.append(quest)
     return LongForm(elementName: quest.elementType, questID: "questId",query: quest.questQuery, action: { tags in
                 })

GoInfoGame/GoInfoGame/quests/LongQuests/View/LongQuestView.swift

@@ -54,16 +54,19 @@ struct LongQuestView: View {
 }
 
 #Preview {
-    let longQeust = LongQuest(questID: 14,
-                              questTitle: "Does the length of this crossing allow for safe navigation?",
-                              questDescription: "Determine whether this crossing is short enough to cross safely.",
-                              questType: .exclusiveChoice,
-                              questTag: "ext:crossing_adequate_length",
-                              questAnswerChoices: [QuestAnswerChoice(value: "yes", choiceText: "Yes, this roadway can be crossed safely.", imageURL: nil, choiceFollowUp: nil),
-                                                   QuestAnswerChoice(value: "no", choiceText: "No, this roadway is too wide to cross safely.", imageURL: nil, choiceFollowUp: nil)], questImageURL: nil, questAnswerValidation: nil, questAnswerDependency: nil, questUserAnswer: nil)
-    
-    
-    LongQuestView(quest: longQeust, selectedChoice: .constant(nil), uploadPhoto: { s in
+    let jsonString = """
+{
+                    "quest_id": 205,
+                    "quest_title": "Additional crossing notes...",
+                    "quest_description": "Add any additional observations you'd like to record about this crossing",
+                    "quest_type": "TextEntry",
+                    "quest_tag": "ext:crossing:description",
+"quest_image_url": "https://raw.githubusercontent.com/TaskarCenterAtUW/tdei-tools/main/images/kerb/lowered_landscape.png"
+                }
+"""
+    if let longQeust = try? JSONDecoder().decode(LongQuest.self, from: jsonString.data(using: .utf8)!) {
+        LongQuestView(quest: longQeust, selectedChoice: .constant(nil), uploadPhoto: { s in
 
-    })
+            })
+    }
 }

GoInfoGame/GoInfoGame/quests/LongQuests/ViewModel/LongFormViewModel.swift

@@ -8,15 +8,26 @@
 import Foundation
 
 class LongFormViewModel: ObservableObject {
-    @Published var longForm: LongFormElement?
+    var longForm: LongFormElement?
     @Published var selectedChoices: [Int: QuestAnswerChoice?] = [:]
 
     init() {}
 
      func shouldShowQuest(_ quest: LongQuest) -> Bool {
-        guard let dependency = quest.questAnswerDependency else {
-            return true
-        }
+         guard let dependencies = quest.questAnswerDependency else {
+             return true
+         }
+         var dependencyResult: Bool = true
+         for dependency in dependencies {
+             dependencyResult = dependencyResult && checkDependency(dependency)
+             if !dependencyResult {
+                 return dependencyResult
+             }
+         }
+         return dependencyResult
+    }
+    
+    func checkDependency(_ dependency: QuestAnswerDependency) -> Bool {
         if let answeredChoiceOptional = selectedChoices[dependency.questionID],
            let answeredChoice = answeredChoiceOptional,
            !answeredChoice.value.isEmpty {

GoInfoGame/GoInfoGame/quests/QuestsRepository.swift

@@ -148,8 +148,8 @@ extension QuestsRepository {
         return longQuestModels.first(where: { $0.elementType.lowercased() == elementType.lowercased() })?.questQuery
     }
 
-    func questsForQuery(_ query: String) -> [LongQuest]? {
-        return longQuestModels.first(where: {$0.questQuery == query})?.quests
+    func questElementForQuery(_ query: String) -> LongFormElement? {
+        return longQuestModels.first(where: {$0.questQuery == query})
     }
 }