mirror of
https://github.com/hcengineering/platform.git
synced 2026-09-10 03:37:43 +02:00
UBER-1144: Fixed estimation time representation used when creating issue and issue template (#4139)
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
import tracker from '../../../plugin'
|
||||
import EstimationPopup from './EstimationPopup.svelte'
|
||||
import EstimationStatsPresenter from './EstimationStatsPresenter.svelte'
|
||||
import TimePresenter from './TimePresenter.svelte'
|
||||
|
||||
export let value: Issue | AttachedData<Issue> | IssueDraft
|
||||
export let isEditable: boolean = true
|
||||
@@ -81,9 +82,7 @@
|
||||
<Button
|
||||
{focusIndex}
|
||||
showTooltip={isEditable ? { label: tracker.string.Estimation } : undefined}
|
||||
label={tracker.string.TimeSpendValue}
|
||||
notSelected={value.estimation === 0}
|
||||
labelParams={{ value: value.estimation }}
|
||||
icon={tracker.icon.DueDate}
|
||||
{justify}
|
||||
{width}
|
||||
@@ -91,6 +90,8 @@
|
||||
{kind}
|
||||
disabled={!isEditable}
|
||||
on:click={handleestimationEditorOpened}
|
||||
/>
|
||||
>
|
||||
<TimePresenter slot="content" value={value.estimation} />
|
||||
</Button>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
use:tooltip={{
|
||||
component: Label,
|
||||
props: {
|
||||
label: tracker.string.TimeSpendValue,
|
||||
label: tracker.string.TimeSpendHours,
|
||||
params: { value }
|
||||
}
|
||||
}}
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
import { EditBoxPopup } from '@hcengineering/view-resources'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import tracker from '../../plugin'
|
||||
import TimePresenter from '../issues/timereport/TimePresenter.svelte'
|
||||
|
||||
export let value: IssueTemplateChild | IssueTemplate | Data<IssueTemplate> | IssueDraft
|
||||
export let isEditable: boolean = true
|
||||
@@ -62,8 +63,6 @@
|
||||
{#if value}
|
||||
<Button
|
||||
showTooltip={isEditable ? { label: tracker.string.Estimation } : undefined}
|
||||
label={tracker.string.TimeSpendValue}
|
||||
labelParams={{ value: value.estimation }}
|
||||
icon={tracker.icon.Estimation}
|
||||
notSelected={value.estimation === 0}
|
||||
{justify}
|
||||
@@ -72,5 +71,7 @@
|
||||
{kind}
|
||||
disabled={!isEditable}
|
||||
on:click={handleestimationEditorOpened}
|
||||
/>
|
||||
>
|
||||
<TimePresenter slot="content" value={value.estimation} />
|
||||
</Button>
|
||||
{/if}
|
||||
|
||||
@@ -268,7 +268,6 @@ export default mergeIds(trackerId, tracker, {
|
||||
TimeSpendReportDate: '' as IntlString,
|
||||
TimeSpendReportValue: '' as IntlString,
|
||||
TimeSpendReportDescription: '' as IntlString,
|
||||
TimeSpendValue: '' as IntlString,
|
||||
TimeSpendDays: '' as IntlString,
|
||||
TimeSpendHours: '' as IntlString,
|
||||
TimeSpendMinutes: '' as IntlString,
|
||||
|
||||
Reference in New Issue
Block a user