diff --git a/teachertool/src/components/HeaderBar.tsx b/teachertool/src/components/HeaderBar.tsx
index 96e88aae8c7..06ef158d6d3 100644
--- a/teachertool/src/components/HeaderBar.tsx
+++ b/teachertool/src/components/HeaderBar.tsx
@@ -4,7 +4,6 @@ import css from "./styling/HeaderBar.module.scss";
import { Button } from "react-common/components/controls/Button";
import { MenuBar } from "react-common/components/controls/MenuBar";
import { AppStateContext } from "../state/appStateContext";
-import { getSafeRubricName } from "../state/helpers";
import { Ticks } from "../constants";
interface HeaderBarProps {}
diff --git a/teachertool/src/components/HomeScreen.tsx b/teachertool/src/components/HomeScreen.tsx
index c0ebebccd2b..6d345ebcfc6 100644
--- a/teachertool/src/components/HomeScreen.tsx
+++ b/teachertool/src/components/HomeScreen.tsx
@@ -9,23 +9,23 @@ import { Link } from "react-common/components/controls/Link";
import { Button } from "react-common/components/controls/Button";
import { classList } from "react-common/components/util";
import { showModal } from "../transforms/showModal";
-import { resetRubricAsync } from "../transforms/resetRubricAsync";
-import { loadRubricAsync } from "../transforms/loadRubricAsync";
+import { resetChecklistAsync } from "../transforms/resetChecklistAsync";
+import { loadChecklistAsync } from "../transforms/loadChecklistAsync";
import { Constants, Strings, Ticks } from "../constants";
import { Swiper, SwiperSlide } from "swiper/react";
import { Mousewheel, Navigation } from "swiper";
import { AppStateContext } from "../state/appStateContext";
-import { CarouselCardSet, RequestStatus, CarouselRubricResourceCard, CardType } from "../types";
+import { CarouselCardSet, RequestStatus } from "../types";
import { useJsonDocRequest } from "../hooks/useJsonDocRequest";
-import { isRubricResourceCard } from "../utils";
-import { ImportRubricOptions } from "../types/modalOptions";
+import { isChecklistResourceCard } from "../utils";
+import { ImportChecklistOptions } from "../types/modalOptions";
const Welcome: React.FC = () => {
return (
-
{lf("Welcome to MakeCode Project Insights!")}
+
{lf("Welcome to MakeCode Code Evaluation!")}
- {lf("This tool is designed to help you evaluate student projects using a rubric.")}{" "}
+ {lf("This tool is designed to help you evaluate student projects using an automated checklist.")}{" "}
{lf("Learn More.")}
@@ -80,21 +80,21 @@ const LoadingCard: React.FC = ({ delay }) => {
);
};
-interface RubricResourceCardProps {
+interface ChecklistResourceCardProps {
cardTitle: string;
imageUrl: string;
- rubricUrl: string;
+ checklistUrl: string;
}
-const RubricResourceCard: React.FC = ({ cardTitle, imageUrl, rubricUrl }) => {
+const ChecklistResourceCard: React.FC = ({ cardTitle, imageUrl, checklistUrl }) => {
const onCardClickedAsync = async () => {
- pxt.tickEvent(Ticks.LoadRubric, { rubricUrl });
- await loadRubricAsync(rubricUrl);
+ pxt.tickEvent(Ticks.LoadChecklist, { checklistUrl });
+ await loadChecklistAsync(checklistUrl);
};
return (
@@ -201,8 +201,8 @@ const CardCarousel: React.FC
= ({ title, cardsUrl }) => {
{fetchStatus === "success" && (
{cardSet?.cards.map((card, index) => {
- if (isRubricResourceCard(card)) {
- return ;
+ if (isChecklistResourceCard(card)) {
+ return ;
} else {
return ;
}
diff --git a/teachertool/src/components/ImportRubricModal.tsx b/teachertool/src/components/ImportChecklistModal.tsx
similarity index 54%
rename from teachertool/src/components/ImportRubricModal.tsx
rename to teachertool/src/components/ImportChecklistModal.tsx
index 0bc07ae187d..ff8ee21c1b7 100644
--- a/teachertool/src/components/ImportRubricModal.tsx
+++ b/teachertool/src/components/ImportChecklistModal.tsx
@@ -2,15 +2,15 @@ import { useContext, useState } from "react";
import { AppStateContext } from "../state/appStateContext";
import { Modal } from "react-common/components/controls/Modal";
import { hideModal } from "../transforms/hideModal";
-import { getRubricFromFileAsync } from "../transforms/getRubricFromFileAsync";
+import { getChecklistFromFileAsync } from "../transforms/getChecklistFromFileAsync";
import { DragAndDropFileSurface } from "./DragAndDropFileSurface";
import { Strings } from "../constants";
-import css from "./styling/ImportRubricModal.module.scss";
-import { replaceActiveRubricAsync } from "../transforms/replaceActiveRubricAsync";
+import css from "./styling/ImportChecklistModal.module.scss";
+import { replaceActiveChecklistAsync } from "../transforms/replaceActiveChecklistAsync";
export interface IProps {}
-export const ImportRubricModal: React.FC = () => {
+export const ImportChecklistModal: React.FC = () => {
const { state: teacherTool } = useContext(AppStateContext);
const [errorMessage, setErrorMessage] = useState(undefined);
@@ -20,19 +20,19 @@ export const ImportRubricModal: React.FC = () => {
}
async function handleFileDroppedAsync(file: File) {
- const parsedRubric = await getRubricFromFileAsync(file, false /* allow partial */);
- if (!parsedRubric) {
- setErrorMessage(Strings.InvalidRubricFile);
+ const parsedChecklist = await getChecklistFromFileAsync(file, false /* allow partial */);
+ if (!parsedChecklist) {
+ setErrorMessage(Strings.InvalidChecklistFile);
} else {
setErrorMessage(undefined);
closeModal();
- replaceActiveRubricAsync(parsedRubric);
+ replaceActiveChecklistAsync(parsedChecklist);
}
}
- return teacherTool.modalOptions?.modal === "import-rubric" ? (
-
-
+ return teacherTool.modalOptions?.modal === "import-checklist" ? (
+
+
diff --git a/teachertool/src/components/MainPanel.tsx b/teachertool/src/components/MainPanel.tsx
index aef72e4d91d..3cc41a4bd95 100644
--- a/teachertool/src/components/MainPanel.tsx
+++ b/teachertool/src/components/MainPanel.tsx
@@ -1,7 +1,7 @@
import * as React from "react";
import css from "./styling/MainPanel.module.scss";
import { SplitPane } from "./SplitPane";
-import { RubricWorkspace } from "./RubricWorkspace";
+import { ChecklistWorkspace } from "./ChecklistWorkspace";
import { ProjectWorkspace } from "./ProjectWorkspace";
import { getLastSplitPosition, setLastSplitPosition } from "../services/storageService";
@@ -22,7 +22,7 @@ export const MainPanel: React.FC
= () => {
defaultSize={defaultSize}
startingSize={lastSavedSplitPosition}
primary={"left"}
- left={}
+ left={}
right={}
leftMinSize="5rem"
rightMinSize="5rem"
diff --git a/teachertool/src/components/PrintButton.tsx b/teachertool/src/components/PrintButton.tsx
index f4eb24c43d1..1c73685d595 100644
--- a/teachertool/src/components/PrintButton.tsx
+++ b/teachertool/src/components/PrintButton.tsx
@@ -5,7 +5,7 @@ import { stateAndDispatch } from "../state";
import { showToast } from "../state/actions";
import { makeToast } from "../utils";
import { Strings } from "../constants";
-import { getSafeRubricName } from "../state/helpers";
+import { getSafeChecklistName } from "../state/helpers";
interface PrintButtonProps {
printRef: React.RefObject;
@@ -16,7 +16,7 @@ export const PrintButton: React.FC = ({ printRef }) => {
const handlePrint = useReactToPrint({
content: () => printRef.current,
onPrintError: () => showToast(makeToast("error", lf("Unable to print evaluation results"), 2000)),
- documentTitle: `${pxt.Util.sanitizeFileName(getSafeRubricName(teacherTool)!)} - ${pxt.Util.sanitizeFileName(
+ documentTitle: `${pxt.Util.sanitizeFileName(getSafeChecklistName(teacherTool)!)} - ${pxt.Util.sanitizeFileName(
teacherTool.projectMetadata?.name || Strings.UntitledProject
)}`,
});
diff --git a/teachertool/src/components/RubricPreview.tsx b/teachertool/src/components/RubricPreview.tsx
deleted file mode 100644
index 8041bfaabd4..00000000000
--- a/teachertool/src/components/RubricPreview.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { getCatalogCriteriaWithId } from "../state/helpers";
-import { Rubric } from "../types/rubric";
-import css from "./styling/RubricPreview.module.scss";
-
-export interface IRubricPreviewProps {
- rubric: Rubric;
-}
-
-export const RubricPreview: React.FC = ({ rubric }) => {
- return (
-
-
{rubric.name}
- {rubric.criteria.map((c, i) => {
- const template = getCatalogCriteriaWithId(c.catalogCriteriaId)?.template;
- return template ? (
-
- {template}
-
- ) : null;
- })}
-