Improvements on start button

This commit is contained in:
Joao Ramos
2024-09-03 23:23:18 +01:00
parent a7c1ea0409
commit 25e6cb36a9
4 changed files with 65 additions and 37 deletions

View File

@@ -6,7 +6,7 @@ import {
archivedAssignmentFilter,
futureAssignmentFilter,
pastAssignmentFilter,
unstartedAssignmentFilter,
startHasExpiredAssignmentFilter,
} from "@/utils/assignments";
import clsx from "clsx";
import { groupBy } from "lodash";
@@ -40,10 +40,10 @@ export default function AssignmentsPage({
const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
const unstartedAssignments = assignments.filter(unstartedAssignmentFilter);
const displayAssignmentView = !!selectedAssignment && !isCreatingAssignment;
const assignmentsPastExpiredStart = assignments.filter(startHasExpiredAssignmentFilter);
return (
<>
{displayAssignmentView && (
@@ -144,21 +144,6 @@ export default function AssignmentsPage({
))}
</div>
</section>
<section className="flex flex-col gap-4">
<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 (
@@ -203,6 +188,25 @@ export default function AssignmentsPage({
/>
))}
</div>
</section>
<section className="flex flex-col gap-4">
<h2 className="text-2xl font-semibold">
Assignments start expired ({assignmentsPastExpiredStart.length})
</h2>
<div className="flex flex-wrap gap-2">
{assignments.filter(startHasExpiredAssignmentFilter).map((a) => (
<AssignmentCard
{...a}
users={users}
onClick={() => setSelectedAssignment(a)}
key={a.id}
allowDownload
reload={reloadAssignments}
allowArchive
allowExcelDownload
/>
))}
</div>
</section>
<section className="flex flex-col gap-4">
<h2 className="text-2xl font-semibold">