Merge pull request 'v0.1.3: minor fixes' (#4) from dev into main

Reviewed-on: #4
This commit is contained in:
Louis Heredero 2025-03-02 15:10:42 +00:00
commit 8393855514
3 changed files with 18 additions and 14 deletions

View File

@ -17,7 +17,7 @@ from dotenv import load_dotenv
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
APP_VERSION = "0.1.2"
APP_VERSION = "0.1.3"
load_dotenv(BASE_DIR / ".env")

View File

@ -229,7 +229,9 @@ class Table {
durations[i] = hours
total += hours
parentDurations[i] += hours
this.dailyTotals[i] += hours
if (parent.is_productive) {
this.dailyTotals[i] += hours
}
})
return {
id: project.id,
@ -239,18 +241,20 @@ class Table {
}
})
this.addProject(
parent.id,
parent.name,
parent.project_num,
parentDurations.map(v => v === 0 ? "" : v),
true,
parent.is_productive
)
if (parentDurations.reduce((a, b) => a + b, 0) !== 0) {
this.addProject(
parent.id,
parent.name,
parent.project_num,
parentDurations.map(v => v === 0 ? "" : v),
true,
parent.is_productive
)
projects.filter(p => p.total !== 0).forEach(project => {
this.addProject(project.id, project.name, "", project.durations)
})
projects.filter(p => p.total !== 0).forEach(project => {
this.addProject(project.id, project.name, "", project.durations)
})
}
})
this.updateTotals()
}

View File

@ -64,7 +64,7 @@
</tr>
<tr class="day-dates"></tr>
<tr class="day-totals">
<th colspan="2">TOTAL</th>
<th colspan="2">Total Productive</th>
</tr>
</tbody>
</table>