Changeset 510 for Dev/trunk/src/server

Timestamp:

03/12/14 15:16:54 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Factored out general object mapping and iteration.
• Split widgets for multiplechoice and singlechoice.
• Restored readOnly/disabled setting for QuestionEditorPreviewItem? on innerWidget (since view innerWidget is not a form anymore, we cannot just set it on that, we iterate over all form children now).

File:

• Dev/trunk/src/server/config/couchdb-schema.json (modified) (2 diffs)

Dev/trunk/src/server/config/couchdb-schema.json

@@ -114 +114 @@
           { "$ref": "#/definitions/content/NumberInput" },
           { "$ref": "#/definitions/content/ScaleInput" },
+          { "$ref": "#/definitions/content/SingleChoiceInput" },
           { "$ref": "#/definitions/content/MultipleChoiceInput" }
         ]
@@ -200 +201 @@
         "additionalProperties": false
       },
+      "SingleChoiceInput": {
+        "type": "object",
+        "properties": {
+          "type": { "type": "string", "pattern": "^SingleChoiceInput$" },
+          "items": { "type": "array", "items": {
+              "type": "object",
+              "properties": {
+                  "text": { "$ref": "#/definitions/nonEmptyString" },
+                  "value": { "$ref": "#/definitions/nonEmptyString" }
+              },
+              "required": ["text","value"],
+              "additionalProperties": false
+          } },
+          "otherItem": {
+              "type": "object",
+              "properties": {
+                  "text": { "$ref": "#/definitions/nonEmptyString" },
+                  "value": { "$ref": "#/definitions/nonEmptyString" }
+              },
+              "required": ["subcode","value"],
+              "additionalProperties": false
+          },
+          "subcode": { "$ref": "#/definitions/codeString" }
+        },
+        "required":["type","items","subcode"],
+        "additionalProperties": false
+      },
       "MultipleChoiceInput": {
         "type": "object",
         "properties": {
           "type": { "type": "string", "pattern": "^MultipleChoiceInput$" },
-          "allowMultiple": { "type": "boolean" },
           "items": { "type": "array", "items": {
               "type": "object",