devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/ExamGenRework

Browse Source
This commit is contained in:
Carlos-Mesquita
2024-11-10 06:56:26 +00:00
parent 4219341951 bead6d98ae
commit af21ff2f20
3 changed files with 209 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/exam.tsx
View File

@@ -67,7 +67,7 @@ export default function Page({user, assignment, exams = [], session}: Props) {
useEffect(() => {
if (assignment && exams.length > 0 && !state.assignment && !session) {
if (moment(assignment.startDate).isAfter(moment()) || moment(assignment.endDate).isBefore(moment())) return
if ((moment(assignment.startDate).isAfter(moment()) || moment(assignment.endDate).isBefore(moment())) && assignment.start) return
state.setUserSolutions([]);
state.setShowSolutions(false);
@@ -117,7 +117,7 @@ export default function Page({user, assignment, exams = [], session}: Props) {
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
</Head>
<ExamPage page="exams" user={user} hideSidebar={!!assignment} />
<ExamPage page="exams" user={user} hideSidebar={!!assignment || !!state.assignment} />
</>
);
}

17
src/pages/official-exam.tsx
View File

@@ -2,11 +2,7 @@
import AssignmentCard from "@/components/High/AssignmentCard";
import Layout from "@/components/High/Layout";
import Button from "@/components/Low/Button";
import ProgressBar from "@/components/Low/ProgressBar";
import Separator from "@/components/Low/Separator";
import InviteWithUserCard from "@/components/Medium/InviteWithUserCard";
import SessionCard from "@/components/Medium/SessionCard";
import ModuleBadge from "@/components/ModuleBadge";
import ProfileSummary from "@/components/ProfileSummary";
import {Session} from "@/hooks/useSessions";
import {Grading} from "@/interfaces";
@@ -21,25 +17,20 @@ import {findBy, mapBy, redirect, serialize} from "@/utils";
import { requestUser } from "@/utils/api";
import {activeAssignmentFilter} from "@/utils/assignments";
import {getAssignmentsByAssignee} from "@/utils/assignments.be";
import {getEntitiesWithRoles, getEntityWithRoles} from "@/utils/entities.be";
import {getEntitiesWithRoles} from "@/utils/entities.be";
import {getExamsByIds} from "@/utils/exams.be";
import {getGradingSystemByEntity} from "@/utils/grading.be";
import {convertInvitersToEntity, getInvitesByInvitee} from "@/utils/invites.be";
import {countExamModules, countFullExams, MODULE_ARRAY, sortByModule, sortByModuleName} from "@/utils/moduleUtils";
import {sortByModule} from "@/utils/moduleUtils";
import {checkAccess} from "@/utils/permissions";
import {getGradingLabel} from "@/utils/score";
import {getSessionsByUser} from "@/utils/sessions.be";
import {averageScore} from "@/utils/stats";
import {getStatsByUser} from "@/utils/stats.be";
import axios from "axios";
import clsx from "clsx";
import {withIronSessionSsr} from "iron-session/next";
import {capitalize, uniqBy} from "lodash";
import {uniqBy} from "lodash";
import moment from "moment";
import Head from "next/head";
import {useRouter} from "next/router";
import { useMemo, useState } from "react";
import {BsArrowRepeat, BsBook, BsClipboard, BsFileEarmarkText, BsHeadphones, BsMegaphone, BsPen, BsPencil, BsStar} from "react-icons/bs";
import {BsArrowRepeat} from "react-icons/bs";
import {ToastContainer} from "react-toastify";
interface Props {