@pie-element/ebsr 7.0.0 → 7.0.4

package/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.0.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr@7.0.3...@pie-element/ebsr@7.0.4) (2021-11-01)
+
+**Note:** Version bump only for package @pie-element/ebsr
+
+
+
+
+
+## [7.0.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr@7.0.2...@pie-element/ebsr@7.0.3) (2021-10-04)
+
+**Note:** Version bump only for package @pie-element/ebsr
+
+
+
+
+
+## [7.0.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr@7.0.1...@pie-element/ebsr@7.0.2) (2021-09-20)
+
+
+### Bug Fixes
+
+* pie-lib updates ([e521c2f](https://github.com/pie-framework/pie-elements/commit/e521c2f1a44aa7f3e14f82a1cee05ceb484ed0a6))
+* Updated pie-lib versions ([2fe4c5d](https://github.com/pie-framework/pie-elements/commit/2fe4c5d0be2d40f5fdb34815855695a7f1087f56))
+* Updated pie-lib versions ([1c23830](https://github.com/pie-framework/pie-elements/commit/1c23830fc75d1de5f7bb3bb16de3c665ae5fa350))
+
+
+
+
+
+## [7.0.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr@7.0.0...@pie-element/ebsr@7.0.1) (2021-09-01)
+
+**Note:** Version bump only for package @pie-element/ebsr
+
+
+
+
+
 # [7.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr@6.7.0...@pie-element/ebsr@7.0.0) (2021-08-09)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.0.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-configure@7.0.3...@pie-element/ebsr-configure@7.0.4) (2021-11-01)
+
+**Note:** Version bump only for package @pie-element/ebsr-configure
+
+
+
+
+
+## [7.0.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-configure@7.0.2...@pie-element/ebsr-configure@7.0.3) (2021-10-04)
+
+**Note:** Version bump only for package @pie-element/ebsr-configure
+
+
+
+
+
+## [7.0.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-configure@7.0.1...@pie-element/ebsr-configure@7.0.2) (2021-09-20)
+
+
+### Bug Fixes
+
+* pie-lib updates ([e521c2f](https://github.com/pie-framework/pie-elements/commit/e521c2f1a44aa7f3e14f82a1cee05ceb484ed0a6))
+* Updated pie-lib versions ([2fe4c5d](https://github.com/pie-framework/pie-elements/commit/2fe4c5d0be2d40f5fdb34815855695a7f1087f56))
+* Updated pie-lib versions ([1c23830](https://github.com/pie-framework/pie-elements/commit/1c23830fc75d1de5f7bb3bb16de3c665ae5fa350))
+
+
+
+
+
+## [7.0.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-configure@7.0.0...@pie-element/ebsr-configure@7.0.1) (2021-09-01)
+
+**Note:** Version bump only for package @pie-element/ebsr-configure
+
+
+
+
+
 # [7.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-configure@6.4.0...@pie-element/ebsr-configure@7.0.0) (2021-08-09)
 
 

package/configure/lib/defaults.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 

package/configure/lib/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -37,13 +39,15 @@ var _main = _interopRequireDefault(require("./main"));
 
 var _defaults2 = _interopRequireDefault(require("./defaults"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["partA", "partB"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var MODEL_UPDATED = _pieConfigureEvents.ModelUpdatedEvent.TYPE;
 var MC_TAG_NAME = 'ebsr-multiple-choice-configure';
@@ -78,6 +82,9 @@ var prepareCustomizationObject = function prepareCustomizationObject(config, mod
   };
 };
 
+var _ref = _defaults2["default"] || {},
+    modelDefault = _ref.model;
+
 var EbsrConfigure = /*#__PURE__*/function (_HTMLElement) {
   (0, _inherits2["default"])(EbsrConfigure, _HTMLElement);
 
@@ -89,10 +96,7 @@ var EbsrConfigure = /*#__PURE__*/function (_HTMLElement) {
     (0, _classCallCheck2["default"])(this, EbsrConfigure);
     _this = _super2.call(this);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onModelChanged", function (m, reset) {
-      _this._model = _objectSpread(_objectSpread(_objectSpread({}, _this._model), m), {}, {
-        partA: _objectSpread(_objectSpread({}, _this._model.partA), m.partA),
-        partB: _objectSpread(_objectSpread({}, _this._model.partB), m.partB)
-      });
+      _this._model = EbsrConfigure.createDefaultModel(m, _this._model);
 
       _this.dispatchModelUpdated(reset);
 
@@ -124,10 +128,7 @@ var EbsrConfigure = /*#__PURE__*/function (_HTMLElement) {
   (0, _createClass2["default"])(EbsrConfigure, [{
     key: "model",
     set: function set(m) {
-      this._model = _objectSpread(_objectSpread(_objectSpread({}, this._model), m), {}, {
-        partA: _objectSpread(_objectSpread({}, this._model.partA), m.partA),
-        partB: _objectSpread(_objectSpread({}, this._model.partB), m.partB)
-      });
+      this._model = EbsrConfigure.createDefaultModel(m, this._model);
 
       this._render();
     }
@@ -186,10 +187,21 @@ var EbsrConfigure = /*#__PURE__*/function (_HTMLElement) {
 
 exports["default"] = EbsrConfigure;
 (0, _defineProperty2["default"])(EbsrConfigure, "createDefaultModel", function () {
-  var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return _objectSpread(_objectSpread(_objectSpread({}, _defaults2["default"].model), model), {}, {
-    partA: _objectSpread(_objectSpread({}, _defaults2["default"].model.partA), model.partA),
-    partB: _objectSpread(_objectSpread({}, _defaults2["default"].model.partB), model.partB)
+  var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref2$partA = _ref2.partA,
+      partA = _ref2$partA === void 0 ? {} : _ref2$partA,
+      _ref2$partB = _ref2.partB,
+      partB = _ref2$partB === void 0 ? {} : _ref2$partB,
+      model = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
+
+  var defaults = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : modelDefault;
+  return _objectSpread(_objectSpread(_objectSpread({}, defaults), model), {}, {
+    partA: _objectSpread(_objectSpread(_objectSpread({}, defaults.partA), partA), {}, {
+      choicesLayout: partA.choicesLayout || partA.verticalMode === false && 'horizontal' || defaults.partA.choicesLayout
+    }),
+    partB: _objectSpread(_objectSpread(_objectSpread({}, defaults.partB), partB), {}, {
+      choicesLayout: partB.choicesLayout || partB.verticalMode === false && 'horizontal' || defaults.partB.choicesLayout
+    })
   });
 });
 //# sourceMappingURL=index.js.map

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["MODEL_UPDATED","ModelUpdatedEvent","TYPE","MC_TAG_NAME","EbsrMCConfigure","MultipleChoiceConfigure","defineMultipleChoice","customElements","get","define","prepareCustomizationObject","config","model","configuration","sensibleDefaults","settingsPanelDisabled","EbsrConfigure","m","reset","_model","partA","partB","dispatchModelUpdated","_render","e","target","preventDefault","stopImmediatePropagation","id","getAttribute","update","dispatchEvent","createDefaultModel","_configuration","onConfigurationChanged","bind","resetValue","c","info","onModelChanged","addEventListener","onModelUpdated","removeEventListener","element","React","createElement","Main","ReactDOM","render","HTMLElement"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport { ModelUpdatedEvent } from '@pie-framework/pie-configure-events';\nimport MultipleChoiceConfigure from '@pie-element/multiple-choice/configure/lib';\nimport defaults from 'lodash/defaults';\nimport Main from './main';\n\nimport sensibleDefaults from './defaults';\n\nconst MODEL_UPDATED = ModelUpdatedEvent.TYPE;\nconst MC_TAG_NAME = 'ebsr-multiple-choice-configure';\n\nclass EbsrMCConfigure extends MultipleChoiceConfigure { }\n\nconst defineMultipleChoice = () => {\n  if (!customElements.get(MC_TAG_NAME)) {\n    customElements.define(MC_TAG_NAME, EbsrMCConfigure);\n  }\n};\n\ndefineMultipleChoice();\n\nconst prepareCustomizationObject = (config, model) => {\n  const configuration = defaults(config, sensibleDefaults.configuration);\n  configuration.settingsPanelDisabled = true;\n\n  return {\n    configuration,\n    model\n  };\n};\n\nexport default class EbsrConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => ({\n    ...sensibleDefaults.model,\n    ...model,\n    partA: {\n      ...sensibleDefaults.model.partA,\n      ...model.partA\n    },\n    partB: {\n      ...sensibleDefaults.model.partB,\n      ...model.partB\n    },\n  });\n\n  constructor() {\n    super();\n\n    this._model = EbsrConfigure.createDefaultModel();\n    this._configuration = sensibleDefaults.configuration;\n    this.onConfigurationChanged = this.onConfigurationChanged.bind(this);\n  }\n\n  set model(m) {\n    this._model = {\n      ...this._model,\n      ...m,\n      partA: {\n        ...this._model.partA,\n        ...m.partA,\n      },\n      partB: {\n        ...this._model.partB,\n        ...m.partB,\n      }\n    };\n\n    this._render();\n  }\n\n  dispatchModelUpdated(reset) {\n    const resetValue = !!reset;\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, resetValue));\n  }\n\n  onModelChanged = (m, reset) => {\n    this._model = {\n      ...this._model,\n      ...m,\n      partA: {\n        ...this._model.partA,\n        ...m.partA,\n      },\n      partB: {\n        ...this._model.partB,\n        ...m.partB,\n      }\n    };\n\n    this.dispatchModelUpdated(reset);\n    this._render();\n\n  };\n\n  set configuration(c) {\n    const info = prepareCustomizationObject(c, this._model);\n    this._configuration = info.configuration;\n\n    this._render();\n  }\n\n  onConfigurationChanged(c) {\n    this._configuration = prepareCustomizationObject(c, this._model).configuration;\n\n    if (this._model) {\n      this.onModelChanged(this._model);\n    }\n\n    this._render();\n  }\n\n  onModelUpdated = e => {\n    if (e.target === this) {\n      return;\n    }\n\n    e.preventDefault();\n    e.stopImmediatePropagation();\n\n    const id = e.target && e.target.getAttribute('id');\n\n    if (id) {\n      if (e.update) {\n        this._model[`part${id}`] = e.update;\n      }\n\n      this.dispatchEvent(new ModelUpdatedEvent(this._model));\n    }\n  };\n\n  connectedCallback() {\n    this.addEventListener(MODEL_UPDATED, this.onModelUpdated);\n    this._render();\n  }\n\n  disconnectedCallback() {\n    this.removeEventListener(MODEL_UPDATED, this.onModelUpdated);\n  }\n\n  _render() {\n    let element = React.createElement(Main, {\n      model: this._model,\n      configuration: this._configuration,\n      onModelChanged: this.onModelChanged,\n      onConfigurationChanged: this.onConfigurationChanged,\n    });\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["MODEL_UPDATED","ModelUpdatedEvent","TYPE","MC_TAG_NAME","EbsrMCConfigure","MultipleChoiceConfigure","defineMultipleChoice","customElements","get","define","prepareCustomizationObject","config","model","configuration","sensibleDefaults","settingsPanelDisabled","modelDefault","EbsrConfigure","m","reset","_model","createDefaultModel","dispatchModelUpdated","_render","e","target","preventDefault","stopImmediatePropagation","id","getAttribute","update","dispatchEvent","_configuration","onConfigurationChanged","bind","resetValue","c","info","onModelChanged","addEventListener","onModelUpdated","removeEventListener","element","React","createElement","Main","ReactDOM","render","HTMLElement","partA","partB","defaults","choicesLayout","verticalMode"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport { ModelUpdatedEvent } from '@pie-framework/pie-configure-events';\nimport MultipleChoiceConfigure from '@pie-element/multiple-choice/configure/lib';\nimport defaults from 'lodash/defaults';\nimport Main from './main';\n\nimport sensibleDefaults from './defaults';\n\nconst MODEL_UPDATED = ModelUpdatedEvent.TYPE;\nconst MC_TAG_NAME = 'ebsr-multiple-choice-configure';\n\nclass EbsrMCConfigure extends MultipleChoiceConfigure { }\n\nconst defineMultipleChoice = () => {\n  if (!customElements.get(MC_TAG_NAME)) {\n    customElements.define(MC_TAG_NAME, EbsrMCConfigure);\n  }\n};\n\ndefineMultipleChoice();\n\nconst prepareCustomizationObject = (config, model) => {\n  const configuration = defaults(config, sensibleDefaults.configuration);\n  configuration.settingsPanelDisabled = true;\n\n  return {\n    configuration,\n    model\n  };\n};\n\nconst { model: modelDefault } = sensibleDefaults || {};\n\nexport default class EbsrConfigure extends HTMLElement {\n  static createDefaultModel = ({ partA = {}, partB = {}, ...model } = {}, defaults = modelDefault) => ({\n    ...defaults,\n    ...model,\n    partA: {\n      ...defaults.partA,\n      ...partA,\n      choicesLayout: partA.choicesLayout || (partA.verticalMode === false && 'horizontal') || defaults.partA.choicesLayout\n    },\n    partB: {\n      ...defaults.partB,\n      ...partB,\n      choicesLayout: partB.choicesLayout || (partB.verticalMode === false && 'horizontal') || defaults.partB.choicesLayout\n    },\n  });\n\n  constructor() {\n    super();\n\n    this._model = EbsrConfigure.createDefaultModel();\n\n    this._configuration = sensibleDefaults.configuration;\n    this.onConfigurationChanged = this.onConfigurationChanged.bind(this);\n  }\n\n  set model(m) {\n    this._model = EbsrConfigure.createDefaultModel(m, this._model);\n\n    this._render();\n  }\n\n  dispatchModelUpdated(reset) {\n    const resetValue = !!reset;\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, resetValue));\n  }\n\n  onModelChanged = (m, reset) => {\n    this._model = EbsrConfigure.createDefaultModel(m, this._model);\n\n    this.dispatchModelUpdated(reset);\n    this._render();\n\n  };\n\n  set configuration(c) {\n    const info = prepareCustomizationObject(c, this._model);\n    this._configuration = info.configuration;\n\n    this._render();\n  }\n\n  onConfigurationChanged(c) {\n    this._configuration = prepareCustomizationObject(c, this._model).configuration;\n\n    if (this._model) {\n      this.onModelChanged(this._model);\n    }\n\n    this._render();\n  }\n\n  onModelUpdated = e => {\n\n    if (e.target === this) {\n      return;\n    }\n\n    e.preventDefault();\n    e.stopImmediatePropagation();\n\n    const id = e.target && e.target.getAttribute('id');\n\n    if (id) {\n      if (e.update) {\n        this._model[`part${id}`] = e.update;\n      }\n\n      this.dispatchEvent(new ModelUpdatedEvent(this._model));\n    }\n  };\n\n  connectedCallback() {\n    this.addEventListener(MODEL_UPDATED, this.onModelUpdated);\n    this._render();\n  }\n\n  disconnectedCallback() {\n    this.removeEventListener(MODEL_UPDATED, this.onModelUpdated);\n  }\n\n  _render() {\n    let element = React.createElement(Main, {\n      model: this._model,\n      configuration: this._configuration,\n      onModelChanged: this.onModelChanged,\n      onConfigurationChanged: this.onConfigurationChanged,\n    });\n    ReactDOM.render(element, this);\n  }\n}\n"],"file":"index.js"}

package/configure/lib/main.js

@@ -33,13 +33,15 @@ var _styles = require("@material-ui/core/styles");
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["partA", "partB", "partialScoring", "scoringType"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var Panel = _configUi.settings.Panel,
     toggle = _configUi.settings.toggle,
@@ -125,7 +127,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
           partB = configuration.partB,
           partialScoring = configuration.partialScoring,
           scoringType = configuration.scoringType,
-          generalConfiguration = (0, _objectWithoutProperties2["default"])(configuration, ["partA", "partB", "partialScoring", "scoringType"]);
+          generalConfiguration = (0, _objectWithoutProperties2["default"])(configuration, _excluded);
 
       var _ref = partA || {},
           _ref$feedback = _ref.feedback,
@@ -207,7 +209,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
             'partA.choicePrefix': choicePrefixA.settings && radio(choicePrefixA.label, ['numbers', 'letters']),
             'partA.lockChoiceOrder': lockChoiceOrderA.settings && toggle(lockChoiceOrderA.label),
             'partA.choicesLayout': choicesLayoutA.settings && dropdown(choicesLayoutA.label, ['vertical', 'grid', 'horizontal']),
-            'partA.gridColumns': modelPartA.choicesLayout === 'grid' && nrOfColumnsAvailable.partA.length > 0 && dropdown(gridColumnsA.label, nrOfColumnsAvailable.partA)
+            'partA.gridColumns': choicesLayoutA.settings && modelPartA.choicesLayout === 'grid' && nrOfColumnsAvailable.partA.length > 0 && dropdown(gridColumnsA.label, nrOfColumnsAvailable.partA)
           }), (0, _defineProperty2["default"])(_ref3, "Properties ".concat(firstPart), {
             'partA.feedbackEnabled': feedbackA.settings && toggle(feedbackA.label),
             'partA.promptEnabled': promptA.settings && toggle(promptA.label),
@@ -219,7 +221,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
             'partB.choicePrefix': choicePrefixB.settings && radio(choicePrefixB.label, ['numbers', 'letters']),
             'partB.lockChoiceOrder': lockChoiceOrderB.settings && toggle(lockChoiceOrderB.label),
             'partB.choicesLayout': choicesLayoutB.settings && dropdown(choicesLayoutB.label, ['vertical', 'grid', 'horizontal']),
-            'partB.gridColumns': modelPartB.choicesLayout === 'grid' && nrOfColumnsAvailable.partB.length > 0 && dropdown(gridColumnsB.label, nrOfColumnsAvailable.partB)
+            'partB.gridColumns': choicesLayoutB.settings && modelPartB.choicesLayout === 'grid' && nrOfColumnsAvailable.partB.length > 0 && dropdown(gridColumnsB.label, nrOfColumnsAvailable.partB)
           }), (0, _defineProperty2["default"])(_ref3, "Properties ".concat(secondPart), {
             'partB.feedbackEnabled': feedbackB.settings && toggle(feedbackB.label),
             'partB.promptEnabled': promptB.settings && toggle(promptB.label),

package/configure/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/main.jsx"],"names":["Panel","settings","toggle","radio","dropdown","styles","theme","design","paddingTop","spacing","unit","part","display","flexDirection","padding","Main","choices","correctFound","map","choice","correct","model","key","onModelChanged","props","partA","choiceMode","removeExtraChoices","partB","classes","configuration","onConfigurationChanged","partLabelType","modelPartA","modelPartB","partialScoring","scoringType","generalConfiguration","feedback","feedbackA","choiceModeA","choicePrefix","choicePrefixA","lockChoiceOrder","lockChoiceOrderA","prompt","promptA","teacherInstructions","teacherInstructionsA","studentInstructions","studentInstructionsA","choicesLayout","choicesLayoutA","gridColumns","gridColumnsA","rationale","rationaleA","feedbackB","choiceModeB","choicePrefixB","lockChoiceOrderB","promptB","teacherInstructionsB","studentInstructionsB","choicesLayoutB","gridColumnsB","rationaleB","type","typeIsNumber","firstPart","secondPart","nrOfColumnsAvailable","length","Array","from","_","i","partLabels","label","ref","_model","React","Component","PropTypes","object","func","Styled"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { settings, layout } from '@pie-lib/config-ui';\nimport { withStyles } from '@material-ui/core/styles';\nimport cloneDeep from 'lodash/cloneDeep';\n\nconst { Panel, toggle, radio, dropdown } = settings;\n\nconst styles = theme => ({\n  design: {\n    paddingTop: theme.spacing.unit * 3\n  },\n  part: {\n    display: 'flex',\n    flexDirection: 'column',\n    padding: '16px 0 32px'\n  }\n});\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    configuration: PropTypes.object,\n    model: PropTypes.object,\n    onModelChanged: PropTypes.func,\n    onConfigurationChanged: PropTypes.func\n  };\n\n  removeExtraChoices = (choices) => {\n    let correctFound = false;\n\n     return (choices || []).map(choice => {\n      if (correctFound) {\n        choice.correct = false;\n        return choice;\n      }\n\n      if (choice.correct) {\n        correctFound = true;\n      }\n\n      return choice;\n    });\n  }\n\n  onModelChanged = (model, key) => {\n    const { onModelChanged } = this.props;\n\n    if (key === 'partA.choiceMode' && model.partA.choiceMode === 'radio') {\n      model.partA.choices = this.removeExtraChoices(model.partA.choices);\n\n      return onModelChanged(model, true);\n    }\n\n    if (key === 'partB.choiceMode' && model.partB.choiceMode === 'radio') {\n      model.partB.choices = this.removeExtraChoices(model.partB.choices);\n\n      return onModelChanged(model, true);\n    }\n\n    return onModelChanged(model);\n  }\n\n  render() {\n    const {\n      classes,\n      model,\n      configuration,\n      onConfigurationChanged\n    } = this.props;\n    const { partLabelType, partA: modelPartA, partB: modelPartB } = model;\n    const { partA, partB, partialScoring, scoringType, ...generalConfiguration } = configuration;\n    const {\n      feedback: feedbackA = {},\n      choiceMode: choiceModeA = {},\n      choicePrefix: choicePrefixA = {},\n      lockChoiceOrder: lockChoiceOrderA = {},\n      prompt: promptA = {},\n      teacherInstructions: teacherInstructionsA = {},\n      studentInstructions: studentInstructionsA = {},\n      choicesLayout: choicesLayoutA = {},\n      gridColumns: gridColumnsA = {},\n      rationale: rationaleA = {}\n    } = partA || {};\n    const {\n      feedback: feedbackB = {},\n      choiceMode: choiceModeB = {},\n      choicePrefix: choicePrefixB = {},\n      lockChoiceOrder: lockChoiceOrderB = {},\n      prompt: promptB = {},\n      teacherInstructions: teacherInstructionsB = {},\n      studentInstructions: studentInstructionsB = {},\n      choicesLayout: choicesLayoutB = {},\n      gridColumns: gridColumnsB = {},\n      rationale: rationaleB = {}\n    } = partB || {};\n    const type = partLabelType || 'Numbers';\n    const typeIsNumber = type === 'Numbers';\n    const firstPart = `Part ${typeIsNumber ? '1' : 'A'}`;\n    const secondPart = `Part ${typeIsNumber ? '2' : 'B'}`;\n    const nrOfColumnsAvailable = {\n      partA: modelPartA.choices && modelPartA.choices.length ?\n        Array.from({length: modelPartA.choices.length}, (_, i) => (`${i + 1}`)) : [],\n      partB: modelPartB.choices && modelPartB.choices.length ?\n        Array.from({length: modelPartB.choices.length}, (_, i) => (`${i + 1}`)) : [],\n    };\n\n    return (\n      <div className={classes.design}>\n        <layout.ConfigLayout\n          settings={\n            <Panel\n              model={model}\n              onChangeModel={this.onModelChanged}\n              configuration={configuration}\n              onChangeConfiguration={onConfigurationChanged}\n              groups={{\n                'Settings for both': {\n                  partLabels:\n                    generalConfiguration.partLabels.settings &&\n                    toggle(generalConfiguration.partLabels.label),\n                  partLabelType:\n                    model.partLabels && dropdown('', ['Numbers', 'Letters']),\n                  partialScoring:\n                    partialScoring.settings && toggle(partialScoring.label),\n                  scoringType:\n                    scoringType.settings && radio(scoringType.label, ['auto', 'rubric'])\n                },\n                [`Settings ${firstPart}`]: {\n                  'partA.choiceMode':\n                    choiceModeA.settings &&\n                    radio(choiceModeA.label, ['checkbox', 'radio']),\n                  'partA.choicePrefix':\n                    choicePrefixA.settings &&\n                    radio(choicePrefixA.label, ['numbers', 'letters']),\n                  'partA.lockChoiceOrder':\n                    lockChoiceOrderA.settings && toggle(lockChoiceOrderA.label),\n                  'partA.choicesLayout':\n                    choicesLayoutA.settings &&\n                    dropdown(choicesLayoutA.label, ['vertical', 'grid', 'horizontal']),\n                  'partA.gridColumns':\n                    modelPartA.choicesLayout === 'grid' && nrOfColumnsAvailable.partA.length > 0 &&\n                    dropdown(gridColumnsA.label, nrOfColumnsAvailable.partA)\n                },\n                [`Properties ${firstPart}`]: {\n                  'partA.feedbackEnabled': feedbackA.settings &&\n                    toggle(feedbackA.label),\n                  'partA.promptEnabled':\n                    promptA.settings && toggle(promptA.label),\n                  'partA.teacherInstructionsEnabled':\n                    teacherInstructionsA.settings &&\n                    toggle(teacherInstructionsA.label),\n                  'partA.studentInstructionsEnabled':\n                    studentInstructionsA.settings &&\n                    toggle(studentInstructionsA.label),\n                  'partA.rationaleEnabled':\n                    rationaleA.settings && toggle(rationaleA.label)\n                },\n                [`Settings ${secondPart}`]: {\n                  'partB.choiceMode':\n                    choiceModeB.settings &&\n                    radio(choiceModeB.label, ['checkbox', 'radio']),\n                  'partB.choicePrefix':\n                    choicePrefixB.settings &&\n                    radio(choicePrefixB.label, ['numbers', 'letters']),\n                  'partB.lockChoiceOrder':\n                    lockChoiceOrderB.settings && toggle(lockChoiceOrderB.label),\n                  'partB.choicesLayout':\n                    choicesLayoutB.settings &&\n                    dropdown(choicesLayoutB.label, ['vertical', 'grid', 'horizontal']),\n                  'partB.gridColumns':\n                    modelPartB.choicesLayout === 'grid' && nrOfColumnsAvailable.partB.length > 0 &&\n                    dropdown(gridColumnsB.label, nrOfColumnsAvailable.partB)\n                },\n                [`Properties ${secondPart}`]: {\n                  'partB.feedbackEnabled':\n                    feedbackB.settings && toggle(feedbackB.label),\n                  'partB.promptEnabled':\n                    promptB.settings && toggle(promptB.label),\n                  'partB.teacherInstructionsEnabled':\n                    teacherInstructionsB.settings &&\n                    toggle(teacherInstructionsB.label),\n                  'partB.studentInstructionsEnabled':\n                    studentInstructionsB.settings &&\n                    toggle(studentInstructionsB.label),\n                  'partB.rationaleEnabled':\n                    rationaleB.settings && toggle(rationaleB.label)\n                }\n              }}\n            />\n          }\n        >\n          <div>\n            <div className={classes.part}>\n              {model.partLabels && <p>{firstPart}</p>}\n              <ebsr-multiple-choice-configure\n                id=\"A\"\n                key=\"partA\"\n                ref={ref => {\n                  if (ref) {\n                    // do not use destructuring to get model from props\n                    this.partA = ref;\n                    this.partA._model = cloneDeep(this.props.model.partA);\n                    this.partA.configuration = {\n                      ...partA,\n                      ...generalConfiguration\n                    };\n                  }\n                }}\n              />\n            </div>\n\n            <div className={classes.part}>\n              {model.partLabels && <p>{secondPart}</p>}\n              <ebsr-multiple-choice-configure\n                id=\"B\"\n                key=\"partB\"\n                ref={ref => {\n                  if (ref) {\n                    // do not use destructuring to get model from props\n                    this.partB = ref;\n                    this.partB._model = cloneDeep(this.props.model.partB);\n                    this.partB.configuration = {\n                      ...partB,\n                      ...generalConfiguration\n                    };\n                  }\n                }}\n              />\n            </div>\n          </div>\n        </layout.ConfigLayout>\n      </div>\n    );\n  }\n}\n\nconst Styled = withStyles(styles)(Main);\n\nexport default Styled;\n"],"file":"main.js"}
+{"version":3,"sources":["../src/main.jsx"],"names":["Panel","settings","toggle","radio","dropdown","styles","theme","design","paddingTop","spacing","unit","part","display","flexDirection","padding","Main","choices","correctFound","map","choice","correct","model","key","onModelChanged","props","partA","choiceMode","removeExtraChoices","partB","classes","configuration","onConfigurationChanged","partLabelType","modelPartA","modelPartB","partialScoring","scoringType","generalConfiguration","feedback","feedbackA","choiceModeA","choicePrefix","choicePrefixA","lockChoiceOrder","lockChoiceOrderA","prompt","promptA","teacherInstructions","teacherInstructionsA","studentInstructions","studentInstructionsA","choicesLayout","choicesLayoutA","gridColumns","gridColumnsA","rationale","rationaleA","feedbackB","choiceModeB","choicePrefixB","lockChoiceOrderB","promptB","teacherInstructionsB","studentInstructionsB","choicesLayoutB","gridColumnsB","rationaleB","type","typeIsNumber","firstPart","secondPart","nrOfColumnsAvailable","length","Array","from","_","i","partLabels","label","ref","_model","React","Component","PropTypes","object","func","Styled"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { settings, layout } from '@pie-lib/config-ui';\nimport { withStyles } from '@material-ui/core/styles';\nimport cloneDeep from 'lodash/cloneDeep';\n\nconst { Panel, toggle, radio, dropdown } = settings;\n\nconst styles = theme => ({\n  design: {\n    paddingTop: theme.spacing.unit * 3\n  },\n  part: {\n    display: 'flex',\n    flexDirection: 'column',\n    padding: '16px 0 32px'\n  }\n});\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    configuration: PropTypes.object,\n    model: PropTypes.object,\n    onModelChanged: PropTypes.func,\n    onConfigurationChanged: PropTypes.func\n  };\n\n  removeExtraChoices = (choices) => {\n    let correctFound = false;\n\n     return (choices || []).map(choice => {\n      if (correctFound) {\n        choice.correct = false;\n        return choice;\n      }\n\n      if (choice.correct) {\n        correctFound = true;\n      }\n\n      return choice;\n    });\n  }\n\n  onModelChanged = (model, key) => {\n    const { onModelChanged } = this.props;\n\n    if (key === 'partA.choiceMode' && model.partA.choiceMode === 'radio') {\n      model.partA.choices = this.removeExtraChoices(model.partA.choices);\n\n      return onModelChanged(model, true);\n    }\n\n    if (key === 'partB.choiceMode' && model.partB.choiceMode === 'radio') {\n      model.partB.choices = this.removeExtraChoices(model.partB.choices);\n\n      return onModelChanged(model, true);\n    }\n\n    return onModelChanged(model);\n  }\n\n  render() {\n    const {\n      classes,\n      model,\n      configuration,\n      onConfigurationChanged\n    } = this.props;\n    const { partLabelType, partA: modelPartA, partB: modelPartB } = model;\n    const { partA, partB, partialScoring, scoringType, ...generalConfiguration } = configuration;\n    const {\n      feedback: feedbackA = {},\n      choiceMode: choiceModeA = {},\n      choicePrefix: choicePrefixA = {},\n      lockChoiceOrder: lockChoiceOrderA = {},\n      prompt: promptA = {},\n      teacherInstructions: teacherInstructionsA = {},\n      studentInstructions: studentInstructionsA = {},\n      choicesLayout: choicesLayoutA = {},\n      gridColumns: gridColumnsA = {},\n      rationale: rationaleA = {}\n    } = partA || {};\n    const {\n      feedback: feedbackB = {},\n      choiceMode: choiceModeB = {},\n      choicePrefix: choicePrefixB = {},\n      lockChoiceOrder: lockChoiceOrderB = {},\n      prompt: promptB = {},\n      teacherInstructions: teacherInstructionsB = {},\n      studentInstructions: studentInstructionsB = {},\n      choicesLayout: choicesLayoutB = {},\n      gridColumns: gridColumnsB = {},\n      rationale: rationaleB = {}\n    } = partB || {};\n    const type = partLabelType || 'Numbers';\n    const typeIsNumber = type === 'Numbers';\n    const firstPart = `Part ${typeIsNumber ? '1' : 'A'}`;\n    const secondPart = `Part ${typeIsNumber ? '2' : 'B'}`;\n    const nrOfColumnsAvailable = {\n      partA: modelPartA.choices && modelPartA.choices.length ?\n        Array.from({length: modelPartA.choices.length}, (_, i) => (`${i + 1}`)) : [],\n      partB: modelPartB.choices && modelPartB.choices.length ?\n        Array.from({length: modelPartB.choices.length}, (_, i) => (`${i + 1}`)) : [],\n    };\n\n    return (\n      <div className={classes.design}>\n        <layout.ConfigLayout\n          settings={\n            <Panel\n              model={model}\n              onChangeModel={this.onModelChanged}\n              configuration={configuration}\n              onChangeConfiguration={onConfigurationChanged}\n              groups={{\n                'Settings for both': {\n                  partLabels:\n                    generalConfiguration.partLabels.settings &&\n                    toggle(generalConfiguration.partLabels.label),\n                  partLabelType:\n                    model.partLabels && dropdown('', ['Numbers', 'Letters']),\n                  partialScoring:\n                    partialScoring.settings && toggle(partialScoring.label),\n                  scoringType:\n                    scoringType.settings && radio(scoringType.label, ['auto', 'rubric'])\n                },\n                [`Settings ${firstPart}`]: {\n                  'partA.choiceMode':\n                    choiceModeA.settings &&\n                    radio(choiceModeA.label, ['checkbox', 'radio']),\n                  'partA.choicePrefix':\n                    choicePrefixA.settings &&\n                    radio(choicePrefixA.label, ['numbers', 'letters']),\n                  'partA.lockChoiceOrder':\n                    lockChoiceOrderA.settings && toggle(lockChoiceOrderA.label),\n                  'partA.choicesLayout':\n                    choicesLayoutA.settings &&\n                    dropdown(choicesLayoutA.label, ['vertical', 'grid', 'horizontal']),\n                  'partA.gridColumns':\n                    choicesLayoutA.settings && modelPartA.choicesLayout === 'grid' &&\n                    nrOfColumnsAvailable.partA.length > 0 &&\n                    dropdown(gridColumnsA.label, nrOfColumnsAvailable.partA)\n                },\n                [`Properties ${firstPart}`]: {\n                  'partA.feedbackEnabled': feedbackA.settings &&\n                    toggle(feedbackA.label),\n                  'partA.promptEnabled':\n                    promptA.settings && toggle(promptA.label),\n                  'partA.teacherInstructionsEnabled':\n                    teacherInstructionsA.settings &&\n                    toggle(teacherInstructionsA.label),\n                  'partA.studentInstructionsEnabled':\n                    studentInstructionsA.settings &&\n                    toggle(studentInstructionsA.label),\n                  'partA.rationaleEnabled':\n                    rationaleA.settings && toggle(rationaleA.label)\n                },\n                [`Settings ${secondPart}`]: {\n                  'partB.choiceMode':\n                    choiceModeB.settings &&\n                    radio(choiceModeB.label, ['checkbox', 'radio']),\n                  'partB.choicePrefix':\n                    choicePrefixB.settings &&\n                    radio(choicePrefixB.label, ['numbers', 'letters']),\n                  'partB.lockChoiceOrder':\n                    lockChoiceOrderB.settings && toggle(lockChoiceOrderB.label),\n                  'partB.choicesLayout':\n                    choicesLayoutB.settings &&\n                    dropdown(choicesLayoutB.label, ['vertical', 'grid', 'horizontal']),\n                  'partB.gridColumns':\n                    choicesLayoutB.settings && modelPartB.choicesLayout === 'grid' &&\n                    nrOfColumnsAvailable.partB.length > 0 &&\n                    dropdown(gridColumnsB.label, nrOfColumnsAvailable.partB)\n                },\n                [`Properties ${secondPart}`]: {\n                  'partB.feedbackEnabled':\n                    feedbackB.settings && toggle(feedbackB.label),\n                  'partB.promptEnabled':\n                    promptB.settings && toggle(promptB.label),\n                  'partB.teacherInstructionsEnabled':\n                    teacherInstructionsB.settings &&\n                    toggle(teacherInstructionsB.label),\n                  'partB.studentInstructionsEnabled':\n                    studentInstructionsB.settings &&\n                    toggle(studentInstructionsB.label),\n                  'partB.rationaleEnabled':\n                    rationaleB.settings && toggle(rationaleB.label)\n                }\n              }}\n            />\n          }\n        >\n          <div>\n            <div className={classes.part}>\n              {model.partLabels && <p>{firstPart}</p>}\n              <ebsr-multiple-choice-configure\n                id=\"A\"\n                key=\"partA\"\n                ref={ref => {\n                  if (ref) {\n                    // do not use destructuring to get model from props\n                    this.partA = ref;\n                    this.partA._model = cloneDeep(this.props.model.partA);\n                    this.partA.configuration = {\n                      ...partA,\n                      ...generalConfiguration\n                    };\n                  }\n                }}\n              />\n            </div>\n\n            <div className={classes.part}>\n              {model.partLabels && <p>{secondPart}</p>}\n              <ebsr-multiple-choice-configure\n                id=\"B\"\n                key=\"partB\"\n                ref={ref => {\n                  if (ref) {\n                    // do not use destructuring to get model from props\n                    this.partB = ref;\n                    this.partB._model = cloneDeep(this.props.model.partB);\n                    this.partB.configuration = {\n                      ...partB,\n                      ...generalConfiguration\n                    };\n                  }\n                }}\n              />\n            </div>\n          </div>\n        </layout.ConfigLayout>\n      </div>\n    );\n  }\n}\n\nconst Styled = withStyles(styles)(Main);\n\nexport default Styled;\n"],"file":"main.js"}

package/configure/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@pie-element/ebsr-configure",
   "private": true,
-  "version": "7.0.0",
+  "version": "7.0.4",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
   "author": "",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-element/multiple-choice": "^6.0.0",
+    "@pie-element/multiple-choice": "^6.1.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
+    "@pie-lib/config-ui": "^10.10.11",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",

package/configure/src/index.js

@@ -30,17 +30,21 @@ const prepareCustomizationObject = (config, model) => {
   };
 };
 
+const { model: modelDefault } = sensibleDefaults || {};
+
 export default class EbsrConfigure extends HTMLElement {
-  static createDefaultModel = (model = {}) => ({
-    ...sensibleDefaults.model,
+  static createDefaultModel = ({ partA = {}, partB = {}, ...model } = {}, defaults = modelDefault) => ({
+    ...defaults,
     ...model,
     partA: {
-      ...sensibleDefaults.model.partA,
-      ...model.partA
+      ...defaults.partA,
+      ...partA,
+      choicesLayout: partA.choicesLayout || (partA.verticalMode === false && 'horizontal') || defaults.partA.choicesLayout
     },
     partB: {
-      ...sensibleDefaults.model.partB,
-      ...model.partB
+      ...defaults.partB,
+      ...partB,
+      choicesLayout: partB.choicesLayout || (partB.verticalMode === false && 'horizontal') || defaults.partB.choicesLayout
     },
   });
 
@@ -48,23 +52,13 @@ export default class EbsrConfigure extends HTMLElement {
     super();
 
     this._model = EbsrConfigure.createDefaultModel();
+
     this._configuration = sensibleDefaults.configuration;
     this.onConfigurationChanged = this.onConfigurationChanged.bind(this);
   }
 
   set model(m) {
-    this._model = {
-      ...this._model,
-      ...m,
-      partA: {
-        ...this._model.partA,
-        ...m.partA,
-      },
-      partB: {
-        ...this._model.partB,
-        ...m.partB,
-      }
-    };
+    this._model = EbsrConfigure.createDefaultModel(m, this._model);
 
     this._render();
   }
@@ -76,18 +70,7 @@ export default class EbsrConfigure extends HTMLElement {
   }
 
   onModelChanged = (m, reset) => {
-    this._model = {
-      ...this._model,
-      ...m,
-      partA: {
-        ...this._model.partA,
-        ...m.partA,
-      },
-      partB: {
-        ...this._model.partB,
-        ...m.partB,
-      }
-    };
+    this._model = EbsrConfigure.createDefaultModel(m, this._model);
 
     this.dispatchModelUpdated(reset);
     this._render();
@@ -112,6 +95,7 @@ export default class EbsrConfigure extends HTMLElement {
   }
 
   onModelUpdated = e => {
+
     if (e.target === this) {
       return;
     }

package/configure/src/main.jsx

@@ -139,7 +139,8 @@ export class Main extends React.Component {
                     choicesLayoutA.settings &&
                     dropdown(choicesLayoutA.label, ['vertical', 'grid', 'horizontal']),
                   'partA.gridColumns':
-                    modelPartA.choicesLayout === 'grid' && nrOfColumnsAvailable.partA.length > 0 &&
+                    choicesLayoutA.settings && modelPartA.choicesLayout === 'grid' &&
+                    nrOfColumnsAvailable.partA.length > 0 &&
                     dropdown(gridColumnsA.label, nrOfColumnsAvailable.partA)
                 },
                 [`Properties ${firstPart}`]: {
@@ -169,7 +170,8 @@ export class Main extends React.Component {
                     choicesLayoutB.settings &&
                     dropdown(choicesLayoutB.label, ['vertical', 'grid', 'horizontal']),
                   'partB.gridColumns':
-                    modelPartB.choicesLayout === 'grid' && nrOfColumnsAvailable.partB.length > 0 &&
+                    choicesLayoutB.settings && modelPartB.choicesLayout === 'grid' &&
+                    nrOfColumnsAvailable.partB.length > 0 &&
                     dropdown(gridColumnsB.label, nrOfColumnsAvailable.partB)
                 },
                 [`Properties ${secondPart}`]: {

package/controller/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-controller@6.0.0...@pie-element/ebsr-controller@6.0.1) (2021-09-01)
+
+**Note:** Version bump only for package @pie-element/ebsr-controller
+
+
+
+
+
 # [6.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/ebsr-controller@5.2.2...@pie-element/ebsr-controller@6.0.0) (2021-08-09)
 
 

package/controller/lib/index.js

@@ -13,6 +13,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _defaults = _interopRequireDefault(require("./defaults"));
@@ -25,7 +27,9 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["partA", "partB"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
@@ -78,29 +82,36 @@ var parsePart = function parsePart(part, key, session, env) {
   });
 };
 
-var normalize = function normalize(question) {
+var normalize = function normalize(_ref) {
+  var _ref$partA = _ref.partA,
+      partA = _ref$partA === void 0 ? {} : _ref$partA,
+      _ref$partB = _ref.partB,
+      partB = _ref$partB === void 0 ? {} : _ref$partB,
+      question = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   return _objectSpread(_objectSpread({
     partLabels: true,
     partLabelType: 'Letters'
   }, question), {}, {
-    partA: _objectSpread(_objectSpread({}, _defaults["default"].partA), {}, {
+    partA: _objectSpread(_objectSpread(_objectSpread({}, _defaults["default"].partA), {}, {
       rationaleEnabled: true,
       feedbackEnabled: true,
       promptEnabled: true,
       teacherInstructionsEnabled: true,
       studentInstructionsEnabled: true,
-      choicesLayout: 'vertical',
       gridColumns: '2'
-    }, question.partA),
-    partB: _objectSpread(_objectSpread({}, _defaults["default"].partB), {}, {
+    }, partA), {}, {
+      choicesLayout: partA.choicesLayout || partA.verticalMode === false && 'horizontal' || 'vertical'
+    }),
+    partB: _objectSpread(_objectSpread(_objectSpread({}, _defaults["default"].partB), {}, {
       rationaleEnabled: true,
       promptEnabled: true,
       feedbackEnabled: true,
       teacherInstructionsEnabled: true,
       studentInstructionsEnabled: true,
-      choicesLayout: 'vertical',
       gridColumns: '2'
-    }, question.partB)
+    }, partB), {}, {
+      choicesLayout: partB.choicesLayout || partB.verticalMode === false && 'horizontal' || 'vertical'
+    })
   });
 };
 /**
@@ -120,7 +131,7 @@ function model(_x, _x2, _x3, _x4) {
 
 function _model() {
   _model = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(question, session, env, updateSession) {
-    var normalizedQuestion, partA, partB, shuffledValues, us, partASession, partALockChoiceOrder, _ref5, partAChoices, _ref6, partBChoices, partBSession, partBLockChoiceOrder;
+    var normalizedQuestion, partA, partB, shuffledValues, us, partASession, partALockChoiceOrder, _ref6, partAChoices, _ref7, partBChoices, partBSession, partBLockChoiceOrder;
 
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
@@ -142,8 +153,8 @@ function _model() {
 
             partASession = (0, _get["default"])(session, 'value.partA');
             partALockChoiceOrder = (0, _controllerUtils.lockChoices)(normalizedQuestion.partA, partASession, env);
-            _ref5 = partA || {}, partAChoices = _ref5.choices;
-            _ref6 = partB || {}, partBChoices = _ref6.choices;
+            _ref6 = partA || {}, partAChoices = _ref6.choices;
+            _ref7 = partB || {}, partBChoices = _ref7.choices;
 
             if (!(!partALockChoiceOrder && partAChoices && partAChoices.length)) {
               _context.next = 13;
@@ -237,14 +248,14 @@ var isCorrect = function isCorrect(c) {
 };
 
 var getScore = function getScore(config, sessionPart, key) {
-  var _ref = config && config[key] || {},
-      _ref$choices = _ref.choices,
-      choices = _ref$choices === void 0 ? [] : _ref$choices;
+  var _ref2 = config && config[key] || {},
+      _ref2$choices = _ref2.choices,
+      choices = _ref2$choices === void 0 ? [] : _ref2$choices;
 
   var maxScore = choices.length;
 
-  var _ref2 = sessionPart || {},
-      sessionPartValue = _ref2.value;
+  var _ref3 = sessionPart || {},
+      sessionPartValue = _ref3.value;
 
   var chosen = function chosen(c) {
     return !!(sessionPartValue || []).find(function (v) {
@@ -277,8 +288,8 @@ var getScore = function getScore(config, sessionPart, key) {
 
 function outcome(config, session) {
   return new Promise(function (resolve) {
-    var _ref3 = session || {},
-        value = _ref3.value;
+    var _ref4 = session || {},
+        value = _ref4.value;
 
     if (!session || !value) {
       resolve({
@@ -290,9 +301,9 @@ function outcome(config, session) {
     }
 
     if (value) {
-      var _ref4 = value || {},
-          partA = _ref4.partA,
-          partB = _ref4.partB;
+      var _ref5 = value || {},
+          partA = _ref5.partA,
+          partB = _ref5.partB;
 
       var scoreA = getScore(config, partA, 'partA');
       var scoreB = getScore(config, partB, 'partB');

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["prepareChoice","model","env","defaultFeedback","choice","out","label","value","role","mode","rationale","rationaleEnabled","correct","feedbackEnabled","feedbackType","feedback","type","parsePart","part","key","session","Object","assign","incorrect","choices","map","disabled","complete","min","filter","c","length","responseCorrect","undefined","normalize","question","partLabels","partLabelType","partA","defaults","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","choicesLayout","gridColumns","partB","updateSession","normalizedQuestion","shuffledValues","us","id","element","update","Promise","resolve","partASession","partALockChoiceOrder","partAChoices","partBChoices","partBSession","partBLockChoiceOrder","e","console","error","partLabel","teacherInstructions","prompt","createDefaultModel","isCorrect","getScore","config","sessionPart","maxScore","sessionPartValue","chosen","find","v","correctAndNotChosen","incorrectAndChosen","correctChoices","reduce","total","partialScoring","parseFloat","toFixed","outcome","score","scoreA","scoreB","empty","max","returnPartCorrect","answers","forEach","i","push","createCorrectResponseSession","partACorrect","partBCorrect"],"mappings":";;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,CAACC,KAAD,EAAQC,GAAR,EAAaC,eAAb;AAAA,SAAiC,UAAAC,MAAM,EAAI;AAC/D,QAAMC,GAAG,GAAG;AACVC,MAAAA,KAAK,EAAEF,MAAM,CAACE,KADJ;AAEVC,MAAAA,KAAK,EAAEH,MAAM,CAACG;AAFJ,KAAZ;;AAKA,QACEL,GAAG,CAACM,IAAJ,KAAa,YAAb,KACCN,GAAG,CAACO,IAAJ,KAAa,MAAb,IAAuBP,GAAG,CAACO,IAAJ,KAAa,UADrC,CADF,EAGE;AACAJ,MAAAA,GAAG,CAACK,SAAJ,GAAgBT,KAAK,CAACU,gBAAN,GAAyBP,MAAM,CAACM,SAAhC,GAA4C,IAA5D;AACD,KALD,MAKO;AACLL,MAAAA,GAAG,CAACK,SAAJ,GAAgB,IAAhB;AACD;;AAED,QAAIR,GAAG,CAACO,IAAJ,KAAa,UAAjB,EAA6B;AAC3BJ,MAAAA,GAAG,CAACO,OAAJ,GAAc,CAAC,CAACR,MAAM,CAACQ,OAAvB;;AAEA,UAAIX,KAAK,CAACY,eAAV,EAA2B;AACzB,YAAMC,YAAY,GAAIV,MAAM,CAACW,QAAP,IAAmBX,MAAM,CAACW,QAAP,CAAgBC,IAApC,IAA6C,MAAlE;;AAEA,YAAIF,YAAY,KAAK,SAArB,EAAgC;AAC9BT,UAAAA,GAAG,CAACU,QAAJ,GAAeZ,eAAe,CAACC,MAAM,CAACQ,OAAP,GAAiB,SAAjB,GAA6B,WAA9B,CAA9B;AACD,SAFD,MAEO,IAAIE,YAAY,KAAK,QAArB,EAA+B;AACpCT,UAAAA,GAAG,CAACU,QAAJ,GAAeX,MAAM,CAACW,QAAP,CAAgBR,KAA/B;AACD;AACF;AACF;;AAED,WAAOF,GAAP;AACD,GA9BqB;AAAA,CAAtB;;AAgCA,IAAMY,SAAS,GAAG,SAAZA,SAAY,CAACC,IAAD,EAAOC,GAAP,EAAYC,OAAZ,EAAqBlB,GAArB,EAA6B;AAC7C,MAAMC,eAAe,GAAGkB,MAAM,CAACC,MAAP,CACtB;AAAEV,IAAAA,OAAO,EAAE,SAAX;AAAsBW,IAAAA,SAAS,EAAE;AAAjC,GADsB,EAEtBL,IAAI,CAACf,eAFiB,CAAxB;AAKA,MAAIqB,OAAO,GAAGN,IAAI,CAACM,OAAL,GACVN,IAAI,CAACM,OAAL,CAAaC,GAAb,CAAiBzB,aAAa,CAACkB,IAAD,EAAOhB,GAAP,EAAYC,eAAZ,CAA9B,CADU,GAEV,EAFJ;AAIA,yCACKe,IADL;AAEEM,IAAAA,OAAO,EAAPA,OAFF;AAGEE,IAAAA,QAAQ,EAAExB,GAAG,CAACO,IAAJ,KAAa,QAHzB;AAIEkB,IAAAA,QAAQ,EAAE;AACRC,MAAAA,GAAG,EAAEV,IAAI,CAACM,OAAL,CAAaK,MAAb,CAAoB,UAAAC,CAAC;AAAA,eAAIA,CAAC,CAAClB,OAAN;AAAA,OAArB,EAAoCmB;AADjC,KAJZ;AAOEC,IAAAA,eAAe,EACb9B,GAAG,CAACO,IAAJ,KAAa,UAAb,GACI,8BAAkBS,IAAlB,EAAwBC,GAAxB,EAA6BC,OAA7B,CADJ,GAEIa;AAVR;AAYD,CAtBD;;AAwBO,IAAMC,SAAS,GAAG,SAAZA,SAAY,CAAAC,QAAQ;AAAA;AAC/BC,IAAAA,UAAU,EAAE,IADmB;AAE/BC,IAAAA,aAAa,EAAE;AAFgB,KAG5BF,QAH4B;AAI/BG,IAAAA,KAAK,kCACAC,qBAASD,KADT;AAEH3B,MAAAA,gBAAgB,EAAE,IAFf;AAGHE,MAAAA,eAAe,EAAE,IAHd;AAIH2B,MAAAA,aAAa,EAAE,IAJZ;AAKHC,MAAAA,0BAA0B,EAAE,IALzB;AAMHC,MAAAA,0BAA0B,EAAE,IANzB;AAOHC,MAAAA,aAAa,EAAE,UAPZ;AAQHC,MAAAA,WAAW,EAAE;AARV,OASAT,QAAQ,CAACG,KATT,CAJ0B;AAe/BO,IAAAA,KAAK,kCACAN,qBAASM,KADT;AAEHlC,MAAAA,gBAAgB,EAAE,IAFf;AAGH6B,MAAAA,aAAa,EAAE,IAHZ;AAIH3B,MAAAA,eAAe,EAAE,IAJd;AAKH4B,MAAAA,0BAA0B,EAAE,IALzB;AAMHC,MAAAA,0BAA0B,EAAE,IANzB;AAOHC,MAAAA,aAAa,EAAE,UAPZ;AAQHC,MAAAA,WAAW,EAAE;AARV,OASAT,QAAQ,CAACU,KATT;AAf0B;AAAA,CAA1B;AA4BP;AACA;AACA;AACA;AACA;AACA;AACA;;;;;SACsB5C,K;;;;;yFAAf,iBAAqBkC,QAArB,EAA+Bf,OAA/B,EAAwClB,GAAxC,EAA6C4C,aAA7C;AAAA;;AAAA;AAAA;AAAA;AAAA;AACCC,YAAAA,kBADD,GACsBb,SAAS,CAACC,QAAD,CAD/B;AAECG,YAAAA,KAFD,GAESrB,SAAS,CAAC8B,kBAAkB,CAACT,KAApB,EAA2B,OAA3B,EAAoClB,OAApC,EAA6ClB,GAA7C,CAFlB;AAGC2C,YAAAA,KAHD,GAGS5B,SAAS,CAAC8B,kBAAkB,CAACF,KAApB,EAA2B,OAA3B,EAAoCzB,OAApC,EAA6ClB,GAA7C,CAHlB;AAKC8C,YAAAA,cALD,GAKkB,EALlB;;AAOCC,YAAAA,EAPD,GAOM,SAALA,EAAK,CAAA/B,IAAI;AAAA,qBAAI,UAACgC,EAAD,EAAKC,OAAL,EAAcC,MAAd;AAAA,uBACjB,IAAIC,OAAJ,CAAY,UAAAC,OAAO,EAAI;AACrBN,kBAAAA,cAAc,CAAC9B,IAAD,CAAd,GAAuBkC,MAAM,CAACJ,cAA9B;AACAM,kBAAAA,OAAO;AACR,iBAHD,CADiB;AAAA,eAAJ;AAAA,aAPV;;AAaCC,YAAAA,YAbD,GAagB,qBAAInC,OAAJ,EAAa,aAAb,CAbhB;AAcCoC,YAAAA,oBAdD,GAcwB,kCAAYT,kBAAkB,CAACT,KAA/B,EAAsCiB,YAAtC,EAAoDrD,GAApD,CAdxB;AAAA,oBAgB6BoC,KAAK,IAAI,EAhBtC,EAgBYmB,YAhBZ,SAgBGjC,OAhBH;AAAA,oBAiB6BqB,KAAK,IAAI,EAjBtC,EAiBYa,YAjBZ,SAiBGlC,OAjBH;;AAAA,kBAmBD,CAACgC,oBAAD,IAAyBC,YAAzB,IAAyCA,YAAY,CAAC1B,MAnBrD;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAoBmB,yCACpB0B,YADoB,EAEpB;AAAET,cAAAA,cAAc,EAAE,CAAC5B,OAAO,CAAC4B,cAAR,IAA0B,EAA3B,EAA+BV;AAAjD,aAFoB,EAGpBW,EAAE,CAAC,OAAD,CAHkB,EAIpB,OAJoB,CApBnB;;AAAA;AAoBHX,YAAAA,KAAK,CAACd,OApBH;;AAAA;AA4BCmC,YAAAA,YA5BD,GA4BgB,qBAAIvC,OAAJ,EAAa,aAAb,CA5BhB;AA6BCwC,YAAAA,oBA7BD,GA6BwB,kCAAYb,kBAAkB,CAACF,KAA/B,EAAsCc,YAAtC,EAAoDzD,GAApD,CA7BxB;;AAAA,kBA+BD,CAAC0D,oBAAD,IAAyBF,YAAzB,IAAyCA,YAAY,CAAC3B,MA/BrD;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAgCmB,yCACpB2B,YADoB,EAEpB;AAAEV,cAAAA,cAAc,EAAE,CAAC5B,OAAO,CAAC4B,cAAR,IAA0B,EAA3B,EAA+BH;AAAjD,aAFoB,EAGpBI,EAAE,CAAC,OAAD,CAHkB,EAIpB,OAJoB,CAhCnB;;AAAA;AAgCHJ,YAAAA,KAAK,CAACrB,OAhCH;;AAAA;AAwCL,gBAAI,CAAC,yBAAQwB,cAAR,CAAL,EAA8B;AAC5B,kBAAIF,aAAa,IAAI,OAAOA,aAAP,KAAyB,UAA9C,EAA0D;AACxDA,gBAAAA,aAAa,CAAC1B,OAAO,CAAC8B,EAAT,EAAa9B,OAAO,CAAC+B,OAArB,EAA8B;AACzCH,kBAAAA,cAAc,EAAdA;AADyC,iBAA9B,CAAb,UAES,UAAAa,CAAC,EAAI;AACZC,kBAAAA,OAAO,CAACC,KAAR,CAAc,uBAAd,EAAuCF,CAAvC;AACD,iBAJD;AAKD;AACF;;AAED,gBAAId,kBAAkB,CAACX,UAAvB,EAAmC;AACjCE,cAAAA,KAAK,CAAC0B,SAAN,GACEjB,kBAAkB,CAACV,aAAnB,KAAqC,SAArC,GAAiD,QAAjD,GAA4D,QAD9D;AAEAQ,cAAAA,KAAK,CAACmB,SAAN,GACEjB,kBAAkB,CAACV,aAAnB,KAAqC,SAArC,GAAiD,QAAjD,GAA4D,QAD9D;AAED,aALD,MAKO;AACLC,cAAAA,KAAK,CAAC0B,SAAN,GAAkB/B,SAAlB;AACAY,cAAAA,KAAK,CAACmB,SAAN,GAAkB/B,SAAlB;AACD;;AAED,gBACE/B,GAAG,CAACM,IAAJ,KAAa,YAAb,KACCN,GAAG,CAACO,IAAJ,KAAa,MAAb,IAAuBP,GAAG,CAACO,IAAJ,KAAa,UADrC,CADF,EAGE;AACA6B,cAAAA,KAAK,CAAC2B,mBAAN,GAA4BlB,kBAAkB,CAACT,KAAnB,CACzBG,0BADyB,GAExBM,kBAAkB,CAACT,KAAnB,CAAyB2B,mBAFD,GAGxB,IAHJ;AAIApB,cAAAA,KAAK,CAACoB,mBAAN,GAA4BlB,kBAAkB,CAACF,KAAnB,CACzBJ,0BADyB,GAExBM,kBAAkB,CAACF,KAAnB,CAAyBoB,mBAFD,GAGxB,IAHJ;AAID,aAZD,MAYO;AACL3B,cAAAA,KAAK,CAAC2B,mBAAN,GAA4B,IAA5B;AACApB,cAAAA,KAAK,CAACoB,mBAAN,GAA4B,IAA5B;AACD;;AAED3B,YAAAA,KAAK,CAAC4B,MAAN,GAAenB,kBAAkB,CAACT,KAAnB,CAAyBE,aAAzB,GACXO,kBAAkB,CAACT,KAAnB,CAAyB4B,MADd,GAEX,IAFJ;AAGArB,YAAAA,KAAK,CAACqB,MAAN,GAAenB,kBAAkB,CAACF,KAAnB,CAAyBL,aAAzB,GACXO,kBAAkB,CAACF,KAAnB,CAAyBqB,MADd,GAEX,IAFJ;AAhFK,6CAoFE,IAAIb,OAAJ,CAAY,UAAAC,OAAO,EAAI;AAC5BA,cAAAA,OAAO,CAAC;AACN5B,gBAAAA,QAAQ,EAAExB,GAAG,CAACO,IAAJ,KAAa,QADjB;AAENA,gBAAAA,IAAI,EAAEP,GAAG,CAACO,IAFJ;AAGN6B,gBAAAA,KAAK,EAALA,KAHM;AAINO,gBAAAA,KAAK,EAALA;AAJM,eAAD,CAAP;AAMD,aAPM,CApFF;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AA8FA,IAAMsB,kBAAkB,GAAG,SAArBA,kBAAqB;AAAA,MAAClE,KAAD,uEAAS,EAAT;AAAA,SAChC,IAAIoD,OAAJ,CAAY,UAAAC,OAAO,EAAI;AACrBA,IAAAA,OAAO,iCACFf,oBADE,GAEFtC,KAFE,EAAP;AAID,GALD,CADgC;AAAA,CAA3B;;;;AAQP,IAAMmE,SAAS,GAAG,SAAZA,SAAY,CAAAtC,CAAC;AAAA,SAAIA,CAAC,CAAClB,OAAF,KAAc,IAAlB;AAAA,CAAnB;;AAEA,IAAMyD,QAAQ,GAAG,SAAXA,QAAW,CAACC,MAAD,EAASC,WAAT,EAAsBpD,GAAtB,EAA8B;AAAA,aACnBmD,MAAM,IAAIA,MAAM,CAACnD,GAAD,CAAjB,IAA2B,EADP;AAAA,0BACrCK,OADqC;AAAA,MACrCA,OADqC,6BAC3B,EAD2B;;AAE7C,MAAMgD,QAAQ,GAAGhD,OAAO,CAACO,MAAzB;;AAF6C,cAGTwC,WAAW,IAAI,EAHN;AAAA,MAG9BE,gBAH8B,SAGrClE,KAHqC;;AAK7C,MAAMmE,MAAM,GAAG,SAATA,MAAS,CAAA5C,CAAC;AAAA,WAAI,CAAC,CAAC,CAAC2C,gBAAgB,IAAI,EAArB,EAAyBE,IAAzB,CAA8B,UAAAC,CAAC;AAAA,aAAIA,CAAC,KAAK9C,CAAC,CAACvB,KAAZ;AAAA,KAA/B,CAAN;AAAA,GAAhB;;AACA,MAAMsE,mBAAmB,GAAG,SAAtBA,mBAAsB,CAAA/C,CAAC;AAAA,WAAIsC,SAAS,CAACtC,CAAD,CAAT,IAAgB,CAAC4C,MAAM,CAAC5C,CAAD,CAA3B;AAAA,GAA7B;;AACA,MAAMgD,kBAAkB,GAAG,SAArBA,kBAAqB,CAAAhD,CAAC;AAAA,WAAI,CAACsC,SAAS,CAACtC,CAAD,CAAV,IAAiB4C,MAAM,CAAC5C,CAAD,CAA3B;AAAA,GAA5B;;AACA,MAAMiD,cAAc,GAAGvD,OAAO,CAACwD,MAAR,CAAe,UAACC,KAAD,EAAQ7E,MAAR,EAAmB;AACvD,QAAIyE,mBAAmB,CAACzE,MAAD,CAAnB,IAA+B0E,kBAAkB,CAAC1E,MAAD,CAArD,EAA+D;AAC7D,aAAO6E,KAAK,GAAG,CAAf;AACD,KAFD,MAEO;AACL,aAAOA,KAAP;AACD;AACF,GANsB,EAMpBzD,OAAO,CAACO,MANY,CAAvB,CAR6C,CAgB7C;;AACA,MAAI,CAACuC,MAAM,CAACY,cAAR,IAA0BH,cAAc,GAAGP,QAA/C,EAAyD;AACvD,WAAO,CAAP;AACD;;AAED,SAAOW,UAAU,CAACX,QAAQ,GAAG,CAACO,cAAc,GAAGP,QAAlB,EAA4BY,OAA5B,CAAoC,CAApC,CAAH,GAA4C,CAArD,CAAjB;AACD,CAtBD;;AAwBO,SAASC,OAAT,CAAiBf,MAAjB,EAAyBlD,OAAzB,EAAkC;AACvC,SAAO,IAAIiC,OAAJ,CAAY,UAAAC,OAAO,EAAI;AAAA,gBACVlC,OAAO,IAAI,EADD;AAAA,QACpBb,KADoB,SACpBA,KADoB;;AAG5B,QAAI,CAACa,OAAD,IAAY,CAACb,KAAjB,EAAwB;AACtB+C,MAAAA,OAAO,CAAC;AAAEgC,QAAAA,KAAK,EAAE,CAAT;AAAYC,QAAAA,MAAM,EAAE,CAApB;AAAuBC,QAAAA,MAAM,EAAE,CAA/B;AAAkCC,QAAAA,KAAK,EAAE;AAAzC,OAAD,CAAP;AACD;;AAED,QAAIlF,KAAJ,EAAW;AAAA,kBACgBA,KAAK,IAAI,EADzB;AAAA,UACD+B,KADC,SACDA,KADC;AAAA,UACMO,KADN,SACMA,KADN;;AAGT,UAAM0C,MAAM,GAAGlB,QAAQ,CAACC,MAAD,EAAShC,KAAT,EAAgB,OAAhB,CAAvB;AACA,UAAMkD,MAAM,GAAGnB,QAAQ,CAACC,MAAD,EAASzB,KAAT,EAAgB,OAAhB,CAAvB;;AAEA,UAAI,CAACyB,MAAM,CAACY,cAAZ,EAA4B;AAC1B;AACA;AACA5B,QAAAA,OAAO,CAAC;AAAEgC,UAAAA,KAAK,EAAGC,MAAM,KAAK,CAAX,IAAgBC,MAAM,KAAK,CAA5B,GAAiC,CAAjC,GAAqC,CAA9C;AAAiDD,UAAAA,MAAM,EAANA,MAAjD;AAAyDC,UAAAA,MAAM,EAANA,MAAzD;AAAiEE,UAAAA,GAAG,EAAE;AAAtE,SAAD,CAAP;AACD,OAJD,MAIO;AACL;AACA,YAAIH,MAAM,KAAK,CAAf,EAAkB;AAChB,cAAIC,MAAM,KAAK,CAAf,EAAkB;AAChB;AACAlC,YAAAA,OAAO,CAAC;AAAEgC,cAAAA,KAAK,EAAE,CAAT;AAAYC,cAAAA,MAAM,EAANA,MAAZ;AAAoBC,cAAAA,MAAM,EAANA,MAApB;AAA4BE,cAAAA,GAAG,EAAE;AAAjC,aAAD,CAAP;AACD,WAHD,MAGO;AACL;AACApC,YAAAA,OAAO,CAAC;AAAEgC,cAAAA,KAAK,EAAE,CAAT;AAAYC,cAAAA,MAAM,EAANA,MAAZ;AAAoBC,cAAAA,MAAM,EAANA,MAApB;AAA4BE,cAAAA,GAAG,EAAE;AAAjC,aAAD,CAAP;AACD;AACF,SARD,MAQO;AACL;AACApC,UAAAA,OAAO,CAAC;AAAEgC,YAAAA,KAAK,EAAE,CAAT;AAAYC,YAAAA,MAAM,EAANA,MAAZ;AAAoBC,YAAAA,MAAM,EAANA,MAApB;AAA4BE,YAAAA,GAAG,EAAE;AAAjC,WAAD,CAAP;AACD;AACF;AACF;AACF,GAjCM,CAAP;AAkCD;;AAED,IAAMC,iBAAiB,GAAG,SAApBA,iBAAoB,CAAAnE,OAAO,EAAI;AACnC,MAAIoE,OAAO,GAAG,EAAd;AAEApE,EAAAA,OAAO,CAACqE,OAAR,CAAgB,UAAAC,CAAC,EAAI;AAAA,QACXlF,OADW,GACQkF,CADR,CACXlF,OADW;AAAA,QACFL,KADE,GACQuF,CADR,CACFvF,KADE;;AAEnB,QAAIK,OAAJ,EAAa;AACXgF,MAAAA,OAAO,CAACG,IAAR,CAAaxF,KAAb;AACD;AACF,GALD;AAMA,SAAOqF,OAAP;AACD,CAVD;;AAYO,IAAMI,4BAA4B,GAAG,SAA/BA,4BAA+B,CAAC7D,QAAD,EAAWjC,GAAX,EAAmB;AAC7D,SAAO,IAAImD,OAAJ,CAAY,UAAAC,OAAO,EAAI;AAC5B,QAAIpD,GAAG,CAACO,IAAJ,KAAa,UAAb,IAA2BP,GAAG,CAACM,IAAJ,KAAa,YAA5C,EAA0D;AAAA,UAChD8B,KADgD,GAC/BH,QAD+B,CAChDG,KADgD;AAAA,UACzCO,KADyC,GAC/BV,QAD+B,CACzCU,KADyC;AAGxD,UAAMoD,YAAY,GAAGN,iBAAiB,CAACrD,KAAK,CAACd,OAAP,CAAtC;AACA,UAAM0E,YAAY,GAAGP,iBAAiB,CAAC9C,KAAK,CAACrB,OAAP,CAAtC;AAEA8B,MAAAA,OAAO,CAAC;AACN/C,QAAAA,KAAK,EAAE;AACL+B,UAAAA,KAAK,EAAE;AACLY,YAAAA,EAAE,EAAE,OADC;AAEL3C,YAAAA,KAAK,EAAE0F;AAFF,WADF;AAKLpD,UAAAA,KAAK,EAAE;AACLK,YAAAA,EAAE,EAAE,OADC;AAEL3C,YAAAA,KAAK,EAAE2F;AAFF;AALF,SADD;AAWNhD,QAAAA,EAAE,EAAE;AAXE,OAAD,CAAP;AAaD,KAnBD,MAmBO;AACLI,MAAAA,OAAO,CAAC,IAAD,CAAP;AACD;AACF,GAvBM,CAAP;AAwBD,CAzBM","sourcesContent":["import defaults from './defaults';\nimport { lockChoices, getShuffledChoices } from '@pie-lib/controller-utils';\nimport { isResponseCorrect } from './utils';\nimport get from 'lodash/get';\nimport isEmpty from 'lodash/isEmpty';\n\nconst prepareChoice = (model, env, defaultFeedback) => choice => {\n  const out = {\n    label: choice.label,\n    value: choice.value\n  };\n\n  if (\n    env.role === 'instructor' &&\n    (env.mode === 'view' || env.mode === 'evaluate')\n  ) {\n    out.rationale = model.rationaleEnabled ? choice.rationale : null;\n  } else {\n    out.rationale = null;\n  }\n\n  if (env.mode === 'evaluate') {\n    out.correct = !!choice.correct;\n\n    if (model.feedbackEnabled) {\n      const feedbackType = (choice.feedback && choice.feedback.type) || 'none';\n\n      if (feedbackType === 'default') {\n        out.feedback = defaultFeedback[choice.correct ? 'correct' : 'incorrect'];\n      } else if (feedbackType === 'custom') {\n        out.feedback = choice.feedback.value;\n      }\n    }\n  }\n\n  return out;\n};\n\nconst parsePart = (part, key, session, env) => {\n  const defaultFeedback = Object.assign(\n    { correct: 'Correct', incorrect: 'Incorrect' },\n    part.defaultFeedback\n  );\n\n  let choices = part.choices\n    ? part.choices.map(prepareChoice(part, env, defaultFeedback))\n    : [];\n\n  return {\n    ...part,\n    choices,\n    disabled: env.mode !== 'gather',\n    complete: {\n      min: part.choices.filter(c => c.correct).length\n    },\n    responseCorrect:\n      env.mode === 'evaluate'\n        ? isResponseCorrect(part, key, session)\n        : undefined\n  };\n};\n\nexport const normalize = question => ({\n  partLabels: true,\n  partLabelType: 'Letters',\n  ...question,\n  partA: {\n    ...defaults.partA,\n    rationaleEnabled: true,\n    feedbackEnabled: true,\n    promptEnabled: true,\n    teacherInstructionsEnabled: true,\n    studentInstructionsEnabled: true,\n    choicesLayout: 'vertical',\n    gridColumns: '2',\n    ...question.partA\n  },\n  partB: {\n    ...defaults.partB,\n    rationaleEnabled: true,\n    promptEnabled: true,\n    feedbackEnabled: true,\n    teacherInstructionsEnabled: true,\n    studentInstructionsEnabled: true,\n    choicesLayout: 'vertical',\n    gridColumns: '2',\n    ...question.partB\n  }\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n * @param {*} updateSession - optional - a function that will set the properties passed into it on the session.\n */\nexport async function model(question, session, env, updateSession) {\n  const normalizedQuestion = normalize(question);\n  const partA = parsePart(normalizedQuestion.partA, 'partA', session, env);\n  const partB = parsePart(normalizedQuestion.partB, 'partB', session, env);\n\n  const shuffledValues = {};\n\n  const us = part => (id, element, update) =>\n    new Promise(resolve => {\n      shuffledValues[part] = update.shuffledValues;\n      resolve();\n    });\n\n  const partASession = get(session, 'value.partA');\n  const partALockChoiceOrder = lockChoices(normalizedQuestion.partA, partASession, env);\n\n  const { choices: partAChoices } = partA || {};\n  const { choices: partBChoices } = partB || {};\n\n  if (!partALockChoiceOrder && partAChoices && partAChoices.length) {\n    partA.choices = await getShuffledChoices(\n      partAChoices,\n      { shuffledValues: (session.shuffledValues || {}).partA },\n      us('partA'),\n      'value'\n    );\n  }\n\n  const partBSession = get(session, 'value.partB');\n  const partBLockChoiceOrder = lockChoices(normalizedQuestion.partB, partBSession, env);\n\n  if (!partBLockChoiceOrder && partBChoices && partBChoices.length) {\n    partB.choices = await getShuffledChoices(\n      partBChoices,\n      { shuffledValues: (session.shuffledValues || {}).partB },\n      us('partB'),\n      'value'\n    );\n  }\n\n  if (!isEmpty(shuffledValues)) {\n    if (updateSession && typeof updateSession === 'function') {\n      updateSession(session.id, session.element, {\n        shuffledValues\n      }).catch(e => {\n        console.error('update session failed', e);\n      });\n    }\n  }\n\n  if (normalizedQuestion.partLabels) {\n    partA.partLabel =\n      normalizedQuestion.partLabelType === 'Letters' ? 'Part A' : 'Part 1';\n    partB.partLabel =\n      normalizedQuestion.partLabelType === 'Letters' ? 'Part B' : 'Part 2';\n  } else {\n    partA.partLabel = undefined;\n    partB.partLabel = undefined;\n  }\n\n  if (\n    env.role === 'instructor' &&\n    (env.mode === 'view' || env.mode === 'evaluate')\n  ) {\n    partA.teacherInstructions = normalizedQuestion.partA\n      .teacherInstructionsEnabled\n      ? normalizedQuestion.partA.teacherInstructions\n      : null;\n    partB.teacherInstructions = normalizedQuestion.partB\n      .teacherInstructionsEnabled\n      ? normalizedQuestion.partB.teacherInstructions\n      : null;\n  } else {\n    partA.teacherInstructions = null;\n    partB.teacherInstructions = null;\n  }\n\n  partA.prompt = normalizedQuestion.partA.promptEnabled\n    ? normalizedQuestion.partA.prompt\n    : null;\n  partB.prompt = normalizedQuestion.partB.promptEnabled\n    ? normalizedQuestion.partB.prompt\n    : null;\n\n  return new Promise(resolve => {\n    resolve({\n      disabled: env.mode !== 'gather',\n      mode: env.mode,\n      partA,\n      partB\n    });\n  });\n}\n\nexport const createDefaultModel = (model = {}) =>\n  new Promise(resolve => {\n    resolve({\n      ...defaults,\n      ...model\n    });\n  });\n\nconst isCorrect = c => c.correct === true;\n\nconst getScore = (config, sessionPart, key) => {\n  const { choices = [] } = (config && config[key]) || {};\n  const maxScore = choices.length;\n  const { value: sessionPartValue } = sessionPart || {};\n\n  const chosen = c => !!(sessionPartValue || []).find(v => v === c.value);\n  const correctAndNotChosen = c => isCorrect(c) && !chosen(c);\n  const incorrectAndChosen = c => !isCorrect(c) && chosen(c);\n  const correctChoices = choices.reduce((total, choice) => {\n    if (correctAndNotChosen(choice) || incorrectAndChosen(choice)) {\n      return total - 1;\n    } else {\n      return total;\n    }\n  }, choices.length);\n\n  // determine score for a part\n  if (!config.partialScoring && correctChoices < maxScore) {\n    return 0;\n  }\n\n  return parseFloat(maxScore ? (correctChoices / maxScore).toFixed(2) : 0);\n};\n\nexport function outcome(config, session) {\n  return new Promise(resolve => {\n    const { value } = session || {};\n\n    if (!session || !value) {\n      resolve({ score: 0, scoreA: 0, scoreB: 0, empty: true });\n    }\n\n    if (value) {\n      const { partA, partB } = value || {};\n\n      const scoreA = getScore(config, partA, 'partA');\n      const scoreB = getScore(config, partB, 'partB');\n\n      if (!config.partialScoring) {\n        // The EBSR item is worth 1 point\n        // That point is awarded if and only if both parts are fully correct, otherwise no points are awarded\n        resolve({ score: (scoreA === 1 && scoreB === 1) ? 1 : 0, scoreA, scoreB, max: 1 });\n      } else {\n        // The EBSR item is worth 2 points\n        if (scoreA === 1) {\n          if (scoreB === 1) {\n            // If Part A and Part B are both correct, 2 points are awarded\n            resolve({ score: 2, scoreA, scoreB, max: 2 });\n          } else {\n            // If Part A is correct and part B is incorrect, 1 point is awarded\n            resolve({ score: 1, scoreA, scoreB, max: 2 });\n          }\n        } else {\n          // For all other combinations, no points are awarded\n          resolve({ score: 0, scoreA, scoreB, max: 2 });\n        }\n      }\n    }\n  });\n}\n\nconst returnPartCorrect = choices => {\n  let answers = [];\n\n  choices.forEach(i => {\n    const { correct, value } = i;\n    if (correct) {\n      answers.push(value);\n    }\n  });\n  return answers;\n};\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise(resolve => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { partA, partB } = question;\n\n      const partACorrect = returnPartCorrect(partA.choices);\n      const partBCorrect = returnPartCorrect(partB.choices);\n\n      resolve({\n        value: {\n          partA: {\n            id: 'partA',\n            value: partACorrect\n          },\n          partB: {\n            id: 'partB',\n            value: partBCorrect\n          }\n        },\n        id: '1'\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["prepareChoice","model","env","defaultFeedback","choice","out","label","value","role","mode","rationale","rationaleEnabled","correct","feedbackEnabled","feedbackType","feedback","type","parsePart","part","key","session","Object","assign","incorrect","choices","map","disabled","complete","min","filter","c","length","responseCorrect","undefined","normalize","partA","partB","question","partLabels","partLabelType","defaults","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","gridColumns","choicesLayout","verticalMode","updateSession","normalizedQuestion","shuffledValues","us","id","element","update","Promise","resolve","partASession","partALockChoiceOrder","partAChoices","partBChoices","partBSession","partBLockChoiceOrder","e","console","error","partLabel","teacherInstructions","prompt","createDefaultModel","isCorrect","getScore","config","sessionPart","maxScore","sessionPartValue","chosen","find","v","correctAndNotChosen","incorrectAndChosen","correctChoices","reduce","total","partialScoring","parseFloat","toFixed","outcome","score","scoreA","scoreB","empty","max","returnPartCorrect","answers","forEach","i","push","createCorrectResponseSession","partACorrect","partBCorrect"],"mappings":"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","sourcesContent":["import defaults from './defaults';\nimport { lockChoices, getShuffledChoices } from '@pie-lib/controller-utils';\nimport { isResponseCorrect } from './utils';\nimport get from 'lodash/get';\nimport isEmpty from 'lodash/isEmpty';\n\nconst prepareChoice = (model, env, defaultFeedback) => choice => {\n  const out = {\n    label: choice.label,\n    value: choice.value\n  };\n\n  if (\n    env.role === 'instructor' &&\n    (env.mode === 'view' || env.mode === 'evaluate')\n  ) {\n    out.rationale = model.rationaleEnabled ? choice.rationale : null;\n  } else {\n    out.rationale = null;\n  }\n\n  if (env.mode === 'evaluate') {\n    out.correct = !!choice.correct;\n\n    if (model.feedbackEnabled) {\n      const feedbackType = (choice.feedback && choice.feedback.type) || 'none';\n\n      if (feedbackType === 'default') {\n        out.feedback = defaultFeedback[choice.correct ? 'correct' : 'incorrect'];\n      } else if (feedbackType === 'custom') {\n        out.feedback = choice.feedback.value;\n      }\n    }\n  }\n\n  return out;\n};\n\nconst parsePart = (part, key, session, env) => {\n  const defaultFeedback = Object.assign(\n    { correct: 'Correct', incorrect: 'Incorrect' },\n    part.defaultFeedback\n  );\n\n  let choices = part.choices\n    ? part.choices.map(prepareChoice(part, env, defaultFeedback))\n    : [];\n\n  return {\n    ...part,\n    choices,\n    disabled: env.mode !== 'gather',\n    complete: {\n      min: part.choices.filter(c => c.correct).length\n    },\n    responseCorrect:\n      env.mode === 'evaluate'\n        ? isResponseCorrect(part, key, session)\n        : undefined\n  };\n};\n\nexport const normalize = ({ partA = {}, partB = {}, ...question }) => ({\n  partLabels: true,\n  partLabelType: 'Letters',\n  ...question,\n  partA: {\n    ...defaults.partA,\n    rationaleEnabled: true,\n    feedbackEnabled: true,\n    promptEnabled: true,\n    teacherInstructionsEnabled: true,\n    studentInstructionsEnabled: true,\n    gridColumns: '2',\n    ...partA,\n    choicesLayout: partA.choicesLayout || (partA.verticalMode === false && 'horizontal') || 'vertical'\n  },\n  partB: {\n    ...defaults.partB,\n    rationaleEnabled: true,\n    promptEnabled: true,\n    feedbackEnabled: true,\n    teacherInstructionsEnabled: true,\n    studentInstructionsEnabled: true,\n    gridColumns: '2',\n    ...partB,\n    choicesLayout: partB.choicesLayout || (partB.verticalMode === false && 'horizontal') || 'vertical'\n  }\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n * @param {*} updateSession - optional - a function that will set the properties passed into it on the session.\n */\nexport async function model(question, session, env, updateSession) {\n  const normalizedQuestion = normalize(question);\n  const partA = parsePart(normalizedQuestion.partA, 'partA', session, env);\n  const partB = parsePart(normalizedQuestion.partB, 'partB', session, env);\n\n  const shuffledValues = {};\n\n  const us = part => (id, element, update) =>\n    new Promise(resolve => {\n      shuffledValues[part] = update.shuffledValues;\n      resolve();\n    });\n\n  const partASession = get(session, 'value.partA');\n  const partALockChoiceOrder = lockChoices(normalizedQuestion.partA, partASession, env);\n\n  const { choices: partAChoices } = partA || {};\n  const { choices: partBChoices } = partB || {};\n\n  if (!partALockChoiceOrder && partAChoices && partAChoices.length) {\n    partA.choices = await getShuffledChoices(\n      partAChoices,\n      { shuffledValues: (session.shuffledValues || {}).partA },\n      us('partA'),\n      'value'\n    );\n  }\n\n  const partBSession = get(session, 'value.partB');\n  const partBLockChoiceOrder = lockChoices(normalizedQuestion.partB, partBSession, env);\n\n  if (!partBLockChoiceOrder && partBChoices && partBChoices.length) {\n    partB.choices = await getShuffledChoices(\n      partBChoices,\n      { shuffledValues: (session.shuffledValues || {}).partB },\n      us('partB'),\n      'value'\n    );\n  }\n\n  if (!isEmpty(shuffledValues)) {\n    if (updateSession && typeof updateSession === 'function') {\n      updateSession(session.id, session.element, {\n        shuffledValues\n      }).catch(e => {\n        console.error('update session failed', e);\n      });\n    }\n  }\n\n  if (normalizedQuestion.partLabels) {\n    partA.partLabel =\n      normalizedQuestion.partLabelType === 'Letters' ? 'Part A' : 'Part 1';\n    partB.partLabel =\n      normalizedQuestion.partLabelType === 'Letters' ? 'Part B' : 'Part 2';\n  } else {\n    partA.partLabel = undefined;\n    partB.partLabel = undefined;\n  }\n\n  if (\n    env.role === 'instructor' &&\n    (env.mode === 'view' || env.mode === 'evaluate')\n  ) {\n    partA.teacherInstructions = normalizedQuestion.partA\n      .teacherInstructionsEnabled\n      ? normalizedQuestion.partA.teacherInstructions\n      : null;\n    partB.teacherInstructions = normalizedQuestion.partB\n      .teacherInstructionsEnabled\n      ? normalizedQuestion.partB.teacherInstructions\n      : null;\n  } else {\n    partA.teacherInstructions = null;\n    partB.teacherInstructions = null;\n  }\n\n  partA.prompt = normalizedQuestion.partA.promptEnabled\n    ? normalizedQuestion.partA.prompt\n    : null;\n  partB.prompt = normalizedQuestion.partB.promptEnabled\n    ? normalizedQuestion.partB.prompt\n    : null;\n\n  return new Promise(resolve => {\n    resolve({\n      disabled: env.mode !== 'gather',\n      mode: env.mode,\n      partA,\n      partB\n    });\n  });\n}\n\nexport const createDefaultModel = (model = {}) =>\n  new Promise(resolve => {\n    resolve({\n      ...defaults,\n      ...model\n    });\n  });\n\nconst isCorrect = c => c.correct === true;\n\nconst getScore = (config, sessionPart, key) => {\n  const { choices = [] } = (config && config[key]) || {};\n  const maxScore = choices.length;\n  const { value: sessionPartValue } = sessionPart || {};\n\n  const chosen = c => !!(sessionPartValue || []).find(v => v === c.value);\n  const correctAndNotChosen = c => isCorrect(c) && !chosen(c);\n  const incorrectAndChosen = c => !isCorrect(c) && chosen(c);\n  const correctChoices = choices.reduce((total, choice) => {\n    if (correctAndNotChosen(choice) || incorrectAndChosen(choice)) {\n      return total - 1;\n    } else {\n      return total;\n    }\n  }, choices.length);\n\n  // determine score for a part\n  if (!config.partialScoring && correctChoices < maxScore) {\n    return 0;\n  }\n\n  return parseFloat(maxScore ? (correctChoices / maxScore).toFixed(2) : 0);\n};\n\nexport function outcome(config, session) {\n  return new Promise(resolve => {\n    const { value } = session || {};\n\n    if (!session || !value) {\n      resolve({ score: 0, scoreA: 0, scoreB: 0, empty: true });\n    }\n\n    if (value) {\n      const { partA, partB } = value || {};\n\n      const scoreA = getScore(config, partA, 'partA');\n      const scoreB = getScore(config, partB, 'partB');\n\n      if (!config.partialScoring) {\n        // The EBSR item is worth 1 point\n        // That point is awarded if and only if both parts are fully correct, otherwise no points are awarded\n        resolve({ score: (scoreA === 1 && scoreB === 1) ? 1 : 0, scoreA, scoreB, max: 1 });\n      } else {\n        // The EBSR item is worth 2 points\n        if (scoreA === 1) {\n          if (scoreB === 1) {\n            // If Part A and Part B are both correct, 2 points are awarded\n            resolve({ score: 2, scoreA, scoreB, max: 2 });\n          } else {\n            // If Part A is correct and part B is incorrect, 1 point is awarded\n            resolve({ score: 1, scoreA, scoreB, max: 2 });\n          }\n        } else {\n          // For all other combinations, no points are awarded\n          resolve({ score: 0, scoreA, scoreB, max: 2 });\n        }\n      }\n    }\n  });\n}\n\nconst returnPartCorrect = choices => {\n  let answers = [];\n\n  choices.forEach(i => {\n    const { correct, value } = i;\n    if (correct) {\n      answers.push(value);\n    }\n  });\n  return answers;\n};\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise(resolve => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { partA, partB } = question;\n\n      const partACorrect = returnPartCorrect(partA.choices);\n      const partBCorrect = returnPartCorrect(partB.choices);\n\n      resolve({\n        value: {\n          partA: {\n            id: 'partA',\n            value: partACorrect\n          },\n          partB: {\n            id: 'partB',\n            value: partBCorrect\n          }\n        },\n        id: '1'\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n"],"file":"index.js"}

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/ebsr-controller",
   "private": true,
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/controller/src/index.js

@@ -60,7 +60,7 @@ const parsePart = (part, key, session, env) => {
   };
 };
 
-export const normalize = question => ({
+export const normalize = ({ partA = {}, partB = {}, ...question }) => ({
   partLabels: true,
   partLabelType: 'Letters',
   ...question,
@@ -71,9 +71,9 @@ export const normalize = question => ({
     promptEnabled: true,
     teacherInstructionsEnabled: true,
     studentInstructionsEnabled: true,
-    choicesLayout: 'vertical',
     gridColumns: '2',
-    ...question.partA
+    ...partA,
+    choicesLayout: partA.choicesLayout || (partA.verticalMode === false && 'horizontal') || 'vertical'
   },
   partB: {
     ...defaults.partB,
@@ -82,9 +82,9 @@ export const normalize = question => ({
     feedbackEnabled: true,
     teacherInstructionsEnabled: true,
     studentInstructionsEnabled: true,
-    choicesLayout: 'vertical',
     gridColumns: '2',
-    ...question.partB
+    ...partB,
+    choicesLayout: partB.choicesLayout || (partB.verticalMode === false && 'horizontal') || 'vertical'
   }
 });
 

package/docs/config-schema.json

@@ -681,4 +681,4 @@
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
-}
+}

package/docs/config-schema.json.md

@@ -510,4 +510,4 @@ Indicates if the item has to be displayed in the Settings Panel
 
 ### `label` (string)
 
-Indicates the label for the item that has to be displayed in the Settings Panel
+Indicates the label for the item that has to be displayed in the Settings Panel

package/docs/pie-schema.json

@@ -622,4 +622,4 @@
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
-}
+}

package/docs/pie-schema.json.md

@@ -456,4 +456,4 @@ The label of the choice
 
 ### `correct` (boolean)
 
-Indicates if choice is correct
+Indicates if choice is correct

package/lib/index.js

@@ -31,13 +31,13 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _debug = _interopRequireDefault(require("debug"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var SESSION_CHANGED = _piePlayerEvents.SessionChangedEvent.TYPE;
 var MC_TAG_NAME = 'ebsr-multiple-choice';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["SESSION_CHANGED","SessionChangedEvent","TYPE","MC_TAG_NAME","log","EbsrMC","MultipleChoice","defineMultipleChoice","customElements","get","define","isNonEmptyArray","a","Array","isArray","length","isSessionComplete","session","b","Ebsr","e","target","preventDefault","stopImmediatePropagation","id","getAttribute","key","toUpperCase","update","_model","dispatchSessionChanged","srcElement","_session","m","whenDefined","then","setPartModel","partA","partB","s","setPartSession","part","mode","model","keyMode","choicePrefix","value","partSession","complete","dispatchEvent","tagName","toLowerCase","querySelector","_render","addEventListener","onSessionUpdated","removeEventListener","innerHTML","HTMLElement"],"mappings":"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","sourcesContent":["import { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport MultipleChoice from '@pie-element/multiple-choice';\nimport get from 'lodash/get';\nimport debug from 'debug';\nconst SESSION_CHANGED = SessionChangedEvent.TYPE;\nconst MC_TAG_NAME = 'ebsr-multiple-choice';\nconst log = debug('pie-elements:ebsr');\n\nclass EbsrMC extends MultipleChoice {}\n\nconst defineMultipleChoice = () => {\n  if (!customElements.get(MC_TAG_NAME)) {\n    customElements.define(MC_TAG_NAME, EbsrMC);\n  }\n};\n\ndefineMultipleChoice();\n\nconst isNonEmptyArray = (a) => Array.isArray(a) && a.length > 0;\n\nexport const isSessionComplete = (session) => {\n  const a = get(session, 'value.partA.value');\n  const b = get(session, 'value.partB.value');\n\n  return isNonEmptyArray(a) && isNonEmptyArray(b);\n};\n\nexport default class Ebsr extends HTMLElement {\n  constructor() {\n    super();\n    this._model = {};\n    this._session = {};\n  }\n\n  onSessionUpdated = (e) => {\n    if (e.target === this) {\n      return;\n    }\n\n    e.preventDefault();\n    e.stopImmediatePropagation();\n\n    const id = e.target.getAttribute('id');\n\n    if (id) {\n      const key = `part${id.toUpperCase()}`;\n\n      if (e.update) {\n        this._model[key] = e.update;\n      }\n      //TODO: accessing a private property here. The session event should contain the update in future to prevent this.\n      this.dispatchSessionChanged(e.srcElement._session, key);\n    }\n  };\n\n  set model(m) {\n    this._model = m;\n\n    customElements.whenDefined(MC_TAG_NAME).then(() => {\n      this.setPartModel(this.partA, 'partA');\n      this.setPartModel(this.partB, 'partB');\n    });\n  }\n\n  set session(s) {\n    this._session = s;\n\n    customElements.whenDefined(MC_TAG_NAME).then(() => {\n      this.setPartSession(this.partA, 'partA');\n      this.setPartSession(this.partB, 'partB');\n    });\n  }\n\n  setPartModel(part, key) {\n    if (this._model && this._model[key]) {\n      const { mode } = this._model;\n\n      part.model = {\n        ...this._model[key],\n        mode,\n        keyMode: this._model[key].choicePrefix,\n      };\n    }\n  }\n\n  setPartSession(part, key) {\n    if (this._session && this._model) {\n      const { value } = this._session;\n      part.session = value && value[key] ? value[key] : { id: key };\n    }\n  }\n\n  dispatchSessionChanged(partSession, key) {\n    this._session.value = {\n      ...this._session.value,\n      [key]: partSession,\n    };\n\n    log('[onSessionChanged] session: ', this._session);\n    const complete = isSessionComplete(this._session);\n    this.dispatchEvent(\n      new SessionChangedEvent(this.tagName.toLowerCase(), complete)\n    );\n  }\n\n  get partA() {\n    return this.querySelector(`${MC_TAG_NAME}#a`);\n  }\n\n  get partB() {\n    return this.querySelector(`${MC_TAG_NAME}#b`);\n  }\n\n  connectedCallback() {\n    this._render();\n    this.addEventListener(SESSION_CHANGED, this.onSessionUpdated);\n  }\n\n  disconnectedCallback() {\n    this.removeEventListener(SESSION_CHANGED, this.onSessionUpdated);\n  }\n\n  _render() {\n    this.innerHTML = `\n      <div>\n        <${MC_TAG_NAME} id=\"a\"></${MC_TAG_NAME}>\n        <${MC_TAG_NAME} id=\"b\"></${MC_TAG_NAME}>\n      </div>\n    `;\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["SESSION_CHANGED","SessionChangedEvent","TYPE","MC_TAG_NAME","log","EbsrMC","MultipleChoice","defineMultipleChoice","customElements","get","define","isNonEmptyArray","a","Array","isArray","length","isSessionComplete","session","b","Ebsr","e","target","preventDefault","stopImmediatePropagation","id","getAttribute","key","toUpperCase","update","_model","dispatchSessionChanged","srcElement","_session","m","whenDefined","then","setPartModel","partA","partB","s","setPartSession","part","mode","model","keyMode","choicePrefix","value","partSession","complete","dispatchEvent","tagName","toLowerCase","querySelector","_render","addEventListener","onSessionUpdated","removeEventListener","innerHTML","HTMLElement"],"mappings":"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","sourcesContent":["import { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport MultipleChoice from '@pie-element/multiple-choice';\nimport get from 'lodash/get';\nimport debug from 'debug';\nconst SESSION_CHANGED = SessionChangedEvent.TYPE;\nconst MC_TAG_NAME = 'ebsr-multiple-choice';\nconst log = debug('pie-elements:ebsr');\n\nclass EbsrMC extends MultipleChoice {}\n\nconst defineMultipleChoice = () => {\n  if (!customElements.get(MC_TAG_NAME)) {\n    customElements.define(MC_TAG_NAME, EbsrMC);\n  }\n};\n\ndefineMultipleChoice();\n\nconst isNonEmptyArray = (a) => Array.isArray(a) && a.length > 0;\n\nexport const isSessionComplete = (session) => {\n  const a = get(session, 'value.partA.value');\n  const b = get(session, 'value.partB.value');\n\n  return isNonEmptyArray(a) && isNonEmptyArray(b);\n};\n\nexport default class Ebsr extends HTMLElement {\n  constructor() {\n    super();\n    this._model = {};\n    this._session = {};\n  }\n\n  onSessionUpdated = (e) => {\n    if (e.target === this) {\n      return;\n    }\n\n    e.preventDefault();\n    e.stopImmediatePropagation();\n\n    const id = e.target.getAttribute('id');\n\n    if (id) {\n      const key = `part${id.toUpperCase()}`;\n\n      if (e.update) {\n        this._model[key] = e.update;\n      }\n      //TODO: accessing a private property here. The session event should contain the update in future to prevent this.\n      this.dispatchSessionChanged(e.srcElement._session, key);\n    }\n  };\n\n  set model(m) {\n    this._model = m;\n\n    customElements.whenDefined(MC_TAG_NAME).then(() => {\n      this.setPartModel(this.partA, 'partA');\n      this.setPartModel(this.partB, 'partB');\n    });\n  }\n\n  set session(s) {\n    this._session = s;\n\n    customElements.whenDefined(MC_TAG_NAME).then(() => {\n      this.setPartSession(this.partA, 'partA');\n      this.setPartSession(this.partB, 'partB');\n    });\n  }\n\n  setPartModel(part, key) {\n    if (this._model && this._model[key]) {\n      const { mode } = this._model;\n\n      part.model = {\n        ...this._model[key],\n        mode,\n        keyMode: this._model[key].choicePrefix,\n      };\n    }\n  }\n\n  setPartSession(part, key) {\n    if (this._session && this._model) {\n      const { value } = this._session;\n      part.session = value && value[key] ? value[key] : { id: key };\n    }\n  }\n\n  dispatchSessionChanged(partSession, key) {\n    this._session.value = {\n      ...this._session.value,\n      [key]: partSession,\n    };\n\n    log('[onSessionChanged] session: ', this._session);\n    const complete = isSessionComplete(this._session);\n    this.dispatchEvent(\n      new SessionChangedEvent(this.tagName.toLowerCase(), complete)\n    );\n  }\n\n  get partA() {\n    return this.querySelector(`${MC_TAG_NAME}#a`);\n  }\n\n  get partB() {\n    return this.querySelector(`${MC_TAG_NAME}#b`);\n  }\n\n  connectedCallback() {\n    this._render();\n    this.addEventListener(SESSION_CHANGED, this.onSessionUpdated);\n  }\n\n  disconnectedCallback() {\n    this.removeEventListener(SESSION_CHANGED, this.onSessionUpdated);\n  }\n\n  _render() {\n    this.innerHTML = `\n      <div>\n        <${MC_TAG_NAME} id=\"a\"></${MC_TAG_NAME}>\n        <${MC_TAG_NAME} id=\"b\"></${MC_TAG_NAME}>\n      </div>\n    `;\n  }\n}\n"],"file":"index.js"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pie-element/ebsr",
-  "version": "7.0.0",
+  "version": "7.0.4",
   "description": "",
   "repository": "pie-framework/pie-elements",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@pie-element/multiple-choice": "^6.0.0",
+    "@pie-element/multiple-choice": "^6.1.2",
     "@pie-framework/pie-player-events": "^0.1.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
@@ -15,7 +15,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "3f18de3bed4cf482a0b908f01d868610b6532cd6",
+  "gitHead": "39691eb79f1f5ece91c831add33b05871b20828b",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },