diff --git a/frontend/src/routes/time/Index.svelte b/frontend/src/routes/time/Index.svelte index 0964a53..3c0684b 100644 --- a/frontend/src/routes/time/Index.svelte +++ b/frontend/src/routes/time/Index.svelte @@ -15,6 +15,7 @@ let router = useTinyRouter(); let times = $state(null); + let closed = $state(false); let tasks = {}; let projects = {}; let project_filter = $state(null); @@ -94,9 +95,11 @@ return false; } + + async function loadTimes(){ const url = api('time'); - const resp = await fetch(url,{credentials:'include'}); + const resp = await post(url,{closed:closed}); if (resp.ok){ var json = await resp.json(); times = json.times; @@ -160,6 +163,10 @@ router.navigate(`/task/${tid}/view`); } + function reload(ev){ + loadTimes(); + } + function toggleRange(range){ let affected = sortedTimes.filter(time => time.start.startsWith(range)); if (ranges[range]){ @@ -217,6 +224,12 @@ {/if} +
| toggleRange(time.start.substring(0,4))}> + | toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} > {time.start.substring(0,4)} | {/if} {#if timeMap.months[line]} -toggleRange(time.start.substring(0,7))}> + | toggleRange(time.start.substring(0,7))} title={time.start.substring(5,7)} > {time.start.substring(5,7)} | {/if} diff --git a/time/src/main/java/de/srsoftware/umbrella/time/Constants.java b/time/src/main/java/de/srsoftware/umbrella/time/Constants.java index ff345c4..5859381 100644 --- a/time/src/main/java/de/srsoftware/umbrella/time/Constants.java +++ b/time/src/main/java/de/srsoftware/umbrella/time/Constants.java @@ -5,6 +5,7 @@ public class Constants { private Constants(){} public static final String CHILDREN = "children"; + public static final String CLOSED = "closed"; public static final String CONFIG_DATABASE = "umbrella.modules.time.database"; public static final String DOCUMENTS = "documents"; public static final String IDS = "ids"; diff --git a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java index 4868ce7..b9fe38d 100644 --- a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java +++ b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java @@ -75,8 +75,7 @@ public class TimeModule extends BaseHandler implements TimeService { var head = path.pop(); return switch (head) { case STARTED -> getStartedTime(user.get(),ex); - case null -> getUserTimes(user.get(),ex); - default -> super.doGet(path,ex); + case null, default -> super.doGet(path,ex); }; } catch (UmbrellaException e){ return send(ex,e); @@ -119,6 +118,7 @@ public class TimeModule extends BaseHandler implements TimeService { case LIST -> listTimes(ex,user.get()); case SEARCH -> postSearch(ex, user.get()); case TRACK_TASK -> trackTask(user.get(),path,ex); + case null -> postUserTimeList(user.get(),ex); default -> { try { long timeId = Long.parseLong(head); @@ -199,31 +199,6 @@ public class TimeModule extends BaseHandler implements TimeService { return send(ex,UmbrellaException.notFound("no started time")); } - private boolean getUserTimes(UmbrellaUser user, HttpExchange ex) throws IOException { - Set