save plaintext for activity template too

STEM-C · Sep 6, 2024 · b796890 · b796890
1 parent 6eb0513
commit b796890
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 5 deletions.
diff --git a/client/src/Utils/requests.js b/client/src/Utils/requests.js
@@ -580,12 +580,13 @@ export const updateSessionArduino = async(id, arduino) =>
     error: 'stuff did not work lol'
   });
 
-  export const updateDayArduino = async(id, arduino) =>
+  export const updateDayArduino = async(id, arduino,arduinoanswer) =>
     makeRequest({
       method: PUT,
       path: `${server}/days/arduino/${id}`,
       data: {
-        arduino
+        arduino,
+        arduinoanswer
       },
       auth: true,
       error: 'stuff did not work lol'

diff --git a/client/src/views/Researcher/dayz.jsx b/client/src/views/Researcher/dayz.jsx
@@ -53,7 +53,7 @@ export default function CodeDayz() {
             //console.log(response.data.template);
 
             //console.log(getArduinoXML(response.data.template, workspaceRef.current));
-            updateDayArduino(parseInt(rID.value), getArduinoXML(response.data.template, workspaceRef.current))
+            updateDayArduino(parseInt(rID.value), getArduinoXML(response.data.template, workspaceRef.current), getArduinoXML(response.data.activity_template, workspaceRef.current))
                 .catch(error => {
                     console.log(error)
                 });

diff --git a/server/api/day/controllers/day.js b/server/api/day/controllers/day.js
@@ -112,11 +112,12 @@ module.exports = {
 
   async arduinoUpdate(ctx) {
     const {id} = ctx.params;
-    const {arduino} = ctx.request.body;
+    const {arduino, arduinoanswer} = ctx.request.body;
     const day = await strapi.services.day.findOne({ id });
     //console.log(session)
     //console.log(arduino)
     day.template_code = arduino;
+    day.template_code_answer = arduinoanswer;
     const updatedDay = await strapi.services.day.update({id}, day);
     return updatedDay
 

diff --git a/server/api/day/documentation/1.0.0/day.json b/server/api/day/documentation/1.0.0/day.json
@@ -892,6 +892,9 @@
           "template_code": {
             "type": "string"
           },
+          "template_code_answer": {
+            "type": "string"
+          },
           "blocks": {
             "type": "array",
             "items": {
@@ -993,6 +996,9 @@
           "template_code": {
             "type": "string"
           },
+          "template_code_answer": {
+            "type": "string"
+          },
           "blocks": {
             "type": "array",
             "items": {

diff --git a/server/api/day/models/day.settings.json b/server/api/day/models/day.settings.json
@@ -27,6 +27,10 @@
       "type": "text",
       "required": false
     },
+    "template_code_answer": {
+      "type": "text",
+      "required": false
+    },
     "blocks": {
       "collection": "block"
     },

diff --git a/server/api/learning-components/documentation/1.0.0/learning-components.json b/server/api/learning-components/documentation/1.0.0/learning-components.json
@@ -562,6 +562,9 @@
                 "template_code": {
                   "type": "string"
                 },
+                "template_code_answer": {
+                  "type": "string"
+                },
                 "blocks": {
                   "type": "array",
                   "items": {

diff --git a/server/api/learning-standard/documentation/1.0.0/learning-standard.json b/server/api/learning-standard/documentation/1.0.0/learning-standard.json
@@ -570,6 +570,9 @@
                 "template_code": {
                   "type": "string"
                 },
+                "template_code_answer": {
+                  "type": "string"
+                },
                 "blocks": {
                   "type": "array",
                   "items": {

diff --git a/server/api/save/documentation/1.0.0/save.json b/server/api/save/documentation/1.0.0/save.json
@@ -613,6 +613,9 @@
               "template_code": {
                 "type": "string"
               },
+              "template_code_answer": {
+                "type": "string"
+              },
               "blocks": {
                 "type": "array",
                 "items": {

diff --git a/server/api/submission/documentation/1.0.0/submission.json b/server/api/submission/documentation/1.0.0/submission.json
@@ -627,6 +627,9 @@
               "template_code": {
                 "type": "string"
               },
+              "template_code_answer": {
+                "type": "string"
+              },
               "blocks": {
                 "type": "array",
                 "items": {

diff --git a/server/extensions/documentation/documentation/1.0.0/full_documentation.json b/server/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "09/05/2024 8:56:36 PM"
+    "x-generation-date": "09/06/2024 9:04:56 PM"
   },
   "x-strapi-config": {
     "path": "/documentation",
@@ -12577,6 +12577,9 @@
           "template_code": {
             "type": "string"
           },
+          "template_code_answer": {
+            "type": "string"
+          },
           "blocks": {
             "type": "array",
             "items": {
@@ -12678,6 +12681,9 @@
           "template_code": {
             "type": "string"
           },
+          "template_code_answer": {
+            "type": "string"
+          },
           "blocks": {
             "type": "array",
             "items": {
@@ -12971,6 +12977,9 @@
                 "template_code": {
                   "type": "string"
                 },
+                "template_code_answer": {
+                  "type": "string"
+                },
                 "blocks": {
                   "type": "array",
                   "items": {
@@ -13110,6 +13119,9 @@
                 "template_code": {
                   "type": "string"
                 },
+                "template_code_answer": {
+                  "type": "string"
+                },
                 "blocks": {
                   "type": "array",
                   "items": {
@@ -13453,6 +13465,9 @@
               "template_code": {
                 "type": "string"
               },
+              "template_code_answer": {
+                "type": "string"
+              },
               "blocks": {
                 "type": "array",
                 "items": {
@@ -14560,6 +14575,9 @@
               "template_code": {
                 "type": "string"
               },
+              "template_code_answer": {
+                "type": "string"
+              },
               "blocks": {
                 "type": "array",
                 "items": {