answer rubrics and samples for hand-grading

packages/doenetml-iframe/package.json

@@ -2,7 +2,7 @@
     "name": "@doenet/doenetml-iframe",
     "type": "module",
     "description": "A renderer for DoenetML contained in an iframe",
-    "version": "0.7.0-alpha21",
+    "version": "0.7.0-alpha22",
     "license": "AGPL-3.0-or-later",
     "homepage": "https://github.com/Doenet/DoenetML#readme",
     "private": true,

packages/doenetml-worker/src/ComponentTypes.js

@@ -24,6 +24,9 @@ import * as Paginator from "./components/Paginator";
 import * as MatrixInput from "./components/MatrixInput";
 import * as Solution from "./components/Solution";
 import * as ContentBrowser from "./components/ContentBrowser";
+import * as Rubrics from "./components/answerRubrics/Rubrics";
+import * as Samples from "./components/answerRubrics/Samples";
+import * as Evaluations from "./components/answerRubrics/Evaluations";
 
 import Document from "./components/Document";
 import Text from "./components/Text";
@@ -172,6 +175,8 @@ import ContentPicker from "./components/ContentPicker";
 // import VertexConstraints from "./components/VertexConstraints";
 // import EdgeConstraints from "./components/EdgeConstraints";
 import StickyGroup from "./components/StickyGroup";
+import Criteria from "./components/answerRubrics/Criteria";
+import Response from "./components/answerRubrics/Response";
 
 //Extended
 import * as ComponentSize from "./components/abstract/ComponentSize";
@@ -226,6 +231,9 @@ const componentTypeArray = [
     ...Object.values(MatrixInput),
     ...Object.values(Solution),
     ...Object.values(ContentBrowser),
+    ...Object.values(Rubrics),
+    ...Object.values(Samples),
+    ...Object.values(Evaluations),
     Document,
     Text,
     TextList,
@@ -368,6 +376,8 @@ const componentTypeArray = [
     // VertexConstraints,
     // EdgeConstraints,
     StickyGroup,
+    Criteria,
+    Response,
 
     BaseComponent,
     InlineComponent,

packages/doenetml-worker/src/components/Answer.js

@@ -242,6 +242,10 @@ export default class Answer extends InlineComponent {
             public: true,
         };
 
+        attributes.forStatement = {
+            createTargetComponentNames: true,
+        };
+
         return attributes;
     }
 
@@ -437,6 +441,11 @@ export default class Answer extends InlineComponent {
                 ) {
                     childIsWrappable.push(false);
                     definitelyDoNotAddInput = true;
+                } else if (
+                    componentIsSpecifiedType(child, "rubrics") ||
+                    componentIsSpecifiedType(child, "samples")
+                ) {
+                    childIsWrappable.push(false);
                 } else if (
                     componentInfoObjects.isInheritedComponentType({
                         inheritedComponentType: child.componentType,
@@ -643,6 +652,8 @@ export default class Answer extends InlineComponent {
                 group: "responses",
                 componentTypes: ["considerAsResponses"],
             },
+            { group: "rubrics", componentTypes: ["rubrics"] },
+            { group: "samples", componentTypes: ["samples"] },
         ];
     }
 
@@ -2070,6 +2081,112 @@ export default class Answer extends InlineComponent {
             },
         };
 
+        stateVariableDefinitions.forStatement = {
+            returnDependencies: () => ({
+                forStatement: {
+                    dependencyType: "attributeTargetComponentNames",
+                    attributeName: "forStatement",
+                },
+            }),
+            definition({ dependencyValues }) {
+                let forStatement = null;
+                if (dependencyValues.forStatement?.length === 1) {
+                    forStatement =
+                        dependencyValues.forStatement[0].absoluteName;
+                }
+                return { setValue: { forStatement } };
+            },
+        };
+
+        stateVariableDefinitions.statementText = {
+            stateVariablesDeterminingDependencies: ["forStatement"],
+            returnDependencies({ stateValues }) {
+                let dependencies = {};
+                if (stateValues.forStatement) {
+                    dependencies.statementText = {
+                        dependencyType: "stateVariable",
+                        componentName: stateValues.forStatement,
+                        variableName: "text",
+                        variableOptional: true,
+                    };
+                }
+
+                return dependencies;
+            },
+            definition({ dependencyValues }) {
+                let statementText = "";
+
+                if (dependencyValues.statementText) {
+                    statementText = dependencyValues.statementText;
+                }
+
+                return { setValue: { statementText } };
+            },
+        };
+
+        stateVariableDefinitions.rubricData = {
+            returnDependencies: () => ({
+                rubricsChildren: {
+                    dependencyType: "child",
+                    childGroups: ["rubrics"],
+                    variableNames: ["data"],
+                },
+                samplesChildren: {
+                    dependencyType: "child",
+                    childGroups: ["samples"],
+                    variableNames: ["data"],
+                },
+                statementText: {
+                    dependencyType: "stateVariable",
+                    variableName: "statementText",
+                },
+            }),
+            definition({ dependencyValues }) {
+                let rubricData = {};
+
+                if (dependencyValues.rubricsChildren.length > 0) {
+                    rubricData.rubrics =
+                        dependencyValues.rubricsChildren[
+                            dependencyValues.rubricsChildren.length - 1
+                        ].stateValues.data;
+                } else {
+                    rubricData.rubrics = [];
+                }
+
+                if (dependencyValues.samplesChildren.length > 0) {
+                    const samplesOrig =
+                        dependencyValues.samplesChildren[
+                            dependencyValues.samplesChildren.length - 1
+                        ].stateValues.data;
+
+                    rubricData.samples = samplesOrig.map((samp) => {
+                        const evaluations = samp.evaluations.map(
+                            (evaluation) => {
+                                const forRubric = evaluation.forRubric;
+                                const rubric = rubricData.rubrics.find(
+                                    (r) => r.rubricName === forRubric,
+                                );
+                                return {
+                                    rubric,
+                                    ...evaluation,
+                                };
+                            },
+                        );
+                        return {
+                            ...samp,
+                            evaluations,
+                        };
+                    });
+                } else {
+                    rubricData.samples = [];
+                }
+
+                rubricData.statement = dependencyValues.statementText;
+
+                return { setValue: { rubricData } };
+            },
+        };
+
         return stateVariableDefinitions;
     }
 
