@instructure/quiz-core 20.7.1-rc.7 → 20.8.0

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/RichFillBlankType/presenter.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -13,7 +15,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -23,23 +25,11 @@ var _index = _interopRequireDefault(require("../shared/AfsTableWrapper/index.js"
 
 var _presenter = require("../shared/AfsPartsContainer/presenter.js");
 
-var _index2 = _interopRequireDefault(require("../shared/ChoiceGroupTypeTable/index.js"));
-
-var _uiText = require("@instructure/ui-text");
-
-var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+var _index2 = _interopRequireDefault(require("./ChoiceGroupTypeTable/index.js"));
 
 var _index3 = _interopRequireDefault(require("../shared/AggregationTable/index.js"));
 
-var _emotion = require("@instructure/emotion");
-
-var _styles = _interopRequireDefault(require("./styles.js"));
-
-var _theme = _interopRequireDefault(require("./theme.js"));
-
-var _dec, _class, _class2, _temp;
-
-var RichFillBlankType = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
+var RichFillBlankType = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(RichFillBlankType, _Component);
 
   var _super = (0, _createSuper2.default)(RichFillBlankType);
@@ -55,26 +45,11 @@ var RichFillBlankType = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _this.renderBlankInfo = function (blank) {
-      var _blank$aggregate, _blank$aggregate2;
-
-      var correctCount = (blank === null || blank === void 0 ? void 0 : (_blank$aggregate = blank.aggregate) === null || _blank$aggregate === void 0 ? void 0 : _blank$aggregate.correct) || 0;
-      var incorrectCount = (blank === null || blank === void 0 ? void 0 : (_blank$aggregate2 = blank.aggregate) === null || _blank$aggregate2 === void 0 ? void 0 : _blank$aggregate2.incorrect) || 0;
-      var noAnswer = (blank === null || blank === void 0 ? void 0 : blank.no_answer) || 0;
-      var correctString = "".concat((0, _formatMessage.default)('Correct'), ": ").concat(correctCount, " ");
-      var incorrectString = "".concat((0, _formatMessage.default)('Incorrect'), ": ").concat(incorrectCount, " ");
-      var noAnswerString = "".concat((0, _formatMessage.default)('No Answer'), ": ").concat(noAnswer, " ");
-      return (0, _emotion.jsx)("div", {
-        css: _this.props.styles.groupAggregationContainer
-      }, (0, _emotion.jsx)(_uiText.Text, null, correctString), (0, _emotion.jsx)(_uiText.Text, null, incorrectString), (0, _emotion.jsx)(_uiText.Text, null, noAnswerString));
-    };
-
     _this.renderGroup = function (key, itemId, blank, index) {
-      return (0, _emotion.jsx)(_index2.default, {
+      return /*#__PURE__*/_react.default.createElement(_index2.default, {
         key: key,
         itemId: itemId,
         blank: blank,
-        blankInfo: _this.renderBlankInfo(blank),
         index: index
       });
     };
@@ -85,7 +60,7 @@ var RichFillBlankType = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.
           itemId = _this$props.itemId;
       var blanks = answerSummary.blanks;
       return blanks.map(function (blank, index) {
-        var key = "ChoiceGroupTypeTable_".concat(index);
+        var key = "ChoiceGroupTypeTable_".concat(itemId, "_").concat(index);
         return _this.renderGroup(key, itemId, blank, index);
       });
     };
@@ -94,9 +69,9 @@ var RichFillBlankType = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.
       var _this$props2 = _this.props,
           answerSummary = _this$props2.answerSummary,
           itemId = _this$props2.itemId;
-      return (0, _emotion.jsx)(_index.default, null, (0, _emotion.jsx)(_presenter.AfsPartsContainer, {
+      return /*#__PURE__*/_react.default.createElement(_index.default, null, /*#__PURE__*/_react.default.createElement(_presenter.AfsPartsContainer, {
         afsTable: _this.renderGroups(),
-        aggregationTable: (0, _emotion.jsx)(_index3.default, {
+        aggregationTable: /*#__PURE__*/_react.default.createElement(_index3.default, {
           itemId: itemId,
           answerSummary: answerSummary
         })
@@ -107,9 +82,10 @@ var RichFillBlankType = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.
   }
 
   return RichFillBlankType;
-}(_react.Component), _class2.propTypes = {
+}(_react.Component);
+
+exports.RichFillBlankType = RichFillBlankType;
+RichFillBlankType.propTypes = {
   itemId: _propTypes.default.number.isRequired,
-  answerSummary: _propTypes2.richFillBlankTypeAnswerSummaryPropType.isRequired,
-  styles: _propTypes.default.object
-}.isRequired, _temp)) || _class);
-exports.RichFillBlankType = RichFillBlankType;
+  answerSummary: _propTypes2.richFillBlankTypeAnswerSummaryPropType.isRequired
+}.isRequired;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/ScoreDistributionType/Table/index.js

@@ -0,0 +1,140 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ScoreDistributionTypeTable = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+
+var _propTypes = require("../../../propTypes.js");
+
+var _react = require("react");
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var _uiTable = require("@instructure/ui-table");
+
+var _propTypes2 = _interopRequireDefault(require("prop-types"));
+
+var _emotion = require("@instructure/emotion");
+
+var _styles = _interopRequireDefault(require("./styles.js"));
+
+var _theme = _interopRequireDefault(require("./theme.js"));
+
+var _dec, _class, _class2, _temp;
+
+var ScoreDistributionTypeTable = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ScoreDistributionTypeTable, _Component);
+
+  var _super = (0, _createSuper2.default)(ScoreDistributionTypeTable);
+
+  function ScoreDistributionTypeTable() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, ScoreDistributionTypeTable);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _this.renderFirstCell = function (content) {
+      return (0, _emotion.jsx)("div", {
+        css: _this.props.styles.firstTextContainer
+      }, content);
+    };
+
+    _this.renderCell = function (content) {
+      return (0, _emotion.jsx)("div", {
+        css: _this.props.styles.textContainer
+      }, content);
+    };
+
+    _this.renderRow = function (choice, choiceIndex) {
+      var count = choice.count,
+          score = choice.score,
+          percentage = choice.percentage;
+      return (0, _emotion.jsx)(_uiTable.Table.Row, {
+        key: choiceIndex
+      }, (0, _emotion.jsx)(_uiTable.Table.Cell, {
+        themeOverride: {
+          padding: '0'
+        }
+      }, _this.renderFirstCell(score)), (0, _emotion.jsx)(_uiTable.Table.Cell, {
+        themeOverride: {
+          padding: '0'
+        }
+      }, _this.renderCell(count)), (0, _emotion.jsx)(_uiTable.Table.Cell, {
+        themeOverride: {
+          padding: '0'
+        },
+        textAlign: "center"
+      }, _this.renderCell("".concat(percentage, "%"))));
+    };
+
+    return _this;
+  }
+
+  (0, _createClass2.default)(ScoreDistributionTypeTable, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.props.makeStyles();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate() {
+      this.props.makeStyles();
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          scores = _this$props.scores,
+          itemId = _this$props.itemId,
+          styles = _this$props.styles;
+      var pointsHeaderId = "answer-frequency-summary-points-".concat(itemId);
+      var respondentsHeaderId = "answer-frequency-summary-respondents-".concat(itemId);
+      var percentageHeaderId = "answer-frequency-summary-percentage-".concat(itemId);
+      return (0, _emotion.jsx)("div", {
+        css: styles.tableContainer
+      }, (0, _emotion.jsx)(_uiTable.Table, {
+        caption: (0, _formatMessage.default)('Score Frequency Summary'),
+        elementRef: this.setTableRef
+      }, (0, _emotion.jsx)(_uiTable.Table.Head, null, (0, _emotion.jsx)(_uiTable.Table.Row, null, (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
+        id: pointsHeaderId,
+        height: "47px"
+      }, (0, _formatMessage.default)('Points')), (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
+        id: respondentsHeaderId,
+        height: "47px",
+        textAlign: "center"
+      }, (0, _formatMessage.default)('Respondents')), (0, _emotion.jsx)(_uiTable.Table.ColHeader, {
+        id: percentageHeaderId,
+        height: "47px",
+        textAlign: "center"
+      }, (0, _formatMessage.default)('%')))), (0, _emotion.jsx)(_uiTable.Table.Body, null, scores.map(this.renderRow))));
+    }
+  }]);
+  ScoreDistributionTypeTable.displayName = "ScoreDistributionTypeTable";
+  return ScoreDistributionTypeTable;
+}(_react.Component), _class2.propTypes = {
+  itemId: _propTypes2.default.number.isRequired,
+  scores: _propTypes2.default.arrayOf(_propTypes.scoreDistributionType).isRequired,
+  // eslint-disable-next-line react/require-default-props
+  makeStyles: _propTypes2.default.func,
+  // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
+  styles: _propTypes2.default.object
+}, _temp)) || _class);
+exports.ScoreDistributionTypeTable = ScoreDistributionTypeTable;
+var _default = ScoreDistributionTypeTable;
+exports.default = _default;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/ScoreDistributionType/Table/styles.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var generateStyle = function generateStyle(componentTheme) {
+  var borderBottom = "solid 0.0625rem ".concat(componentTheme.colorGray);
+  return {
+    tableContainer: {
+      width: 'calc(25% + 350px)',
+      maxWidth: '100%',
+      '& table': {
+        borderCollapse: 'separate',
+        borderSpacing: '0 1px',
+        '& thead tr': {
+          '& th, & td': {
+            borderBottom: borderBottom
+          }
+        },
+        '& tbody tr': {
+          '& th, & td': {
+            width: '33.33%',
+            borderBottom: borderBottom
+          },
+          '& th': {
+            fontWeight: 400
+          }
+        }
+      }
+    },
+    textContainer: {
+      height: 'calc(100% - 4px)',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center'
+    },
+    firstTextContainer: {
+      padding: componentTheme.cellPadding
+    }
+  };
+};
+
+var _default = generateStyle;
+exports.default = _default;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/ScoreDistributionType/Table/theme.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var generateComponentTheme = function generateComponentTheme(_ref) {
+  var spacing = _ref.spacing,
+      colors = _ref.colors;
+  return {
+    tableBottomPadding: spacing === null || spacing === void 0 ? void 0 : spacing.medium,
+    colorGray: colors === null || colors === void 0 ? void 0 : colors.tiara,
+    cellPadding: "".concat(spacing === null || spacing === void 0 ? void 0 : spacing.small, " ").concat(spacing === null || spacing === void 0 ? void 0 : spacing.small)
+  };
+};
+
+var _default = generateComponentTheme;
+exports.default = _default;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/ScoreDistributionType/index.js

