This commit is contained in:
@@ -1,11 +1,16 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import type { IconName, iconNames } from "../external/icons";
|
import type { IconName, iconNames } from "../external/icons";
|
||||||
import { formatTime } from "../utils/time";
|
import { formatTime } from "../utils/time";
|
||||||
import DaysLeft from "./DaysLeft.svelte";
|
import DaysLeft from "./DaysLeft.svelte";
|
||||||
import Icon from "./Icon.svelte";
|
import Icon from "./Icon.svelte";
|
||||||
import LinkHook from "./LinkHook.svelte";
|
import LinkHook from "./LinkHook.svelte";
|
||||||
import Markdown from "./Markdown.svelte";
|
import Markdown from "./Markdown.svelte";
|
||||||
|
|
||||||
|
interface ActualParent {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
}
|
||||||
|
|
||||||
interface EntryCommon {
|
interface EntryCommon {
|
||||||
id: string
|
id: string
|
||||||
name?: string
|
name?: string
|
||||||
@@ -29,6 +34,8 @@ import { formatTime } from "../utils/time";
|
|||||||
}
|
}
|
||||||
|
|
||||||
export let entry: EntryCommon = null;
|
export let entry: EntryCommon = null;
|
||||||
|
export let actualParent: ActualParent = null;
|
||||||
|
export let hideParentName: boolean = false;
|
||||||
|
|
||||||
let iconName: IconName;
|
let iconName: IconName;
|
||||||
let displayName: string;
|
let displayName: string;
|
||||||
@@ -48,6 +55,16 @@ import { formatTime } from "../utils/time";
|
|||||||
<Icon name={iconName} />
|
<Icon name={iconName} />
|
||||||
</div>
|
</div>
|
||||||
</slot>
|
</slot>
|
||||||
|
{#if (actualParent != null)}
|
||||||
|
{#if !hideParentName}
|
||||||
|
<div class="actual-parent-icon">
|
||||||
|
<Icon block name="link" />
|
||||||
|
</div>
|
||||||
|
<div class="actual-parent">
|
||||||
|
<a href={`/questlog#${actualParent.id}`}>{actualParent.name}</a>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
<div class="name">{displayName}</div>
|
<div class="name">{displayName}</div>
|
||||||
{#if (entry.endTime != null)}
|
{#if (entry.endTime != null)}
|
||||||
<div class="times">
|
<div class="times">
|
||||||
@@ -95,6 +112,31 @@ import { formatTime } from "../utils/time";
|
|||||||
background: #333;
|
background: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.actual-parent-icon {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
font-size: 1em;
|
||||||
|
padding: 0.3em 0;
|
||||||
|
padding-bottom: 0.1em;
|
||||||
|
|
||||||
|
margin-right: 0.5em;
|
||||||
|
color: #555;
|
||||||
|
}
|
||||||
|
div.actual-parent {
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 100;
|
||||||
|
margin: auto 0;
|
||||||
|
vertical-align: middle;
|
||||||
|
padding: 0.125em 0;
|
||||||
|
padding-right: 1ch;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
div.actual-parent :global(div.icon) {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
div.name {
|
div.name {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
|
|||||||
@@ -17,8 +17,11 @@
|
|||||||
|
|
||||||
export let task: TaskResult = null;
|
export let task: TaskResult = null;
|
||||||
export let project: Project = null;
|
export let project: Project = null;
|
||||||
|
export let actualProject: Project | null = null;
|
||||||
export let showAllOptions: boolean = false;
|
export let showAllOptions: boolean = false;
|
||||||
|
|
||||||
|
export let actualParent: Project | null = null;
|
||||||
|
|
||||||
let showLogs = false;
|
let showLogs = false;
|
||||||
let mdLogAdd: ModalData;
|
let mdLogAdd: ModalData;
|
||||||
let mdTaskEdit: ModalData;
|
let mdTaskEdit: ModalData;
|
||||||
@@ -72,10 +75,11 @@
|
|||||||
$: mdTaskLink = {name: "tasklink.add", task};
|
$: mdTaskLink = {name: "tasklink.add", task};
|
||||||
$: mdTaskUnlink = {name: "tasklink.delete", task, project};
|
$: mdTaskUnlink = {name: "tasklink.delete", task, project};
|
||||||
$: isLinked = task.projectId !== project.id;
|
$: isLinked = task.projectId !== project.id;
|
||||||
|
$: actualParent = (actualProject != null && actualProject.id !== project.id) ? actualProject : null;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<StatusColor affects="task" entry={task}>
|
<StatusColor affects="task" entry={task}>
|
||||||
<ChildEntry entry={task}>
|
<ChildEntry entry={task} actualParent={actualParent} hideParentName={!showAllOptions}>
|
||||||
<div slot="icon">
|
<div slot="icon">
|
||||||
<TaskIcon task={task} />
|
<TaskIcon task={task} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
import type Project from "../models/project";
|
import type Project from "../models/project";
|
||||||
import type { TaskResult } from "../models/task";
|
import type { TaskResult } from "../models/task";
|
||||||
import TaskEntry from "./TaskEntry.svelte";
|
import TaskEntry from "./TaskEntry.svelte";
|
||||||
|
import projectStore from "../stores/project";
|
||||||
|
|
||||||
export let project: Project;
|
export let project: Project;
|
||||||
export let tasks: TaskResult[];
|
export let tasks: TaskResult[];
|
||||||
@@ -12,7 +13,11 @@
|
|||||||
{#if tasks.length > 0}
|
{#if tasks.length > 0}
|
||||||
<h3>{header}</h3>
|
<h3>{header}</h3>
|
||||||
{#each tasks as task (task.id)}
|
{#each tasks as task (task.id)}
|
||||||
<TaskEntry showAllOptions={showAllOptions} task={task} project={project} />
|
<TaskEntry
|
||||||
|
showAllOptions={showAllOptions}
|
||||||
|
task={task} project={project}
|
||||||
|
actualProject={$projectStore.projects.find(p => p.id === task.projectId)}
|
||||||
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user