From b4e3109350e90d3d82b18d45de15ce136a045a9d Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Fri, 28 Apr 2023 18:06:17 +0500
Subject: [PATCH] TSK-1339: resize tooltip for dueDate and ignore overdue in
done/cancelled (#3113)
Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
.../src/components/calendar/DueDatePopup.svelte | 15 +++++++++------
.../components/calendar/DueDatePresenter.svelte | 3 ++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/packages/ui/src/components/calendar/DueDatePopup.svelte b/packages/ui/src/components/calendar/DueDatePopup.svelte
index c309bbdce4..89df17a187 100644
--- a/packages/ui/src/components/calendar/DueDatePopup.svelte
+++ b/packages/ui/src/components/calendar/DueDatePopup.svelte
@@ -23,6 +23,7 @@
export let daysDifference: number = 0
export let isOverdue: boolean = false
export let iconModifier: 'warning' | 'critical' | 'overdue' | undefined = undefined
+ export let shouldIgnoreOverdue: boolean = false
</script>
{#if formattedDate}
@@ -32,7 +33,7 @@
class:mIconContainerWarning={iconModifier === 'warning'}
class:mIconContainerCritical={iconModifier === 'critical' || iconModifier === 'overdue'}
>
- <Icon icon={isOverdue ? DPCalendarOver : DPCalendar} size={'small'} />
+ <Icon icon={isOverdue && !shouldIgnoreOverdue ? DPCalendarOver : DPCalendar} size={'small'} />
</div>
<div class="messageContainer">
<div class="title">
@@ -42,10 +43,12 @@
/>
</div>
<div class="description">
- <Label
- label={isOverdue ? ui.string.DueDatePopupOverdueDescription : ui.string.DueDatePopupDescription}
- params={{ value: daysDifference }}
- />
+ {#if !shouldIgnoreOverdue}
+ <Label
+ label={isOverdue ? ui.string.DueDatePopupOverdueDescription : ui.string.DueDatePopupDescription}
+ params={{ value: daysDifference }}
+ />
+ {/if}
</div>
</div>
</div>
@@ -54,7 +57,7 @@
<style lang="scss">
.root {
display: flex;
- width: 15rem;
+ width: 10rem;
}
.iconContainer {
diff --git a/packages/ui/src/components/calendar/DueDatePresenter.svelte b/packages/ui/src/components/calendar/DueDatePresenter.svelte
index 4a28f7fa71..c3e7b51296 100644
--- a/packages/ui/src/components/calendar/DueDatePresenter.svelte
+++ b/packages/ui/src/components/calendar/DueDatePresenter.svelte
@@ -84,7 +84,8 @@
formattedDate,
daysDifference,
isOverdue,
- iconModifier
+ iconModifier,
+ shouldIgnoreOverdue
}
}
: undefined}