@@ -0,0 +1,80 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ScoreDistributionType = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _index = _interopRequireDefault(require("./Table/index.js"));
+
+var _propTypes2 = require("../../propTypes.js");
+
+var _index2 = _interopRequireDefault(require("../shared/AggregationTable/index.js"));
+
+var _presenter = require("../shared/AfsPartsContainer/presenter.js");
+
+var _index3 = _interopRequireDefault(require("../shared/AfsTableWrapper/index.js"));
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var ScoreDistributionType = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ScoreDistributionType, _Component);
+
+  var _super = (0, _createSuper2.default)(ScoreDistributionType);
+
+  function ScoreDistributionType() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, ScoreDistributionType);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _this.render = function () {
+      var _this$props = _this.props,
+          answerSummary = _this$props.answerSummary,
+          itemId = _this$props.itemId;
+      return /*#__PURE__*/_react.default.createElement(_index3.default, {
+        tableHeader: (0, _formatMessage.default)('Score Frequency Summary')
+      }, /*#__PURE__*/_react.default.createElement(_presenter.AfsPartsContainer, {
+        afsTable: /*#__PURE__*/_react.default.createElement(_index.default, {
+          itemId: itemId,
+          scores: answerSummary.score_distribution
+        }),
+        aggregationTable: /*#__PURE__*/_react.default.createElement(_index2.default, {
+          itemId: itemId,
+          answerSummary: answerSummary
+        })
+      }));
+    };
+
+    return _this;
+  }
+
+  return ScoreDistributionType;
+}(_react.Component);
+
+exports.ScoreDistributionType = ScoreDistributionType;
+ScoreDistributionType.propTypes = {
+  itemId: _propTypes.default.number,
+  answerSummary: _propTypes2.scoreDistributionTypeAnswerSummaryPropType
+}.isRequired;
+var _default = ScoreDistributionType;
+exports.default = _default;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/presenter.js

