From 4f5f12473d7c1cf544449d9a484be9a26ecd6299 Mon Sep 17 00:00:00 2001 From: LordBaryhobal Date: Fri, 14 Feb 2025 15:05:09 +0100 Subject: [PATCH] completely removed weekly stats + added .gitignore --- .gitignore | 2 ++ TimeDispatcher/urls.py | 1 - dispatcher/static/dashboard.css | 21 ------------ dispatcher/static/dashboard.js | 57 --------------------------------- templates/dashboard.html | 9 ------ 5 files changed, 2 insertions(+), 88 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ad3199 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +__pycache__ +db.sqlite3 \ No newline at end of file diff --git a/TimeDispatcher/urls.py b/TimeDispatcher/urls.py index 6a161d7..b79ba28 100644 --- a/TimeDispatcher/urls.py +++ b/TimeDispatcher/urls.py @@ -38,7 +38,6 @@ urlpatterns = [ path("projects//set_parent/", views.set_parent, name="set_parent"), path("projects//", views.project_view, name="project"), path("stats/by-month///", views.get_stats_by_month, name="stats_by_month"), - #path("stats/between///", views.get_stats_between, name="stats_between"), path("clockings//", views.set_clocking, name="set_clocking"), path("sagex///", views.set_real_sagex, name="set_real_sagex"), ] diff --git a/dispatcher/static/dashboard.css b/dispatcher/static/dashboard.css index bf3962e..077d495 100644 --- a/dispatcher/static/dashboard.css +++ b/dispatcher/static/dashboard.css @@ -34,27 +34,6 @@ background-color: var(--dark4); } -/* -.by-range #list { - display: flex; - flex-direction: column; - gap: 0.8em; -} - -.by-range #list .row { - display: flex; - gap: 1.2em; - padding: 0.4em 0.8em; - background-color: var(--dark3); -} - -.by-range #list .no-data { - font-style: italic; - padding: 0.4em 0.8em; - background-color: var(--dark2); -} -*/ - .by-range .tables { display: flex; } diff --git a/dispatcher/static/dashboard.js b/dispatcher/static/dashboard.js index f136454..8bfc99f 100644 --- a/dispatcher/static/dashboard.js +++ b/dispatcher/static/dashboard.js @@ -1,5 +1,4 @@ let prevMonthBtn, nextMonthBtn, month -let prevWeekBtn, nextWeekBtn, week let curYear = new Date().getFullYear() let curMonth = new Date().getMonth() let curWeekDate = new Date() @@ -20,14 +19,6 @@ function nextMonth() { } updateTableMonthly() } -function prevWeek() { - curWeekDate = new Date(curWeekDate.valueOf() - 7 * DAY_MS) - updateTableWeekly() -} -function nextWeek() { - curWeekDate = new Date(curWeekDate.valueOf() + 7 * DAY_MS) - updateTableWeekly() -} function updateTableMonthly() { let year = curYear.toString().padStart(4, "0") @@ -49,29 +40,6 @@ function updateTableMonthly() { }) } -function updateTableWeekly() { - let weekNum = curWeekDate.getWeek() - let weekDay = (curWeekDate.getDay() + 6) % 7 - let startDate = new Date(curWeekDate.valueOf() - weekDay * DAY_MS) - let endDate = new Date(startDate.valueOf() + 6 * DAY_MS) - - let today = new Date() - let date = `${MONTHS[startDate.getMonth()]} ${startDate.getDate()}` - if (startDate.getFullYear() !== today.getFullYear()) { - date += " " + startDate.getFullYear().toString().padStart(4, "0") - } - document.getElementById("week").innerText = `Week ${weekNum} (${date})` - - fetch(`stats/between/${formatDate(startDate)}/${formatDate(endDate)}/`).then(res => { - return res.json() - }).then(res => { - if (res.status !== "success") { - return - } - updateTable(res.data) - }) -} - function updateTable(data) { let totalWorked = data.clockings.map(c => c.total).reduce((a, b) => a + b, 0) @@ -212,33 +180,8 @@ window.addEventListener("load", () => { nextMonthBtn = document.getElementById("next-month") month = document.getElementById("month") - /*prevWeekBtn = document.getElementById("prev-week") - nextWeekBtn = document.getElementById("next-week") - week = document.getElementById("week")*/ - prevMonthBtn.addEventListener("click", () => prevMonth()) nextMonthBtn.addEventListener("click", () => nextMonth()) - /*prevWeekBtn.addEventListener("click", () => prevWeek()) - nextWeekBtn.addEventListener("click", () => nextWeek())*/ - - let monthGrp = document.getElementById("month-sel") - //let weekGrp = document.getElementById("week-sel") - - /* - rangeSel = document.getElementById("range-sel") - rangeSel.addEventListener("change", () => { - let mode = rangeSel.value - if (mode === "weekly") { - monthGrp.classList.add("hidden") - weekGrp.classList.remove("hidden") - updateTableWeekly() - } else { - monthGrp.classList.remove("hidden") - weekGrp.classList.add("hidden") - updateTableMonthly() - } - }) - */ updateTableMonthly() }) \ No newline at end of file diff --git a/templates/dashboard.html b/templates/dashboard.html index e2310b4..3f068c3 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -20,15 +20,6 @@
Month
-