Merge branch 'please-stop-messing-this-up' into develop

STEM-C · Mar 6, 2024 · 25ea0bc · 25ea0bc
2 parents bf0b4c1 + 92a3321
commit 25ea0bc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/client/src/views/ContentCreator/DayEditor/components/DayDetailModal.jsx b/client/src/views/ContentCreator/DayEditor/components/DayDetailModal.jsx
@@ -169,7 +169,7 @@ const DayDetailModal = ({
           <Input.TextArea
             onChange={e => setDescription(e.target.value)}
             value={description}
-            //required
+            required
             placeholder="Enter description"
           ></Input.TextArea>
         </Form.Item>
@@ -186,7 +186,7 @@ const DayDetailModal = ({
             onChange={e => setTekS(e.target.value)}
             value={TekS}
             className="input"
-            //required
+            required
             placeholder="Enter tekS"
           ></Input>
         </Form.Item>

diff --git a/client/src/views/ContentCreator/LessonEditor/LessonEditor.jsx b/client/src/views/ContentCreator/LessonEditor/LessonEditor.jsx
@@ -115,15 +115,15 @@ export default function LessonEditor({
               onChange={e => setDescription(e.target.value)}
               value={description}
               rows={3}
-              //required
+              required
               placeholder="Enter lesson description"
             />
           </Form.Item>
           <Form.Item id="form-label" label="Teks">
             <Input
               onChange={e => setTeks(e.target.value)}
               value={teks}
-              //required
+              required
               placeholder="Enter lesson teks"
             />
           </Form.Item>

diff --git a/server/api/learning-standard/controllers/learning-standard.js b/server/api/learning-standard/controllers/learning-standard.js
@@ -18,7 +18,7 @@ module.exports = {
 
     // validate the request
     const { name, expectations, teks } = ctx.request.body;
-    if (!name)
+    if (!expectations || !name || !teks)
       return ctx.badRequest('A name, teks and expectations must be provided!', {
         id: 'Learning-standard.update.body.invalid',
         error: 'ValidationError',

diff --git a/server/api/learning-standard/models/learning-standard.settings.json b/server/api/learning-standard/models/learning-standard.settings.json
@@ -20,8 +20,7 @@
       "required": true
     },
     "expectations": {
-      "type": "text",
-      "required": false
+      "type": "text"
     },
     "days": {
       "via": "learning_standard",
@@ -33,8 +32,7 @@
     },
     "teks": {
       "type": "string",
-      "unique": false,
-      "required": false
+      "unique": false
     },
     "link": {
       "type": "string"

diff --git a/server/api/unit/controllers/unit.js b/server/api/unit/controllers/unit.js
@@ -35,9 +35,9 @@ module.exports = {
     if (
       !strapi.services.validator.isPositiveInt(number) ||
       !strapi.services.validator.isPositiveInt(gradeId) ||
-      // !teks_id ||
-      !name
-      // !teks_description
+      !teks_id ||
+      !name ||
+      !teks_description
     )
       return ctx.badRequest(
         'A grade, name, teks_description must be provided! Number and Teks_id must be positive interger! ',