Imporvements on started management of assignment

src/dashboards/AssignmentView.tsx

@@ -16,8 +16,15 @@ import clsx from "clsx";
 import { capitalize, uniqBy } from "lodash";
 import moment from "moment";
 import { useRouter } from "next/router";
-import {BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen} from "react-icons/bs";
+import {
+  BsBook,
+  BsClipboard,
+  BsHeadphones,
+  BsMegaphone,
+  BsPen,
+} from "react-icons/bs";
 import { toast } from "react-toastify";
+import { activeAssignmentFilter } from "@/utils/assignments";
 
 interface Props {
   isOpen: boolean;
@@ -39,7 +46,11 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
 
     axios
       .delete(`/api/assignments/${assignment?.id}`)
-			.then(() => toast.success(`Successfully deleted the assignment "${assignment?.name}".`))
+      .then(() =>
+        toast.success(
+          `Successfully deleted the assignment "${assignment?.name}".`
+        )
+      )
       .catch(() => toast.error("Something went wrong, please try again later."))
       .finally(onClose);
   };
@@ -49,7 +60,9 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
       axios
         .post(`/api/assignments/${assignment.id}/start`)
         .then(() => {
-					toast.success(`The assignment "${assignment.name}" has been started successfully!`);
+          toast.success(
+            `The assignment "${assignment.name}" has been started successfully!`
+          );
         })
         .catch((e) => {
           console.log(e);
@@ -71,15 +84,26 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
     const resultModuleBandScores = assignment.results.map((r) => {
       const moduleStats = r.stats.filter((s) => s.module === module);
 
-			const correct = moduleStats.reduce((acc, curr) => acc + curr.score.correct, 0);
-			const total = moduleStats.reduce((acc, curr) => acc + curr.score.total, 0);
+      const correct = moduleStats.reduce(
+        (acc, curr) => acc + curr.score.correct,
+        0
+      );
+      const total = moduleStats.reduce(
+        (acc, curr) => acc + curr.score.total,
+        0
+      );
       return calculateBandScore(correct, total, module, r.type);
     });
 
-		return resultModuleBandScores.length === 0 ? -1 : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) / assignment.results.length;
+    return resultModuleBandScores.length === 0
+      ? -1
+      : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) /
+          assignment.results.length;
   };
 
