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

Improvements on start button

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dashboards/AssignmentCreator.tsx
View File

@@ -47,7 +47,7 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
}),
);
const [isLoading, setIsLoading] = useState(false);
const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : new Date());
const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : moment().add(1, 'hour').toDate());
const [endDate, setEndDate] = useState<Date | null>(
assignment ? moment(assignment.endDate).toDate() : moment().hours(23).minutes(59).add(8, "day").toDate(),

8
src/dashboards/AssignmentView.tsx
View File

@@ -24,7 +24,7 @@ import {
BsPen,
} from "react-icons/bs";
import { toast } from "react-toastify";
import { activeAssignmentFilter } from "@/utils/assignments";
import { futureAssignmentFilter } from "@/utils/assignments";
interface Props {
isOpen: boolean;
@@ -296,11 +296,9 @@ export default function AssignmentView({ isOpen, assignment, onClose }: Props) {
const shouldRenderStart = () => {
if (assignment) {
if (activeAssignmentFilter(assignment)) {
return false;
if (futureAssignmentFilter(assignment)) {
return true;
}
return assignment.results.length === 0;
}
return false;

40
src/dashboards/views/AssignmentsPage.tsx
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">

52
src/utils/assignments.ts
View File

@@ -1,15 +1,29 @@
import moment from "moment";
import {Assignment} from "@/interfaces/results";
export const futureAssignmentFilter = (a: Assignment) => {
if(a.archived) return false;
if(a.start) return false;
// export const futureAssignmentFilter = (a: Assignment) => {
// if(a.archived) return false;
// if(a.start) return false;
// const currentDate = moment();
// const startDate = moment(a.startDate);
// if(currentDate.isAfter(startDate)) return false;
// if(a.autoStart && a.autoStartDate) {
// return moment(a.autoStartDate).isAfter(currentDate);
// }
// return false;
// }
export const futureAssignmentFilter = (a: Assignment) => {
const currentDate = moment();
const startDate = moment(a.startDate);
if(startDate.isAfter(currentDate)) return true;
if(a.autoStart && a.autoStartDate) {
return moment(a.autoStartDate).isAfter(currentDate);
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) {
if(moment(a.startDate).isBefore(currentDate)) return false;
return true;
}
return false;
}
@@ -36,16 +50,28 @@ export const activeAssignmentFilter = (a: Assignment) => {
return moment(a.autoStartDate).isBefore(currentDate);
}
// if(currentDate.isAfter(moment(a.startDate))) return true;
return false;
};
export const unstartedAssignmentFilter = (a: Assignment) => {
// 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) {
// if(moment(a.startDate).isBefore(currentDate)) return false;
// return true;
// }
// return false;
// }
export const startHasExpiredAssignmentFilter = (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;
if(a.start) return false;
if(currentDate.isAfter(moment(a.startDate)) && currentDate.isBefore(moment(a.endDate))) return true;
return false;
}