Added content to item and sharedpassage

Learnosity · Aug 28, 2017 · 263a17c · 263a17c
1 parent c453ce6
commit 263a17c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 18 deletions.
diff --git a/src/Config/resources/schemas/item.json b/src/Config/resources/schemas/item.json
@@ -7,10 +7,14 @@
                     "type": "string",
                     "description": "A unique item identifier across Itembank. It has a limitation of maximum of 150 characters and must only contain ASCII printable characters, except for double quotes, single quotes and accent."
                 },
-                "definition": {
-                    "required": true,
-                    "type": "object",
-                    "description": "An object defining the layout of the item wrapper."
+                "content": {
+                    "required": false,
+                    "type": "string",
+                    "description": ""
+                },
+                "questionReferences": {
+                    "required": false,
+                    "type": "array"
                 },
                 "questions": {
                     "required": false,

diff --git a/src/Config/resources/schemas/questions.json b/src/Config/resources/schemas/questions.json
@@ -29307,6 +29307,12 @@
                         "required": false,
                         "description": "It will be displayed above the sharedpassage's heading.",
                         "type": "string"
+                    },
+                    "content": {
+                        "name": "Content",
+                        "required": false,
+                        "description": "Manually entered into Schemas because entity generator doesn't support conditionals today...",
+                        "type": "string"
                     }
                 },
                 "type": "feature",

diff --git a/src/Entities/Item/item.php b/src/Entities/Item/item.php
@@ -10,7 +10,8 @@
 */
 class item extends BaseEntity {
     protected $reference;
-    protected $definition;
+    protected $content;
+    protected $questionReferences;
     protected $questions;
     protected $features;
     protected $metadata;
@@ -19,12 +20,10 @@ class item extends BaseEntity {
     protected $workflow;
 
     public function __construct(
-                    $reference,
-                                $definition
+                    $reference
                         )
     {
                 $this->reference = $reference;
-                $this->definition = $definition;
             }
 
     /**
@@ -48,21 +47,39 @@ public function set_reference ($reference) {
     }
 
     /**
-    * Get definition \
-    * An object defining the layout of the item wrapper. \
-    * @return object $definition \
+    * Get content \
+    *  \
+    * @return string $content \
+    */
+    public function get_content() {
+        return $this->content;
+    }
+
+    /**
+    * Set content \
+    *  \
+    * @param string $content \
     */
-    public function get_definition() {
-        return $this->definition;
+    public function set_content ($content) {
+        $this->content = $content;
     }
 
     /**
-    * Set definition \
-    * An object defining the layout of the item wrapper. \
-    * @param object $definition \
+    * Get questionReferences \
+    *  \
+    * @return array $questionReferences \
+    */
+    public function get_questionReferences() {
+        return $this->questionReferences;
+    }
+
+    /**
+    * Set questionReferences \
+    *  \
+    * @param array $questionReferences \
     */
-    public function set_definition ($definition) {
-        $this->definition = $definition;
+    public function set_questionReferences (array $questionReferences) {
+        $this->questionReferences = $questionReferences;
     }
 
     /**

diff --git a/src/Entities/QuestionTypes/sharedpassage.php b/src/Entities/QuestionTypes/sharedpassage.php
@@ -15,6 +15,7 @@ class sharedpassage extends BaseQuestionType {
     protected $paginated_content;
     protected $is_math;
     protected $instructor_stimulus;
+    protected $content;
 
     public function __construct(
                     $type
@@ -131,6 +132,24 @@ public function set_instructor_stimulus ($instructor_stimulus) {
         $this->instructor_stimulus = $instructor_stimulus;
     }
 
+    /**
+    * Get Content \
+    * Manually entered into Schemas because entity generator doesn't support conditionals today... \
+    * @return string $content \
+    */
+    public function get_content() {
+        return $this->content;
+    }
+
+    /**
+    * Set Content \
+    * Manually entered into Schemas because entity generator doesn't support conditionals today... \
+    * @param string $content \
+    */
+    public function set_content ($content) {
+        $this->content = $content;
+    }
+
 
     public function get_widget_type() {
     return 'feature';