diff --git a/svelte-ui/src/components/GoalEntry.svelte b/svelte-ui/src/components/GoalEntry.svelte index d4ac5a9..a5ae6d5 100644 --- a/svelte-ui/src/components/GoalEntry.svelte +++ b/svelte-ui/src/components/GoalEntry.svelte @@ -6,6 +6,7 @@ import OptionRow from "./OptionRow.svelte"; import ParentEntry from "./ParentEntry.svelte"; import Progress from "./Progress.svelte"; +import TimeProgress from "./TimeProgress.svelte"; export let goal: GoalResult = null; export let showAllOptions = false; @@ -13,31 +14,11 @@ let mdGoalEdit: ModalData; let mdGoalDelete: ModalData; - let msLength: number; - let msElapsed: number; - let now = Date.now(); $: mdGoalEdit = {name:"goal.edit", goal}; $: mdGoalDelete = {name:"goal.delete", goal}; - - $: { - const start = Date.parse(goal.startTime) - const length = Date.parse(goal.endTime) - start; - - msLength = length; - msElapsed = 0; - - if (now > start) { - if (now > start + length) { - msElapsed = length; - } else { - msElapsed = Math.round(now - start); - } - } - } - - + diff --git a/svelte-ui/src/components/ParentEntry.svelte b/svelte-ui/src/components/ParentEntry.svelte index 64aa023..74f4199 100644 --- a/svelte-ui/src/components/ParentEntry.svelte +++ b/svelte-ui/src/components/ParentEntry.svelte @@ -6,6 +6,7 @@ import LinkHook from "./LinkHook.svelte"; import Markdown from "./Markdown.svelte"; import ProjectProgress from "./ProjectProgress.svelte"; +import TimeProgress from "./TimeProgress.svelte"; interface EntryIconHolder { icon: IconName @@ -30,6 +31,7 @@ export let headerLink = ""; export let hideProgress: boolean = false; export let hideIcon: boolean = false; + export let showTimeProgress: boolean = false; let iconName: IconName; @@ -68,6 +70,9 @@ {#if (!hideProgress && entry.tasks != null)} + {#if showTimeProgress && entry.endTime} + + {/if} {/if} {#if (full)} diff --git a/svelte-ui/src/components/Progress.svelte b/svelte-ui/src/components/Progress.svelte index 032c372..9f883b0 100644 --- a/svelte-ui/src/components/Progress.svelte +++ b/svelte-ui/src/components/Progress.svelte @@ -78,6 +78,10 @@ title = `${count} / ${target} (${percentage}%)` } } + + $: { + console.log(ons, offs); + }
@@ -101,7 +105,8 @@ margin: 0; box-sizing: border-box; width: 100%; - height: 1em; + height: 16px; + margin: 0.5px 0; } div.bar > div { @@ -109,7 +114,8 @@ flex-basis: 0; display: inline-block; box-sizing: border-box; - border: 1px solid #111; + margin: 0 0.5px; + border: 0.25px solid #111; } div.non-segmented { @@ -134,12 +140,29 @@ } div.bar.thin { - height: 0.25em; + height: 3px; } div.bar.thinner { - height: 0.125em; + height: 1px; + } + div.bar.thinner div { + border-bottom: none; + border-top: none; } div.bar.thinner div.none { background-color: #111111; } + + @media screen and (min-width: 1200) { + div.bar div { + margin: 1px 1px; + } + + div.bar.thin { + height: 4px; + } + div.bar.thinner { + height: 4px; + } + } \ No newline at end of file diff --git a/svelte-ui/src/components/ProjectEntry.svelte b/svelte-ui/src/components/ProjectEntry.svelte index 2256cc8..e1d6ab8 100644 --- a/svelte-ui/src/components/ProjectEntry.svelte +++ b/svelte-ui/src/components/ProjectEntry.svelte @@ -31,6 +31,7 @@ import taskStore from "../stores/tasks"; headerLink={linkProject ? "/projects#"+project.id : ""} hideProgress={hideProgress} hideIcon={hideIcon} + showTimeProgress={!hideProgress} > {#if showAllOptions} diff --git a/svelte-ui/src/components/QLListItem.svelte b/svelte-ui/src/components/QLListItem.svelte index 45392f1..933f5f6 100644 --- a/svelte-ui/src/components/QLListItem.svelte +++ b/svelte-ui/src/components/QLListItem.svelte @@ -4,6 +4,7 @@ import DaysLeft from "./DaysLeft.svelte"; import Icon from "./Icon.svelte"; import ProjectProgress from "./ProjectProgress.svelte"; +import TimeProgress from "./TimeProgress.svelte"; export let project: ProjectResult; @@ -33,6 +34,9 @@ {/if}
+ {#if project.endTime} + + {/if} @@ -63,6 +67,7 @@ padding: 0.3em 0.5ch; padding-right: 1ch; + padding-top: 0.4em; } div.ql-list-item.selected div.icon { color: #666; diff --git a/svelte-ui/src/components/TimeProgress.svelte b/svelte-ui/src/components/TimeProgress.svelte new file mode 100644 index 0000000..548b431 --- /dev/null +++ b/svelte-ui/src/components/TimeProgress.svelte @@ -0,0 +1,32 @@ + + + +