-	const aggregateScoresByModule = (stats: Stat[]): {module: Module; total: number; missing: number; correct: number}[] => {
+  const aggregateScoresByModule = (
+    stats: Stat[]
+  ): { module: Module; total: number; missing: number; correct: number }[] => {
     const scores: {
       [key in Module]: { total: number; missing: number; correct: number };
     } = {
@@ -123,10 +147,22 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
       .map((x) => ({ module: x as Module, ...scores[x as Module] }));
   };
 
-	const customContent = (stats: Stat[], user: string, focus: "academic" | "general") => {
-		const correct = stats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
-		const total = stats.reduce((accumulator, current) => accumulator + current.score.total, 0);
-		const aggregatedScores = aggregateScoresByModule(stats).filter((x) => x.total > 0);
+  const customContent = (
+    stats: Stat[],
+    user: string,
+    focus: "academic" | "general"
+  ) => {
+    const correct = stats.reduce(
+      (accumulator, current) => accumulator + current.score.correct,
+      0
+    );
+    const total = stats.reduce(
+      (accumulator, current) => accumulator + current.score.total,
+      0
+    );
+    const aggregatedScores = aggregateScoresByModule(stats).filter(
+      (x) => x.total > 0
+    );
 
     const aggregatedLevels = aggregatedScores.map((x) => ({
       module: x.module,
@@ -136,7 +172,9 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
     const timeSpent = stats[0].timeSpent;
 
     const selectExam = () => {
-			const examPromises = uniqBy(stats, "exam").map((stat) => getExamById(stat.module, stat.exam));
+      const examPromises = uniqBy(stats, "exam").map((stat) =>
+        getExamById(stat.module, stat.exam)
+      );
 
       Promise.all(examPromises).then((exams) => {
         if (exams.every((x) => !!x)) {
@@ -147,7 +185,7 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
             exams
               .map((x) => x!)
               .sort(sortByModule)
-							.map((x) => x!.module),
+              .map((x) => x!.module)
           );
           router.push("/exercises");
         }
@@ -158,11 +196,15 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
       <>
         <div className="-md:items-center flex w-full justify-between 2xl:items-center">
           <div className="-md:gap-2 -md:items-center flex md:flex-col md:gap-1 2xl:flex-row 2xl:items-center 2xl:gap-2">
-						<span className="font-medium">{formatTimestamp(stats[0].date.toString())}</span>
+            <span className="font-medium">
+              {formatTimestamp(stats[0].date.toString())}
+            </span>
             {timeSpent && (
               <>
                 <span className="md:hidden 2xl:flex">• </span>
-								<span className="text-sm">{Math.floor(timeSpent / 60)} minutes</span>
+                <span className="text-sm">
+                  {Math.floor(timeSpent / 60)} minutes
+                </span>
               </>
             )}
           </div>
@@ -170,10 +212,16 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
             className={clsx(
               correct / total >= 0.7 && "text-mti-purple",
               correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
-							correct / total < 0.3 && "text-mti-rose",
-						)}>
+              correct / total < 0.3 && "text-mti-rose"
+            )}
+          >
             Level{" "}
-						{(aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length).toFixed(1)}
+            {(
+              aggregatedLevels.reduce(
+                (accumulator, current) => accumulator + current.level,
+                0
+              ) / aggregatedLevels.length
+            ).toFixed(1)}
           </span>
         </div>
 
@@ -188,8 +236,9 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
                   module === "listening" && "bg-ielts-listening",
                   module === "writing" && "bg-ielts-writing",
                   module === "speaking" && "bg-ielts-speaking",
-									module === "level" && "bg-ielts-level",
-								)}>
+                  module === "level" && "bg-ielts-level"
+                )}
+              >
                 {module === "reading" && <BsBook className="h-4 w-4" />}
                 {module === "listening" && <BsHeadphones className="h-4 w-4" />}
                 {module === "writing" && <BsPen className="h-4 w-4" />}
@@ -216,11 +265,14 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
           className={clsx(
             "border-mti-gray-platinum -md:hidden flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
+            correct / total >= 0.3 &&
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           onClick={selectExam}
-					role="button">
+          role="button"
+        >
           {content}
         </div>
         <div
@@ -228,17 +280,32 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
           className={clsx(
             "border-mti-gray-platinum -md:tooltip flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out md:hidden",
             correct / total >= 0.7 && "hover:border-mti-purple",
-						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
-						correct / total < 0.3 && "hover:border-mti-rose",
+            correct / total >= 0.3 &&
+              correct / total < 0.7 &&
+              "hover:border-mti-red",
+            correct / total < 0.3 && "hover:border-mti-rose"
           )}
           data-tip="Your screen size is too small to view previous exams."
-					role="button">
+          role="button"
+        >
           {content}
         </div>
       </div>
     );
   };
 
+  const shouldRenderStart = () => {
+    if (assignment) {
+      if (activeAssignmentFilter(assignment)) {
+        return false;
+      }
+
+	  return assignment.results.length === 0;
+    }
+
+    return false;
+  };
+
   return (
     <Modal isOpen={isOpen} onClose={onClose} title={assignment?.name}>
       <div className="mt-4 flex w-full flex-col gap-4">
@@ -247,14 +314,27 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
           label={`${assignment?.results.length}/${assignment?.assignees.length} assignees completed`}
           className="h-6"
           textClassName={
-						(assignment?.results.length || 0) / (assignment?.assignees.length || 1) < 0.5 ? "!text-mti-gray-dim font-light" : "text-white"
+            (assignment?.results.length || 0) /
+              (assignment?.assignees.length || 1) <
+            0.5
+              ? "!text-mti-gray-dim font-light"
+              : "text-white"
+          }
+          percentage={
+            ((assignment?.results.length || 0) /
+              (assignment?.assignees.length || 1)) *
+            100
           }
-					percentage={((assignment?.results.length || 0) / (assignment?.assignees.length || 1)) * 100}
         />
         <div className="flex items-start gap-8">
           <div className="flex flex-col gap-2">
-						<span>Start Date: {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}</span>
-						<span>End Date: {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}</span>
+            <span>
+              Start Date:{" "}
+              {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}
+            </span>
+            <span>
+              End Date: {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}
+            </span>
           </div>
           <div className="flex flex-col gap-2">
             <span>
@@ -264,7 +344,10 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
                 .map((u) => `${u.name} (${u.email})`)
                 .join(", ")}
             </span>
-						<span>Assigner: {getUserName(users.find((x) => x.id === assignment?.assigner))}</span>
+            <span>
+              Assigner:{" "}
+              {getUserName(users.find((x) => x.id === assignment?.assigner))}
+            </span>
           </div>
         </div>
         <div className="flex flex-col gap-2">
@@ -281,15 +364,20 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
                     module === "listening" && "bg-ielts-listening",
                     module === "writing" && "bg-ielts-writing",
                     module === "speaking" && "bg-ielts-speaking",
-										module === "level" && "bg-ielts-level",
-									)}>
+                    module === "level" && "bg-ielts-level"
+                  )}
+                >
                   {module === "reading" && <BsBook className="h-4 w-4" />}
