fix wrapping in task status numbers, check mark as active by default if a log would bring it at or past the target.
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-01-04 16:29:33 +01:00
parent f785cda541
commit c43b180106
3 changed files with 12 additions and 19 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
</div> </div>
{:else} {:else}
<div class="icon"> <div class="icon">
{task.completedAmount} / {task.itemAmount} {task.completedAmount}&nbsp;/&nbsp;{task.itemAmount}
</div> </div>
{/if} {/if}
<div class="name">{task.name}</div> <div class="name">{task.name}</div>
+10 -17
View File
@@ -7,25 +7,25 @@ import logStore from "../stores/logs";
import projectStore, { fpProjectStore } from "../stores/project"; import projectStore, { fpProjectStore } from "../stores/project";
import { formatFormTime } from "../utils/time"; import { formatFormTime } from "../utils/time";
const md = $modalStore;
if (md.name !== "log.add") {
throw new Error("Wrong form");
}
const task = md.task;
let loggedTime = formatFormTime(new Date); let loggedTime = formatFormTime(new Date);
let taskName = "";
let description = ""; let description = "";
let markInactive = false; let markInactive = task.completedAmount >= (task.itemAmount - 1);
let error = null; let error = null;
function onSubmit() { function onSubmit() {
const md = $modalStore;
if (md.name !== "log.add") {
throw new Error("Wrong form");
}
stuffLogClient.createLog({ stuffLogClient.createLog({
taskId: md.task.id, taskId: task.id,
loggedTime: new Date(loggedTime).toISOString(), loggedTime: new Date(loggedTime).toISOString(),
description, description,
}).then(() => { }).then(() => {
if (markInactive) { if (markInactive) {
return stuffLogClient.updateTask(md.task.id, {active: false}) return stuffLogClient.updateTask(task.id, {active: false})
} }
}).then(() => { }).then(() => {
modalStore.close(); modalStore.close();
@@ -43,19 +43,12 @@ import logStore from "../stores/logs";
function onClose() { function onClose() {
modalStore.close(); modalStore.close();
} }
$: {
const md = $modalStore;
if (md.name === "log.add") {
taskName = md.task.name;
}
}
</script> </script>
<Modal show title="Add Log" error={error} closable on:close={onClose}> <Modal show title="Add Log" error={error} closable on:close={onClose}>
<form on:submit|preventDefault={onSubmit}> <form on:submit|preventDefault={onSubmit}>
<label for="taskName">Task</label> <label for="taskName">Task</label>
<input disabled name="taskName" type="text" bind:value={taskName} /> <input disabled name="taskName" type="text" bind:value={task.name} />
<label for="loggedTime">Logged Time</label> <label for="loggedTime">Logged Time</label>
<input name="loggedTime" type="datetime-local" bind:value={loggedTime} /> <input name="loggedTime" type="datetime-local" bind:value={loggedTime} />
+1 -1
View File
@@ -55,6 +55,6 @@
<hr /> <hr />
<button type="submit">Delete1 Task</button> <button type="submit">Delete Task</button>
</form> </form>
</Modal> </Modal>