@@ -27,7 +27,11 @@ var _index3 = _interopRequireDefault(require("./RichFillBlankType/index.js"));
 
 var _index4 = _interopRequireDefault(require("./AggregationType/index.js"));
 
-var _index5 = require("./MatchingType/index.js");
+var _index5 = _interopRequireDefault(require("./NumericType/index.js"));
+
+var _index6 = require("./MatchingType/index.js");
+
+var _index7 = require("./ScoreDistributionType/index.js");
 
 var _propTypes = require("../propTypes.js");
 
@@ -58,15 +62,15 @@ var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
       }
 
       if (afsFlags.matchingEnabled) {
-        _this.afsTableComponentMap.set('matching', _index5.MatchingType);
+        _this.afsTableComponentMap.set('matching', _index6.MatchingType);
       }
 
       if (afsFlags.orderingEnabled) {
-        _this.afsTableComponentMap.set('ordering', _index5.OrderingType);
+        _this.afsTableComponentMap.set('ordering', _index6.OrderingType);
       }
 
       if (afsFlags.categorizationEnabled) {
-        _this.afsTableComponentMap.set('categorization', _index5.CategorizationType);
+        _this.afsTableComponentMap.set('categorization', _index6.CategorizationType);
       }
 
       if (afsFlags.trueFalseEnabled) {
@@ -84,6 +88,18 @@ var AnswerFrequencySummary = /*#__PURE__*/function (_Component) {
       if (afsFlags.fillInTheBlankEnabled) {
         _this.afsTableComponentMap.set('rich-fill-blank', _index3.default);
       }
+
+      if (afsFlags.numericEnabled) {
+        _this.afsTableComponentMap.set('numeric', _index5.default);
+      }
+
+      if (afsFlags.essayEnabled) {
+        _this.afsTableComponentMap.set('essay', _index7.ScoreDistributionType);
+      }
+
+      if (afsFlags.fileUploadEnabled) {
+        _this.afsTableComponentMap.set('file-upload', _index7.ScoreDistributionType);
+      }
     };
 
     _this.render = function () {

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AfsTableWrapper/presenter.js

@@ -45,6 +45,11 @@ var AfsTableWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, null), _d
 
     _this = _super.call.apply(_super, [this].concat(args));
 
+    _this.getHeader = function () {
+      var tableHeader = _this.props.tableHeader;
+      return tableHeader || (0, _formatMessage.default)('Answer Frequency Summary');
+    };
+
     _this.render = function () {
       return (0, _emotion.jsx)(_uiFlex.Flex, {
         direction: "row",
@@ -58,7 +63,7 @@ var AfsTableWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, null), _d
         level: "h3",
         weight: "bold",
         color: "primary"
-      }, (0, _formatMessage.default)('Answer Frequency Summary')), _this.props.children)));
+      }, _this.getHeader()), _this.props.children)));
     };
 
     return _this;
