Add question number to ControlBar (#366)

* added assessment status ("Question 1 of 1") to control bar in workspace.
jiachen

* added assessment status ("Question 1 of 1") to control bar in workspace.
jiachen

* updated snapshots

Author: jiachen247

src/components/Playground.tsx

@@ -80,6 +80,9 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
   public render() {
     const workspaceProps: WorkspaceProps = {
       controlBarProps: {
+        hasAssessment: false,
+        currentQuestion: 0,
+        assessmentLength: 0,
         externalLibraryName: this.props.externalLibraryName,
         handleChapterSelect: ({ chapter }: { chapter: number }, e: any) =>
           this.props.handleChapterSelect(chapter),
@@ -91,9 +94,6 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
         handleReplEval: this.props.handleReplEval,
         handleReplOutputClear: this.props.handleReplOutputClear,
         hasChapterSelect: true,
-        hasNextButton: false,
-        hasPreviousButton: false,
-        hasReturnButton: false,
         hasSaveButton: false,
         hasShareButton: true,
         isRunning: this.props.isRunning,

src/components/academy/grading/GradingWorkspace.tsx

@@ -213,15 +213,15 @@ class GradingWorkspace extends React.Component<GradingWorkspaceProps> {
     const listingPath = `/academy/grading`
     const gradingWorkspacePath = listingPath + `/${this.props.submissionId}`
     return {
+      hasAssessment: true,
+      currentQuestion: questionId + 1,
+      assessmentLength: this.props.grading!.length,
       handleChapterSelect: this.props.handleChapterSelect,
       handleEditorEval: this.props.handleEditorEval,
       handleInterruptEval: this.props.handleInterruptEval,
       handleReplEval: this.props.handleReplEval,
       handleReplOutputClear: this.props.handleReplOutputClear,
       hasChapterSelect: false,
-      hasNextButton: questionId < this.props.grading!.length - 1,
-      hasPreviousButton: questionId > 0,
-      hasReturnButton: questionId === this.props.grading!.length - 1,
       hasSaveButton: false,
       hasShareButton: false,
       isRunning: this.props.isRunning,

src/components/assessment/AssessmentWorkspace.tsx

@@ -253,16 +253,16 @@ class AssessmentWorkspace extends React.Component<
     const listingPath = `/academy/${assessmentCategoryLink(this.props.assessment!.category)}`
     const assessmentWorkspacePath = listingPath + `/${this.props.assessment!.id.toString()}`
     return {
+      hasAssessment: true,
+      currentQuestion: questionId + 1,
+      assessmentLength: this.props.assessment!.questions.length,
       handleChapterSelect: this.props.handleChapterSelect,
       handleEditorEval: this.props.handleEditorEval,
       handleInterruptEval: this.props.handleInterruptEval,
       handleReplEval: this.props.handleReplEval,
       handleReplOutputClear: this.props.handleReplOutputClear,
       handleReplValueChange: this.props.handleReplValueChange,
       hasChapterSelect: false,
-      hasNextButton: questionId < this.props.assessment!.questions.length - 1,
-      hasPreviousButton: questionId > 0,
-      hasReturnButton: questionId === this.props.assessment!.questions.length - 1,
       hasSaveButton:
         !beforeNow(this.props.closeDate) &&
         this.props.assessment!.questions[questionId].type !== QuestionTypes.mcq,