wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-22 00:10:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Time report popup should show issue name (#2640)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-02-15 19:33:44 +06:00 committed by GitHub
parent d18d77f191
commit a17d24c965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,7 +250,7 @@
"ReportedTime": "Использовано", "ReportedTime": "Использовано",
"TimeSpendReports": "Отчеты по времени", "TimeSpendReports": "Отчеты по времени",
"TimeSpendReport": "Время", "TimeSpendReport": "Время",
"TimeSpendReportAdd": "Добавить завтраченное время", "TimeSpendReportAdd": "Добавить затраченное время",
"TimeSpendReportDate": "Дата", "TimeSpendReportDate": "Дата",
"TimeSpendReportValue": "Затраченное время", "TimeSpendReportValue": "Затраченное время",
"TimeSpendReportValueTooltip": "Затраченное время в человеко днях", "TimeSpendReportValueTooltip": "Затраченное время в человеко днях",

10
plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
View File

@ -18,9 +18,10 @@
import type { IntlString } from '@hcengineering/platform' import type { IntlString } from '@hcengineering/platform'
import presentation, { Card, getClient, UserBox } from '@hcengineering/presentation' import presentation, { Card, getClient, UserBox } from '@hcengineering/presentation'
import { Issue, TimeReportDayType, TimeSpendReport } from '@hcengineering/tracker' import { Issue, TimeReportDayType, TimeSpendReport } from '@hcengineering/tracker'
import { DatePresenter, EditBox, Button } from '@hcengineering/ui' import { Button, DatePresenter, EditBox } from '@hcengineering/ui'
import tracker from '../../../plugin' import tracker from '../../../plugin'
import { getTimeReportDate, getTimeReportDayType } from '../../../utils' import { getTimeReportDate, getTimeReportDayType } from '../../../utils'
import TitlePresenter from '../TitlePresenter.svelte'
import TimeReportDayDropdown from './TimeReportDayDropdown.svelte' import TimeReportDayDropdown from './TimeReportDayDropdown.svelte'
export let issue: Issue | undefined = undefined export let issue: Issue | undefined = undefined
@ -84,12 +85,17 @@
</script> </script>
<Card <Card
label={tracker.string.TimeSpendReportAdd} label={value === undefined ? tracker.string.TimeSpendReportAdd : tracker.string.TimeSpendReportValue}
{canSave} {canSave}
okAction={create} okAction={create}
on:close on:close
okLabel={value === undefined ? presentation.string.Create : presentation.string.Save} okLabel={value === undefined ? presentation.string.Create : presentation.string.Save}
> >
<svelte:fragment slot="header">
{#if issue}
<TitlePresenter showParent={false} value={issue} />
{/if}
</svelte:fragment>
<div class="flex-row-center gap-2"> <div class="flex-row-center gap-2">
<EditBox focus bind:value={data.value} {placeholder} format={'number'} maxDigitsAfterPoint={3} kind={'editbox'} /> <EditBox focus bind:value={data.value} {placeholder} format={'number'} maxDigitsAfterPoint={3} kind={'editbox'} />
<Button kind={'link-bordered'} on:click={() => (data.value = 0.125)}><span slot="content">1/8</span></Button> <Button kind={'link-bordered'} on:click={() => (data.value = 0.125)}><span slot="content">1/8</span></Button>