@@ -67,6 +72,7 @@ var AfsTableWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, null), _d
   return AfsTableWrapper;
 }(_react.Component), _class2.propTypes = {
   children: _propTypes.default.node.isRequired,
-  styles: _propTypes.default.object
+  styles: _propTypes.default.object,
+  tableHeader: _propTypes.default.string
 }, _temp)) || _class);
 exports.AfsTableWrapper = AfsTableWrapper;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AggregationTable/presenter.js

@@ -44,33 +44,33 @@ var _popoverContent = require("./popoverContent.js");
 var _dec, _class, _class2, _temp;
 
 var styles = {
-  componentId: 'fSsSV',
+  componentId: 'fMmrG',
   template: function template(theme) {
-    return "\n\n.fSsSV_cvRx{align-items:center;display:flex;height:100%;justify-content:center;min-height:47px;width:46px}\n\n.fSsSV_fPIL{min-width:500px}\n\n.fSsSV_fPIL table{border-collapse:separate;border-spacing:0 12px}\n\n.fSsSV_fPIL thead th{border-color:".concat(theme.colorHeaderBottomBorder || 'inherit', ";border-style:solid;border-width:0 0 1px 0}\n\n.fSsSV_fPIL table tbody tr td{border-style:solid;border-width:2px 0 2px 0;width:33.33%}\n\n.fSsSV_fPIL table tbody tr th:first-child{border-radius:4px 0 0 4px;border-style:solid;border-width:2px 0 2px 2px;font-weight:400}\n\n.fSsSV_fPIL table tbody tr td:last-child{border-radius:0 4px 4px 0;border-style:solid;border-width:2px 2px 2px 0}\n\n.fSsSV_dzqP table tbody tr:first-child td,.fSsSV_dzqP table tbody tr:first-child th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fSsSV_fZpZ table tbody tr:first-child td,.fSsSV_fZpZ table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fSsSV_fZpZ table tbody tr:nth-child(2) td,.fSsSV_fZpZ table tbody tr:nth-child(2) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fSsSV_dgTJ table tbody tr:first-child td,.fSsSV_dgTJ table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fSsSV_dgTJ table tbody tr:nth-child(2) td,.fSsSV_dgTJ table tbody tr:nth-child(2) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fSsSV_dgTJ table tbody tr:nth-child(3) td,.fSsSV_dgTJ table tbody tr:nth-child(3) th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fSsSV_bUPM table tbody tr:first-child td,.fSsSV_bUPM table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fSsSV_bUPM table tbody tr:nth-child(2) td,.fSsSV_bUPM table tbody tr:nth-child(2) th{border-color:").concat(theme.colorBlue || 'inherit', "}\n\n.fSsSV_bUPM table tbody tr:nth-child(3) td,.fSsSV_bUPM table tbody tr:nth-child(3) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fSsSV_bUPM table tbody tr:nth-child(4) td,.fSsSV_bUPM table tbody tr:nth-child(4) th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fSsSV_bvau{background-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fSsSV_cxOH{background-color:").concat(theme.colorRed || 'inherit', "}\n\n.fSsSV_eRkO{background-color:").concat(theme.colorBlue || 'inherit', "}\n\n.fSsSV_eKcq{background-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fSsSV_euQM{padding:12px 0 12px 10px}\n\n.fSsSV_fuuc{padding-left:45px}\n\n.fSsSV_vDgC svg{fill:#fff}\n\n.fSsSV_fHMm{border-color:").concat(theme.colorHeaderBottomBorder || 'inherit', ";border-style:solid;border-width:0 0 1px 0}");
+    return "\n\n.fMmrG_cvRx{align-items:center;display:flex;height:100%;justify-content:center;min-height:47px;width:46px}\n\n.fMmrG_fPIL{min-width:500px}\n\n.fMmrG_fPIL table{border-collapse:separate;border-spacing:0 12px}\n\n.fMmrG_fPIL thead th{border-color:".concat(theme.colorHeaderBottomBorder || 'inherit', ";border-style:solid;border-width:0 0 1px 0}\n\n.fMmrG_fPIL table tbody tr td{border-style:solid;border-width:2px 0 2px 0;width:33.33%}\n\n.fMmrG_fPIL table tbody tr th:first-child{border-radius:4px 0 0 4px;border-style:solid;border-width:2px 0 2px 2px;font-weight:400}\n\n.fMmrG_fPIL table tbody tr td:last-child{border-radius:0 4px 4px 0;border-style:solid;border-width:2px 2px 2px 0}\n\n.fMmrG_dzqP table tbody tr:first-child td,.fMmrG_dzqP table tbody tr:first-child th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fMmrG_fZpZ table tbody tr:first-child td,.fMmrG_fZpZ table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fMmrG_fZpZ table tbody tr:nth-child(2) td,.fMmrG_fZpZ table tbody tr:nth-child(2) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fMmrG_dgTJ table tbody tr:first-child td,.fMmrG_dgTJ table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fMmrG_dgTJ table tbody tr:nth-child(2) td,.fMmrG_dgTJ table tbody tr:nth-child(2) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fMmrG_dgTJ table tbody tr:nth-child(3) td,.fMmrG_dgTJ table tbody tr:nth-child(3) th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fMmrG_bYLj table tbody tr:first-child td,.fMmrG_bYLj table tbody tr:first-child th{border-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fMmrG_bYLj table tbody tr:nth-child(2) td,.fMmrG_bYLj table tbody tr:nth-child(2) th{border-color:").concat(theme.colorBlue || 'inherit', "}\n\n.fMmrG_bYLj table tbody tr:nth-child(3) td,.fMmrG_bYLj table tbody tr:nth-child(3) th{border-color:").concat(theme.colorRed || 'inherit', "}\n\n.fMmrG_bYLj table tbody tr:nth-child(4) td,.fMmrG_bYLj table tbody tr:nth-child(4) th{border-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fMmrG_bvau{background-color:").concat(theme.colorGreen || 'inherit', "}\n\n.fMmrG_cxOH{background-color:").concat(theme.colorRed || 'inherit', "}\n\n.fMmrG_dsqS{background-color:").concat(theme.colorBlue || 'inherit', "}\n\n.fMmrG_eKcq{background-color:").concat(theme.colorGrey || 'inherit', "}\n\n.fMmrG_euQM{padding:12px 0 12px 10px}\n\n.fMmrG_fuuc{padding-left:45px}\n\n.fMmrG_vDgC svg{fill:#fff}\n\n.fMmrG_fHMm{border-color:").concat(theme.colorHeaderBottomBorder || 'inherit', ";border-style:solid;border-width:0 0 1px 0}");
   },
-  'iconWrapper': 'fSsSV_cvRx',
-  'collapsingTable': 'fSsSV_fPIL',
-  'onlyNoanswer': 'fSsSV_dzqP',
-  'correctIncorrect': 'fSsSV_fZpZ',
-  'correctIncorrectNoanswer': 'fSsSV_dgTJ',
-  'correctIncorrectNoanswerPartial': 'fSsSV_bUPM',
-  'correctBackground': 'fSsSV_bvau',
-  'incorrectBackground': 'fSsSV_cxOH',
-  'partialCorrectBackground': 'fSsSV_eRkO',
-  'noAnswerBackground': 'fSsSV_eKcq',
-  'labelWrapper': 'fSsSV_euQM',
-  'firstHeaderCell': 'fSsSV_fuuc',
-  'iconWhite': 'fSsSV_vDgC',
-  'headerCell': 'fSsSV_fHMm'
+  'iconWrapper': 'fMmrG_cvRx',
+  'collapsingTable': 'fMmrG_fPIL',
+  'onlyNoanswer': 'fMmrG_dzqP',
+  'correctIncorrect': 'fMmrG_fZpZ',
+  'correctIncorrectNoanswer': 'fMmrG_dgTJ',
+  'correctIncorrectNoanswerGraded': 'fMmrG_bYLj',
+  'correctBackground': 'fMmrG_bvau',
+  'incorrectBackground': 'fMmrG_cxOH',
+  'gradedBackground': 'fMmrG_dsqS',
+  'noAnswerBackground': 'fMmrG_eKcq',
+  'labelWrapper': 'fMmrG_euQM',
+  'firstHeaderCell': 'fMmrG_fuuc',
+  'iconWhite': 'fMmrG_vDgC',
+  'headerCell': 'fMmrG_fHMm'
 };
 var noAnswerKey = 'noAnswer';
 var incorrectKey = 'incorrect';
 var correctKey = 'correct';
