Removed the autoStartDate and replaced it with the current startDate

This commit is contained in:
Tiago Ribeiro
2024-11-10 00:13:09 +00:00
parent 042b07c267
commit 7ac15fc767
7 changed files with 149 additions and 225 deletions

View File

@@ -1,38 +1,20 @@
import moment from "moment";
import { Assignment } from "@/interfaces/results";
// 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();
if (moment(a.endDate).isBefore(currentDate)) return false;
if (a.archived) return false;
if (moment(a.endDate).isBefore(currentDate)) return false;
if (a.autoStart && moment(a.startDate).isBefore(currentDate)) 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;
return !a.start;
}
export const pastAssignmentFilter = (a: Assignment) => {
const currentDate = moment();
if (a.archived) {
return false;
}
if (a.archived) return false;
return moment(a.endDate).isBefore(currentDate);
}
@@ -44,25 +26,11 @@ export const activeAssignmentFilter = (a: Assignment) => {
if (moment(a.endDate).isBefore(currentDate) || a.archived) return false;
if (a.start) return true;
if (a.autoStart && a.autoStartDate) return moment(a.autoStartDate).isBefore(currentDate);
if (a.autoStart) return currentDate.isAfter(moment(a.startDate));
return currentDate.isAfter(moment(a.startDate));
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) {
// if(moment(a.startDate).isBefore(currentDate)) return false;
// return true;
// }
// return false;
// }
export const startHasExpiredAssignmentFilter = (a: Assignment) => {
const currentDate = moment();
if (a.archived) return false;