@pie-element/match-list 1.17.5-next.20 → 1.17.5

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.17.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-list@1.17.4...@pie-element/match-list@1.17.5) (2023-04-25)
+
+
+### Bug Fixes
+
+* update pie-libs PD-2762 ([7ac4313](https://github.com/pie-framework/pie-elements/commit/7ac431346b822fe3bbb0d13375f044f6ce1f426b))
+
+
+
+
+
 ## [1.17.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-list@1.17.3...@pie-element/match-list@1.17.4) (2023-04-14)
 
 

package/controller/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-list-controller@1.6.0...@pie-element/match-list-controller@1.6.1) (2023-04-25)
+
+
+### Bug Fixes
+
+* update pie-libs PD-2762 ([7ac4313](https://github.com/pie-framework/pie-elements/commit/7ac431346b822fe3bbb0d13375f044f6ce1f426b))
+
+
+
+
+
 # [1.6.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-list-controller@1.5.22...@pie-element/match-list-controller@1.6.0) (2023-02-01)
 
 

package/controller/lib/index.js

@@ -184,7 +184,6 @@ function model(question, session, env, updateSession) {
                   updateSession(session.id, session.element, {
                     shuffledValues: shuffledValues
                   })["catch"](function (e) {
-                    // eslint-disable-next-line no-console
                     console.error('update session failed', e);
                   });
                 }

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","getResponseCorrectness","model","answers","env","isPartialScoring","partialScoring","enabled","prompts","Object","keys","length","totalCorrectAnswers","getTotalCorrect","correctAnswers","getCorrectSelected","getCorrectness","question","mode","forEach","p","relatedAnswer","id","getPartialScore","count","totalCorrect","parseFloat","toFixed","getOutComeScore","correctness","outcome","session","Promise","resolve","score","undefined","completed","empty","out","value","createDefaultModel","defaults","updateSession","correctResponse","correctInfo","shuffledValues","us","part","element","update","lockChoiceOrder","e","console","error","prompt","fb","feedback","then","base","config","role","rationale","assign","createCorrectResponseSession","filter","a"],"mappings":"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","sourcesContent":["import isEmpty from 'lodash/isEmpty';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:match-list:controller');\n\nimport defaults from './defaults';\n\nconst getResponseCorrectness = (model, answers, env) => {\n  const isPartialScoring = partialScoring.enabled(model, env);\n  const prompts = model.prompts;\n\n  if (!answers || Object.keys(answers).length === 0) {\n    return 'unanswered';\n  }\n\n  const totalCorrectAnswers = getTotalCorrect(model);\n  const correctAnswers = getCorrectSelected(prompts, answers);\n\n  if (totalCorrectAnswers === correctAnswers) {\n    return 'correct';\n  } else if (correctAnswers === 0) {\n    return 'incorrect';\n  } else if (isPartialScoring) {\n    return 'partial';\n  }\n\n  return 'incorrect';\n};\n\nconst getCorrectness = (question, env, answers) => {\n  if (env.mode === 'evaluate') {\n    return getResponseCorrectness(question, answers, env);\n  }\n};\n\nconst getCorrectSelected = (prompts = [], answers) => {\n  let correctAnswers = 0;\n\n  prompts.forEach((p) => {\n    if (p.relatedAnswer === answers[p.id]) {\n      correctAnswers += 1;\n    }\n  });\n\n  return correctAnswers;\n};\n\nconst getTotalCorrect = (question) => {\n  return question && question.prompts ? question.prompts.length : 0;\n};\n\nconst getPartialScore = (question, answers) => {\n  const count = getCorrectSelected(question && question.prompts, answers);\n  const totalCorrect = getTotalCorrect(question);\n\n  return parseFloat((count / totalCorrect).toFixed(2));\n};\n\nconst getOutComeScore = (question, env, answers) => {\n  const correctness = getCorrectness(question, env, answers);\n\n  return correctness === 'correct' ? 1 : correctness === 'partial' && true ? getPartialScore(question, answers) : 0;\n};\n\nexport const outcome = (question, session, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate') {\n      resolve({ score: undefined, completed: undefined });\n    } else {\n      if (!session || isEmpty(session)) {\n        resolve({ score: 0, empty: true });\n      } else {\n        const out = {\n          score: getOutComeScore(question, env, session.value),\n        };\n\n        resolve(out);\n      }\n    }\n  });\n};\n\nexport function createDefaultModel(model = {}) {\n  return new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\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 function model(question, session, env, updateSession) {\n  return new Promise(async (resolve) => {\n    const correctness = getCorrectness(question, env, session && session.value);\n    const correctResponse = {};\n    const score = `${getOutComeScore(question, env, session && session.value) * 100}%`;\n    const correctInfo = {\n      score,\n      correctness,\n    };\n\n    const shuffledValues = {};\n    let prompts = question.prompts;\n    let answers = question.answers;\n\n    const us = (part) => (id, element, update) => {\n      return new Promise((resolve) => {\n        shuffledValues[part] = update.shuffledValues;\n        resolve();\n      });\n    };\n\n    const lockChoiceOrder = lockChoices(question, session, env);\n\n    if (!lockChoiceOrder) {\n      prompts = await getShuffledChoices(\n        prompts,\n        { shuffledValues: ((session && session.shuffledValues) || {}).prompts },\n        us('prompts'),\n        'id',\n      );\n      answers = await getShuffledChoices(\n        answers,\n        { shuffledValues: ((session && session.shuffledValues) || {}).answers },\n        us('answers'),\n        'id',\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          // eslint-disable-next-line no-console\n          console.error('update session failed', e);\n        });\n      }\n    }\n\n    if (question && prompts) {\n      prompts.forEach((prompt) => {\n        correctResponse[prompt.id] = prompt.relatedAnswer;\n      });\n    }\n\n    const fb =\n      env.mode === 'evaluate'\n        ? getFeedbackForCorrectness(correctInfo.correctness, question.feedback)\n        : Promise.resolve(undefined);\n\n    fb.then((feedback) => {\n      const base = {\n        config: {\n          ...question,\n          prompts,\n          answers,\n        },\n        correctness: correctInfo,\n        feedback,\n        mode: env.mode,\n      };\n\n      if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n        base.rationale = question.rationale;\n      } else {\n        base.rationale = null;\n      }\n\n      const out = Object.assign(base, {\n        correctResponse,\n      });\n\n      log('out: ', out);\n      resolve(out);\n    });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { prompts, answers } = question;\n      const value = {};\n\n      prompts.forEach((p) => {\n        if (answers.filter((a) => a.id === p.relatedAnswer).length) {\n          value[p.id] = p.relatedAnswer;\n        }\n      });\n\n      resolve({\n        value,\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","getResponseCorrectness","model","answers","env","isPartialScoring","partialScoring","enabled","prompts","Object","keys","length","totalCorrectAnswers","getTotalCorrect","correctAnswers","getCorrectSelected","getCorrectness","question","mode","forEach","p","relatedAnswer","id","getPartialScore","count","totalCorrect","parseFloat","toFixed","getOutComeScore","correctness","outcome","session","Promise","resolve","score","undefined","completed","empty","out","value","createDefaultModel","defaults","updateSession","correctResponse","correctInfo","shuffledValues","us","part","element","update","lockChoiceOrder","e","console","error","prompt","fb","feedback","then","base","config","role","rationale","assign","createCorrectResponseSession","filter","a"],"mappings":"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","sourcesContent":["import isEmpty from 'lodash/isEmpty';\nimport { getFeedbackForCorrectness } from '@pie-lib/feedback';\nimport { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/controller-utils';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:match-list:controller');\n\nimport defaults from './defaults';\n\nconst getResponseCorrectness = (model, answers, env) => {\n  const isPartialScoring = partialScoring.enabled(model, env);\n  const prompts = model.prompts;\n\n  if (!answers || Object.keys(answers).length === 0) {\n    return 'unanswered';\n  }\n\n  const totalCorrectAnswers = getTotalCorrect(model);\n  const correctAnswers = getCorrectSelected(prompts, answers);\n\n  if (totalCorrectAnswers === correctAnswers) {\n    return 'correct';\n  } else if (correctAnswers === 0) {\n    return 'incorrect';\n  } else if (isPartialScoring) {\n    return 'partial';\n  }\n\n  return 'incorrect';\n};\n\nconst getCorrectness = (question, env, answers) => {\n  if (env.mode === 'evaluate') {\n    return getResponseCorrectness(question, answers, env);\n  }\n};\n\nconst getCorrectSelected = (prompts = [], answers) => {\n  let correctAnswers = 0;\n\n  prompts.forEach((p) => {\n    if (p.relatedAnswer === answers[p.id]) {\n      correctAnswers += 1;\n    }\n  });\n\n  return correctAnswers;\n};\n\nconst getTotalCorrect = (question) => {\n  return question && question.prompts ? question.prompts.length : 0;\n};\n\nconst getPartialScore = (question, answers) => {\n  const count = getCorrectSelected(question && question.prompts, answers);\n  const totalCorrect = getTotalCorrect(question);\n\n  return parseFloat((count / totalCorrect).toFixed(2));\n};\n\nconst getOutComeScore = (question, env, answers) => {\n  const correctness = getCorrectness(question, env, answers);\n\n  return correctness === 'correct' ? 1 : correctness === 'partial' && true ? getPartialScore(question, answers) : 0;\n};\n\nexport const outcome = (question, session, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate') {\n      resolve({ score: undefined, completed: undefined });\n    } else {\n      if (!session || isEmpty(session)) {\n        resolve({ score: 0, empty: true });\n      } else {\n        const out = {\n          score: getOutComeScore(question, env, session.value),\n        };\n\n        resolve(out);\n      }\n    }\n  });\n};\n\nexport function createDefaultModel(model = {}) {\n  return new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\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 function model(question, session, env, updateSession) {\n  return new Promise(async (resolve) => {\n    const correctness = getCorrectness(question, env, session && session.value);\n    const correctResponse = {};\n    const score = `${getOutComeScore(question, env, session && session.value) * 100}%`;\n    const correctInfo = {\n      score,\n      correctness,\n    };\n\n    const shuffledValues = {};\n    let prompts = question.prompts;\n    let answers = question.answers;\n\n    const us = (part) => (id, element, update) => {\n      return new Promise((resolve) => {\n        shuffledValues[part] = update.shuffledValues;\n        resolve();\n      });\n    };\n\n    const lockChoiceOrder = lockChoices(question, session, env);\n\n    if (!lockChoiceOrder) {\n      prompts = await getShuffledChoices(\n        prompts,\n        { shuffledValues: ((session && session.shuffledValues) || {}).prompts },\n        us('prompts'),\n        'id',\n      );\n      answers = await getShuffledChoices(\n        answers,\n        { shuffledValues: ((session && session.shuffledValues) || {}).answers },\n        us('answers'),\n        'id',\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 (question && prompts) {\n      prompts.forEach((prompt) => {\n        correctResponse[prompt.id] = prompt.relatedAnswer;\n      });\n    }\n\n    const fb =\n      env.mode === 'evaluate'\n        ? getFeedbackForCorrectness(correctInfo.correctness, question.feedback)\n        : Promise.resolve(undefined);\n\n    fb.then((feedback) => {\n      const base = {\n        config: {\n          ...question,\n          prompts,\n          answers,\n        },\n        correctness: correctInfo,\n        feedback,\n        mode: env.mode,\n      };\n\n      if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n        base.rationale = question.rationale;\n      } else {\n        base.rationale = null;\n      }\n\n      const out = Object.assign(base, {\n        correctResponse,\n      });\n\n      log('out: ', out);\n      resolve(out);\n    });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { prompts, answers } = question;\n      const value = {};\n\n      prompts.forEach((p) => {\n        if (answers.filter((a) => a.id === p.relatedAnswer).length) {\n          value[p.id] = p.relatedAnswer;\n        }\n      });\n\n      resolve({\n        value,\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/match-list-controller",
   "private": true,
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "1.17.5-next.20+3fa630eb9",
+  "version": "1.17.5",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -14,10 +14,10 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/correct-answer-toggle": "^2.3.71",
+    "@pie-lib/correct-answer-toggle": "^2.3.72",
     "@pie-lib/drag": "^2.1.18",
     "@pie-lib/math-rendering": "^2.5.14",
-    "@pie-lib/render-ui": "^4.14.21",
+    "@pie-lib/render-ui": "^4.14.22",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
@@ -28,7 +28,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "3fa630eb96b116cb685ab58fbf216fb572d1c333",
+  "gitHead": "f39573eef3b2bef5a26295defe4018f707c6a815",
   "main": "lib/index.js",
   "module": "src/index.js"
 }