wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-16 05:13:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

UBERF-5630: fix inactive employee status in activity (#4782)

Browse Source 
Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
This commit is contained in:
Kristina 2024-02-27 12:30:45 +04:00 committed by GitHub
parent 7e8f153da5
commit 7875ca74ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
View File

@ -151,7 +151,7 @@
<div class="flex-col ml-2 w-full clear-mins message-content"> <div class="flex-col ml-2 w-full clear-mins message-content">
<div class="header clear-mins"> <div class="header clear-mins">
{#if person} {#if person}
<EmployeePresenter value={person} shouldShowAvatar={false} /> <EmployeePresenter value={person} shouldShowAvatar={false} compact />
{:else} {:else}
<div class="strong"> <div class="strong">
<Label label={core.string.System} /> <Label label={core.string.System} />

2
plugins/contact-resources/src/components/EmployeePresenter.svelte
View File

@ -21,6 +21,7 @@
export let defaultName: IntlString | undefined = ui.string.NotSelected export let defaultName: IntlString | undefined = ui.string.NotSelected
// export let element: HTMLElement | undefined = undefined // export let element: HTMLElement | undefined = undefined
export let noUnderline: boolean = false export let noUnderline: boolean = false
export let compact = false
$: employeeValue = typeof value === 'string' ? $personByIdStore.get(value) : value $: employeeValue = typeof value === 'string' ? $personByIdStore.get(value) : value
@ -42,6 +43,7 @@
{accent} {accent}
{defaultName} {defaultName}
{noUnderline} {noUnderline}
{compact}
statusLabel={!active && shouldShowName ? contact.string.Inactive : undefined} statusLabel={!active && shouldShowName ? contact.string.Inactive : undefined}
on:accent-color on:accent-color
/> />

3
plugins/contact-resources/src/components/PersonContent.svelte
View File

@ -46,6 +46,7 @@
export let colorInherit: boolean = false export let colorInherit: boolean = false
export let accent: boolean = false export let accent: boolean = false
export let maxWidth = '' export let maxWidth = ''
export let compact = false
const client = getClient() const client = getClient()
@ -71,7 +72,7 @@
{#if value} {#if value}
{#if statusLabel} {#if statusLabel}
<div class="inline-flex items-center clear-mins w-full"> <div class="inline-flex items-center clear-mins" class:w-full={!compact}>
<PersonElement <PersonElement
{value} {value}
{name} {name}

2
plugins/contact-resources/src/components/PersonPresenter.svelte
View File

@ -39,6 +39,7 @@
export let colorInherit: boolean = false export let colorInherit: boolean = false
export let accent: boolean = false export let accent: boolean = false
export let maxWidth = '' export let maxWidth = ''
export let compact = false
const client = getClient() const client = getClient()
$: personValue = typeof value === 'string' ? $personByIdStore.get(value) : value $: personValue = typeof value === 'string' ? $personByIdStore.get(value) : value
@ -92,6 +93,7 @@
{colorInherit} {colorInherit}
{accent} {accent}
{maxWidth} {maxWidth}
{compact}
on:accent-color on:accent-color
/> />
{/if} {/if}