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

UBER-1144: Fixed estimation time representation used when creating issue and issue template (#4139)

Browse Source
This commit is contained in:
Pete Anøther 2023-12-04 23:08:12 -03:00 committed by GitHub
parent 00e05256ea
commit e50bdd461b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/tracker-assets/lang/en.json
View File

@ -236,7 +236,6 @@
"TimeSpendReportValue": "Spent time",
"TimeSpendReportValueTooltip": "Spent time in hours",
"TimeSpendReportDescription": "Description",
"TimeSpendValue": "{value}d",
"TimeSpendDays": "{value}d",
"TimeSpendHours": "{value}h",
"TimeSpendMinutes": "{value}m",

1
plugins/tracker-assets/lang/ru.json
View File

@ -236,7 +236,6 @@
"TimeSpendReportValue": "Затраченные дни",
"TimeSpendReportValueTooltip": "Затраченное время в человеко днях",
"TimeSpendReportDescription": "Описание",
"TimeSpendValue": "{value}d",
"TimeSpendDays": "{value}d",
"TimeSpendHours": "{value}h",
"TimeSpendMinutes": "{value}m",

7
plugins/tracker-resources/src/components/issues/timereport/EstimationEditor.svelte
View File

@ -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}

2
plugins/tracker-resources/src/components/issues/timereport/TimePresenter.svelte
View File

@ -64,7 +64,7 @@
use:tooltip={{
component: Label,
props: {
label: tracker.string.TimeSpendValue,
label: tracker.string.TimeSpendHours,
params: { value }
}
}}

7
plugins/tracker-resources/src/components/templates/EstimationEditor.svelte
View File

@ -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}

1
plugins/tracker-resources/src/plugin.ts
View File

@ -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,

2
tests/sanity/tests/tracker/tracker.spec.ts
View File

@ -306,7 +306,7 @@ test.describe('Tracker tests', () => {
status: 'Todo',
priority: 'Urgent',
assignee: 'Appleseed John',
estimation: '1d',
estimation: '1h',
dueDate: '24'
})
})