Compare commits

...

5 Commits

Author SHA1 Message Date
StephanRichter 1d7b47aaa0 made project page the entrypoint
Build Docker Image / Docker-Build (push) Successful in 2m39s
Build Docker Image / Clean-Registry (push) Successful in 5s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-06-17 15:07:44 +02:00
StephanRichter f49b44cd56 Merge branch 'bugfix/pipeline'
Build Docker Image / Clean-Registry (push) Successful in 6s
Build Docker Image / Docker-Build (push) Failing after 14m18s
2026-06-17 09:21:55 +02:00
StephanRichter 60777feaa3 dropped call to make.eldorado.srsoftware.de
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-06-17 09:18:03 +02:00
StephanRichter bcc1182dea improved time table: now updating started time when starting new time track
Build Docker Image / Docker-Build (push) Successful in 2m25s
Build Docker Image / Clean-Registry (push) Failing after 10m18s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-06-17 09:14:57 +02:00
StephanRichter 4a83bb6bee overhauled account index page:
Build Docker Image / Docker-Build (push) Successful in 2m34s
Build Docker Image / Clean-Registry (push) Successful in 5s
- dropped ids from display
- ordered accounts by name

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-06-16 08:32:06 +02:00
5 changed files with 23 additions and 13 deletions
-5
View File
@@ -41,11 +41,6 @@ jobs:
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Restart umbrella.srsoftware.de
if: github.ref == 'refs/heads/dev'
run: |
curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
Clean-Registry:
runs-on: ubuntu-latest
steps:
+1 -1
View File
@@ -90,7 +90,7 @@
{#if messages.warning}
<span class="warn">{@html messages.warning}</span>
{/if}
<Route path="/" component={User} />
<Route path="/" component={ProjectList} />
<Route path="/account/:id" component={Account} />
<Route path="/accounting" component={Accounts} />
<Route path="/accounting/new" component={NewAccount} />
+2 -2
View File
@@ -44,9 +44,9 @@
</span>
<ul>
{#each accounts as account (account.id)}
{#each accounts.toSorted((a,b) => a.name.localeCompare(b.name)) as account (account.id)}
<li>
<a {onclick} href="/account/{account.id}">{account.name} ({account.id})</a>
<a {onclick} href="/account/{account.id}">{account.name}</a>
</li>
{/each}
</ul>
+11 -3
View File
@@ -1,7 +1,7 @@
<script>
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { api, drop, patch, post } from '../../urls.svelte.js';
import { api, drop, get, patch, post } from '../../urls.svelte.js';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte.js';
import { timetrack } from '../../user.svelte.js';
@@ -41,10 +41,18 @@
});
async function addTime(task_id){
const url = api(`time/track_task/${task_id}`);
const resp = await post(url,now()); // create new time or return time with assigned tasks
let url = api(`time/track_task/${task_id}`);
let resp = await post(url,now()); // create new time or return time with assigned tasks
if (resp.ok) {
const track = await resp.json();
if (timetrack.running){
url = api(`time/${timetrack.running.id}`);
resp = await get(url);
if (resp.ok){
let previous = await resp.json();
times[previous.id] = previous;
}
}
timetrack.running = track;
} else {
error(resp);
@@ -79,8 +79,15 @@ public class TimeModule extends BaseHandler implements TimeService {
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
case STARTED -> getStartedTime(user.get(),ex);
case null, default -> super.doGet(path,ex);
case STARTED -> getStartedTime(user.get(),ex);
case null -> super.doGet(path,ex);
default -> {
try {
yield sendContent(ex,timeDb.load(Long.parseLong(head)));
} catch (NumberFormatException ignored) {
yield super.doGet(path,ex);
}
}
};
} catch (UmbrellaException e){
return send(ex,e);