resolved merge conflicts

chingu-x · May 6, 2024 · 65f96ac · 65f96ac
2 parents 0ffaf9d + 61ddd65
commit 65f96ac
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@ Another example [here](https://co-pilot.dev/changelog)
 - Updated response for route GET sprints/meetings/{meetingId} to include updatedAt for agendas [#140](https://github.com/chingu-x/chingu-dashboard-be/pull/140)
 - Update test github actions workflow with timeout [#143](https://github.com/chingu-x/chingu-dashboard-be/pull/143)
 - Refractor of all form title reference to use values from formTitle.ts [#145](https://github.com/chingu-x/chingu-dashboard-be/pull/145)
+- Update/Add more form input types [#146](https://github.com/chingu-x/chingu-dashboard-be/pull/146)
 
 ### Fixed
 

diff --git a/prisma/seed/data/input-types.ts b/prisma/seed/data/input-types.ts
@@ -2,9 +2,18 @@ export default [
     {
         name: "text",
     },
+    {
+        name: "shortText",
+    },
+    {
+        name: "url",
+    },
     {
         name: "radio",
     },
+    {
+        name: "radioIcon",
+    },
     {
         name: "radioGroup",
     },
@@ -15,9 +24,12 @@ export default [
         name: "number",
     },
     {
-        name: "yesNo",
+        name: "boolean",
     },
     {
         name: "teamMembersCheckbox",
     },
+    {
+        name: "scale",
+    },
 ];
diff --git a/prisma/seed/forms/checkinform.ts b/prisma/seed/forms/checkinform.ts
@@ -85,7 +85,7 @@ export const populateCheckinForm = async () => {
                         order: 4,
                         inputType: {
                             connect: {
-                                name: "radio",
+                                name: "radioIcon",
                             },
                         },
                         text: "How would you rate your team's progress right now?",
@@ -97,13 +97,13 @@ export const populateCheckinForm = async () => {
                                     createMany: {
                                         data: [
                                             {
-                                                text: "We have had a good start!",
+                                                text: "{{greenRocket}} We have had a good start!",
                                             },
                                             {
-                                                text: "I'm nervous we won't finish",
+                                                text: "{{amberRocket}} I'm nervous we won't finish",
                                             },
                                             {
-                                                text: "It doesn't look good right now",
+                                                text: "{{redRocket}} It doesn't look good right now",
                                             },
                                         ],
                                     },
@@ -151,10 +151,10 @@ export const populateCheckinForm = async () => {
                         order: 5,
                         inputType: {
                             connect: {
-                                name: "yesNo",
+                                name: "boolean",
                             },
                         },
-                        text: "Did you deploy to Production at the end of this Sprint",
+                        text: "{{Yes,No}}Did you deploy to Production at the end of this Sprint",
                         answerRequired: true,
                     },
                     {

diff --git a/prisma/seed/forms/voyage-project-submission.ts b/prisma/seed/forms/voyage-project-submission.ts
@@ -90,10 +90,10 @@ export const populateVoyageSubmissionForm = async () => {
                         order: 8,
                         inputType: {
                             connect: {
-                                name: "radio",
+                                name: "scale",
                             },
                         },
-                        text: "On a scale of 0-10, how likely are you to suggest Chingu to a friend or colleague?",
+                        text: "{{Not Likely,Extremely Likely}}On a scale of 0-10, how likely are you to suggest Chingu to a friend or colleague?",
                         answerRequired: true,
                         optionGroup: {
                             create: {

diff --git a/prisma/seed/responses/helper.ts b/prisma/seed/responses/helper.ts
@@ -72,7 +72,8 @@ export const populateQuestionResponses = async (
         responseGroupId: responseGroupId,
     };
     switch (question.inputType.name) {
-        case "text": {
+        case "text":
+        case "shortText": {
             await prisma.response.create({
                 data: {
                     ...data,
@@ -81,6 +82,8 @@ export const populateQuestionResponses = async (
             });
             break;
         }
+        case "scale":
+        case "radioIcon":
         case "radio": {
             const radioChoices = await getRandomOptionId(
                 question.optionGroupId,
@@ -174,7 +177,7 @@ export const populateQuestionResponses = async (
             });
             break;
         }
-        case "yesNo": {
+        case "boolean": {
             await prisma.response.create({
                 data: {
                     ...data,