-									{module === "listening" && <BsHeadphones className="h-4 w-4" />}
+                  {module === "listening" && (
+                    <BsHeadphones className="h-4 w-4" />
+                  )}
                   {module === "writing" && <BsPen className="h-4 w-4" />}
                   {module === "speaking" && <BsMegaphone className="h-4 w-4" />}
                   {module === "level" && <BsClipboard className="h-4 w-4" />}
                   {calculateAverageModuleScore(module) > -1 && (
-										<span className="text-sm">{calculateAverageModuleScore(module).toFixed(1)}</span>
+                    <span className="text-sm">
+                      {calculateAverageModuleScore(module).toFixed(1)}
+                    </span>
                   )}
                 </div>
               ))}
@@ -297,26 +385,44 @@ export default function AssignmentView({isOpen, assignment, onClose}: Props) {
         </div>
         <div className="flex flex-col gap-2">
           <span className="text-xl font-bold">
-						Results ({assignment?.results.length}/{assignment?.assignees.length})
+            Results ({assignment?.results.length}/{assignment?.assignees.length}
+            )
           </span>
           <div>
             {assignment && assignment?.results.length > 0 && (
               <div className="grid w-full grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-3 xl:gap-6">
-								{assignment.results.map((r) => customContent(r.stats, r.user, r.type))}
+                {assignment.results.map((r) =>
+                  customContent(r.stats, r.user, r.type)
+                )}
               </div>
             )}
-						{assignment && assignment?.results.length === 0 && <span className="ml-1 font-semibold">No results yet...</span>}
+            {assignment && assignment?.results.length === 0 && (
+              <span className="ml-1 font-semibold">No results yet...</span>
+            )}
           </div>
         </div>
 
         <div className="flex gap-4 w-full items-center justify-end">
-					{assignment && (assignment.results.length === assignment.assignees.length || moment().isAfter(moment(assignment.endDate))) && (
-						<Button variant="outline" color="red" className="w-full max-w-[200px]" onClick={deleteAssignment}>
+          {assignment &&
+            (assignment.results.length === assignment.assignees.length ||
+              moment().isAfter(moment(assignment.endDate))) && (
+              <Button
+                variant="outline"
+                color="red"
+                className="w-full max-w-[200px]"
+                onClick={deleteAssignment}
+              >
                 Delete
               </Button>
             )}
-					{assignment && (assignment.results.length === 0 || moment().isAfter(moment(assignment.startDate))) && (
-						<Button variant="outline" color="green" className="w-full max-w-[200px]" onClick={startAssignment}>
+          {/** if the assignment is not deemed as active yet, display start */}
+          {shouldRenderStart() && (
+            <Button
+              variant="outline"
+              color="green"
+              className="w-full max-w-[200px]"
+              onClick={startAssignment}
+            >
               Start
             </Button>
           )}

src/dashboards/views/AssignmentsPage.tsx

@@ -1,7 +1,13 @@
 import { Assignment } from "@/interfaces/results";
 import { CorporateUser, Group, User } from "@/interfaces/user";
 import { getUserCompanyName } from "@/resources/user";
-import {activeAssignmentFilter, archivedAssignmentFilter, futureAssignmentFilter, pastAssignmentFilter} from "@/utils/assignments";
+import {
+  activeAssignmentFilter,
+  archivedAssignmentFilter,
+  futureAssignmentFilter,
+  pastAssignmentFilter,
+  unstartedAssignmentFilter,
+} from "@/utils/assignments";
 import clsx from "clsx";
 import { groupBy } from "lodash";
 import { useState } from "react";
@@ -21,14 +27,28 @@ interface Props {
   reloadAssignments: () => void;
 }
 
-export default function AssignmentsPage({assignments, corporateAssignments, user, groups, users, isLoading, onBack, reloadAssignments}: Props) {
+export default function AssignmentsPage({
+  assignments,
+  corporateAssignments,
+  user,
+  groups,
+  users,
+  isLoading,
+  onBack,
+  reloadAssignments,
+}: Props) {
   const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
   const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
 
+  const unstartedAssignments = assignments.filter(unstartedAssignmentFilter);
+
+  const displayAssignmentView = !!selectedAssignment && !isCreatingAssignment;
+
   return (
     <>
+      {displayAssignmentView && (
         <AssignmentView
-				isOpen={!!selectedAssignment && !isCreatingAssignment}
+          isOpen={displayAssignmentView}
           onClose={() => {
             setSelectedAssignment(undefined);
             setIsCreatingAssignment(false);
@@ -36,8 +56,10 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
           }}
           assignment={selectedAssignment}
         />
+      )}
       {/** I'll be using this is creating assingment as a workaround for a key to trigger a new rendering */}
-			{isCreatingAssignment && <AssignmentCreator
+      {isCreatingAssignment && (
+        <AssignmentCreator
           assignment={selectedAssignment}
           groups={groups}
           users={users}
@@ -48,53 +70,105 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
             setSelectedAssignment(undefined);
             reloadAssignments();
           }}
-			/>}
+        />
+      )}
       <div className="w-full flex justify-between items-center">
         <div
           onClick={onBack}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+          className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+        >
           <BsArrowLeft className="text-xl" />
           <span>Back</span>
         </div>
         <div
           onClick={reloadAssignments}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
+          className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+        >
           <span>Reload</span>
-					<BsArrowRepeat className={clsx("text-xl", isLoading && "animate-spin")} />
+          <BsArrowRepeat
+            className={clsx("text-xl", isLoading && "animate-spin")}
+          />
         </div>
       </div>
       <div className="flex flex-col gap-2">
         <span className="text-lg font-bold">Active Assignments Status</span>
         <div className="flex items-center gap-4">
           <span>
-						<b>Total:</b> {assignments.filter(activeAssignmentFilter).reduce((acc, curr) => acc + curr.results.length, 0)}/
-						{assignments.filter(activeAssignmentFilter).reduce((acc, curr) => curr.exams.length + acc, 0)}
+            <b>Total:</b>{" "}
+            {assignments
+              .filter(activeAssignmentFilter)
+              .reduce((acc, curr) => acc + curr.results.length, 0)}
+            /
+            {assignments
+              .filter(activeAssignmentFilter)
+              .reduce((acc, curr) => curr.exams.length + acc, 0)}
           </span>
-					{Object.keys(groupBy(corporateAssignments, (x) => x.corporate?.id)).map((x) => (
+          {Object.keys(
+            groupBy(corporateAssignments, (x) => x.corporate?.id)
+          ).map((x) => (
             <div key={x}>
-							<span className="font-semibold">{getUserCompanyName(users.find((u) => u.id === x)!, users, groups)}: </span>
+              <span className="font-semibold">
+                {getUserCompanyName(
+                  users.find((u) => u.id === x)!,
+                  users,
+                  groups
+                )}
+                :{" "}
+              </span>
               <span>
-								{groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.results.length + acc, 0)}/
-								{groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.exams.length + acc, 0)}
+                {groupBy(corporateAssignments, (x) => x.corporate?.id)[
+                  x
+                ].reduce((acc, curr) => curr.results.length + acc, 0)}
+                /
+                {groupBy(corporateAssignments, (x) => x.corporate?.id)[
+                  x
+                ].reduce((acc, curr) => curr.exams.length + acc, 0)}
               </span>
             </div>
           ))}
         </div>
       </div>
       <section className="flex flex-col gap-4">
-				<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeAssignmentFilter).length})</h2>
+        <h2 className="text-2xl font-semibold">
+          Active Assignments (
+          {assignments.filter(activeAssignmentFilter).length})
+        </h2>
         <div className="flex flex-wrap gap-2">
           {assignments.filter(activeAssignmentFilter).map((a) => (
-						<AssignmentCard {...a} users={users} onClick={() => setSelectedAssignment(a)} key={a.id} />
+            <AssignmentCard
+              {...a}
+              users={users}
+              onClick={() => setSelectedAssignment(a)}
+              key={a.id}
+            />
           ))}
         </div>
       </section>
       <section className="flex flex-col gap-4">
-				<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureAssignmentFilter).length})</h2>
+        <h2 className="text-2xl font-semibold">
+          Active Assignments Pending Start ({unstartedAssignments.length})
+        </h2>
+        <div className="flex flex-wrap gap-2">
+          {unstartedAssignments.map((a) => (
+            <AssignmentCard
+              {...a}
+              users={users}
+              onClick={() => setSelectedAssignment(a)}
+              key={a.id}
+            />
+          ))}
+        </div>
+      </section>
+      <section className="flex flex-col gap-4">
+        <h2 className="text-2xl font-semibold">
+          Planned Assignments (
+          {assignments.filter(futureAssignmentFilter).length})
+        </h2>
         <div className="flex flex-wrap gap-2">
           <div
             onClick={() => setIsCreatingAssignment(true)}
-						className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
+            className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
+          >
             <BsPlus className="text-6xl" />
             <span className="text-lg">New Assignment</span>
           </div>
@@ -112,7 +186,9 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
         </div>
       </section>
       <section className="flex flex-col gap-4">
-				<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastAssignmentFilter).length})</h2>
+        <h2 className="text-2xl font-semibold">
+          Past Assignments ({assignments.filter(pastAssignmentFilter).length})
+        </h2>
         <div className="flex flex-wrap gap-2">
           {assignments.filter(pastAssignmentFilter).map((a) => (
             <AssignmentCard
@@ -129,7 +205,10 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
         </div>
       </section>
       <section className="flex flex-col gap-4">
-				<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})</h2>
+        <h2 className="text-2xl font-semibold">
+          Archived Assignments (
+          {assignments.filter(archivedAssignmentFilter).length})
+        </h2>
         <div className="flex flex-wrap gap-2">
           {assignments.filter(archivedAssignmentFilter).map((a) => (
             <AssignmentCard

src/utils/assignments.ts

@@ -38,3 +38,14 @@ export const activeAssignmentFilter = (a: Assignment) => {
 
     return false;
 };
+
+export const unstartedAssignmentFilter = (a: Assignment) => {
+    const currentDate = moment();
+    if(moment(a.endDate).isBefore(currentDate)) return false;
+    if(a.archived) return false;
+
+    if(a.autoStart && a.autoStartDate && moment(a.autoStartDate).isBefore(currentDate)) return false;
+
+    if(!a.start) return true;
+    return false;
+}