hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-12-22 19:11:33 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TSK-397: Fixed time report round (#2389)

Browse Source 
Signed-off-by: Anton Brechka <anton.brechka@xored.com>
This commit is contained in:
mrsadman99 2022-11-24 11:48:16 +03:00 committed by GitHub
parent 2238986bdb
commit 3578f2b90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/ui/src/components/EditBox.svelte
View File

@ -22,6 +22,7 @@
import Icon from './Icon.svelte'
import Label from './Label.svelte'
import { resizeObserver } from '../resize'
import { floorFractionDigits } from '../utils'
export let label: IntlString | undefined = undefined
export let icon: Asset | AnySvelteComponent | undefined = undefined
@ -30,6 +31,7 @@
export let placeholder: IntlString = plugin.string.EditBoxPlaceholder
export let placeholderParam: any | undefined = undefined
export let format: 'text' | 'password' | 'number' = 'text'
export let maxDigitsAfterPoint: number | undefined = undefined
export let kind: EditStyle = 'editbox'
export let focus: boolean = false
export let focusable: boolean = false
@ -43,6 +45,16 @@
let phTraslate: string = ''
let parentWidth: number | undefined
$: {
if (
format === 'number' &&
maxDigitsAfterPoint &&
value &&
!value.toString().match(`^\\d+\\.?\\d{0,${maxDigitsAfterPoint}}$`)
) {
value = floorFractionDigits(Number(value), maxDigitsAfterPoint)
}
}
$: style = `max-width: ${
maxWidth || (parentWidth ? (icon ? `calc(${parentWidth}px - 1.25rem)` : `${parentWidth}px`) : 'max-content')
};`

4
packages/ui/src/utils.ts
View File

@ -43,3 +43,7 @@ export function fetchMetadataLocalStorage<T> (id: Metadata<T>): T | null {
export function checkMobile (): boolean {
return /Android|webOS|iPhone|iPad|iPod|BlackBerry|Mobile|Opera Mini/i.test(navigator.userAgent)
}
export function floorFractionDigits (n: number | string, amount: number): number {
return Number(Number(n).toFixed(amount))
}

1
plugins/tracker-resources/src/components/issues/timereport/EstimationPopup.svelte
View File

@ -108,6 +108,7 @@
{kind}
placeholder={tracker.string.Estimation}
focus
maxDigitsAfterPoint={3}
on:keypress={_onkeypress}
on:change={() => {
if (typeof _value === 'number') {

19
plugins/tracker-resources/src/components/issues/timereport/EstimationStatsPresenter.svelte
View File

@ -16,16 +16,15 @@
import { AttachedData } from '@hcengineering/core'
import { Issue } from '@hcengineering/tracker'
import { Label } from '@hcengineering/ui'
import { floorFractionDigits, Label } from '@hcengineering/ui'
import tracker from '../../../plugin'
import EstimationProgressCircle from './EstimationProgressCircle.svelte'
import { floorFractionDigits } from '../../../utils'
export let value: Issue | AttachedData<Issue>
$: childReportTime = floorFractionDigits(
value.reportedTime + (value.childInfo ?? []).map((it) => it.reportedTime).reduce((a, b) => a + b, 0),
2
3
)
$: childEstimationTime = (value.childInfo ?? []).map((it) => it.estimation).reduce((a, b) => a + b, 0)
</script>
@ -41,7 +40,7 @@
{#if value.reportedTime > 0 || childReportTime > 0}
{#if childReportTime}
{@const rchildReportTime = childReportTime}
{@const reportDiff = floorFractionDigits(rchildReportTime - value.reportedTime, 2)}
{@const reportDiff = floorFractionDigits(rchildReportTime - value.reportedTime, 3)}
{#if reportDiff !== 0 && value.reportedTime !== 0}
<div class="flex flex-nowrap mr-1" class:showError={reportDiff > 0}>
<Label label={tracker.string.TimeSpendValue} params={{ value: rchildReportTime }} />
@ -49,16 +48,16 @@
<div class="romColor">
(<Label
label={tracker.string.TimeSpendValue}
params={{ value: floorFractionDigits(value.reportedTime, 2) }}
params={{ value: floorFractionDigits(value.reportedTime, 3) }}
/>)
</div>
{:else if value.reportedTime === 0}
<Label label={tracker.string.TimeSpendValue} params={{ value: childReportTime }} />
{:else}
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.reportedTime, 2) }} />
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.reportedTime, 3) }} />
{/if}
{:else}
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.reportedTime, 2) }} />
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.reportedTime, 3) }} />
{/if}
<div class="p-1">/</div>
{/if}
@ -73,15 +72,15 @@
<div class="romColor">
(<Label
label={tracker.string.TimeSpendValue}
params={{ value: floorFractionDigits(value.estimation, 2) }}
params={{ value: floorFractionDigits(value.estimation, 3) }}
/>)
</div>
{/if}
{:else}
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.estimation, 2) }} />
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.estimation, 3) }} />
{/if}
{:else}
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.estimation, 2) }} />
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.estimation, 3) }} />
{/if}
</span>
</div>