-var partialCorrectKey = 'partialCorrect';
+var gradedKey = 'graded';
 
 var _ref = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckSolid, null);
 
-var _ref2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconOvalHalfSolid, null);
+var _ref2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconGradebookSolid, null);
 
 var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconXSolid, null);
 
@@ -148,9 +148,9 @@ var AggregationTable = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, null, concatenatedPercentage)));
     };
 
-    _this.partialCorrectExist = function () {
-      var aggregate = _this.props.answerSummary.aggregate;
-      return !!(aggregate === null || aggregate === void 0 ? void 0 : aggregate.partial_correct);
+    _this.gradedExist = function () {
+      var graded = _this.props.answerSummary.graded;
+      return !!graded;
     };
 
     _this.correctExist = function () {
@@ -168,24 +168,19 @@ var AggregationTable = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       return !!no_answer;
     };
 
-    _this.getCorrectLabel = function () {
-      return _this.partialCorrectExist() ? (0, _formatMessage.default)('Fully correct') : (0, _formatMessage.default)('Correct');
-    };
-
     _this.renderCorrect = function () {
       var aggregate = _this.props.answerSummary.aggregate;
       var correct = aggregate.correct;
       var correctCount = correct.count || 0;
       var correctPercentage = correct.percentage || 0;
-      return _this.renderRow(correctKey, _ref, _this.getCorrectLabel(), correctCount, correctPercentage);
+      return _this.renderRow(correctKey, _ref, (0, _formatMessage.default)('Correct'), correctCount, correctPercentage);
     };
 
-    _this.renderPartialCorrect = function () {
-      var aggregate = _this.props.answerSummary.aggregate;
-      var partial_correct = aggregate.partial_correct;
-      var partialCorrectCount = partial_correct.count || 0;
-      var partialCorrectPercentage = partial_correct.percentage || 0;
-      return _this.renderRow(partialCorrectKey, _ref2, (0, _formatMessage.default)('Partially correct'), partialCorrectCount, partialCorrectPercentage);
+    _this.renderGraded = function () {
+      var graded = _this.props.answerSummary.graded;
+      var gradedCount = graded.count || 0;
+      var gradedPercentage = graded.percentage || 0;
+      return _this.renderRow(gradedKey, _ref2, (0, _formatMessage.default)('Graded'), gradedCount, gradedPercentage);
     };
 
     _this.renderIncorrect = function () {
@@ -206,16 +201,16 @@ var AggregationTable = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
     _this.getColorProfile = function () {
       var colorProfile;
 
-      var correctIncorrectNoAnswerPartial = _this.partialCorrectExist() && _this.noAnswerExist() && _this.correctExist() && _this.incorrectExist();
+      var correctIncorrectNoAnswerGraded = _this.gradedExist() && _this.noAnswerExist() && _this.correctExist() && _this.incorrectExist();
 
-      var correctIncorrectNoAnswer = !_this.partialCorrectExist() && _this.noAnswerExist() && _this.correctExist() && _this.incorrectExist();
+      var correctIncorrectNoAnswer = !_this.gradedExist() && _this.noAnswerExist() && _this.correctExist() && _this.incorrectExist();
 
-      var onlyNoAnswer = _this.noAnswerExist() && !_this.partialCorrectExist() && !_this.correctExist() && !_this.incorrectExist();
+      var onlyNoAnswer = _this.noAnswerExist() && !_this.gradedExist() && !_this.correctExist() && !_this.incorrectExist();
 
       if (correctIncorrectNoAnswer) {
         colorProfile = 'correctIncorrectNoanswer';
-      } else if (correctIncorrectNoAnswerPartial) {
-        colorProfile = 'correctIncorrectNoanswerPartial';
+      } else if (correctIncorrectNoAnswerGraded) {
+        colorProfile = 'correctIncorrectNoanswerGraded';
       } else if (onlyNoAnswer) {
         colorProfile = 'onlyNoanswer';
       } else {
@@ -231,7 +226,7 @@ var AggregationTable = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         className: (0, _classnames.default)(styles.collapsingTable, styles[_this.getColorProfile()])
       }, /*#__PURE__*/_react.default.createElement(_uiTable.Table, {
         caption: (0, _formatMessage.default)('Answer Frequency Summary Aggregates')
-      }, _this.renderHeaderRow(popover), /*#__PURE__*/_react.default.createElement(_uiTable.Table.Body, null, _this.correctExist() && _this.renderCorrect(), _this.partialCorrectExist() && _this.renderPartialCorrect(), _this.incorrectExist() && _this.renderIncorrect(), _this.noAnswerExist() && _this.renderNoAnswer())));
+      }, _this.renderHeaderRow(popover), /*#__PURE__*/_react.default.createElement(_uiTable.Table.Body, null, _this.correctExist() && _this.renderCorrect(), _this.gradedExist() && _this.renderGraded(), _this.incorrectExist() && _this.renderIncorrect(), _this.noAnswerExist() && _this.renderNoAnswer())));
     };
 
     return _this;

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/ExpandableCard/index.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _presenter.ExpandableCard;
+  }
+});
+
+var _presenter = require("./presenter.js");