Compare commits

...

19 Commits

Author SHA1 Message Date
73994d3a4e Merge branch 'bugfix/time_filtered_by_prj' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
Build Docker Image / Clean-Registry (push) Successful in 3s
2026-01-05 08:49:30 +01:00
dddba981c0 implemented bugfix: selecting times by project id broke layout
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 08:48:57 +01:00
ac2f974e5a Merge branch 'workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m31s
Build Docker Image / Clean-Registry (push) Successful in 3s
2026-01-03 23:55:31 +01:00
cd25d23246 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m40s
2026-01-03 22:17:39 +01:00
8d2f3ef88e fixed tagging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:17:30 +01:00
8e53d3b306 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 41s
2026-01-03 22:14:28 +01:00
bd95c3d0c4 debugging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:14:22 +01:00
421a350f57 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Has been cancelled
2026-01-03 22:13:31 +01:00
dceb84669b debugging
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:13:21 +01:00
eaeb625d51 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m32s
2026-01-03 22:03:10 +01:00
e980dbf884 working on tag creation
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-03 22:03:04 +01:00
dfa991b90a Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m31s
2026-01-03 21:41:56 +01:00
3b40250488 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m29s
2026-01-03 21:37:50 +01:00
8e8992f534 Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m39s
2026-01-03 21:32:59 +01:00
076efda195 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m46s
2026-01-03 21:23:29 +01:00
5c1e802a6f Merge branch 'feature/workflow' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m42s
2026-01-03 21:13:42 +01:00
750e0f16e1 Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 2m43s
2026-01-03 21:07:38 +01:00
c06083476f Merge branch 'feature/workflow' into dev
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 0s
2026-01-03 21:06:39 +01:00
f784ec6109 Merge branch 'main' into dev 2025-12-28 14:10:06 +01:00

View File

@@ -20,7 +20,7 @@
let projects = {};
let project_filter = $state(null);
if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project');
let sortedTimes = $derived.by(() => Object.values(times).map(time => ({
let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).map(time => ({
...time,
start: display(time.start_time),
end: display(time.end_time),
@@ -52,6 +52,7 @@
}
function calcYearMap(){
console.log('calcYearMap called');
let result = {
months : {},
years : {}
@@ -123,7 +124,7 @@
function match_prj_filter(time){
if (!project_filter) return true;
for (var tid of time.task_ids){
if (project_filter == tasks[tid].project_id) return true;
if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
}
return false;
}
@@ -258,7 +259,6 @@
</thead>
<tbody>
{#each sortedTimes as time,line}
{#if match_prj_filter(time)}
<tr class={selected[time.id]?'selected':''}>
{#if timeMap.years[line]}
<td class="year" rowspan={timeMap.years[line]} onclick={e => toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} >
@@ -321,7 +321,6 @@
</td>
{/if}
</tr>
{/if}
{/each}
</tbody>
</table>