9
plugins/tracker-resources/src/components/issues/timereport/ReportedTimeEditor.svelte
View File

@ -16,8 +16,7 @@
<script lang="ts">
import type { IntlString } from '@hcengineering/platform'
import { Issue } from '@hcengineering/tracker'
import { ActionIcon, eventToHTMLElement, IconAdd, Label, showPopup } from '@hcengineering/ui'
import { floorFractionDigits } from '../../../utils'
import { ActionIcon, eventToHTMLElement, floorFractionDigits, IconAdd, Label, showPopup } from '@hcengineering/ui'
import ReportsPopup from './ReportsPopup.svelte'
import TimeSpendReportPopup from './TimeSpendReportPopup.svelte'
@ -39,7 +38,7 @@
}
$: childTime = floorFractionDigits(
(object.childInfo ?? []).map((it) => it.reportedTime).reduce((a, b) => a + b, 0),
2
3
)
</script>
@ -47,7 +46,7 @@
<div id="ReportedTimeEditor" class="link-container flex-between" on:click={showReports}>
{#if value !== undefined}
<span class="overflow-label">
{floorFractionDigits(value, 2)}
{floorFractionDigits(value, 3)}
{#if childTime !== 0}
/ {childTime}
{/if}
@ -61,7 +60,7 @@
</div>
{:else if value !== undefined}
<span class="overflow-label">
{floorFractionDigits(value, 2)}
{floorFractionDigits(value, 3)}
{#if childTime !== 0}
/ {childTime}
{/if}

5
plugins/tracker-resources/src/components/issues/timereport/TimeSpendReport.svelte
View File

@ -17,11 +17,10 @@
import { WithLookup } from '@hcengineering/core'
import { getClient } from '@hcengineering/presentation'
import type { TimeSpendReport } from '@hcengineering/tracker'
import { eventToHTMLElement, Label, showPopup, tooltip } from '@hcengineering/ui'
import { eventToHTMLElement, floorFractionDigits, Label, showPopup, tooltip } from '@hcengineering/ui'
import view, { AttributeModel } from '@hcengineering/view'
import { getObjectPresenter } from '@hcengineering/view-resources'
import tracker from '../../../plugin'
import { floorFractionDigits } from '../../../utils'
import TimeSpendReportPopup from './TimeSpendReportPopup.svelte'
export let value: WithLookup<TimeSpendReport>
@ -65,7 +64,7 @@
}
: undefined}
>
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.value, 2) }} />
<Label label={tracker.string.TimeSpendValue} params={{ value: floorFractionDigits(value.value, 3) }} />
</span>
{/if}

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

@ -78,7 +78,7 @@
okLabel={value === undefined ? presentation.string.Create : presentation.string.Save}
>
<div class="flex-row-center gap-2">
<EditBox focus bind:value={data.value} {placeholder} format={'number'} kind={'editbox'} />
<EditBox focus bind:value={data.value} {placeholder} format={'number'} maxDigitsAfterPoint={3} kind={'editbox'} />
<UserBox
_class={contact.class.Employee}
label={contact.string.Employee}

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

