@pie-element/placement-ordering 8.4.1-next.5 → 8.4.1-next.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/configure/lib/choice-editor.js +2 -2
- package/configure/lib/choice-editor.js.map +1 -1
- package/configure/lib/choice-tile.js.map +1 -1
- package/configure/lib/defaults.js.map +1 -1
- package/configure/lib/design.js +77 -60
- package/configure/lib/design.js.map +1 -1
- package/configure/lib/help.js.map +1 -1
- package/configure/lib/index.js.map +1 -1
- package/configure/lib/utils.js.map +1 -1
- package/configure/package.json +3 -3
- package/controller/lib/defaults.js.map +1 -1
- package/controller/lib/index.js +6 -8
- package/controller/lib/index.js.map +1 -1
- package/controller/lib/scoring.js.map +1 -1
- package/controller/package.json +2 -2
- package/docs/config-schema.json.md +1 -1
- package/docs/demo/config.js +2 -2
- package/docs/demo/generate.js +7 -9
- package/docs/demo/index.html +1 -2
- package/docs/demo/session.js +1 -1
- package/docs/pie-schema.json.md +1 -1
- package/lib/index.js.map +1 -1
- package/lib/main.js.map +1 -1
- package/lib/ordering.js.map +1 -1
- package/lib/placement-ordering.js +73 -30
- package/lib/placement-ordering.js.map +1 -1
- package/lib/tile.js.map +1 -1
- package/lib/tiler.js.map +1 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["prepareCustomizationObject","config","model","configuration","defaultValues","addWeightToCorrectResponse","correctResponse","map","correct","weight","undefined","id","PlacementOrdering","_model","createDefaultModel","_configuration","onModelChanged","resetSession","_rerender","dispatchUpdate","onConfigurationChanged","insertImage","handler","dispatchEvent","InsertImageEvent","deleteImage","src","done","DeleteImageEvent","reset","ModelUpdatedEvent","s","c","info","InsertSoundEvent","DeleteSoundEvent","element","React","createElement","Main","imageSupport","add","uploadSoundSupport","insertSound","bind","onDeleteSound","ReactDOM","render","HTMLElement","mapChoicesToReturnCorrectResponse","choices","ch","defaultModel"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAQA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,0BAA0B,GAAG,SAA7BA,0BAA6B,CAACC,MAAD,EAASC,KAAT,EAAmB;AACpD,MAAMC,aAAa,GAAG,2BAASF,MAAT,EAAiBG,qBAAcD,aAA/B,CAAtB;AAEA,SAAO;AAAEA,IAAAA,aAAa,EAAbA,aAAF;AAAiBD,IAAAA,KAAK,EAALA;AAAjB,GAAP;AACD,CAJD;;AAMO,IAAMG,0BAA0B,GAAG,SAA7BA,0BAA6B,
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["prepareCustomizationObject","config","model","configuration","defaultValues","addWeightToCorrectResponse","correctResponse","map","correct","weight","undefined","id","PlacementOrdering","_model","createDefaultModel","_configuration","onModelChanged","resetSession","_rerender","dispatchUpdate","onConfigurationChanged","insertImage","handler","dispatchEvent","InsertImageEvent","deleteImage","src","done","DeleteImageEvent","reset","ModelUpdatedEvent","s","c","info","InsertSoundEvent","DeleteSoundEvent","element","React","createElement","Main","imageSupport","add","uploadSoundSupport","insertSound","bind","onDeleteSound","ReactDOM","render","HTMLElement","mapChoicesToReturnCorrectResponse","choices","ch","defaultModel"],"mappings":"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","sourcesContent":["import {\n ModelUpdatedEvent,\n DeleteImageEvent,\n InsertImageEvent,\n InsertSoundEvent,\n DeleteSoundEvent,\n} from '@pie-framework/pie-configure-events';\n\nimport Main from './design';\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport defaultValues from './defaults';\nimport defaults from 'lodash/defaults';\n\nconst prepareCustomizationObject = (config, model) => {\n const configuration = defaults(config, defaultValues.configuration);\n\n return { configuration, model };\n};\n\nexport const addWeightToCorrectResponse = (correctResponse) =>\n correctResponse &&\n correctResponse.map((correct) => {\n // if weight is set\n if (correct.weight !== undefined) {\n return { id: correct.id, weight: correct.weight };\n } else {\n return { id: correct, weight: 0 };\n }\n });\n/**\n * assuming that the correct response will be set via ui, not via config,\n * correctResponse (if not set) will be initialized with choices default order\n */\nexport default class PlacementOrdering extends HTMLElement {\n static createDefaultModel = (model = {}) => {\n const mapChoicesToReturnCorrectResponse = (choices) => choices && choices.map((ch) => ({ id: ch.id, weight: 0 }));\n\n let correctResponse =\n addWeightToCorrectResponse(model.correctResponse) || mapChoicesToReturnCorrectResponse(model.choices);\n\n const defaultModel = {\n ...defaultValues.model,\n ...model,\n };\n\n if (correctResponse) {\n defaultModel.correctResponse = correctResponse;\n }\n\n return defaultModel;\n };\n\n constructor() {\n super();\n\n this._model = PlacementOrdering.createDefaultModel();\n this._configuration = defaultValues.configuration;\n\n this.onModelChanged = (model, resetSession) => {\n this._model = model;\n this._rerender();\n this.dispatchUpdate(resetSession);\n };\n\n this.onConfigurationChanged = (configuration) => {\n this._configuration = prepareCustomizationObject(configuration).configuration;\n\n this.onModelChanged(this._model);\n this._rerender();\n };\n\n this.insertImage = (handler) => {\n this.dispatchEvent(new InsertImageEvent(handler));\n };\n\n this.deleteImage = (src, done) => {\n this.dispatchEvent(new DeleteImageEvent(src, done));\n };\n }\n\n dispatchUpdate(reset) {\n this.dispatchEvent(new ModelUpdatedEvent(this._model, reset));\n }\n\n set model(s) {\n this._model = PlacementOrdering.createDefaultModel(s);\n this._rerender();\n }\n\n set configuration(c) {\n const info = prepareCustomizationObject(c, this._model);\n\n this.onModelChanged(info.model);\n this._configuration = info.configuration;\n this._rerender();\n }\n\n insertSound(handler) {\n this.dispatchEvent(new InsertSoundEvent(handler));\n }\n\n onDeleteSound(src, done) {\n this.dispatchEvent(new DeleteSoundEvent(src, done));\n }\n\n _rerender() {\n let element = React.createElement(Main, {\n model: this._model,\n configuration: this._configuration,\n onModelChanged: this.onModelChanged,\n onConfigurationChanged: this.onConfigurationChanged,\n imageSupport: {\n add: this.insertImage,\n delete: this.deleteImage,\n },\n uploadSoundSupport: {\n add: this.insertSound.bind(this),\n delete: this.onDeleteSound.bind(this),\n },\n });\n ReactDOM.render(element, this);\n }\n}\n"],"file":"index.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/utils.js"],"names":["generateValidationMessage","answersMessage"],"mappings":";;;;;;;AAAO,IAAMA,yBAAyB,GAAG,SAA5BA,yBAA4B,GAAM;AAC7C,MAAMC,cAAc,
|
|
1
|
+
{"version":3,"sources":["../src/utils.js"],"names":["generateValidationMessage","answersMessage"],"mappings":";;;;;;;AAAO,IAAMA,yBAAyB,GAAG,SAA5BA,yBAA4B,GAAM;AAC7C,MAAMC,cAAc,GAClB,yCACA,wDADA,GAEA,yEAHF;AAKA,SAAO,6BAA6BA,cAApC;AACD,CAPM","sourcesContent":["export const generateValidationMessage = () => {\n const answersMessage =\n '\\nThere should be at least 3 tokens.' +\n '\\nThe tokens should not be empty and should be unique.' +\n '\\nThe correct ordering should not be identical to the initial ordering.';\n\n return 'Validation requirements:' + answersMessage;\n};\n"],"file":"utils.js"}
|
package/configure/package.json
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
"@material-ui/core": "^3.9.2",
|
|
9
9
|
"@material-ui/icons": "^3.0.1",
|
|
10
10
|
"@pie-framework/pie-configure-events": "^1.3.0",
|
|
11
|
-
"@pie-lib/config-ui": "^11.0.
|
|
12
|
-
"@pie-lib/editable-html": "^9.2.
|
|
13
|
-
"@pie-lib/scoring-config": "^3.5.
|
|
11
|
+
"@pie-lib/config-ui": "^11.0.26",
|
|
12
|
+
"@pie-lib/editable-html": "^9.2.8",
|
|
13
|
+
"@pie-lib/scoring-config": "^3.5.190",
|
|
14
14
|
"debug": "^3.1.0",
|
|
15
15
|
"lodash": "^4.17.15",
|
|
16
16
|
"nested-property": "^0.0.7",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/defaults.js"],"names":["choiceLabel","choices","correctResponse","enableImages","prompt","numberedGuides","orientation","partialScoring","placementArea","choiceLabelEnabled","removeTilesAfterPlacing","scoringType","targetLabel","note","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;eAAe;AACbA,EAAAA,WAAW,EAAE,EADA;AAEbC,EAAAA,OAAO,EAAE,EAFI;AAGbC,EAAAA,eAAe,EAAE,EAHJ;AAIbC,EAAAA,YAAY,EAAE,KAJD;AAKbC,EAAAA,MAAM,EAAE,qBALK;AAMbC,EAAAA,cAAc,EAAE,KANH;AAObC,EAAAA,WAAW,EAAE,UAPA;AAQbC,EAAAA,cAAc,EAAE,IARH;AASbC,EAAAA,aAAa,EAAE,KATF;AAUbC,EAAAA,kBAAkB,EAAE,IAVP;AAWbC,EAAAA,uBAAuB,EAAE,IAXZ;AAYbC,EAAAA,WAAW,EAAE,MAZA;AAabC,EAAAA,WAAW,EAAE,EAbA;AAcbC,EAAAA,IAAI,EAAE,0KAdO;AAebC,EAAAA,gBAAgB,EAAE,IAfL;AAgBbC,EAAAA,eAAe,EAAE,IAhBJ;AAiBbC,EAAAA,aAAa,EAAE,IAjBF;AAkBbC,EAAAA,0BAA0B,EAAE,IAlBf;AAmBbC,EAAAA,0BAA0B,EAAE;AAnBf,C","sourcesContent":["export default {\n choiceLabel: '',\n choices: [],\n correctResponse: [],\n enableImages: false,\n prompt: 'Item Stem goes here',\n numberedGuides: false,\n orientation: 'vertical',\n partialScoring: true,\n placementArea: false,\n choiceLabelEnabled: true,\n removeTilesAfterPlacing: true,\n scoringType: 'auto',\n targetLabel: '',\n note: 'The answer shown above is the most common correct answer for this item. One or more additional correct answers are also defined, and will also be recognized as correct.',\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true
|
|
1
|
+
{"version":3,"sources":["../src/defaults.js"],"names":["choiceLabel","choices","correctResponse","enableImages","prompt","numberedGuides","orientation","partialScoring","placementArea","choiceLabelEnabled","removeTilesAfterPlacing","scoringType","targetLabel","note","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;eAAe;AACbA,EAAAA,WAAW,EAAE,EADA;AAEbC,EAAAA,OAAO,EAAE,EAFI;AAGbC,EAAAA,eAAe,EAAE,EAHJ;AAIbC,EAAAA,YAAY,EAAE,KAJD;AAKbC,EAAAA,MAAM,EAAE,qBALK;AAMbC,EAAAA,cAAc,EAAE,KANH;AAObC,EAAAA,WAAW,EAAE,UAPA;AAQbC,EAAAA,cAAc,EAAE,IARH;AASbC,EAAAA,aAAa,EAAE,KATF;AAUbC,EAAAA,kBAAkB,EAAE,IAVP;AAWbC,EAAAA,uBAAuB,EAAE,IAXZ;AAYbC,EAAAA,WAAW,EAAE,MAZA;AAabC,EAAAA,WAAW,EAAE,EAbA;AAcbC,EAAAA,IAAI,EAAE,0KAdO;AAebC,EAAAA,gBAAgB,EAAE,IAfL;AAgBbC,EAAAA,eAAe,EAAE,IAhBJ;AAiBbC,EAAAA,aAAa,EAAE,IAjBF;AAkBbC,EAAAA,0BAA0B,EAAE,IAlBf;AAmBbC,EAAAA,0BAA0B,EAAE;AAnBf,C","sourcesContent":["export default {\n choiceLabel: '',\n choices: [],\n correctResponse: [],\n enableImages: false,\n prompt: 'Item Stem goes here',\n numberedGuides: false,\n orientation: 'vertical',\n partialScoring: true,\n placementArea: false,\n choiceLabelEnabled: true,\n removeTilesAfterPlacing: true,\n scoringType: 'auto',\n targetLabel: '',\n note: 'The answer shown above is the most common correct answer for this item. One or more additional correct answers are also defined, and will also be recognized as correct.',\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true,\n};\n"],"file":"defaults.js"}
|
package/controller/lib/index.js
CHANGED
|
@@ -123,13 +123,6 @@ function model(question, session, env) {
|
|
|
123
123
|
});
|
|
124
124
|
base.note = normalizedQuestion.note;
|
|
125
125
|
base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;
|
|
126
|
-
|
|
127
|
-
if (env.mode === 'gather' && !normalizedQuestion.placementArea && !session.value) {
|
|
128
|
-
session.value = base.choices.map(function (m) {
|
|
129
|
-
return m.id;
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
|
-
|
|
133
126
|
log('[model] removing tileSize for the moment.');
|
|
134
127
|
base.prompt = normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null;
|
|
135
128
|
base.config = {
|
|
@@ -188,6 +181,11 @@ function model(question, session, env) {
|
|
|
188
181
|
|
|
189
182
|
if (!allCorrect) {
|
|
190
183
|
base.correctResponse = (0, _scoring.flattenCorrect)(normalizedQuestion);
|
|
184
|
+
} // requirement made in PD-2182
|
|
185
|
+
|
|
186
|
+
|
|
187
|
+
if (!normalizedQuestion.feedback) {
|
|
188
|
+
normalizedQuestion.feedbackEnabled = false;
|
|
191
189
|
}
|
|
192
190
|
|
|
193
191
|
fb = normalizedQuestion.feedbackEnabled ? (0, _feedback.getFeedbackForCorrectness)(base.correctness, normalizedQuestion.feedback) : Promise.resolve(undefined);
|
|
@@ -199,7 +197,7 @@ function model(question, session, env) {
|
|
|
199
197
|
resolve(base);
|
|
200
198
|
}
|
|
201
199
|
|
|
202
|
-
case
|
|
200
|
+
case 15:
|
|
203
201
|
case "end":
|
|
204
202
|
return _context.stop();
|
|
205
203
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["log","questionError","Error","outcome","question","session","env","Promise","resolve","reject","_","isEmpty","score","empty","correctResponse","s","finalScore","partialScoring","enabled","e","createDefaultModel","model","defaults","normalize","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","normalizedQuestion","base","alternateResponses","every","isArray","console","error","outcomes","completeLength","length","choices","filter","choice","label","note","showNote","mode","placementArea","value","map","m","id","prompt","config","orientation","includeTargets","choiceLabelEnabled","targetLabel","choiceLabel","showOrdering","numberedGuides","allowSameChoiceInTargets","removeTilesAfterPlacing","disabled","role","rationale","teacherInstructions","allCorrectResponses","bestSetOfResponses","reduce","info","cr","currentScore","acc","c","idx","arr","allCorrect","correct","isEqual","correctness","fb","feedback","undefined","then","createCorrectResponseSession","validate","errors","reversedChoices","reverse","choicesErrors","forEach","index","identicalAnswer","slice","some","choicesIds","correctResponseIds","response","orderError"],"mappings":"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","sourcesContent":["import { flattenCorrect, getAllCorrectResponses, score } from './scoring';\n\nimport _ from 'lodash';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nimport defaults from './defaults';\nimport isEqual from 'lodash/isEqual';\nimport isEmpty from 'lodash/isEmpty';\n\nconst log = debug('@pie-element:placement-ordering:controller');\n\nexport const questionError = () =>\n new Error('Question is missing required array: correctResponse');\n\nexport function outcome(question, session, env) {\n return new Promise((resolve, reject) => {\n if (!session || _.isEmpty(session)) {\n resolve({ score: 0, empty: true });\n }\n\n if (\n !question ||\n !question.correctResponse ||\n _.isEmpty(question.correctResponse)\n ) {\n reject(questionError());\n } else {\n try {\n const s = score(question, session);\n const finalScore = partialScoring.enabled(question, env || {})\n ? s\n : s === 1\n ? 1\n : 0;\n resolve({\n score: finalScore\n });\n } catch (e) {\n reject(e);\n }\n }\n });\n}\n\nexport function createDefaultModel(model = {}) {\n return new Promise(resolve => {\n resolve({\n ...defaults,\n ...model\n });\n });\n}\n\nexport const normalize = question => ({\n ...defaults,\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true,\n ...question\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n */\nexport function model(question, session, env) {\n return new Promise(async resolve => {\n const normalizedQuestion = normalize(question);\n const base = {};\n\n if (question.alternateResponses && _.every(question.alternateResponses, _.isArray)) {\n log('Deprecated structure of alternateResponses is in use');\n console.error('Deprecated structure of alternateResponses is in use');\n }\n\n base.env = env;\n base.outcomes = [];\n base.completeLength = (normalizedQuestion.correctResponse || []).length;\n base.choices = (normalizedQuestion.choices || []).filter(choice => choice.label);\n base.note = normalizedQuestion.note;\n base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;\n\n if (env.mode === 'gather' && !normalizedQuestion.placementArea && !session.value) {\n session.value = base.choices.map(m => m.id);\n }\n\n log('[model] removing tileSize for the moment.');\n\n base.prompt = normalizedQuestion.promptEnabled\n ? normalizedQuestion.prompt\n : null;\n base.config = {\n orientation: normalizedQuestion.orientation || 'vertical',\n includeTargets: normalizedQuestion.placementArea,\n choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,\n targetLabel: normalizedQuestion.targetLabel,\n choiceLabel: normalizedQuestion.choiceLabel,\n showOrdering: normalizedQuestion.numberedGuides,\n allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing\n };\n\n base.disabled = env.mode !== 'gather';\n\n if (\n env.role === 'instructor' &&\n (env.mode === 'view' || env.mode === 'evaluate')\n ) {\n base.rationale = normalizedQuestion.rationaleEnabled\n ? normalizedQuestion.rationale\n : null;\n base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n ? normalizedQuestion.teacherInstructions\n : null;\n } else {\n base.rationale = null;\n base.teacherInstructions = null;\n }\n\n if (env.mode === 'evaluate') {\n const value = (session && session.value) || [];\n const allCorrectResponses = getAllCorrectResponses(normalizedQuestion);\n\n const bestSetOfResponses = allCorrectResponses.reduce(\n (info, cr) => {\n const currentScore = _.reduce(\n value,\n (acc, c, idx) => acc + (cr[idx] === c ? 1 : 0),\n 0\n );\n\n if (currentScore > info.score) {\n return {\n arr: cr,\n score: currentScore\n };\n }\n\n return info;\n },\n { arr: [], score: 0 }\n );\n\n base.outcomes = _.map(value, function(c, idx) {\n return {\n id: c,\n outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'\n };\n });\n\n const allCorrect = allCorrectResponses.reduce((correct, cr) => {\n if (_.isEqual(cr, value)) {\n return true;\n }\n\n return correct;\n }, false);\n\n base.correctness = allCorrect ? 'correct' : 'incorrect';\n\n if (!allCorrect) {\n base.correctResponse = flattenCorrect(normalizedQuestion);\n }\n\n const fb = normalizedQuestion.feedbackEnabled\n ? getFeedbackForCorrectness(base.correctness, normalizedQuestion.feedback)\n : Promise.resolve(undefined);\n\n fb.then((feedback) => {\n base.feedback = feedback;\n resolve(base);\n });\n } else {\n resolve(base);\n }\n });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n return new Promise(resolve => {\n if (env.mode !== 'evaluate' && env.role === 'instructor') {\n resolve({\n id: '1',\n value: flattenCorrect(question)\n });\n } else {\n resolve(null);\n }\n });\n};\n\nexport const validate = (model = {}, config = {}) => {\n const { choices, correctResponse } = model;\n const errors = {};\n\n const reversedChoices = [...choices || []].reverse();\n const choicesErrors = {};\n\n reversedChoices.forEach((choice, index) => {\n const { id, label } = choice;\n\n if (label === '' || label === '<div></div>') {\n choicesErrors[id] = 'Content should not be empty.';\n } else {\n const identicalAnswer = reversedChoices.slice(index + 1).some(c => c.label === label);\n\n if (identicalAnswer) {\n choicesErrors[id] = 'Content should be unique.';\n }\n }\n });\n\n const choicesIds = (choices || []).map(choice => choice.id);\n const correctResponseIds = (correctResponse || []).map(response => response.id || response);\n\n if (isEqual(choicesIds, correctResponseIds)) {\n errors.orderError = 'The correct ordering should not be identical to the initial ordering.';\n }\n\n if (!isEmpty(choicesErrors)) {\n errors.choicesErrors = choicesErrors;\n }\n\n return errors;\n};\n"],"file":"index.js"}
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["log","questionError","Error","outcome","question","session","env","Promise","resolve","reject","_","isEmpty","score","empty","correctResponse","s","finalScore","partialScoring","enabled","e","createDefaultModel","model","defaults","normalize","rationaleEnabled","feedbackEnabled","promptEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","normalizedQuestion","base","alternateResponses","every","isArray","console","error","outcomes","completeLength","length","choices","filter","choice","label","note","showNote","prompt","config","orientation","includeTargets","placementArea","choiceLabelEnabled","targetLabel","choiceLabel","showOrdering","numberedGuides","allowSameChoiceInTargets","removeTilesAfterPlacing","disabled","mode","role","rationale","teacherInstructions","value","allCorrectResponses","bestSetOfResponses","reduce","info","cr","currentScore","acc","c","idx","arr","map","id","allCorrect","correct","isEqual","correctness","feedback","fb","undefined","then","createCorrectResponseSession","validate","errors","reversedChoices","reverse","choicesErrors","forEach","index","identicalAnswer","slice","some","choicesIds","correctResponseIds","response","orderError"],"mappings":"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","sourcesContent":["import { flattenCorrect, getAllCorrectResponses, score } from './scoring';\n\nimport _ from 'lodash';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nimport defaults from './defaults';\nimport isEqual from 'lodash/isEqual';\nimport isEmpty from 'lodash/isEmpty';\n\nconst log = debug('@pie-element:placement-ordering:controller');\n\nexport const questionError = () =>\n new Error('Question is missing required array: correctResponse');\n\nexport function outcome(question, session, env) {\n return new Promise((resolve, reject) => {\n if (!session || _.isEmpty(session)) {\n resolve({ score: 0, empty: true });\n }\n\n if (\n !question ||\n !question.correctResponse ||\n _.isEmpty(question.correctResponse)\n ) {\n reject(questionError());\n } else {\n try {\n const s = score(question, session);\n const finalScore = partialScoring.enabled(question, env || {})\n ? s\n : s === 1\n ? 1\n : 0;\n resolve({\n score: finalScore\n });\n } catch (e) {\n reject(e);\n }\n }\n });\n}\n\nexport function createDefaultModel(model = {}) {\n return new Promise(resolve => {\n resolve({\n ...defaults,\n ...model\n });\n });\n}\n\nexport const normalize = question => ({\n ...defaults,\n rationaleEnabled: true,\n feedbackEnabled: true,\n promptEnabled: true,\n teacherInstructionsEnabled: true,\n studentInstructionsEnabled: true,\n ...question\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n */\nexport function model(question, session, env) {\n return new Promise(async resolve => {\n const normalizedQuestion = normalize(question);\n const base = {};\n\n if (question.alternateResponses && _.every(question.alternateResponses, _.isArray)) {\n log('Deprecated structure of alternateResponses is in use');\n console.error('Deprecated structure of alternateResponses is in use');\n }\n\n base.env = env;\n base.outcomes = [];\n base.completeLength = (normalizedQuestion.correctResponse || []).length;\n base.choices = (normalizedQuestion.choices || []).filter(choice => choice.label);\n base.note = normalizedQuestion.note;\n base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;\n\n log('[model] removing tileSize for the moment.');\n\n base.prompt = normalizedQuestion.promptEnabled\n ? normalizedQuestion.prompt\n : null;\n base.config = {\n orientation: normalizedQuestion.orientation || 'vertical',\n includeTargets: normalizedQuestion.placementArea,\n choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,\n targetLabel: normalizedQuestion.targetLabel,\n choiceLabel: normalizedQuestion.choiceLabel,\n showOrdering: normalizedQuestion.numberedGuides,\n allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing\n };\n\n base.disabled = env.mode !== 'gather';\n\n if (\n env.role === 'instructor' &&\n (env.mode === 'view' || env.mode === 'evaluate')\n ) {\n base.rationale = normalizedQuestion.rationaleEnabled\n ? normalizedQuestion.rationale\n : null;\n base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n ? normalizedQuestion.teacherInstructions\n : null;\n } else {\n base.rationale = null;\n base.teacherInstructions = null;\n }\n\n if (env.mode === 'evaluate') {\n const value = (session && session.value) || [];\n const allCorrectResponses = getAllCorrectResponses(normalizedQuestion);\n\n const bestSetOfResponses = allCorrectResponses.reduce(\n (info, cr) => {\n const currentScore = _.reduce(\n value,\n (acc, c, idx) => acc + (cr[idx] === c ? 1 : 0),\n 0\n );\n\n if (currentScore > info.score) {\n return {\n arr: cr,\n score: currentScore\n };\n }\n\n return info;\n },\n { arr: [], score: 0 }\n );\n\n base.outcomes = _.map(value, function(c, idx) {\n return {\n id: c,\n outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'\n };\n });\n\n const allCorrect = allCorrectResponses.reduce((correct, cr) => {\n if (_.isEqual(cr, value)) {\n return true;\n }\n\n return correct;\n }, false);\n\n base.correctness = allCorrect ? 'correct' : 'incorrect';\n\n if (!allCorrect) {\n base.correctResponse = flattenCorrect(normalizedQuestion);\n }\n\n // requirement made in PD-2182\n if (!normalizedQuestion.feedback) {\n normalizedQuestion.feedbackEnabled = false;\n }\n\n const fb = normalizedQuestion.feedbackEnabled\n ? getFeedbackForCorrectness(base.correctness, normalizedQuestion.feedback)\n : Promise.resolve(undefined);\n\n fb.then((feedback) => {\n base.feedback = feedback;\n resolve(base);\n });\n } else {\n resolve(base);\n }\n });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n return new Promise(resolve => {\n if (env.mode !== 'evaluate' && env.role === 'instructor') {\n resolve({\n id: '1',\n value: flattenCorrect(question)\n });\n } else {\n resolve(null);\n }\n });\n};\n\nexport const validate = (model = {}, config = {}) => {\n const { choices, correctResponse } = model;\n const errors = {};\n\n const reversedChoices = [...choices || []].reverse();\n const choicesErrors = {};\n\n reversedChoices.forEach((choice, index) => {\n const { id, label } = choice;\n\n if (label === '' || label === '<div></div>') {\n choicesErrors[id] = 'Content should not be empty.';\n } else {\n const identicalAnswer = reversedChoices.slice(index + 1).some(c => c.label === label);\n\n if (identicalAnswer) {\n choicesErrors[id] = 'Content should be unique.';\n }\n }\n });\n\n const choicesIds = (choices || []).map(choice => choice.id);\n const correctResponseIds = (correctResponse || []).map(response => response.id || response);\n\n if (isEqual(choicesIds, correctResponseIds)) {\n errors.orderError = 'The correct ordering should not be identical to the initial ordering.';\n }\n\n if (!isEmpty(choicesErrors)) {\n errors.choicesErrors = choicesErrors;\n }\n\n return errors;\n};\n"],"file":"index.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/scoring.js"],"names":["log","illegalArgumentError","answer","Error","pairwiseCombinationScore","correct","opts","allowDuplicates","orderMustBeComplete","_","isEqual","uniq","length","Array","isArray","correctCombo","toArray","answerCombo","diff","differenceWith","comboLengthDiff","total","actual","n","toFixed","parseFloat","flattenCorrect","question","correctResponse","map","r","id","getAllCorrectResponses","alternates","alternateResponses","alternate","response","score","session","value","allCorrectResponse","configure","removeTilesAfterPlacing","bestScore","forEach","cr","currentScore"],"mappings":";;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,4CAAN,CAAZ;;AAEO,IAAMC,oBAAoB,GAAG,SAAvBA,oBAAuB,
|
|
1
|
+
{"version":3,"sources":["../src/scoring.js"],"names":["log","illegalArgumentError","answer","Error","pairwiseCombinationScore","correct","opts","allowDuplicates","orderMustBeComplete","_","isEqual","uniq","length","Array","isArray","correctCombo","toArray","answerCombo","diff","differenceWith","comboLengthDiff","total","actual","n","toFixed","parseFloat","flattenCorrect","question","correctResponse","map","r","id","getAllCorrectResponses","alternates","alternateResponses","alternate","response","score","session","value","allCorrectResponse","configure","removeTilesAfterPlacing","bestScore","forEach","cr","currentScore"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport { combination } from 'js-combinatorics';\nimport debug from 'debug';\n\nconst log = debug('pie-elements:placement-ordering:controller');\n\nexport const illegalArgumentError = (answer) =>\n new Error(`Cant score answer: ${answer} it has duplicates and allowDuplicates is false`);\nexport const pairwiseCombinationScore = (correct, answer, opts) => {\n opts = { allowDuplicates: false, orderMustBeComplete: false, ...opts };\n\n if (!opts.allowDuplicates && !_.isEqual(_.uniq(correct), correct)) {\n throw illegalArgumentError(answer);\n }\n\n if (opts.allowDuplicates === false && answer.length !== _.uniq(answer).length) {\n return 0;\n }\n\n answer = opts.allowDuplicates !== false ? answer : _.uniq(answer);\n\n log('answer:', answer);\n if (!Array.isArray(correct) || correct.length === 0) {\n throw new Error('correct must be non empty an array');\n }\n\n if (correct.length === 1) {\n return _.isEqual(correct, answer) ? 1 : 0;\n }\n\n if (!Array.isArray(answer) || answer.length < 2) {\n return 0;\n }\n\n if (answer.length > correct.length) {\n return 0;\n }\n\n if (correct.length !== answer.length && opts.orderMustBeComplete) {\n return 0;\n }\n\n const correctCombo = combination(correct, 2).toArray();\n const answerCombo = combination(answer, 2).toArray();\n\n const diff = _.differenceWith(answerCombo, correctCombo, _.isEqual);\n\n const comboLengthDiff = correctCombo.length - answerCombo.length;\n\n const total = correctCombo.length;\n const actual = total - diff.length - comboLengthDiff;\n\n const n = (actual / total).toFixed(2);\n\n return parseFloat(n);\n};\n\n/**\n * Flattens the correctResponse into an array of ordered identifiers representing the\n * correct response.\n */\nexport const flattenCorrect = (question) =>\n question.correctResponse ? question.correctResponse.map((r) => (r && r.id ? r.id : r)) : [];\n\n/**\n * Returns all correct responses for this question\n * @param question - array\n */\nexport const getAllCorrectResponses = (question) => {\n const alternates = (question.alternateResponses || []).map((alternate) => {\n if (Array.isArray(alternate)) {\n return alternate;\n }\n\n return alternate.response;\n });\n\n return [flattenCorrect(question), ...alternates];\n};\n\n/**\n * Returns the score for a session. If weighted scoring is present in the correctResponse\n * field for the question, this will be used. If partial scoring is present in the question\n * model, this will be used. Otherwise the default scoring mechanism (0 for any incorrect, 1\n * for all correct) will be used.\n */\n\nexport const score = (question, session) => {\n const { value } = session || {};\n\n if (!value) {\n return 0;\n }\n\n const allCorrectResponse = getAllCorrectResponses(question);\n const allowDuplicates = (question.configure && question.configure.removeTilesAfterPlacing) !== false;\n\n /**\n * We require this to be the case - locking\n */\n //const orderMustBeComplete = true;\n\n let bestScore = 0;\n\n allCorrectResponse.forEach((cr) => {\n const currentScore = pairwiseCombinationScore(cr, value, {\n allowDuplicates,\n });\n\n if (currentScore >= bestScore) {\n bestScore = currentScore;\n }\n });\n\n return bestScore;\n};\n"],"file":"scoring.js"}
|
package/controller/package.json
CHANGED
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "src/index.js",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@pie-lib/controller-utils": "^0.2.
|
|
9
|
-
"@pie-lib/feedback": "^0.4.
|
|
8
|
+
"@pie-lib/controller-utils": "^0.2.27",
|
|
9
|
+
"@pie-lib/feedback": "^0.4.28",
|
|
10
10
|
"debug": "^3.1.0",
|
|
11
11
|
"js-combinatorics": "^0.5.4",
|
|
12
12
|
"lodash": "^4.17.19"
|
|
@@ -336,4 +336,4 @@ Only available for the width prop: indicates the max width for images in choices
|
|
|
336
336
|
|
|
337
337
|
### `choices` (number)
|
|
338
338
|
|
|
339
|
-
Only available for the height prop: indicates the max height for images in choices and choices labels
|
|
339
|
+
Only available for the height prop: indicates the max height for images in choices and choices labels
|
package/docs/demo/config.js
CHANGED
package/docs/demo/generate.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.model = (id, element) => ({
|
|
|
9
9
|
},
|
|
10
10
|
{
|
|
11
11
|
id: 'c2',
|
|
12
|
-
label: 'Lemon'
|
|
12
|
+
label: 'Lemon',
|
|
13
13
|
},
|
|
14
14
|
{
|
|
15
15
|
id: 'c3',
|
|
@@ -21,23 +21,21 @@ exports.model = (id, element) => ({
|
|
|
21
21
|
},
|
|
22
22
|
],
|
|
23
23
|
correctResponse: ['c1', 'c2', 'c3', 'c4'],
|
|
24
|
-
alternateResponses: [
|
|
25
|
-
{ response: ['c4', 'c3', 'c2', 'c1'] },
|
|
26
|
-
],
|
|
24
|
+
alternateResponses: [{ response: ['c4', 'c3', 'c2', 'c1'] }],
|
|
27
25
|
enableImages: false,
|
|
28
26
|
feedback: {
|
|
29
27
|
correct: {
|
|
30
28
|
type: 'custom',
|
|
31
|
-
custom: 'foo'
|
|
29
|
+
custom: 'foo',
|
|
32
30
|
},
|
|
33
31
|
incorrect: {
|
|
34
32
|
type: 'custom',
|
|
35
|
-
custom: 'no'
|
|
33
|
+
custom: 'no',
|
|
36
34
|
},
|
|
37
35
|
partial: {
|
|
38
36
|
type: 'custom',
|
|
39
|
-
custom: 'nearly'
|
|
40
|
-
}
|
|
37
|
+
custom: 'nearly',
|
|
38
|
+
},
|
|
41
39
|
},
|
|
42
40
|
feedbackEnabled: true,
|
|
43
41
|
prompt: 'Arrange the fruits alphabetically',
|
|
@@ -50,5 +48,5 @@ exports.model = (id, element) => ({
|
|
|
50
48
|
scoringType: 'auto',
|
|
51
49
|
targetLabel: 'Answers',
|
|
52
50
|
toolbarEditorPosition: 'bottom',
|
|
53
|
-
rubricEnabled: false
|
|
51
|
+
rubricEnabled: false,
|
|
54
52
|
});
|
package/docs/demo/index.html
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
<placement-ordering pie-id="1"></placement-ordering>
|
|
2
|
-
<placement-ordering pie-id="2"></placement-ordering>
|
|
1
|
+
<placement-ordering pie-id="1"></placement-ordering> <placement-ordering pie-id="2"></placement-ordering>
|
package/docs/demo/session.js
CHANGED
package/docs/pie-schema.json.md
CHANGED
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.js"],"names":["log","Ordering","sessionChange","bind","_model","_session","element","React","createElement","Main","model","session","onSessionChange","ReactDOM","render","value","dispatchEvent","CustomEvent","bubbles","detail","component","tagName","toLowerCase","complete","length","completeLength","newModel","newSession","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AACA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;IAIqBC,Q;;;;;AACnB,sBAAc;AAAA;;AAAA;AACZ;AACA,UAAKC,aAAL,GAAqB,MAAKA,aAAL,CAAmBC,IAAnB,gDAArB;AAFY;AAGb;;;;WAED,kBAAS;AAAA;;AACP,UAAI,KAAKC,MAAL,IAAe,KAAKC,QAAxB,EAAkC;AAChCL,QAAAA,GAAG,CAAC,oBAAD,EAAuB,KAAKK,QAA5B,CAAH;AACAL,QAAAA,GAAG,CAAC,kBAAD,EAAqB,KAAKI,MAA1B,CAAH;;AAEA,YAAME,OAAO,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACxCC,UAAAA,KAAK,EAAE,KAAKN,MAD4B;AAExCO,UAAAA,OAAO,EAAE,KAAKN,QAF0B;AAGxCO,UAAAA,eAAe,EAAE,KAAKV;AAHkB,SAA1B,CAAhB;;AAMAW,6BAASC,MAAT,CAAgBR,OAAhB,EAAyB,IAAzB,EAA+B,YAAM;AACnC,yCAAW,MAAX;AACD,SAFD;AAGD;AACF;;;WAED,uBAAcK,OAAd,EAAuB;AACrB,WAAKN,QAAL,CAAcU,KAAd,GAAsBJ,OAAO,CAACI,KAA9B;AACA,WAAKD,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,iBAAhB,EAAmC;AACjCC,QAAAA,OAAO,EAAE,IADwB;AAEjCC,QAAAA,MAAM,EAAE;AACNC,UAAAA,SAAS,EAAE,KAAKC,OAAL,CAAaC,WAAb,EADL;AAENC,UAAAA,QAAQ,EACN,KAAKlB,QAAL,
|
|
1
|
+
{"version":3,"sources":["../src/index.js"],"names":["log","Ordering","sessionChange","bind","_model","_session","element","React","createElement","Main","model","session","onSessionChange","ReactDOM","render","value","dispatchEvent","CustomEvent","bubbles","detail","component","tagName","toLowerCase","complete","length","completeLength","newModel","newSession","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AACA,IAAMA,GAAG,GAAG,uBAAM,iCAAN,CAAZ;;IAIqBC,Q;;;;;AACnB,sBAAc;AAAA;;AAAA;AACZ;AACA,UAAKC,aAAL,GAAqB,MAAKA,aAAL,CAAmBC,IAAnB,gDAArB;AAFY;AAGb;;;;WAED,kBAAS;AAAA;;AACP,UAAI,KAAKC,MAAL,IAAe,KAAKC,QAAxB,EAAkC;AAChCL,QAAAA,GAAG,CAAC,oBAAD,EAAuB,KAAKK,QAA5B,CAAH;AACAL,QAAAA,GAAG,CAAC,kBAAD,EAAqB,KAAKI,MAA1B,CAAH;;AAEA,YAAME,OAAO,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACxCC,UAAAA,KAAK,EAAE,KAAKN,MAD4B;AAExCO,UAAAA,OAAO,EAAE,KAAKN,QAF0B;AAGxCO,UAAAA,eAAe,EAAE,KAAKV;AAHkB,SAA1B,CAAhB;;AAMAW,6BAASC,MAAT,CAAgBR,OAAhB,EAAyB,IAAzB,EAA+B,YAAM;AACnC,yCAAW,MAAX;AACD,SAFD;AAGD;AACF;;;WAED,uBAAcK,OAAd,EAAuB;AACrB,WAAKN,QAAL,CAAcU,KAAd,GAAsBJ,OAAO,CAACI,KAA9B;AACA,WAAKD,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,iBAAhB,EAAmC;AACjCC,QAAAA,OAAO,EAAE,IADwB;AAEjCC,QAAAA,MAAM,EAAE;AACNC,UAAAA,SAAS,EAAE,KAAKC,OAAL,CAAaC,WAAb,EADL;AAENC,UAAAA,QAAQ,EACN,KAAKlB,QAAL,IAAiB,KAAKA,QAAL,CAAcU,KAA/B,IAAwC,yBAAQ,KAAKV,QAAL,CAAcU,KAAtB,EAA6BS,MAA7B,KAAwC,KAAKpB,MAAL,CAAYqB;AAHxF;AAFyB,OAAnC,CADF;AAUD;;;SAED,aAAUC,QAAV,EAAoB;AAClB,WAAKtB,MAAL,GAAcsB,QAAd;AACA,WAAKZ,MAAL;AACA,WAAKE,aAAL,CACE,IAAIC,WAAJ,CAAgB,WAAhB,EAA6B;AAC3BC,QAAAA,OAAO,EAAE,IADkB;AAE3BC,QAAAA,MAAM,EAAE;AACNI,UAAAA,QAAQ,EAAE;AADJ;AAFmB,OAA7B,CADF;AAQD;;;SAOD,eAAc;AACZ,aAAO,KAAKlB,QAAZ;AACD,K;SAPD,aAAYsB,UAAZ,EAAwB;AACtB,WAAKtB,QAAL,GAAgBsB,UAAhB;AACA,WAAKb,MAAL;AACD;;;kDAtDmCc,W","sourcesContent":["import Main from './main';\nimport React from 'react';\nimport ReactDOM from 'react-dom';\nimport compact from 'lodash/compact';\nimport debug from 'debug';\nimport { renderMath } from '@pie-lib/math-rendering';\nimport { swap } from './ordering';\nimport { withDragContext } from '@pie-lib/drag';\nconst log = debug('pie-elements:placement-ordering');\n\nexport { withDragContext, swap };\n\nexport default class Ordering extends HTMLElement {\n constructor() {\n super();\n this.sessionChange = this.sessionChange.bind(this);\n }\n\n render() {\n if (this._model && this._session) {\n log('[render] session: ', this._session);\n log('[render] model: ', this._model);\n\n const element = React.createElement(Main, {\n model: this._model,\n session: this._session,\n onSessionChange: this.sessionChange,\n });\n\n ReactDOM.render(element, this, () => {\n renderMath(this);\n });\n }\n }\n\n sessionChange(session) {\n this._session.value = session.value;\n this.render();\n this.dispatchEvent(\n new CustomEvent('session-changed', {\n bubbles: true,\n detail: {\n component: this.tagName.toLowerCase(),\n complete:\n this._session && this._session.value && compact(this._session.value).length === this._model.completeLength,\n },\n }),\n );\n }\n\n set model(newModel) {\n this._model = newModel;\n this.render();\n this.dispatchEvent(\n new CustomEvent('model-set', {\n bubbles: true,\n detail: {\n complete: false,\n },\n }),\n );\n }\n\n set session(newSession) {\n this._session = newSession;\n this.render();\n }\n\n get session() {\n return this._session;\n }\n}\n"],"file":"index.js"}
|
package/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","session","onSessionChange","React","Component","PropTypes","object","isRequired","oneOfType","array","func","out"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;;;;;IAEMA,I;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","session","onSessionChange","React","Component","PropTypes","object","isRequired","oneOfType","array","func","out"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;;;;;IAEMA,I;;;;;;;;;;;;WAOJ,kBAAS;AACP,wBAA4C,KAAKC,KAAjD;AAAA,UAAQC,KAAR,eAAQA,KAAR;AAAA,UAAeC,OAAf,eAAeA,OAAf;AAAA,UAAwBC,eAAxB,eAAwBA,eAAxB;AACA,0BAAO,gCAAC,6BAAD;AAAmB,QAAA,KAAK,EAAEF,KAA1B;AAAiC,QAAA,OAAO,EAAEC,OAA1C;AAAmD,QAAA,eAAe,EAAEC;AAApE,QAAP;AACD;;;EAVgBC,kBAAMC,S;;iCAAnBN,I,eACe;AACjBE,EAAAA,KAAK,EAAEK,sBAAUC,MAAV,CAAiBC,UADP;AAEjBN,EAAAA,OAAO,EAAEI,sBAAUG,SAAV,CAAoB,CAACH,sBAAUI,KAAV,CAAgBF,UAAjB,EAA6BF,sBAAUC,MAAV,CAAiBC,UAA9C,CAApB,CAFQ;AAGjBL,EAAAA,eAAe,EAAEG,sBAAUK,IAAV,CAAeH;AAHf,C;AAWrB,IAAMI,GAAG,GAAG,2BAAgBb,IAAhB,CAAZ;eACea,G","sourcesContent":["import PlacementOrdering from './placement-ordering';\nimport React from 'react';\nimport { withDragContext } from '@pie-lib/drag';\n\nimport PropTypes from 'prop-types';\n\nclass Main extends React.Component {\n static propTypes = {\n model: PropTypes.object.isRequired,\n session: PropTypes.oneOfType([PropTypes.array.isRequired, PropTypes.object.isRequired]),\n onSessionChange: PropTypes.func.isRequired,\n };\n\n render() {\n const { model, session, onSessionChange } = this.props;\n return <PlacementOrdering model={model} session={session} onSessionChange={onSessionChange} />;\n }\n}\nconst out = withDragContext(Main);\nexport default out;\n"],"file":"main.js"}
|
package/lib/ordering.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/ordering.js"],"names":["log","push","arr","fromIndex","toIndex","movedItem","find","item","index","remainingItems","filter","slice","swap","length","undefined","Error","update","tmp","removeResponse","state","targetTile","response","id","updateResponse","from","to","opts","includeTargets","type","findIndex","r","buildTiles","choices","outcomes","targets","i","choice","c","outcome","out","Object","assign","empty","draggable","processedChoices","map","m","indexOf","allowSameChoiceInTargets","droppable","concat","reduce","acc","emptyTile","choiceTile","buildState","Array","tiles","reducer","action","target"],"mappings":";;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA,IAAMA,GAAG,GAAG,uBAAM,0CAAN,CAAZ;;AAEO,IAAMC,IAAI,GAAG,SAAPA,IAAO,CAACC,GAAD,EAAMC,SAAN,EAAiBC,OAAjB,EAA6B;AAC/C,MAAMC,SAAS,GAAGH,GAAG,CAACI,IAAJ,CAAS,UAACC,IAAD,EAAOC,KAAP;AAAA,WAAiBA,KAAK,KAAKL,SAA3B;AAAA,GAAT,CAAlB;AACA,MAAMM,cAAc,GAAGP,GAAG,CAACQ,MAAJ,CAAW,UAACH,IAAD,EAAOC,KAAP;AAAA,WAAiBA,KAAK,KAAKL,SAA3B;AAAA,GAAX,CAAvB;AAEA,uDACKM,cAAc,CAACE,KAAf,CAAqB,CAArB,EAAwBP,OAAxB,CADL,IAEEC,SAFF,uCAGKI,cAAc,CAACE,KAAf,CAAqBP,OAArB,CAHL;AAKD,CATM;;;;AAWA,IAAMQ,IAAI,GAAG,SAAPA,IAAO,CAACV,GAAD,EAAMC,SAAN,EAAiBC,OAAjB,EAA6B;AAC/CJ,EAAAA,GAAG,CAAC,QAAD,EAAWE,GAAX,EAAgBC,SAAhB,EAA2BC,OAA3B,CAAH;;AACA,MACE,CAACF,GAAD,IACAA,GAAG,CAACW,MAAJ,IAAc,CADd,IAEAV,SAAS,KAAKW,SAFd,IAGAV,OAAO,KAAKU,SAJd,EAKE;AACA,UAAM,IAAIC,KAAJ,gEACoDb,GADpD,eAC4DC,SAD5D,cACyEC,OADzE,EAAN;AAGD;;AACD,MAAMY,MAAM,GAAG,2BAAUd,GAAV,CAAf;AACA,MAAMe,GAAG,GAAGf,GAAG,CAACE,OAAD,CAAf;AACAY,EAAAA,MAAM,CAACZ,OAAD,CAAN,GAAkBY,MAAM,CAACb,SAAD,CAAxB;AACAa,EAAAA,MAAM,CAACb,SAAD,CAAN,GAAoBc,GAApB;AACA,SAAOD,MAAP;AACD,CAjBM;;;;AAmBP,SAASE,cAAT,CAAwBC,KAAxB,EAA+BC,UAA/B,EAA2C;AACzC,MAAMJ,MAAM,GAAG,2BAAUG,KAAK,CAACE,QAAhB,CAAf;;AAEA,MAAIL,MAAM,CAACI,UAAU,CAACZ,KAAZ,CAAN,KAA6BY,UAAU,CAACE,EAA5C,EAAgD;AAC9CN,IAAAA,MAAM,CAACI,UAAU,CAACZ,KAAZ,CAAN,GAA2BM,SAA3B;AACD,GAFD,MAEO;AACL,UAAM,IAAIC,KAAJ,uCAEFK,UAAU,CAACZ,KAFT,gDAGkCQ,MAHlC,uBAGqDI,UAAU,CAACE,EAHhE,EAAN;AAKD;;AACD,SAAON,MAAP;AACD;;AAED,SAASO,cAAT,CAAwBJ,KAAxB,EAA+BK,IAA/B,EAAqCC,EAArC,EAAyC;AACvC,MAAQJ,QAAR,GAA2BF,KAA3B,CAAQE,QAAR;AAAA,MAAkBK,IAAlB,GAA2BP,KAA3B,CAAkBO,IAAlB;AACA,MAAMV,MAAM,GAAG,2BAAUK,QAAV,CAAf;;AACA,MAAIK,IAAI,CAACC,cAAT,EAAyB;AACvB,QAAIH,IAAI,CAACI,IAAL,KAAc,QAAd,IAA0BH,EAAE,CAACG,IAAH,KAAY,QAA1C,EAAoD;AAClDZ,MAAAA,MAAM,CAACS,EAAE,CAACjB,KAAJ,CAAN,GAAmBgB,IAAI,CAACF,EAAxB;AACA,aAAON,MAAP;AACD,KAHD,MAGO,IAAIQ,IAAI,CAACI,IAAL,KAAc,QAAd,IAA0BH,EAAE,CAACG,IAAH,KAAY,QAA1C,EAAoD;AACzDZ,MAAAA,MAAM,CAACQ,IAAI,CAAChB,KAAN,CAAN,GAAqBM,SAArB;AACA,aAAOE,MAAP;AACD,KAHM,MAGA,IAAIQ,IAAI,CAACI,IAAL,KAAc,QAAd,IAA0BH,EAAE,CAACG,IAAH,KAAY,QAA1C,EAAoD;AACzD,aAAOhB,IAAI,CAACS,QAAD,EAAWG,IAAI,CAAChB,KAAhB,EAAuBiB,EAAE,CAACjB,KAA1B,CAAX;AACD,KAFM,MAEA;AACLR,MAAAA,GAAG,CAAC,4BAAD,CAAH;AACA,aAAOqB,QAAP;AACD;AACF,GAbD,MAaO;AACL,QAAMlB,SAAS,GAAGgB,KAAK,CAACE,QAAN,CAAeQ,SAAf,CAChB,UAAAC,CAAC;AAAA,aAAIA,CAAC,KAAKhB,SAAN,IAAmBgB,CAAC,KAAKN,IAAI,CAACF,EAAlC;AAAA,KADe,CAAlB;AAGA,QAAMlB,OAAO,GAAGe,KAAK,CAACE,QAAN,CAAeQ,SAAf,CACd,UAAAC,CAAC;AAAA,aAAIA,CAAC,KAAKhB,SAAN,IAAmBgB,CAAC,KAAKL,EAAE,CAACH,EAAhC;AAAA,KADa,CAAhB;AAGAtB,IAAAA,GAAG,CAAC,aAAD,EAAgBG,SAAhB,EAA2B,UAA3B,EAAuCC,OAAvC,CAAH;AACA,WAAOH,IAAI,CAACkB,KAAK,CAACE,QAAP,EAAiBlB,SAAjB,EAA4BC,OAA5B,CAAX;AACD;AACF;;AAED,SAAS2B,UAAT,CAAoBC,OAApB,EAA6BX,QAA7B,EAAuCY,QAAvC,EAAiDP,IAAjD,EAAuD;AACrD,MAAIA,IAAI,CAACC,cAAT,EAAyB;AACvB,QAAMO,OAAO,GAAG,EAAhB;;AADuB,+BAEdC,CAFc;AAGrB,UAAML,CAAC,GAAGT,QAAQ,CAACc,CAAD,CAAlB;AAEA,UAAMC,MAAM,GAAGJ,OAAO,CAAC1B,IAAR,CACb,UAAA+B,CAAC;AAAA,eAAIP,CAAC,KAAKhB,SAAN,IAAmBgB,CAAC,KAAK,IAAzB,IAAiCO,CAAC,CAACf,EAAF,KAASQ,CAA9C;AAAA,OADY,CAAf,CALqB,CAQrB;;AACA,UAAMQ,OAAO,GAAGL,QAAQ,CAACE,CAAD,CAAxB;AAEA,UAAMI,GAAG,GAAGC,MAAM,CAACC,MAAP,CACV;AAAEb,QAAAA,IAAI,EAAE,QAAR;AAAkBpB,QAAAA,KAAK,EAAE2B,CAAzB;AAA4BO,QAAAA,KAAK,EAAEN,MAAM,KAAKtB;AAA9C,OADU,EAEVsB,MAFU,EAGVE,OAHU,EAIV;AAAEK,QAAAA,SAAS,EAAEP,MAAM,KAAKtB;AAAxB,OAJU,CAAZ;AAOAoB,MAAAA,OAAO,CAACjC,IAAR,CAAasC,GAAb;AAlBqB;;AAEvB,SAAK,IAAIJ,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGd,QAAQ,CAACR,MAA7B,EAAqCsB,CAAC,EAAtC,EAA0C;AAAA,YAAjCA,CAAiC;AAiBzC;;AAED,QAAMS,gBAAgB,GAAGZ,OAAO,CAACa,GAAR,CAAY,UAAAC,CAAC,EAAI;AACxC,UAAIzB,QAAQ,CAAC0B,OAAT,CAAiBD,CAAC,CAACxB,EAAnB,MAA2B,CAAC,CAA5B,IAAiC,CAACI,IAAI,CAACsB,wBAA3C,EAAqE;AACnE,eAAO;AACLpB,UAAAA,IAAI,EAAE,QADD;AAELc,UAAAA,KAAK,EAAE,IAFF;AAGLO,UAAAA,SAAS,EAAE,IAHN;AAILN,UAAAA,SAAS,EAAE;AAJN,SAAP;AAMD,OAPD,MAOO;AACL,eAAOH,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBK,CAAlB,EAAqB;AAC1BlB,UAAAA,IAAI,EAAE,QADoB;AAE1BqB,UAAAA,SAAS,EAAE,KAFe;AAG1BN,UAAAA,SAAS,EAAE;AAHe,SAArB,CAAP;AAKD;AACF,KAfwB,CAAzB;AAiBA,WAAOC,gBAAgB,CAACM,MAAjB,CAAwBhB,OAAxB,CAAP;AACD,GAvCD,MAuCO;AACL,WAAOb,QAAQ,CAAC8B,MAAT,CAAgB,UAACC,GAAD,EAAM9B,EAAN,EAAUd,KAAV,EAAoB;AACzC,UAAM6C,SAAS,GAAGb,MAAM,CAACC,MAAP,CAChB;AAAEb,QAAAA,IAAI,EAAE,OAAR;AAAiBe,QAAAA,SAAS,EAAE,KAA5B;AAAmCM,QAAAA,SAAS,EAAE;AAA9C,OADgB,EAEhBjB,OAAO,CAAC1B,IAAR,CAAa,UAAAwC,CAAC;AAAA,eAAIA,CAAC,CAACxB,EAAF,KAASA,EAAb;AAAA,OAAd,CAFgB,EAGhBW,QAAQ,CAACzB,KAAD,CAHQ,CAAlB;AAKA,UAAM8C,UAAU,GAAGd,MAAM,CAACC,MAAP,CACjB;AAAEb,QAAAA,IAAI,EAAE,QAAR;AAAkBe,QAAAA,SAAS,EAAE,IAA7B;AAAmCM,QAAAA,SAAS,EAAE;AAA9C,OADiB,EAEjBjB,OAAO,CAAC1B,IAAR,CAAa,UAAAwC,CAAC;AAAA,eAAIA,CAAC,CAACxB,EAAF,KAASA,EAAb;AAAA,OAAd,CAFiB,EAGjBW,QAAQ,CAACzB,KAAD,CAHS,CAAnB;;AAMA,UAAGA,KAAK,KAAK,CAAb,EAAgB;AACd4C,QAAAA,GAAG,CAACnD,IAAJ,CAASoD,SAAT;AACD;;AAEDD,MAAAA,GAAG,CAACnD,IAAJ,CAASqD,UAAT,EAAqBD,SAArB;AAEA,aAAOD,GAAP;AACD,KAnBM,EAmBJ,EAnBI,CAAP;AAoBD;AACF;;AAEM,SAASG,UAAT,CAAoBvB,OAApB,EAA6BX,QAA7B,EAAuCY,QAAvC,EAAiDP,IAAjD,EAAuD;AAC5DA,EAAAA,IAAI,GAAG,wBAAO;AAAEC,IAAAA,cAAc,EAAE;AAAlB,GAAP,EAAiCD,IAAjC,CAAP;AAEAO,EAAAA,QAAQ,GAAGA,QAAQ,IAAI,EAAvB;AACAZ,EAAAA,QAAQ,GACN,CAACA,QAAD,IAAa,yBAAQA,QAAR,CAAb,GACIK,IAAI,CAACC,cAAL,GACE,IAAI6B,KAAJ,CAAUxB,OAAO,CAACnB,MAAlB,CADF,GAEE,qBAAImB,OAAJ,EAAa,UAAAK,CAAC;AAAA,WAAIA,CAAC,CAACf,EAAN;AAAA,GAAd,CAHN,GAIID,QALN;AAMA,SAAO;AACLW,IAAAA,OAAO,EAAPA,OADK;AAELX,IAAAA,QAAQ,EAARA,QAFK;AAGLK,IAAAA,IAAI,EAAJA,IAHK;AAILO,IAAAA,QAAQ,EAARA,QAJK;AAKLwB,IAAAA,KAAK,EAAE1B,UAAU,CAACC,OAAD,EAAUX,QAAV,EAAoBY,QAApB,EAA8BP,IAA9B;AALZ,GAAP;AAOD;;AAEM,SAASgC,OAAT,CAAiBC,MAAjB,EAAyBxC,KAAzB,EAAgC;AACrC,UAAQwC,MAAM,CAAC/B,IAAf;AACE,SAAK,MAAL;AAAa;AACX,YAAQJ,IAAR,GAAqBmC,MAArB,CAAQnC,IAAR;AAAA,YAAcC,EAAd,GAAqBkC,MAArB,CAAclC,EAAd;AACA,YAAMJ,QAAQ,GAAGE,cAAc,CAACJ,KAAD,EAAQK,IAAR,EAAcC,EAAd,CAA/B;AACA,YAAMgC,KAAK,GAAG1B,UAAU,CACtBZ,KAAK,CAACa,OADgB,EAEtBX,QAFsB,EAGtBF,KAAK,CAACc,QAHgB,EAItBd,KAAK,CAACO,IAJgB,CAAxB;AAMA,eAAOc,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBtB,KAAlB,EAAyB;AAAEE,UAAAA,QAAQ,EAARA,QAAF;AAAYoC,UAAAA,KAAK,EAALA;AAAZ,SAAzB,CAAP;AACD;;AACD,SAAK,QAAL;AAAe;AACb,YAAQG,MAAR,GAAmBD,MAAnB,CAAQC,MAAR;;AACA,YAAMvC,SAAQ,GAAGH,cAAc,CAACC,KAAD,EAAQyC,MAAR,CAA/B;;AACA,YAAMH,MAAK,GAAG1B,UAAU,CACtBZ,KAAK,CAACa,OADgB,EAEtBX,SAFsB,EAGtBF,KAAK,CAACc,QAHgB,EAItBd,KAAK,CAACO,IAJgB,CAAxB;;AAMA,eAAOc,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBtB,KAAlB,EAAyB;AAAEE,UAAAA,QAAQ,EAARA,SAAF;AAAYoC,UAAAA,KAAK,EAALA;AAAZ,SAAzB,CAAP;AACD;AAtBH;;AAwBA,SAAOtC,KAAP;AACD","sourcesContent":["import cloneDeep from 'lodash/cloneDeep';\nimport debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport map from 'lodash/map';\nimport assign from 'lodash/assign';\n\nconst log = debug('pie-elements:placement-ordering:ordering');\n\nexport const push = (arr, fromIndex, toIndex) => {\n const movedItem = arr.find((item, index) => index === fromIndex);\n const remainingItems = arr.filter((item, index) => index !== fromIndex);\n\n return [\n ...remainingItems.slice(0, toIndex),\n movedItem,\n ...remainingItems.slice(toIndex)\n ];\n}\n\nexport const swap = (arr, fromIndex, toIndex) => {\n log('[swap]', arr, fromIndex, toIndex);\n if (\n !arr ||\n arr.length <= 1 ||\n fromIndex === undefined ||\n toIndex === undefined\n ) {\n throw new Error(\n `swap requires a non-empty array, fromIndex, toIndex: ${arr}, ${fromIndex} ${toIndex}`\n );\n }\n const update = cloneDeep(arr);\n const tmp = arr[toIndex];\n update[toIndex] = update[fromIndex];\n update[fromIndex] = tmp;\n return update;\n};\n\nfunction removeResponse(state, targetTile) {\n const update = cloneDeep(state.response);\n\n if (update[targetTile.index] === targetTile.id) {\n update[targetTile.index] = undefined;\n } else {\n throw new Error(\n `Tried to remove from index: ${\n targetTile.index\n }, but the id doesn't match: array: ${update}, target: ${targetTile.id}`\n );\n }\n return update;\n}\n\nfunction updateResponse(state, from, to) {\n const { response, opts } = state;\n const update = cloneDeep(response);\n if (opts.includeTargets) {\n if (from.type === 'choice' && to.type === 'target') {\n update[to.index] = from.id;\n return update;\n } else if (from.type === 'target' && to.type === 'choice') {\n update[from.index] = undefined;\n return update;\n } else if (from.type === 'target' && to.type === 'target') {\n return swap(response, from.index, to.index);\n } else {\n log('do nothing to the response');\n return response;\n }\n } else {\n const fromIndex = state.response.findIndex(\n r => r !== undefined && r === from.id\n );\n const toIndex = state.response.findIndex(\n r => r !== undefined && r === to.id\n );\n log('fromIndex: ', fromIndex, 'toIndex:', toIndex);\n return push(state.response, fromIndex, toIndex);\n }\n}\n\nfunction buildTiles(choices, response, outcomes, opts) {\n if (opts.includeTargets) {\n const targets = [];\n for (let i = 0; i < response.length; i++) {\n const r = response[i];\n\n const choice = choices.find(\n c => r !== undefined && r !== null && c.id === r\n );\n //TODO: index needs to match too!!\n const outcome = outcomes[i];\n\n const out = Object.assign(\n { type: 'target', index: i, empty: choice === undefined },\n choice,\n outcome,\n { draggable: choice !== undefined }\n );\n\n targets.push(out);\n }\n\n const processedChoices = choices.map(m => {\n if (response.indexOf(m.id) !== -1 && !opts.allowSameChoiceInTargets) {\n return {\n type: 'choice',\n empty: true,\n droppable: true,\n draggable: false\n };\n } else {\n return Object.assign({}, m, {\n type: 'choice',\n droppable: false,\n draggable: true\n });\n }\n });\n\n return processedChoices.concat(targets);\n } else {\n return response.reduce((acc, id, index) => {\n const emptyTile = Object.assign(\n { type: 'empty', draggable: false, droppable: true },\n choices.find(m => m.id === id),\n outcomes[index]\n );\n const choiceTile = Object.assign(\n { type: 'choice', draggable: true, droppable: true },\n choices.find(m => m.id === id),\n outcomes[index]\n )\n\n if(index === 0) {\n acc.push(emptyTile)\n }\n\n acc.push(choiceTile, emptyTile);\n\n return acc;\n }, []);\n }\n}\n\nexport function buildState(choices, response, outcomes, opts) {\n opts = assign({ includeTargets: true }, opts);\n\n outcomes = outcomes || [];\n response =\n !response || isEmpty(response)\n ? opts.includeTargets\n ? new Array(choices.length)\n : map(choices, c => c.id)\n : response;\n return {\n choices,\n response,\n opts,\n outcomes,\n tiles: buildTiles(choices, response, outcomes, opts)\n };\n}\n\nexport function reducer(action, state) {\n switch (action.type) {\n case 'move': {\n const { from, to } = action;\n const response = updateResponse(state, from, to);\n const tiles = buildTiles(\n state.choices,\n response,\n state.outcomes,\n state.opts\n );\n return Object.assign({}, state, { response, tiles });\n }\n case 'remove': {\n const { target } = action;\n const response = removeResponse(state, target);\n const tiles = buildTiles(\n state.choices,\n response,\n state.outcomes,\n state.opts\n );\n return Object.assign({}, state, { response, tiles });\n }\n }\n return state;\n}\n"],"file":"ordering.js"}
|
|
1
|
+
{"version":3,"sources":["../src/ordering.js"],"names":["log","push","arr","fromIndex","toIndex","movedItem","find","item","index","remainingItems","filter","slice","swap","length","undefined","Error","update","tmp","removeResponse","state","targetTile","response","id","updateResponse","from","to","opts","includeTargets","type","findIndex","r","buildTiles","choices","outcomes","targets","i","choice","c","outcome","out","Object","assign","empty","draggable","processedChoices","map","m","indexOf","allowSameChoiceInTargets","droppable","concat","reduce","acc","emptyTile","choiceTile","buildState","Array","tiles","reducer","action","target"],"mappings":"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","sourcesContent":["import cloneDeep from 'lodash/cloneDeep';\nimport debug from 'debug';\nimport isEmpty from 'lodash/isEmpty';\nimport map from 'lodash/map';\nimport assign from 'lodash/assign';\n\nconst log = debug('pie-elements:placement-ordering:ordering');\n\nexport const push = (arr, fromIndex, toIndex) => {\n const movedItem = arr.find((item, index) => index === fromIndex);\n const remainingItems = arr.filter((item, index) => index !== fromIndex);\n\n return [...remainingItems.slice(0, toIndex), movedItem, ...remainingItems.slice(toIndex)];\n};\n\nexport const swap = (arr, fromIndex, toIndex) => {\n log('[swap]', arr, fromIndex, toIndex);\n if (!arr || arr.length <= 1 || fromIndex === undefined || toIndex === undefined) {\n throw new Error(`swap requires a non-empty array, fromIndex, toIndex: ${arr}, ${fromIndex} ${toIndex}`);\n }\n const update = cloneDeep(arr);\n const tmp = arr[toIndex];\n update[toIndex] = update[fromIndex];\n update[fromIndex] = tmp;\n return update;\n};\n\nfunction removeResponse(state, targetTile) {\n const update = cloneDeep(state.response);\n\n if (update[targetTile.index] === targetTile.id) {\n update[targetTile.index] = undefined;\n } else {\n throw new Error(\n `Tried to remove from index: ${targetTile.index}, but the id doesn't match: array: ${update}, target: ${targetTile.id}`,\n );\n }\n return update;\n}\n\nfunction updateResponse(state, from, to) {\n const { response, opts } = state;\n const update = cloneDeep(response);\n if (opts.includeTargets) {\n if (from.type === 'choice' && to.type === 'target') {\n update[to.index] = from.id;\n return update;\n } else if (from.type === 'target' && to.type === 'choice') {\n update[from.index] = undefined;\n return update;\n } else if (from.type === 'target' && to.type === 'target') {\n return swap(response, from.index, to.index);\n } else {\n log('do nothing to the response');\n return response;\n }\n } else {\n const fromIndex = state.response.findIndex((r) => r !== undefined && r === from.id);\n const toIndex = state.response.findIndex((r) => r !== undefined && r === to.id);\n log('fromIndex: ', fromIndex, 'toIndex:', toIndex);\n return push(state.response, fromIndex, toIndex);\n }\n}\n\nfunction buildTiles(choices, response, outcomes, opts) {\n if (opts.includeTargets) {\n const targets = [];\n for (let i = 0; i < response.length; i++) {\n const r = response[i];\n\n const choice = choices.find((c) => r !== undefined && r !== null && c.id === r);\n //TODO: index needs to match too!!\n const outcome = outcomes[i];\n\n const out = Object.assign({ type: 'target', index: i, empty: choice === undefined }, choice, outcome, {\n draggable: choice !== undefined,\n });\n\n targets.push(out);\n }\n\n const processedChoices = choices.map((m) => {\n if (response.indexOf(m.id) !== -1 && !opts.allowSameChoiceInTargets) {\n return {\n type: 'choice',\n empty: true,\n droppable: true,\n draggable: false,\n };\n } else {\n return Object.assign({}, m, {\n type: 'choice',\n droppable: false,\n draggable: true,\n });\n }\n });\n\n return processedChoices.concat(targets);\n } else {\n return response.reduce((acc, id, index) => {\n const emptyTile = Object.assign(\n { type: 'empty', draggable: false, droppable: true },\n choices.find((m) => m.id === id),\n outcomes[index],\n );\n const choiceTile = Object.assign(\n { type: 'choice', draggable: true, droppable: true },\n choices.find((m) => m.id === id),\n outcomes[index],\n );\n\n if (index === 0) {\n acc.push(emptyTile);\n }\n\n acc.push(choiceTile, emptyTile);\n\n return acc;\n }, []);\n }\n}\n\nexport function buildState(choices, response, outcomes, opts) {\n opts = assign({ includeTargets: true }, opts);\n\n outcomes = outcomes || [];\n response =\n !response || isEmpty(response)\n ? opts.includeTargets\n ? new Array(choices.length)\n : map(choices, (c) => c.id)\n : response;\n return {\n choices,\n response,\n opts,\n outcomes,\n tiles: buildTiles(choices, response, outcomes, opts),\n };\n}\n\nexport function reducer(action, state) {\n switch (action.type) {\n case 'move': {\n const { from, to } = action;\n const response = updateResponse(state, from, to);\n const tiles = buildTiles(state.choices, response, state.outcomes, state.opts);\n return Object.assign({}, state, { response, tiles });\n }\n case 'remove': {\n const { target } = action;\n const response = removeResponse(state, target);\n const tiles = buildTiles(state.choices, response, state.outcomes, state.opts);\n return Object.assign({}, state, { response, tiles });\n }\n }\n return state;\n}\n"],"file":"ordering.js"}
|
|
@@ -51,6 +51,8 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
|
51
51
|
|
|
52
52
|
var _mathRendering = require("@pie-lib/math-rendering");
|
|
53
53
|
|
|
54
|
+
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
55
|
+
|
|
54
56
|
var _excluded = ["tiler", "ordering", "onDropChoice", "onRemoveChoice"];
|
|
55
57
|
|
|
56
58
|
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); }; }
|
|
@@ -93,6 +95,16 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
93
95
|
|
|
94
96
|
(0, _classCallCheck2["default"])(this, PlacementOrdering);
|
|
95
97
|
_this = _super.call(this, props);
|
|
98
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isValidSession", function (_ref) {
|
|
99
|
+
var model = _ref.model,
|
|
100
|
+
session = _ref.session;
|
|
101
|
+
var config = model.config;
|
|
102
|
+
var compactSessionValues = session && (0, _compact["default"])(session.value) || [];
|
|
103
|
+
var completeSession = compactSessionValues.length === model.choices.length; // if it includes targets, it doesn't have to contain all the choices selected (eg: only 2 targets were filled)
|
|
104
|
+
// but if it does not include targets, it's a must to have all choices selected
|
|
105
|
+
|
|
106
|
+
return config.includeTargets || completeSession;
|
|
107
|
+
});
|
|
96
108
|
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDropChoice", function (target, source, ordering) {
|
|
97
109
|
var _this$props = _this.props,
|
|
98
110
|
onSessionChange = _this$props.onSessionChange,
|
|
@@ -166,7 +178,22 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
166
178
|
(0, _createClass2["default"])(PlacementOrdering, [{
|
|
167
179
|
key: "componentDidMount",
|
|
168
180
|
value: function componentDidMount() {
|
|
169
|
-
this
|
|
181
|
+
var _this2 = this;
|
|
182
|
+
|
|
183
|
+
var _this$props4 = this.props,
|
|
184
|
+
model = _this$props4.model,
|
|
185
|
+
session = _this$props4.session;
|
|
186
|
+
|
|
187
|
+
if (!this.isValidSession({
|
|
188
|
+
model: model,
|
|
189
|
+
session: session
|
|
190
|
+
})) {
|
|
191
|
+
this.setState({
|
|
192
|
+
defaultSessionValue: (0, _cloneDeep["default"])(session === null || session === void 0 ? void 0 : session.value)
|
|
193
|
+
}, function () {
|
|
194
|
+
return _this2.initSessionIfNeeded(_this2.props);
|
|
195
|
+
});
|
|
196
|
+
}
|
|
170
197
|
}
|
|
171
198
|
}, {
|
|
172
199
|
key: "componentDidUpdate",
|
|
@@ -179,53 +206,69 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
179
206
|
}, {
|
|
180
207
|
key: "UNSAFE_componentWillReceiveProps",
|
|
181
208
|
value: function UNSAFE_componentWillReceiveProps(nextProps) {
|
|
209
|
+
var _this$props5, _this$props$session;
|
|
210
|
+
|
|
182
211
|
var newState = {};
|
|
183
212
|
|
|
184
|
-
|
|
213
|
+
var _nextProps$model = nextProps === null || nextProps === void 0 ? void 0 : nextProps.model,
|
|
214
|
+
correctResponse = _nextProps$model.correctResponse,
|
|
215
|
+
config = _nextProps$model.config,
|
|
216
|
+
choices = _nextProps$model.choices;
|
|
217
|
+
|
|
218
|
+
var _ref2 = ((_this$props5 = this.props) === null || _this$props5 === void 0 ? void 0 : _this$props5.model) || {},
|
|
219
|
+
oldConfig = _ref2.config,
|
|
220
|
+
oldChoices = _ref2.choices;
|
|
221
|
+
|
|
222
|
+
if (!correctResponse) {
|
|
185
223
|
newState.showingCorrect = false;
|
|
186
224
|
}
|
|
187
225
|
|
|
188
|
-
var includeTargetsChanged =
|
|
189
|
-
var
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
226
|
+
var includeTargetsChanged = config.includeTargets !== oldConfig.includeTargets;
|
|
227
|
+
var choicesChanged = !(0, _isEqual["default"])(oldChoices, choices);
|
|
228
|
+
var isDefaultSession = (0, _isEqual["default"])(this.state.defaultSessionValue, (_this$props$session = this.props.session) === null || _this$props$session === void 0 ? void 0 : _this$props$session.value);
|
|
229
|
+
var isValidSession = this.isValidSession({
|
|
230
|
+
model: nextProps.model,
|
|
231
|
+
session: nextProps.session
|
|
232
|
+
}); // if the session is not valid anymore, it has to be reset
|
|
233
|
+
// OR
|
|
234
|
+
// if the session is the default one (set if the initial session was not valid or empty)
|
|
235
|
+
// and targets or choices changed, then we can reset the session
|
|
236
|
+
// but if the session is not the default one (it was set by the student), then we do not reset it
|
|
237
|
+
|
|
238
|
+
if (!isValidSession || isDefaultSession && (includeTargetsChanged || choicesChanged)) {
|
|
239
|
+
this.initSessionIfNeeded(nextProps);
|
|
193
240
|
}
|
|
194
241
|
|
|
195
242
|
this.setState(newState);
|
|
196
243
|
}
|
|
197
244
|
}, {
|
|
198
245
|
key: "initSessionIfNeeded",
|
|
199
|
-
value: function initSessionIfNeeded(props
|
|
246
|
+
value: function initSessionIfNeeded(props) {
|
|
200
247
|
var model = props.model,
|
|
201
248
|
session = props.session,
|
|
202
249
|
onSessionChange = props.onSessionChange;
|
|
203
250
|
var newConfig = model.config;
|
|
204
|
-
var
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
var update = (0, _cloneDeep["default"])(session);
|
|
209
|
-
update.value = model.choices.map(function (m) {
|
|
210
|
-
return m.id;
|
|
211
|
-
});
|
|
212
|
-
onSessionChange(update);
|
|
213
|
-
} else if (newConfig.includeTargets) {
|
|
214
|
-
var _update = (0, _cloneDeep["default"])(session);
|
|
215
|
-
|
|
216
|
-
if (reset) {
|
|
217
|
-
delete _update.value;
|
|
218
|
-
}
|
|
251
|
+
var update = (0, _cloneDeep["default"])(session);
|
|
252
|
+
update.value = model.choices.map(function (m) {
|
|
253
|
+
return m.id;
|
|
254
|
+
});
|
|
219
255
|
|
|
220
|
-
|
|
256
|
+
if (newConfig.includeTargets) {
|
|
257
|
+
delete update.value;
|
|
221
258
|
}
|
|
259
|
+
|
|
260
|
+
this.setState({
|
|
261
|
+
defaultSessionValue: (0, _cloneDeep["default"])(update === null || update === void 0 ? void 0 : update.value)
|
|
262
|
+
}, function () {
|
|
263
|
+
return onSessionChange(update);
|
|
264
|
+
});
|
|
222
265
|
}
|
|
223
266
|
}, {
|
|
224
267
|
key: "render",
|
|
225
268
|
value: function render() {
|
|
226
|
-
var _this$
|
|
227
|
-
classes = _this$
|
|
228
|
-
model = _this$
|
|
269
|
+
var _this$props6 = this.props,
|
|
270
|
+
classes = _this$props6.classes,
|
|
271
|
+
model = _this$props6.model;
|
|
229
272
|
var correctResponse = model.correctResponse,
|
|
230
273
|
correctness = model.correctness,
|
|
231
274
|
prompt = model.prompt,
|
|
@@ -248,9 +291,9 @@ var PlacementOrdering = /*#__PURE__*/function (_React$Component) {
|
|
|
248
291
|
var vertical = orientation === 'vertical';
|
|
249
292
|
var ordering = this.createOrdering();
|
|
250
293
|
|
|
251
|
-
var
|
|
252
|
-
mode =
|
|
253
|
-
role =
|
|
294
|
+
var _ref3 = env || {},
|
|
295
|
+
mode = _ref3.mode,
|
|
296
|
+
role = _ref3.role;
|
|
254
297
|
|
|
255
298
|
var Tiler = vertical ? _tiler.VerticalTiler : _tiler.HorizontalTiler;
|
|
256
299
|
var displayNote = (showingCorrect || mode === 'view' && role === 'instructor') && showNote && note;
|