Merge pull request #59 from TaskarCenterAtUW/feature-tag-stepsRamp

Added tags for Steps Ramps

Author: susrisha

GoInfoGame/GoInfoGame/quests/StepsRamp/StepsRamp.swift

@@ -57,11 +57,13 @@ class StepsRamp: QuestBase, Quest {
 
     func onAnswer(answer: StepsRampAnswer) {
         if let rData = self.relationData {
-          //  self.updateTags(id: rData.id, tags: ["ramp":"s"], type: rData.type)
+            let tags = ["ramp:bicycle": answer.bicycleRamp ? "yes" : "no",
+                        "ramp:wheelchair": answer.wheelchairRamp.rawValue,
+                        "ramp:stroller": answer.strollerRamp ? "yes" : "no"]
+            self.updateTags(id: rData.id, tags: tags, type: rData.type)
         }
     }
 
-    
     func copyWithElement(element: Element) -> any Quest {
         let q = StepsRamp()
         q.relationData = element
@@ -85,8 +87,8 @@ class StepsRampAnswer {
     }
 }
 
-enum  WheelchairRampStatus {
-    case YES
-    case NO
-    case SEPARATE
+enum  WheelchairRampStatus: String {
+    case YES = "yes"
+    case NO = "no"
+    case SEPARATE = "separate"
 }

GoInfoGame/GoInfoGame/quests/StepsRamp/StepsRampForm.swift

@@ -20,15 +20,19 @@ struct StepsRampForm: View, QuestForm {
         ImageData(id:"ramp_stroller",type: "stroller", imageName: "ramp_stroller", tag: "ramp:stroller", optionName: LocalizedStrings.questStepsRampStroller.localized),
         ImageData(id:"ramp_wheelchair",type: "wheelchair", imageName: "ramp_wheelchair", tag: "ramp:wheelchair", optionName: LocalizedStrings.questStepsRampWheelchair.localized),
     ]
+    var isBicycleRamp:Bool {
+        selectedImage.contains("ramp:bicycle")
+    }
+    var isStrollerRamp:Bool {
+        selectedImage.contains("ramp:stroller")
+    }
     var body: some View {
         VStack (alignment: .leading){
             QuestionHeader(icon: Image("ic_quest_steps_ramp"), title: LocalizedStrings.questStepsRampTitle.localized, subtitle: "North 88th Street").padding(.bottom,10)
             VStack(alignment: .leading){
                 Text(LocalizedStrings.select.localized).font(.caption).foregroundColor(.gray)
                 ImageGridItemView(gridCount: 2, isLabelBelow: false, imageData: imageData, isImageRotated: false, isDisplayImageOnly: false, isScrollable: false, allowMultipleSelection: true, onTap: { (selectedImage) in
-                    print("Clicked Tag: \(selectedImage)")
                 }, selectedImages: $selectedImage)
-                
                 Divider()
                 HStack() {
                     Spacer()
@@ -43,12 +47,10 @@ struct StepsRampForm: View, QuestForm {
                     Spacer()
                     if !selectedImage.isEmpty {
                         Button() {
-                            /// applying final selected answer
                             if selectedImage.contains("ramp:wheelchair") {
                                 showWheelchairAlert = true
                             }else {
-                                //TODO: none/bicycle/stroller type answer
-                                let answer = StepsRampAnswer(bicycleRamp: true, strollerRamp: true, wheelchairRamp: .NO)
+                                let answer = StepsRampAnswer(bicycleRamp: isBicycleRamp, strollerRamp: isStrollerRamp, wheelchairRamp: .NO)
                                 action?(answer)
                             }
                         }label: {
@@ -59,10 +61,12 @@ struct StepsRampForm: View, QuestForm {
                         /// displayed only when selected answers contains wheelchair
                         .alert(LocalizedStrings.questStepsRampSeparateWheelchair.localized, isPresented: $showWheelchairAlert) {
                             Button(LocalizedStrings.questStepsRampSeparateWheelchairConfirm.localized.uppercased(), action: {
-                                //TODO: wheelchair type answer separate
+                                let answer = StepsRampAnswer(bicycleRamp: isBicycleRamp, strollerRamp: isStrollerRamp, wheelchairRamp: WheelchairRampStatus.SEPARATE)
+                                action?(answer)
                             })
                             Button(LocalizedStrings.questStepsRampSeparateWheelchairDecline.localized.uppercased(), action: {
-                                //TODO: wheelchair type answer not separate
+                                let answer = StepsRampAnswer(bicycleRamp: isBicycleRamp, strollerRamp: isStrollerRamp, wheelchairRamp: WheelchairRampStatus.YES)
+                                action?(answer)
                             })
                             /// no action to be taken
                             Button(LocalizedStrings.questGenericConfirmationNo.localized, role: .cancel, action: {})