STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 3 Actions 1 Packages Projects Releases 3 Wiki Activity

revert

Browse Source
This commit is contained in:
James Collins
2023-02-27 23:18:49 +10:00
parent c40f448aa3
commit 91a4a2c2a4
1 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
resources/js/views/EventList.vue
View File

@@ -134,12 +134,12 @@ const handleLoad = async () => {
events = []; events = [];
if (Object.keys(query).length == 0) { if (Object.keys(query).length == 0) {
// const now = new Date(); const now = new Date();
// const startingDate = new Date(now.setDate(now.getDate() - 14)); const startingDate = new Date(now.setDate(now.getDate() - 14));
query["end_at"] = query["end_at"] =
">" + ">" +
new SMDate("now").format("yyyy/MM/dd HH:mm:ss", { new SMDate(startingDate).format("yyyy/MM/dd HH:mm:ss", {
utc: true, utc: true,
}); });
} }
@@ -163,42 +163,36 @@ const handleLoad = async () => {
let banner = ""; let banner = "";
let bannerType = ""; let bannerType = "";
// const parsedStartAt = new SMDate(item.start_at, { const parsedStartAt = new SMDate(item.start_at, {
// format: "yyyy-MM-dd HH:mm:ss", format: "yyyy-MM-dd HH:mm:ss",
// utc: true, utc: true,
// }); });
// const parsedEndAt = new SMDate(item.end_at, { const parsedEndAt = new SMDate(item.end_at, {
// format: "yyyy-MM-dd HH:mm:ss", format: "yyyy-MM-dd HH:mm:ss",
// utc: true, utc: true,
// }); });
// item.start_at = new SMDate(item.start_at, { item.start_at = parsedStartAt.format("yyyy-MM-dd HH:mm:ss");
// format: "yyyy-MM-dd HH:mm:ss",
// utc: true,
// }).format("yyyy-MM-dd HH:mm:ss");
// item.end_at = new SMDate(item.end_at, { item.end_at = parsedEndAt.format("yyyy-MM-dd HH:mm:ss");
// format: "yyyy-MM-dd HH:mm:ss",
// utc: true,
// }).format("yyyy-MM-dd HH:mm:ss");
// if ( if (
// parsedEndAt.isBefore(new SMDate("now")) || parsedEndAt.isBefore(new SMDate("now")) ||
// item.status == "closed" item.status == "closed"
// ) { ) {
// banner = "closed"; banner = "closed";
// bannerType = "expired"; bannerType = "expired";
// } else if (item.status == "open") { } else if (item.status == "open") {
// banner = "open"; banner = "open";
// bannerType = "success"; bannerType = "success";
// } else if (item.status == "cancelled") { } else if (item.status == "cancelled") {
// banner = "cancelled"; banner = "cancelled";
// bannerType = "danger"; bannerType = "danger";
// } else if (item.status == "soon") { } else if (item.status == "soon") {
// banner = "Open Soon"; banner = "Open Soon";
// bannerType = "warning"; bannerType = "warning";
// } }
events.push({ events.push({
event: item, event: item,