diff --git a/src/core/features/reportbuilder/components/report-column/report-column.html b/src/core/features/reportbuilder/components/report-column/report-column.html index b5799edb3..e0157e75e 100644 --- a/src/core/features/reportbuilder/components/report-column/report-column.html +++ b/src/core/features/reportbuilder/components/report-column/report-column.html @@ -4,9 +4,10 @@ {{ header }} - + - + + diff --git a/src/core/features/reportbuilder/components/report-column/report-column.ts b/src/core/features/reportbuilder/components/report-column/report-column.ts index 4006702e0..ab7259eee 100644 --- a/src/core/features/reportbuilder/components/report-column/report-column.ts +++ b/src/core/features/reportbuilder/components/report-column/report-column.ts @@ -29,6 +29,7 @@ export class CoreReportBuilderReportColumnComponent implements OnInit { @Input() column!: string | number; @Input() contextId!: number; @Input() header!: string; + @Input() source!: string; @Output() onToggleRow: EventEmitter = new EventEmitter(); ngOnInit(): void { diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.html b/src/core/features/reportbuilder/components/report-detail/report-detail.html index 6ffd3a631..be704251f 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.html +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.html @@ -14,7 +14,7 @@ state.cardVisibleColumns" - [isExpanded]="row.isExpanded" [showFirstTitle]="state.cardviewShowFirstTitle" + [isExpanded]="row.isExpanded" [showFirstTitle]="state.cardviewShowFirstTitle" [source]="source$ | async" [contextId]="state.report.details.contextid" [header]="state.report.data.headers[columnIndex]" [column]="column" (onToggleRow)="toggleRow(rowIndex)"> @@ -34,7 +34,7 @@ - diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.ts b/src/core/features/reportbuilder/components/report-detail/report-detail.ts index 992277102..1e2ce0e09 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts @@ -25,7 +25,8 @@ import { CoreNavigator } from '@services/navigator'; import { CoreScreen } from '@services/screen'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreUtils } from '@services/utils/utils'; -import { BehaviorSubject } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; @Component({ selector: 'core-report-builder-report-detail', @@ -55,6 +56,19 @@ export class CoreReportBuilderReportDetailComponent implements OnInit { page: 0, }); + source$: Observable; + + constructor() { + this.source$ = this.state$.pipe( + map(state => { + const splittedSource = state.report?.details.source.split('\\'); + const source = splittedSource?.[splittedSource?.length - 1]; + + return source ?? 'system'; + }), + ); + } + /** * @inheritdoc */ diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.html b/src/core/features/reportbuilder/components/report-summary/report-summary.html index 162a46a58..ae9116769 100644 --- a/src/core/features/reportbuilder/components/report-summary/report-summary.html +++ b/src/core/features/reportbuilder/components/report-summary/report-summary.html @@ -39,9 +39,8 @@ - - + diff --git a/src/core/features/reportbuilder/pages/list/list.html b/src/core/features/reportbuilder/pages/list/list.html index 35539a9a4..066eb5352 100644 --- a/src/core/features/reportbuilder/pages/list/list.html +++ b/src/core/features/reportbuilder/pages/list/list.html @@ -17,7 +17,9 @@ - {{ report.name }} + + + {{ report.sourcename }} diff --git a/src/core/features/reportbuilder/pages/report/report.html b/src/core/features/reportbuilder/pages/report/report.html index 4dd499a70..f7151d711 100644 --- a/src/core/features/reportbuilder/pages/report/report.html +++ b/src/core/features/reportbuilder/pages/report/report.html @@ -9,7 +9,9 @@ - {{ reportDetail.name }} + + + {{ reportDetail.sourcename }}
{{ header }}
- - +
{{ report.name }}
+ +
{{ report.sourcename }}
{{ reportDetail.sourcename }}