Merge branch 'bugfix/timecomplete' into dev
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -80,7 +80,14 @@ public class TimeModule extends BaseHandler implements TimeService {
|
||||
var head = path.pop();
|
||||
return switch (head) {
|
||||
case STARTED -> getStartedTime(user.get(),ex);
|
||||
case null, default -> super.doGet(path,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);
|
||||
|
||||
Reference in New Issue
Block a user