diff --git a/teachertool/src/components/CriteriaEvalResultDropdown.tsx b/teachertool/src/components/CriteriaEvalResultDropdown.tsx index b7c4bdaeec54..507c570b84f4 100644 --- a/teachertool/src/components/CriteriaEvalResultDropdown.tsx +++ b/teachertool/src/components/CriteriaEvalResultDropdown.tsx @@ -12,20 +12,20 @@ interface CriteriaEvalResultProps { } const itemIdToCriteriaResult: pxt.Map = { - "evaluating": EvaluationStatus.InProgress, - "notevaluated": EvaluationStatus.CompleteWithNoResult, - "fail": EvaluationStatus.Fail, - "pass": EvaluationStatus.Pass, - "pending": EvaluationStatus.Pending -} + evaluating: EvaluationStatus.InProgress, + notevaluated: EvaluationStatus.CompleteWithNoResult, + fail: EvaluationStatus.Fail, + pass: EvaluationStatus.Pass, + pending: EvaluationStatus.Pending, +}; const criteriaResultToItemId: pxt.Map = { [EvaluationStatus.InProgress]: "evaluating", [EvaluationStatus.CompleteWithNoResult]: "notevaluated", [EvaluationStatus.Fail]: "fail", [EvaluationStatus.Pass]: "pass", - [EvaluationStatus.Pending]: "pending" -} + [EvaluationStatus.Pending]: "pending", +}; const dropdownItems: DropdownItem[] = [ { @@ -42,7 +42,6 @@ const dropdownItems: DropdownItem[] = [ id: "fail", title: lf("needs work"), label: lf("needs work"), - }, { id: "pass", @@ -54,7 +53,7 @@ const dropdownItems: DropdownItem[] = [ title: lf("not started"), label: lf("not started"), }, -] +]; export const CriteriaEvalResultDropdown: React.FC = ({ result, criteriaId }) => { const selectedResult = useMemo(() => criteriaResultToItemId[result], [result]); @@ -65,7 +64,7 @@ export const CriteriaEvalResultDropdown: React.FC = ({ selectedId={selectedResult} className={classList("rounded", selectedResult)} items={dropdownItems} - onItemSelected={(id) => setEvalResultOutcome(criteriaId, itemIdToCriteriaResult[id])} + onItemSelected={id => setEvalResultOutcome(criteriaId, itemIdToCriteriaResult[id])} /> - ) -} \ No newline at end of file + ); +}; diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx index 7380c061ce54..2cb08072777c 100644 --- a/teachertool/src/components/CriteriaResultEntry.tsx +++ b/teachertool/src/components/CriteriaResultEntry.tsx @@ -31,7 +31,7 @@ const AddNotesButton: React.FC = ({ criteriaId, setShowInpu /> ); -} +}; interface CriteriaResultNotesProps { criteriaId: string; @@ -58,8 +58,8 @@ const CriteriaResultNotes: React.FC = ({ criteriaId, n intervalMs={500} /> - ) -} + ); +}; interface CriteriaResultEntryProps { criteriaId: string; @@ -80,23 +80,21 @@ export const CriteriaResultEntry: React.FC = ({ criter return ( <> - { criteriaTemplateString.current && ( -
-
-

- {criteriaTemplateString.current} -

- -
-
- {!showInput && } - {showInput && } -
+ {criteriaTemplateString.current && ( +
+
+

{criteriaTemplateString.current}

+
- ) - } +
+ {!showInput && } + {showInput && } +
+
+ )} - - ); -} \ No newline at end of file +}; diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx index 52292e0a3dd8..8eff3eb21f6f 100644 --- a/teachertool/src/components/EvalResultDisplay.tsx +++ b/teachertool/src/components/EvalResultDisplay.tsx @@ -3,10 +3,9 @@ import { useContext } from "react"; import css from "./styling/EvalResultDisplay.module.scss"; import { AppStateContext } from "../state/appStateContext"; import { CriteriaResultEntry } from "./CriteriaResultEntry"; -import { QRCodeSVG } from "qrcode.react" +import { QRCodeSVG } from "qrcode.react"; import { getProjectLink } from "../utils"; - const ResultsHeader: React.FC = () => { const { state: teacherTool } = useContext(AppStateContext); @@ -28,7 +27,6 @@ const ResultsHeader: React.FC = () => { ); }; - export const EvalResultDisplay: React.FC<{}> = () => { const { state: teacherTool } = useContext(AppStateContext); @@ -38,9 +36,7 @@ export const EvalResultDisplay: React.FC<{}> = () => {
{Object.keys(teacherTool.evalResults ?? {}).map(criteriaInstanceId => { - return ( - - ) + return ; })}
)} diff --git a/teachertool/src/components/PrintButton.tsx b/teachertool/src/components/PrintButton.tsx index 944f53e06275..e066046eeae2 100644 --- a/teachertool/src/components/PrintButton.tsx +++ b/teachertool/src/components/PrintButton.tsx @@ -13,7 +13,5 @@ export const PrintButton: React.FC = ({ printRef, onHandlePrin content: () => printRef.current, onAfterPrint: onHandlePrint, }); - return ( - - ) -} + return ; +}; diff --git a/teachertool/src/state/actions.ts b/teachertool/src/state/actions.ts index 68494a0c7592..3bd7f925e5b8 100644 --- a/teachertool/src/state/actions.ts +++ b/teachertool/src/state/actions.ts @@ -87,11 +87,11 @@ type SetAutorun = ActionBase & { type SetEvalResultsBatch = ActionBase & { type: "SET_EVAL_RESULTS_BATCH"; criteriaResults: pxt.Map; -} +}; type ClearAllEvalResultNotes = ActionBase & { type: "CLEAR_ALL_EVAL_RESULT_NOTES"; -} +}; /** * Union of all actions @@ -137,7 +137,7 @@ const setProjectMetadata = (metadata: ProjectData | undefined): SetProjectMetada const setEvalResult = (criteriaInstanceId: string, result: CriteriaResult): SetEvalResult => ({ type: "SET_EVAL_RESULT", criteriaInstanceId, - result + result, }); const clearEvalResult = (criteriaInstanceId: string): ClearEvalResult => ({ diff --git a/teachertool/src/state/reducer.ts b/teachertool/src/state/reducer.ts index 91f715ae90ec..b4a88bb0c513 100644 --- a/teachertool/src/state/reducer.ts +++ b/teachertool/src/state/reducer.ts @@ -49,7 +49,7 @@ export default function reducer(state: AppState, action: Action): AppState { case "CLEAR_ALL_EVAL_RESULT_NOTES": { const evalResults = { ...state.evalResults }; for (const result of Object.keys(evalResults)) { - evalResults[result].notes = "" + evalResults[result].notes = ""; } return { ...state, diff --git a/teachertool/src/transforms/initNewProjectResults.ts b/teachertool/src/transforms/initNewProjectResults.ts index e7e70539efec..f27356c4ece1 100644 --- a/teachertool/src/transforms/initNewProjectResults.ts +++ b/teachertool/src/transforms/initNewProjectResults.ts @@ -2,9 +2,8 @@ import { stateAndDispatch } from "../state"; import { setEvalResultsPending } from "./setEvalResultsPending"; import * as Actions from "../state/actions"; - export function initNewProjectResults() { const { dispatch } = stateAndDispatch(); setEvalResultsPending({ overwriteExistingEntries: true }); dispatch(Actions.clearAllEvalResultNotes()); -} \ No newline at end of file +} diff --git a/teachertool/src/transforms/loadProjectMetadataAsync.ts b/teachertool/src/transforms/loadProjectMetadataAsync.ts index 2b77a03f6cd9..1bd1dba9e0c5 100644 --- a/teachertool/src/transforms/loadProjectMetadataAsync.ts +++ b/teachertool/src/transforms/loadProjectMetadataAsync.ts @@ -32,7 +32,7 @@ export async function loadProjectMetadataAsync(inputText: string, shareLink: str const projectData = { ...projMeta, inputText, - } + }; dispatch(Actions.setProjectMetadata(projectData)); initNewProjectResults(); logDebug(`Loaded project metadata: ${JSON.stringify(projMeta)}`); diff --git a/teachertool/src/transforms/setEvalResultNotes.ts b/teachertool/src/transforms/setEvalResultNotes.ts index eec80120b917..8bd6fe28353d 100644 --- a/teachertool/src/transforms/setEvalResultNotes.ts +++ b/teachertool/src/transforms/setEvalResultNotes.ts @@ -6,7 +6,7 @@ export function setEvalResultNotes(criteriaId: string, notes: string) { const newCriteriaEvalResult = { ...teacherTool.evalResults[criteriaId], - notes + notes, }; dispatch(Actions.setEvalResult(criteriaId, newCriteriaEvalResult)); } diff --git a/teachertool/src/transforms/setEvalResultOutcome.ts b/teachertool/src/transforms/setEvalResultOutcome.ts index 128d936c12d4..f23c8aae8e1e 100644 --- a/teachertool/src/transforms/setEvalResultOutcome.ts +++ b/teachertool/src/transforms/setEvalResultOutcome.ts @@ -7,7 +7,7 @@ export function setEvalResultOutcome(criteriaId: string, result: EvaluationStatu const newCriteriaEvalResult = { ...teacherTool.evalResults[criteriaId], - result + result, }; dispatch(Actions.setEvalResult(criteriaId, newCriteriaEvalResult)); -} \ No newline at end of file +} diff --git a/teachertool/src/transforms/setEvalResultsPending.ts b/teachertool/src/transforms/setEvalResultsPending.ts index e0cf58c323d6..d78898b57790 100644 --- a/teachertool/src/transforms/setEvalResultsPending.ts +++ b/teachertool/src/transforms/setEvalResultsPending.ts @@ -3,10 +3,12 @@ import { EvaluationStatus, CriteriaResult } from "../types/criteria"; import { Rubric } from "../types/rubric"; import * as Actions from "../state/actions"; - -export function setEvalResultsPending({ overwriteExistingEntries, rubric }: { - overwriteExistingEntries?: boolean, - rubric?: Rubric +export function setEvalResultsPending({ + overwriteExistingEntries, + rubric, +}: { + overwriteExistingEntries?: boolean; + rubric?: Rubric; }): void { const { state: teachertool, dispatch } = stateAndDispatch(); let allEvalResults: pxt.Map = {}; @@ -18,7 +20,7 @@ export function setEvalResultsPending({ overwriteExistingEntries, rubric }: { } } if (!overwriteExistingEntries) { - allEvalResults = { ...teachertool.evalResults, ...allEvalResults } ; + allEvalResults = { ...teachertool.evalResults, ...allEvalResults }; } dispatch(Actions.setEvalResultsBatch(allEvalResults)); -} \ No newline at end of file +} diff --git a/teachertool/src/transforms/setRubric.ts b/teachertool/src/transforms/setRubric.ts index 1e7c27392b77..72631b0e6666 100644 --- a/teachertool/src/transforms/setRubric.ts +++ b/teachertool/src/transforms/setRubric.ts @@ -7,6 +7,6 @@ import { setEvalResultsPending } from "./setEvalResultsPending"; export function setRubric(rubric: Rubric) { const { dispatch } = stateAndDispatch(); dispatch(Actions.setRubric(rubric)); - setEvalResultsPending({rubric}); + setEvalResultsPending({ rubric }); AutorunService.poke(); } diff --git a/teachertool/src/types/criteria.ts b/teachertool/src/types/criteria.ts index 4314a2b933cb..a798b349e6bb 100644 --- a/teachertool/src/types/criteria.ts +++ b/teachertool/src/types/criteria.ts @@ -35,10 +35,10 @@ export enum EvaluationStatus { Fail, CompleteWithNoResult, InProgress, - Pending + Pending, } export interface CriteriaResult { result: EvaluationStatus; notes?: string; -} \ No newline at end of file +} diff --git a/teachertool/src/types/index.ts b/teachertool/src/types/index.ts index e641f911620c..195ac6d1ca89 100644 --- a/teachertool/src/types/index.ts +++ b/teachertool/src/types/index.ts @@ -47,10 +47,9 @@ export type CarouselCardSet = { export type RequestStatus = "init" | "loading" | "error" | "success"; - export type ProjectData = pxt.Cloud.JsonScript & { inputText: string; -} +}; export type ConfirmationModalOptions = { title: string; message: string; diff --git a/teachertool/src/utils/index.ts b/teachertool/src/utils/index.ts index 85ed226ae380..8be86a48645c 100644 --- a/teachertool/src/utils/index.ts +++ b/teachertool/src/utils/index.ts @@ -40,8 +40,7 @@ export const isRubricResourceCard = (card: any): card is CarouselRubricResourceC return typeof card === "object" && card.cardType === "rubric-resource"; }; - export function getProjectLink(inputText: string): string { const hasMakeCode = inputText?.indexOf("makecode") !== -1; return hasMakeCode ? inputText : `https://makecode.com/${inputText}`; -} \ No newline at end of file +}