completely removed weekly stats + added .gitignore
This commit is contained in:
parent
cce82f02af
commit
4f5f12473d
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
__pycache__
|
||||
db.sqlite3
|
@ -38,7 +38,6 @@ urlpatterns = [
|
||||
path("projects/<int:id>/set_parent/", views.set_parent, name="set_parent"),
|
||||
path("projects/<int:id>/", views.project_view, name="project"),
|
||||
path("stats/by-month/<int:year>/<int:month>/", views.get_stats_by_month, name="stats_by_month"),
|
||||
#path("stats/between/<date:start_date>/<date:end_date>/", views.get_stats_between, name="stats_between"),
|
||||
path("clockings/<date:date>/", views.set_clocking, name="set_clocking"),
|
||||
path("sagex/<int:id>/<year_month:month>/", views.set_real_sagex, name="set_real_sagex"),
|
||||
]
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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()
|
||||
})
|
@ -20,15 +20,6 @@
|
||||
<div id="month">Month</div>
|
||||
<button id="next-month">></button>
|
||||
</div>
|
||||
<!--<div id="week-sel" class="group hidden">
|
||||
<button id="prev-week"><</button>
|
||||
<div id="week">Week</div>
|
||||
<button id="next-week">></button>
|
||||
</div>
|
||||
<select id="range-sel">
|
||||
<option value="monthly">Monthly</option>
|
||||
<option value="weekly">Weekly</option>
|
||||
</select>-->
|
||||
</div>
|
||||
<div class="tables">
|
||||
<table id="headers-table">
|
||||
|
Loading…
x
Reference in New Issue
Block a user