@pie-element/rubric 3.6.1-next.2 → 3.6.2
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/CHANGELOG.md +23 -0
- package/configure/CHANGELOG.md +22 -0
- package/configure/package.json +1 -1
- package/controller/CHANGELOG.md +22 -0
- package/controller/package.json +1 -1
- package/lib/main.js +3 -4
- package/lib/main.js.map +1 -1
- package/module/element.js +14 -13
- package/module/index.html +1 -1
- package/module/manifest.json +1 -1
- package/module/print.html +1 -1
- package/module/print.js +14 -13
- package/package.json +2 -2
- package/src/__tests__/rubric-view.test.jsx +36 -32
- package/src/main.jsx +18 -18
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,29 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [3.6.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric@3.6.1...@pie-element/rubric@3.6.2) (2024-03-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add back changes for PD-1870, that were reverted in previous version ([0cad3b8](https://github.com/pie-framework/pie-elements/commit/0cad3b8f29a123e34098b865190e57b92fbf5ecc))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [3.6.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric@3.6.0...@pie-element/rubric@3.6.1) (2024-03-27)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* display rubric in player according to last changes (PD-3573) PD-3599 ([f7a9038](https://github.com/pie-framework/pie-elements/commit/f7a9038922a923d9b4d8977ae6c212fae842eac6))
|
|
23
|
+
* revert changes made for PD-1870, we'll add them back later ([3e7e73e](https://github.com/pie-framework/pie-elements/commit/3e7e73ecc31de0ae16c59163bad95b6d7a02bb37))
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
6
29
|
# [3.6.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric@3.5.2...@pie-element/rubric@3.6.0) (2024-03-26)
|
|
7
30
|
|
|
8
31
|
|
package/configure/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [3.5.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-configure@3.5.4...@pie-element/rubric-configure@3.5.5) (2024-03-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add back changes for PD-1870, that were reverted in previous version ([0cad3b8](https://github.com/pie-framework/pie-elements/commit/0cad3b8f29a123e34098b865190e57b92fbf5ecc))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [3.5.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-configure@3.5.3...@pie-element/rubric-configure@3.5.4) (2024-03-27)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* revert changes made for PD-1870, we'll add them back later ([3e7e73e](https://github.com/pie-framework/pie-elements/commit/3e7e73ecc31de0ae16c59163bad95b6d7a02bb37))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
## [3.5.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-configure@3.5.2...@pie-element/rubric-configure@3.5.3) (2024-03-26)
|
|
7
29
|
|
|
8
30
|
**Note:** Version bump only for package @pie-element/rubric-configure
|
package/configure/package.json
CHANGED
package/controller/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.5.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-controller@2.5.2...@pie-element/rubric-controller@2.5.3) (2024-03-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add back changes for PD-1870, that were reverted in previous version ([0cad3b8](https://github.com/pie-framework/pie-elements/commit/0cad3b8f29a123e34098b865190e57b92fbf5ecc))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [2.5.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-controller@2.5.1...@pie-element/rubric-controller@2.5.2) (2024-03-27)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* revert changes made for PD-1870, we'll add them back later ([3e7e73e](https://github.com/pie-framework/pie-elements/commit/3e7e73ecc31de0ae16c59163bad95b6d7a02bb37))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
## [2.5.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/rubric-controller@2.5.0...@pie-element/rubric-controller@2.5.1) (2024-03-26)
|
|
7
29
|
|
|
8
30
|
**Note:** Version bump only for package @pie-element/rubric-controller
|
package/controller/package.json
CHANGED
package/lib/main.js
CHANGED
|
@@ -91,8 +91,6 @@ var Rubric = /*#__PURE__*/function (_React$Component) {
|
|
|
91
91
|
}, {
|
|
92
92
|
key: "render",
|
|
93
93
|
value: function render() {
|
|
94
|
-
var _this2 = this;
|
|
95
|
-
|
|
96
94
|
var _this$props = this.props,
|
|
97
95
|
value = _this$props.value,
|
|
98
96
|
classes = _this$props.classes;
|
|
@@ -107,7 +105,8 @@ var Rubric = /*#__PURE__*/function (_React$Component) {
|
|
|
107
105
|
component: "nav"
|
|
108
106
|
}, points.slice(0).reverse().map(function (desc, index) {
|
|
109
107
|
index = points.length - index - 1;
|
|
110
|
-
|
|
108
|
+
var pointsLabel = value.excludeZero ? index + 1 : index;
|
|
109
|
+
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
|
|
111
110
|
key: index
|
|
112
111
|
}, /*#__PURE__*/_react["default"].createElement(_ListItem["default"], {
|
|
113
112
|
key: "P".concat(index)
|
|
@@ -115,7 +114,7 @@ var Rubric = /*#__PURE__*/function (_React$Component) {
|
|
|
115
114
|
className: classes.rubricCol,
|
|
116
115
|
primary: /*#__PURE__*/_react["default"].createElement("div", {
|
|
117
116
|
className: classes.text
|
|
118
|
-
},
|
|
117
|
+
}, pointsLabel === 1 ? "".concat(pointsLabel, " PT") : "".concat(pointsLabel, " PTS"))
|
|
119
118
|
}), /*#__PURE__*/_react["default"].createElement(_ListItemText["default"], {
|
|
120
119
|
primary: /*#__PURE__*/_react["default"].createElement("div", {
|
|
121
120
|
className: classes.text,
|
package/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/main.jsx"],"names":["RubricType","PropTypes","shape","excludeZero","bool","points","arrayOf","string","sampleAnswers","animationsDisabled","Rubric","props","index","value","state","rubricOpen","linkPrefix","toggleRubric","bind","setState","classes","rubricList","slice","reverse","map","desc","length","
|
|
1
|
+
{"version":3,"sources":["../src/main.jsx"],"names":["RubricType","PropTypes","shape","excludeZero","bool","points","arrayOf","string","sampleAnswers","animationsDisabled","Rubric","props","index","value","state","rubricOpen","linkPrefix","toggleRubric","bind","setState","classes","rubricList","slice","reverse","map","desc","length","pointsLabel","rubricCol","text","__html","marginLeft","root","dudUrl","React","Component","object","isRequired","styles","color","backgroundColor","background","flex","minWidth"],"mappings":"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","sourcesContent":["import React from 'react';\nimport { withStyles } from '@material-ui/core/styles';\nimport ListItem from '@material-ui/core/ListItem';\nimport List from '@material-ui/core/List';\nimport ListItemText from '@material-ui/core/ListItemText';\nimport Link from '@material-ui/core/Link';\nimport Collapse from '@material-ui/core/Collapse';\nimport { color } from '@pie-lib/pie-toolbox/render-ui';\nimport PropTypes from 'prop-types';\n\nexport const RubricType = PropTypes.shape({\n excludeZero: PropTypes.bool,\n points: PropTypes.arrayOf(PropTypes.string),\n sampleAnswers: PropTypes.arrayOf(PropTypes.string),\n animationsDisabled: PropTypes.bool,\n});\n\nclass Rubric extends React.Component {\n dudUrl = 'javascript:;';\n\n constructor(props) {\n super(props);\n this.state = {\n rubricOpen: false,\n linkPrefix: 'Show',\n };\n this.toggleRubric = this.toggleRubric.bind(this);\n }\n\n static propTypes = {\n classes: PropTypes.object.isRequired,\n animationsDisabled: PropTypes.bool,\n value: RubricType,\n };\n\n toggleRubric() {\n this.setState({ rubricOpen: !this.state.rubricOpen });\n this.setState({ linkPrefix: this.state.rubricOpen ? 'Show' : 'Hide' });\n }\n\n shouldRenderPoint = (index, value) => {\n if (!value.excludeZero) {\n return true;\n } else {\n return index !== 0;\n }\n };\n\n render() {\n const { value, classes } = this.props;\n let { animationsDisabled } = this.props;\n animationsDisabled = animationsDisabled || value.animationsDisabled;\n\n if (value && value.points) {\n const { points, sampleAnswers } = value;\n\n const rubricList = (\n <List component=\"nav\">\n {points\n .slice(0)\n .reverse()\n .map((desc, index) => {\n index = points.length - index - 1;\n const pointsLabel = value.excludeZero ? index + 1: index;\n\n return (\n <React.Fragment key={index}>\n <ListItem key={`P${index}`}>\n <ListItemText\n className={classes.rubricCol}\n primary={<div className={classes.text}>{pointsLabel === 1 ? `${pointsLabel} PT` : `${pointsLabel} PTS`}</div>}\n />\n\n <ListItemText\n primary={<div className={classes.text} dangerouslySetInnerHTML={{ __html: desc }} />}\n />\n </ListItem>\n\n {sampleAnswers && sampleAnswers[index] && (\n <ListItem key={`S${index}`}>\n <ListItemText\n className={classes.rubricCol}\n style={{ marginLeft: '20px' }}\n primary={<div className={classes.text}>Sample Answer</div>}\n />\n\n <ListItemText\n primary={\n <div className={classes.text} dangerouslySetInnerHTML={{ __html: sampleAnswers[index] }} />\n }\n />\n </ListItem>\n )}\n </React.Fragment>\n );\n })}\n </List>\n );\n\n return (\n <div className={classes.root}>\n {!animationsDisabled ? (\n <React.Fragment>\n <Link href={this.dudUrl} onClick={this.toggleRubric}>\n {this.state.linkPrefix} Rubric\n </Link>\n <Collapse in={this.state.rubricOpen} timeout=\"auto\">\n {rubricList}\n </Collapse>\n </React.Fragment>\n ) : (\n rubricList\n )}\n </div>\n );\n } else {\n return null;\n }\n }\n}\n\nconst styles = () => ({\n root: {\n color: color.text(),\n backgroundColor: color.background(),\n },\n rubricCol: {\n flex: '0 1 auto',\n minWidth: 'fit-content',\n },\n text: {\n color: color.text(),\n },\n});\n\nexport default withStyles(styles)(Rubric);\n"],"file":"main.js"}
|
package/module/element.js
CHANGED
|
@@ -8176,19 +8176,20 @@ class Rubric extends React$1.Component {
|
|
|
8176
8176
|
}
|
|
8177
8177
|
}, points.slice(0).reverse().map((desc, index) => {
|
|
8178
8178
|
index = points.length - index - 1;
|
|
8179
|
-
|
|
8179
|
+
const pointsLabel = value.excludeZero ? index + 1 : index;
|
|
8180
|
+
return React$1.createElement(React$1.Fragment, {
|
|
8180
8181
|
key: index,
|
|
8181
8182
|
__self: this,
|
|
8182
8183
|
__source: {
|
|
8183
8184
|
fileName: _jsxFileName$1,
|
|
8184
|
-
lineNumber:
|
|
8185
|
+
lineNumber: 67
|
|
8185
8186
|
}
|
|
8186
8187
|
}, React$1.createElement(ListItem, {
|
|
8187
8188
|
key: `P${index}`,
|
|
8188
8189
|
__self: this,
|
|
8189
8190
|
__source: {
|
|
8190
8191
|
fileName: _jsxFileName$1,
|
|
8191
|
-
lineNumber:
|
|
8192
|
+
lineNumber: 68
|
|
8192
8193
|
}
|
|
8193
8194
|
}, React$1.createElement(ListItemText, {
|
|
8194
8195
|
className: classes.rubricCol,
|
|
@@ -8197,13 +8198,13 @@ class Rubric extends React$1.Component {
|
|
|
8197
8198
|
__self: this,
|
|
8198
8199
|
__source: {
|
|
8199
8200
|
fileName: _jsxFileName$1,
|
|
8200
|
-
lineNumber:
|
|
8201
|
+
lineNumber: 71
|
|
8201
8202
|
}
|
|
8202
|
-
},
|
|
8203
|
+
}, pointsLabel === 1 ? `${pointsLabel} PT` : `${pointsLabel} PTS`),
|
|
8203
8204
|
__self: this,
|
|
8204
8205
|
__source: {
|
|
8205
8206
|
fileName: _jsxFileName$1,
|
|
8206
|
-
lineNumber:
|
|
8207
|
+
lineNumber: 69
|
|
8207
8208
|
}
|
|
8208
8209
|
}), React$1.createElement(ListItemText, {
|
|
8209
8210
|
primary: React$1.createElement('div', {
|
|
@@ -8214,20 +8215,20 @@ class Rubric extends React$1.Component {
|
|
|
8214
8215
|
__self: this,
|
|
8215
8216
|
__source: {
|
|
8216
8217
|
fileName: _jsxFileName$1,
|
|
8217
|
-
lineNumber:
|
|
8218
|
+
lineNumber: 75
|
|
8218
8219
|
}
|
|
8219
8220
|
}),
|
|
8220
8221
|
__self: this,
|
|
8221
8222
|
__source: {
|
|
8222
8223
|
fileName: _jsxFileName$1,
|
|
8223
|
-
lineNumber:
|
|
8224
|
+
lineNumber: 74
|
|
8224
8225
|
}
|
|
8225
8226
|
})), sampleAnswers && sampleAnswers[index] && React$1.createElement(ListItem, {
|
|
8226
8227
|
key: `S${index}`,
|
|
8227
8228
|
__self: this,
|
|
8228
8229
|
__source: {
|
|
8229
8230
|
fileName: _jsxFileName$1,
|
|
8230
|
-
lineNumber:
|
|
8231
|
+
lineNumber: 80
|
|
8231
8232
|
}
|
|
8232
8233
|
}, React$1.createElement(ListItemText, {
|
|
8233
8234
|
className: classes.rubricCol,
|
|
@@ -8239,13 +8240,13 @@ class Rubric extends React$1.Component {
|
|
|
8239
8240
|
__self: this,
|
|
8240
8241
|
__source: {
|
|
8241
8242
|
fileName: _jsxFileName$1,
|
|
8242
|
-
lineNumber:
|
|
8243
|
+
lineNumber: 84
|
|
8243
8244
|
}
|
|
8244
8245
|
}, "Sample Answer"),
|
|
8245
8246
|
__self: this,
|
|
8246
8247
|
__source: {
|
|
8247
8248
|
fileName: _jsxFileName$1,
|
|
8248
|
-
lineNumber:
|
|
8249
|
+
lineNumber: 81
|
|
8249
8250
|
}
|
|
8250
8251
|
}), React$1.createElement(ListItemText, {
|
|
8251
8252
|
primary: React$1.createElement('div', {
|
|
@@ -8256,13 +8257,13 @@ class Rubric extends React$1.Component {
|
|
|
8256
8257
|
__self: this,
|
|
8257
8258
|
__source: {
|
|
8258
8259
|
fileName: _jsxFileName$1,
|
|
8259
|
-
lineNumber:
|
|
8260
|
+
lineNumber: 89
|
|
8260
8261
|
}
|
|
8261
8262
|
}),
|
|
8262
8263
|
__self: this,
|
|
8263
8264
|
__source: {
|
|
8264
8265
|
fileName: _jsxFileName$1,
|
|
8265
|
-
lineNumber:
|
|
8266
|
+
lineNumber: 87
|
|
8266
8267
|
}
|
|
8267
8268
|
})));
|
|
8268
8269
|
}));
|
package/module/index.html
CHANGED
package/module/manifest.json
CHANGED
package/module/print.html
CHANGED
package/module/print.js
CHANGED
|
@@ -8176,19 +8176,20 @@ class Rubric extends React$1.Component {
|
|
|
8176
8176
|
}
|
|
8177
8177
|
}, points.slice(0).reverse().map((desc, index) => {
|
|
8178
8178
|
index = points.length - index - 1;
|
|
8179
|
-
|
|
8179
|
+
const pointsLabel = value.excludeZero ? index + 1 : index;
|
|
8180
|
+
return React$1.createElement(React$1.Fragment, {
|
|
8180
8181
|
key: index,
|
|
8181
8182
|
__self: this,
|
|
8182
8183
|
__source: {
|
|
8183
8184
|
fileName: _jsxFileName,
|
|
8184
|
-
lineNumber:
|
|
8185
|
+
lineNumber: 67
|
|
8185
8186
|
}
|
|
8186
8187
|
}, React$1.createElement(ListItem, {
|
|
8187
8188
|
key: `P${index}`,
|
|
8188
8189
|
__self: this,
|
|
8189
8190
|
__source: {
|
|
8190
8191
|
fileName: _jsxFileName,
|
|
8191
|
-
lineNumber:
|
|
8192
|
+
lineNumber: 68
|
|
8192
8193
|
}
|
|
8193
8194
|
}, React$1.createElement(ListItemText, {
|
|
8194
8195
|
className: classes.rubricCol,
|
|
@@ -8197,13 +8198,13 @@ class Rubric extends React$1.Component {
|
|
|
8197
8198
|
__self: this,
|
|
8198
8199
|
__source: {
|
|
8199
8200
|
fileName: _jsxFileName,
|
|
8200
|
-
lineNumber:
|
|
8201
|
+
lineNumber: 71
|
|
8201
8202
|
}
|
|
8202
|
-
},
|
|
8203
|
+
}, pointsLabel === 1 ? `${pointsLabel} PT` : `${pointsLabel} PTS`),
|
|
8203
8204
|
__self: this,
|
|
8204
8205
|
__source: {
|
|
8205
8206
|
fileName: _jsxFileName,
|
|
8206
|
-
lineNumber:
|
|
8207
|
+
lineNumber: 69
|
|
8207
8208
|
}
|
|
8208
8209
|
}), React$1.createElement(ListItemText, {
|
|
8209
8210
|
primary: React$1.createElement('div', {
|
|
@@ -8214,20 +8215,20 @@ class Rubric extends React$1.Component {
|
|
|
8214
8215
|
__self: this,
|
|
8215
8216
|
__source: {
|
|
8216
8217
|
fileName: _jsxFileName,
|
|
8217
|
-
lineNumber:
|
|
8218
|
+
lineNumber: 75
|
|
8218
8219
|
}
|
|
8219
8220
|
}),
|
|
8220
8221
|
__self: this,
|
|
8221
8222
|
__source: {
|
|
8222
8223
|
fileName: _jsxFileName,
|
|
8223
|
-
lineNumber:
|
|
8224
|
+
lineNumber: 74
|
|
8224
8225
|
}
|
|
8225
8226
|
})), sampleAnswers && sampleAnswers[index] && React$1.createElement(ListItem, {
|
|
8226
8227
|
key: `S${index}`,
|
|
8227
8228
|
__self: this,
|
|
8228
8229
|
__source: {
|
|
8229
8230
|
fileName: _jsxFileName,
|
|
8230
|
-
lineNumber:
|
|
8231
|
+
lineNumber: 80
|
|
8231
8232
|
}
|
|
8232
8233
|
}, React$1.createElement(ListItemText, {
|
|
8233
8234
|
className: classes.rubricCol,
|
|
@@ -8239,13 +8240,13 @@ class Rubric extends React$1.Component {
|
|
|
8239
8240
|
__self: this,
|
|
8240
8241
|
__source: {
|
|
8241
8242
|
fileName: _jsxFileName,
|
|
8242
|
-
lineNumber:
|
|
8243
|
+
lineNumber: 84
|
|
8243
8244
|
}
|
|
8244
8245
|
}, "Sample Answer"),
|
|
8245
8246
|
__self: this,
|
|
8246
8247
|
__source: {
|
|
8247
8248
|
fileName: _jsxFileName,
|
|
8248
|
-
lineNumber:
|
|
8249
|
+
lineNumber: 81
|
|
8249
8250
|
}
|
|
8250
8251
|
}), React$1.createElement(ListItemText, {
|
|
8251
8252
|
primary: React$1.createElement('div', {
|
|
@@ -8256,13 +8257,13 @@ class Rubric extends React$1.Component {
|
|
|
8256
8257
|
__self: this,
|
|
8257
8258
|
__source: {
|
|
8258
8259
|
fileName: _jsxFileName,
|
|
8259
|
-
lineNumber:
|
|
8260
|
+
lineNumber: 89
|
|
8260
8261
|
}
|
|
8261
8262
|
}),
|
|
8262
8263
|
__self: this,
|
|
8263
8264
|
__source: {
|
|
8264
8265
|
fileName: _jsxFileName,
|
|
8265
|
-
lineNumber:
|
|
8266
|
+
lineNumber: 87
|
|
8266
8267
|
}
|
|
8267
8268
|
})));
|
|
8268
8269
|
}));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pie-element/rubric",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.2",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"module": "src/index.js",
|
|
6
6
|
"description": "Rubric Scoring Interaction",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
},
|
|
16
16
|
"author": "pie framework developers",
|
|
17
17
|
"license": "ISC",
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "2939e10bb564b2874799a8c2ffe28c05612bee6e",
|
|
19
19
|
"scripts": {
|
|
20
20
|
"postpublish": "../../scripts/postpublish"
|
|
21
21
|
},
|
|
@@ -1,46 +1,50 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {shallow, mount} from 'enzyme';
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import Rubric from '../main';
|
|
4
4
|
import Link from '@material-ui/core/Link';
|
|
5
5
|
|
|
6
6
|
describe('rubric viewer', () => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
const wrapper = (extras) => {
|
|
8
|
+
const props = {
|
|
9
|
+
value: {
|
|
10
|
+
points: ['nothing right', 'a teeny bit right', 'mostly right', 'bingo'],
|
|
11
|
+
sampleAnswers: [null, 'just right', 'not left', null],
|
|
12
|
+
excludeZero: false,
|
|
13
|
+
...extras,
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
return mount(<Rubric {...props} />);
|
|
18
|
+
};
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
describe('snapshot', () => {
|
|
21
|
+
it('renders', () => {
|
|
22
|
+
const w = wrapper();
|
|
23
|
+
expect(w).toMatchSnapshot();
|
|
24
|
+
});
|
|
24
25
|
});
|
|
25
|
-
});
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
describe('expanded snapshot', () => {
|
|
28
|
+
it('renders', () => {
|
|
29
|
+
const w = wrapper();
|
|
30
|
+
w.find(Link).simulate('click');
|
|
31
|
+
expect(w).toMatchSnapshot();
|
|
32
|
+
});
|
|
32
33
|
});
|
|
33
|
-
});
|
|
34
34
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
describe('exclude zeros', () => {
|
|
36
|
+
it('renders correctly with excluded zeroes', () => {
|
|
37
|
+
let w = wrapper({
|
|
38
|
+
excludeZero: true,
|
|
39
|
+
points: ['a teeny bit right', 'mostly right', 'bingo'],
|
|
40
|
+
sampleAnswers: ['just right', 'not left', null]
|
|
41
|
+
});
|
|
42
|
+
w.find(Link).simulate('click');
|
|
43
|
+
expect(w.find('li').length).toEqual(5);
|
|
40
44
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
45
|
+
w = wrapper({excludeZero: false});
|
|
46
|
+
w.find(Link).simulate('click');
|
|
47
|
+
expect(w.find('li').length).toEqual(6);
|
|
48
|
+
});
|
|
44
49
|
});
|
|
45
|
-
});
|
|
46
50
|
});
|
package/src/main.jsx
CHANGED
|
@@ -61,37 +61,37 @@ class Rubric extends React.Component {
|
|
|
61
61
|
.reverse()
|
|
62
62
|
.map((desc, index) => {
|
|
63
63
|
index = points.length - index - 1;
|
|
64
|
+
const pointsLabel = value.excludeZero ? index + 1: index;
|
|
65
|
+
|
|
64
66
|
return (
|
|
65
|
-
this.shouldRenderPoint(index, value) && (
|
|
66
67
|
<React.Fragment key={index}>
|
|
67
68
|
<ListItem key={`P${index}`}>
|
|
68
69
|
<ListItemText
|
|
69
|
-
|
|
70
|
-
|
|
70
|
+
className={classes.rubricCol}
|
|
71
|
+
primary={<div className={classes.text}>{pointsLabel === 1 ? `${pointsLabel} PT` : `${pointsLabel} PTS`}</div>}
|
|
71
72
|
/>
|
|
72
73
|
|
|
73
74
|
<ListItemText
|
|
74
|
-
|
|
75
|
+
primary={<div className={classes.text} dangerouslySetInnerHTML={{ __html: desc }} />}
|
|
75
76
|
/>
|
|
76
77
|
</ListItem>
|
|
77
78
|
|
|
78
79
|
{sampleAnswers && sampleAnswers[index] && (
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
80
|
+
<ListItem key={`S${index}`}>
|
|
81
|
+
<ListItemText
|
|
82
|
+
className={classes.rubricCol}
|
|
83
|
+
style={{ marginLeft: '20px' }}
|
|
84
|
+
primary={<div className={classes.text}>Sample Answer</div>}
|
|
85
|
+
/>
|
|
86
|
+
|
|
87
|
+
<ListItemText
|
|
88
|
+
primary={
|
|
89
|
+
<div className={classes.text} dangerouslySetInnerHTML={{ __html: sampleAnswers[index] }} />
|
|
90
|
+
}
|
|
91
|
+
/>
|
|
92
|
+
</ListItem>
|
|
92
93
|
)}
|
|
93
94
|
</React.Fragment>
|
|
94
|
-
)
|
|
95
95
|
);
|
|
96
96
|
})}
|
|
97
97
|
</List>
|