Revert "added skills question as checkbox"

This reverts commit 48cc614.
ubc-biztech · Aug 3, 2023 · 62e01f7 · 62e01f7
1 parent 48cc614
commit 62e01f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/src/pages/admin/DynamicForm/FormCreate.js b/src/pages/admin/DynamicForm/FormCreate.js
@@ -801,8 +801,7 @@ const FormCreate = (props) => {
     type: Yup.mixed().oneOf(["TEXT", "SELECT", "CHECKBOX", "UPLOAD"]).required(),
     label: Yup.string().required("Question is a required field"),
     choices: Yup.string(),
-    required: Yup.boolean().required(),
-    isSkillsQuestion: Yup.boolean()
+    required: Yup.boolean().required()
   });
 
   const validationSchema = Yup.object({

diff --git a/src/pages/admin/DynamicForm/components/CustomQuestion.js b/src/pages/admin/DynamicForm/components/CustomQuestion.js
@@ -57,7 +57,7 @@ const CustomQuestion = (props) => {
   } = props;
 
   const {
-    type, label, choices, questionImageUrl, charLimit, required, isSkillsQuestion
+    type, label, choices, questionImageUrl, charLimit, required
   } = props.data;
   const questionStyles = {
     // -------- QUESTION COMPONENT STYLES ----------
@@ -100,16 +100,11 @@ const CustomQuestion = (props) => {
       flexDirection: "column",
       justifyContent: "center"
     },
-    checkboxContainer: {
+    requiredContainer: {
       display: "flex",
       justifyContent: "flex-end",
       alignItems: "center",
       color: "rgba(255,255,255,0.8)"
-    },
-    checkboxWrapper: {
-      display: "flex",
-      flexDirection: "row",
-      justifyContent: "flex-end"
     }
   };
 
@@ -245,31 +240,18 @@ const CustomQuestion = (props) => {
             value={choices}
           />
         )}
-        <div style={questionStyles.checkboxWrapper}>
-          <div style={questionStyles.checkboxContainer}>
-          Skills Question?
-            <Checkbox
-              id={`${id}.isSkillsQuestion`}
-              name={`${name}.isSkillsQuestion`}
-              color="primary"
-              aria-label="Skills question?"
-              checked={isSkillsQuestion}
-              onChange={handleChange}
-              onBlur={handleBlur}
-            />
-          </div>
-          <div style={questionStyles.checkboxContainer}>
+
+        <div style={questionStyles.requiredContainer}>
           Required?
-            <Checkbox
-              id={`${id}.required`}
-              name={`${name}.required`}
-              color="primary"
-              aria-label="Required question?"
-              checked={required}
-              onChange={handleChange}
-              onBlur={handleBlur}
-            />
-          </div>
+          <Checkbox
+            id={`${id}.required`}
+            name={`${name}.required`}
+            color="primary"
+            aria-label="Required question?"
+            checked={required}
+            onChange={handleChange}
+            onBlur={handleBlur}
+          />
         </div>
       </div>
     </div>