@@ -2209,6 +2326,10 @@ export default class Answer extends InlineComponent {
             }
         }
 
+        const rubricData = (await this.stateValues.handGraded)
+            ? await this.stateValues.rubricData
+            : undefined;
+
         instructions.push({
             updateType: "recordItemSubmission",
             itemNumber: await this.stateValues.inItemNumber,
@@ -2240,6 +2361,7 @@ export default class Answer extends InlineComponent {
                         this.state.currentResponses.shadowingInstructions
                             .createComponentOfType,
                     creditAchieved,
+                    rubricData,
                 },
             },
         });

packages/doenetml-worker/src/components/answerRubrics/Criteria.js

@@ -0,0 +1,44 @@
+import { textFromChildren } from "../../utils/text";
+import BaseComponent from "../abstract/BaseComponent";
+
+export default class Criteria extends BaseComponent {
+    static componentType = "criteria";
+    static rendererType = undefined;
+
+    static includeBlankStringChildren = true;
+
+    static returnChildGroups() {
+        return [
+            {
+                group: "anything",
+                componentTypes: ["_base"],
+            },
+        ];
+    }
+
+    static returnStateVariableDefinitions() {
+        let stateVariableDefinitions = super.returnStateVariableDefinitions();
+
+        stateVariableDefinitions.text = {
+            public: true,
+            shadowingInstructions: {
+                createComponentOfType: "text",
+            },
+            returnDependencies: () => ({
+                inlineChildren: {
+                    dependencyType: "child",
+                    childGroups: ["anything"],
+                    variableNames: ["text", "hidden"],
+                    variablesOptional: true,
+                },
+            }),
+            definition: function ({ dependencyValues }) {
+                let text = textFromChildren(dependencyValues.inlineChildren);
+
+                return { setValue: { text } };
+            },
+        };
+
+        return stateVariableDefinitions;
+    }
+}