@ -16,9 +16,8 @@
import { DocumentQuery, Ref, SortingOrder } from '@hcengineering/core'
import { createQuery } from '@hcengineering/presentation'
import { Issue, Team, TimeSpendReport } from '@hcengineering/tracker'
import { Label, Scroller, Spinner } from '@hcengineering/ui'
import { floorFractionDigits, Label, Scroller, Spinner } from '@hcengineering/ui'
import tracker from '../../../plugin'
import { floorFractionDigits } from '../../../utils'
import TimeSpendReportsList from './TimeSpendReportsList.svelte'
export let issue: Issue
@ -36,11 +35,8 @@
}
})
$: total = floorFractionDigits(
(reports ?? []).reduce((a, b) => a + b.value, 0),
2
)
$: reportedTime = floorFractionDigits(issue.reportedTime, 2)
$: total = (reports ?? []).reduce((a, b) => a + floorFractionDigits(b.value, 3), 0)
$: reportedTime = floorFractionDigits(issue.reportedTime, 3)
</script>
{#if reports}

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

@ -17,7 +17,13 @@
import { Doc, Ref, Space, WithLookup } from '@hcengineering/core'
import UserBox from '@hcengineering/presentation/src/components/UserBox.svelte'
import { Team, TimeSpendReport } from '@hcengineering/tracker'
import { eventToHTMLElement, getEventPositionElement, ListView, showPopup } from '@hcengineering/ui'
import {
eventToHTMLElement,
floorFractionDigits,
getEventPositionElement,
ListView,
showPopup
} from '@hcengineering/ui'
import DatePresenter from '@hcengineering/ui/src/components/calendar/DatePresenter.svelte'
import { ContextMenu, FixedColumn, ListSelectionProvider, SelectDirection } from '@hcengineering/view-resources'
import { getIssueId } from '../../../issues'
@ -98,7 +104,7 @@
readonly
showNavigate={false}
/>
<EstimationPresenter value={report.value} />
<EstimationPresenter value={floorFractionDigits(report.value, 3)} />
<DatePresenter value={report.date} />
</div>
</div>

8
plugins/tracker-resources/src/components/sprints/SprintEditor.svelte
View File

@ -17,12 +17,12 @@
import { IntlString } from '@hcengineering/platform'
import { createQuery, getClient } from '@hcengineering/presentation'
import { Issue, IssueStatus, IssueTemplate, Sprint } from '@hcengineering/tracker'
import type { ButtonKind, ButtonSize, ButtonShape } from '@hcengineering/ui'
import { ButtonKind, ButtonSize, ButtonShape, floorFractionDigits } from '@hcengineering/ui'
import { Label, deviceOptionsStore as deviceInfo } from '@hcengineering/ui'
import DatePresenter from '@hcengineering/ui/src/components/calendar/DatePresenter.svelte'
import { activeSprint } from '../../issues'
import tracker from '../../plugin'
import { floorFractionDigits, getDayOfSprint } from '../../utils'
import { getDayOfSprint } from '../../utils'
import EstimationProgressCircle from '../issues/timereport/EstimationProgressCircle.svelte'
import SprintSelector from './SprintSelector.svelte'
@ -98,7 +98,7 @@
.reduce((it, cur) => {
return it + cur
}, 0),
2
3
)
$: totalReported = floorFractionDigits(
(noParents ?? [{ reportedTime: 0, childInfo: [] } as unknown as Issue])
@ -114,7 +114,7 @@
.reduce((it, cur) => {
return it + cur
}),
2
3
)
const sprintQuery = createQuery()

7
plugins/tracker-resources/src/utils.ts
View File

@ -641,10 +641,3 @@ export async function moveIssuesToAnotherSprint (
return false
}
}
/**
* @public
*/
export const floorFractionDigits = (n: number, amount: number): number => {
return Number(n.toFixed(amount))
}