Skip to content

fix: enhance time spent report popup and scrolling behavior #10880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siamo1721 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: enhance time spent report popup and scrolling behavior #10880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/theme/styles/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1840,6 +1840,8 @@

.antiTable-body__row {
position: relative;
scroll-margin-top: 3rem;
scroll-margin-bottom: 2.5rem;
height: 3.25rem;
color: var(--theme-caption-color);
background-color: var(--theme-table-row-color);
Expand Down
2 changes: 1 addition & 1 deletion plugins/tracker-resources/src/components/issues/timereport/ReportedTimeEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}
function showReports (event: MouseEvent): void {
if (readonly) return
showPopup(ReportsPopup, { issue: object }, eventToHTMLElement(event))
showPopup(ReportsPopup, { issue: object, currentProject }, 'centered')
}
$: childTime = floorFractionDigits(
(object.childInfo ?? []).map((it) => it.reportedTime).reduce((a, b) => a + b, 0),
Expand Down
135 changes: 98 additions & 37 deletions plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { FindOptions } from '@hcengineering/core'
import presentation, { Card } from '@hcengineering/presentation'
import { Issue, Project, TimeSpendReport } from '@hcengineering/tracker'
import { Button, eventToHTMLElement, IconAdd, Scroller, showPopup, tableSP } from '@hcengineering/ui'
import { Button, eventToHTMLElement, IconAdd, showPopup } from '@hcengineering/ui'
import { TableBrowser } from '@hcengineering/view-resources'
import tracker from '../../../plugin'
import IssuePresenter from '../IssuePresenter.svelte'
Expand Down Expand Up @@ -53,40 +53,101 @@
}
</script>

<Card
label={tracker.string.TimeSpendReports}
canSave={true}
on:close
okAction={() => {}}
okLabel={presentation.string.Ok}
on:changeContent
>
<svelte:fragment slot="header">
<IssuePresenter value={issue} disabled />
</svelte:fragment>
<div class="h-50">
<Scroller fade={tableSP}>
<TableBrowser
_class={tracker.class.TimeSpendReport}
query={{ attachedTo: { $in: [issue._id, ...(issue.childInfo?.map((it) => it.childId) ?? [])] } }}
config={[
'$lookup.attachedTo',
'',
'employee',
{
key: '$lookup.attachedTo',
presenter: ParentNamesPresenter,
props: { maxWidth: '20rem' },
label: tracker.string.Title
},
'date',
'description'
]}
{options}
/>
</Scroller>
<div class="reports-popup-shell">
<div class="reports-popup">
<Card
label={tracker.string.TimeSpendReports}
canSave={true}
on:close
okAction={() => {}}
okLabel={presentation.string.Ok}
on:changeContent
>
<svelte:fragment slot="header">
<IssuePresenter value={issue} disabled />
</svelte:fragment>
<div class="reports-table-host">
<TableBrowser
_class={tracker.class.TimeSpendReport}
query={{ attachedTo: { $in: [issue._id, ...(issue.childInfo?.map((it) => it.childId) ?? [])] } }}
config={[
'$lookup.attachedTo',
'',
'employee',
{
key: '$lookup.attachedTo',
presenter: ParentNamesPresenter,
props: { maxWidth: '20rem' },
label: tracker.string.Title
},
'date',
'description'
]}
{options}
/>
</div>
<svelte:fragment slot="buttons">
<Button id="ReportsPopupAddButton" icon={IconAdd} size={'large'} on:click={addReport} />
</svelte:fragment>
</Card>
</div>
<svelte:fragment slot="buttons">
<Button id="ReportsPopupAddButton" icon={IconAdd} size={'large'} on:click={addReport} />
</svelte:fragment>
</Card>
</div>

<style>
.reports-popup-shell {
display: flex;
align-items: stretch;
justify-content: center;
width: 100%;
height: 100%;
padding: 1rem;
box-sizing: border-box;
}

.reports-popup {
width: min(100%, 1600px);
height: 100%;
max-height: 90vh;
}

.reports-popup :global(.antiCard) {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}

.reports-popup :global(.antiCard-content) {
flex: 1 1 auto;
min-height: 0;
display: flex;
flex-direction: column;
}

/* Let Card/Scroller manage scrolling; avoid overriding scroll overflow. */
.reports-popup :global(.antiCard-content > .scroller-container) {
flex: 1 1 auto;
min-height: 0;
height: 100%;
}

.reports-popup :global(.antiCard-content > .scroller-container > .horizontalBox),
.reports-popup :global(.antiCard-content > .scroller-container .scroll) {
height: 100%;
}


.reports-table-host {
flex: 1 1 auto;
min-height: 0;
height: 100%;
display: flex;
flex-direction: column;
}

.reports-table-host :global(.scroller-container) {
flex: 1 1 auto;
min-height: 0;
height: 100%;
}
</style>
8 changes: 5 additions & 3 deletions plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@

export let value: TimeSpendReport | undefined
export let placeholder: IntlString = tracker.string.TimeSpendReportValue
export let defaultTimeReportDay: TimeReportDayType = TimeReportDayType.PreviousWorkDay
export let defaultTimeReportDay: TimeReportDayType = TimeReportDayType.CurrentWorkDay

const effectiveDefaultDay = value ? defaultTimeReportDay : TimeReportDayType.CurrentWorkDay

const data = {
date: value?.date ?? getTimeReportDate(defaultTimeReportDay),
date: value?.date ?? getTimeReportDate(effectiveDefaultDay),
description: value?.description ?? '',
value: value?.value,
employee: value?.employee ?? getCurrentEmployee() ?? assignee ?? null
}

let selectedTimeReportDay = getTimeReportDayType(data.date)
let selectedTimeReportDay = value ? getTimeReportDayType(data.date) : effectiveDefaultDay

export function canClose (): boolean {
return true
Expand Down
3 changes: 2 additions & 1 deletion plugins/view-resources/src/components/Table.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@
selection = pos
onRow(objects[pos])
if (r !== undefined && !noScroll) {
r?.scrollIntoView({ behavior: 'auto', block: 'nearest' })
const block = offset < 0 ? 'start' : offset > 0 ? 'end' : 'nearest'
r.scrollIntoView({ behavior: 'auto', block, inline: 'nearest' })
}
}

Expand Down