From af2f88de211411b805ec1167a43bc9d5cc4e70ef Mon Sep 17 00:00:00 2001
From: RhythmAgg <aggarwalrhythm2211@gmail.com>
Date: Thu, 7 Mar 2024 14:00:07 +0530
Subject: [PATCH] resolved comments, multi problems code assessment

---
 .DS_Store                             | Bin 8196 -> 8196 bytes
 config.js                             |   1 -
 default-code-assessment.json          |  28 +++++++---
 exp_build/exp_gen.js                  |   6 ---
 exp_build/experiment.js               |   4 +-
 validation/schema-map.json            |   2 +-
 validation/schemas/code-assessment.js |  75 ++++++++++++++++++++++++++
 validation/schemas/codeAssessment.js  |  44 ---------------
 8 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100644 validation/schemas/code-assessment.js
 delete mode 100644 validation/schemas/codeAssessment.js

diff --git a/.DS_Store b/.DS_Store
index 840d3c94344a5518240d31d3fe0c0360e269845c..cbd3fbb85752d11031d0e419d694c58ff227ccb6 100644
GIT binary patch
delta 137
zcmZp1XmQw}Di9aWyoZ5-frUYjA)O(Up(Hoo#U&{xKM5$tvF?R;=iU8B9Z}^|@X8lt
z7zQWj=N16<Ffcb7Y;G2K%g7|^HhGSa#N;j^E;g<YUJ=rJH_sBf$jJD0bB@RiZUBa(
BDC+<K

delta 134
zcmZp1XmQw}DiEg<-@(AZz`~%%kj{|FP?DSP;*yk;p9B=+(BYYL*njC!M^yO~yz&JZ
yhQZ1CxdlKy49uPho0|pRGBSz0o;*iLVse)d*W`Uda+@~^?PO#;x;aN=1~&jIS|wco

diff --git a/config.js b/config.js
index 9c161114..0eb11c31 100644
--- a/config.js
+++ b/config.js
@@ -36,7 +36,6 @@ const Lab = {
 const Experiment = {
   descriptor_name: "experiment-descriptor.json",
   default_descriptor: "default-experiment-descriptor.json",
-  default_code_assessment: "default-code-assessment.json",
   build_dir: "build",
   exp_dir: "experiment",
   ui_template_name: "templates",
diff --git a/default-code-assessment.json b/default-code-assessment.json
index 3b38d5d1..0b1ab54e 100644
--- a/default-code-assessment.json
+++ b/default-code-assessment.json
@@ -1,8 +1,22 @@
 {
-    "version": 1.0,
-    "name": "Experiment Name",
-    "inputs": [
-        [1,2,3]
-    ],
-    "expected": "1,2,3"
-}
+    "version": 1,
+    "experiment name": "Experiment Name",
+    "problems": [
+        {
+            "problem name": "Basic Bubble Sort",
+            "description": "Implement basic Bubble Sort algorithm for the given input array",
+            "inputs": [
+                [64,66,20,49,11,79]
+            ],
+            "expected": ["11,20,49,64,66,79"]
+        },
+        {
+            "problem name": "Optimized Bubble Sort",
+            "description": "Implement Optimized Bubble Sort algorithm for the given input array",
+            "inputs": [
+                [64,66,20,49,11,79]
+            ],
+            "expected": ["11,20,49,64,66,79"]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/exp_build/exp_gen.js b/exp_build/exp_gen.js
index 76f486b1..4b2994a1 100644
--- a/exp_build/exp_gen.js
+++ b/exp_build/exp_gen.js
@@ -37,12 +37,6 @@ function run(src, lab_data, build_options) {
   // Include code-assessment.json if the code editor is included
   if(code_assessment.include)
   {
-    if (!shell.test("-f", Experiment.codeAssessmentPath(src))) {
-      shell.cp(
-        path.resolve(Config.Experiment.default_code_assessment),
-        path.resolve(this.src, Experiment.codeAssessmentPath(src))
-      );
-    }
     log.info("Code Editor included")
     build_options.codeditor = true;
     build_options.code_assessment = code_assessment;
diff --git a/exp_build/experiment.js b/exp_build/experiment.js
index 6d66762e..8c4cc3a1 100644
--- a/exp_build/experiment.js
+++ b/exp_build/experiment.js
@@ -270,11 +270,11 @@ class Experiment {
     this.descriptor.units.push(contributors);
   }
 
-  includeCodeEditor(position = 6) {
+  includeCodeEditor(position = 5) {
     const codeditor = {
       "target": "code-assessment.html",
       "label": "Code Assessment",
-      "source": "codeditor.json",
+      "source": "code-assessment.json",
       "unit-type": "task",
       "content-type": "component",
     };
diff --git a/validation/schema-map.json b/validation/schema-map.json
index 75158675..3ac88262 100644
--- a/validation/schema-map.json
+++ b/validation/schema-map.json
@@ -3,5 +3,5 @@
   "pretest.json": "./schemas/quizSchema.js",
   "experiment-descriptor.json": "./schemas/descriptorSchema.js",
   "assessment": "./schemas/quizSchema.js",
-  "code-assessment.json": "./schemas/codeAssessment.js"
+  "code-assessment.json": "./schemas/code-assessment.js"
 }
diff --git a/validation/schemas/code-assessment.js b/validation/schemas/code-assessment.js
new file mode 100644
index 00000000..abd7f754
--- /dev/null
+++ b/validation/schemas/code-assessment.js
@@ -0,0 +1,75 @@
+module.exports = {
+    $schema: "http://json-schema.org/draft-07/schema#",
+    $id: "https://virtual.labs/schemas/code-assessment.json",
+    type: "object",
+    properties: {
+        "version": {
+          type: "integer",
+          enum: [1.0],
+          errorMessage: "Version should be 1.0",
+        },
+    },
+    required: ['version'],
+    if: { properties: { version: { const: 1.0 } }, required: ["version"] },
+    then: {
+        properties: {
+            "experiment name": {
+                type: "string",
+                errorMessage: {
+                    type: "The experiment name should be a string",
+                },
+            },
+            "problems": {
+                type: "array",
+                items: {
+                    type: "object",
+                    properties: {
+                        "problem name": {
+                            type: "string",
+                            errorMessage: {
+                                type: "The problem name should be a string",
+                            },
+                        },
+                        "description": {
+                            type: "string",
+                            errorMessage: {
+                                type: "The description should be a string",
+                            },
+                        },
+                        "inputs": {
+                            type: "array",
+                            errorMessage: {
+                                type: "The inputs should be an array",
+                            },
+                        },
+                        "expected": {
+                            type: "array",
+                            errorMessage: {
+                                type: "The expected should be an array",
+                            },
+                        }
+                    },
+                    required: ["problem name", "description", "inputs", "expected"],
+                    errorMessage: {
+                        required: {
+                            "problem name": "The name of the problem field is required",
+                            "description": "The description is required",
+                            "inputs": "The inputs field is required",
+                            "expected": "The expected field is required"
+                        }
+                    },
+                },
+                errorMessage: {
+                    type: "The problems must be an array",
+                },
+            }
+        },
+        required: ["experiment name", "problems"],
+        errorMessage: {
+            required: {
+                name: "The name of the experiment field is required",
+                problems: "The problems field is required",
+            }
+        },
+    }
+}
\ No newline at end of file
diff --git a/validation/schemas/codeAssessment.js b/validation/schemas/codeAssessment.js
deleted file mode 100644
index e72ff5e1..00000000
--- a/validation/schemas/codeAssessment.js
+++ /dev/null
@@ -1,44 +0,0 @@
-module.exports = {
-    $schema: "http://json-schema.org/draft-07/schema#",
-    $id: "https://virtual.labs/schemas/codeAssessment.json",
-    type: "object",
-    properties: {
-        "version": {
-          type: "integer",
-          enum: [1.0],
-          errorMessage: "Version should be 1.0",
-        },
-    },
-    required: ['version'],
-    if: { properties: { version: { const: 1.0 } }, required: ["version"] },
-    then: {
-        properties: {
-            "name": {
-                type: "string",
-                errorMessage: {
-                    type: "The name should be a string",
-                },
-            },
-            "inputs": {
-                type: "array",
-                errorMessage: {
-                    type: "The inputs must be an array",
-                },
-            },
-            "expected": {
-                type: "string",
-                errorMessage: {
-                    type: "The expected output must be a string",
-                },
-            }
-        },
-        required: ["name", "inputs", "expected"],
-        errorMessage: {
-            required: {
-                name: "The name of the experiment field is required",
-                inputs: "The inputs field is required",
-                expected: "The expected output field is required",
-            }
-        },
-    }
-}
\ No newline at end of file