EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4077 ReportBuilder: Fix number rendering error and error handling

Browse Source
This commit is contained in:
Alfonso Salces 2023-02-23 14:11:10 +01:00
parent 70c07d4afc
commit 4a93fd32ed
5 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/features/reportbuilder/components/report-column/report-column.html
View File

@ -4,10 +4,18 @@
<ion-label>
<p class="item-heading" *ngIf="columnIndex !== 0 || (columnIndex === 0 && showFirstTitle)"> {{ header }} </p>
<h2 *ngIf="columnIndex === 0">
<core-format-text [text]="column" [contextLevel]="source" [contextInstanceId]="contextId"></core-format-text>
<core-format-text *ngIf="isString(column); else notText" [text]="column" [contextLevel]="source"
[contextInstanceId]="contextId">
</core-format-text>
<ng-template #notText>{{ column }}</ng-template>
</h2>
<core-format-text *ngIf="columnIndex !== 0" [text]="column" [contextLevel]="source" [contextInstanceId]="contextId">
</core-format-text>
<ng-container *ngIf="columnIndex !== 0">
<core-format-text *ngIf="isString(column); else notText" [text]="column" [contextLevel]="source"
[contextInstanceId]="contextId">
</core-format-text>
<ng-template #notText>{{ column }}</ng-template>
</ng-container>
</ion-label>
<ion-icon [class.expandable-status-icon-expanded]="!isExpanded" slot="end" aria-hidden="true" name="fas-chevron-up"
class="expandable-status-icon" *ngIf="isExpandable" flip-rtl>

11
src/core/features/reportbuilder/components/report-column/report-column.ts
View File

@ -12,14 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { CoreReportBuilder } from '@features/reportbuilder/services/reportbuilder';
@Component({
selector: 'core-report-builder-report-column',
templateUrl: './report-column.html',
styleUrls: ['./report-column.scss'],
})
export class CoreReportBuilderReportColumnComponent implements OnInit {
export class CoreReportBuilderReportColumnComponent {
@Input() isExpanded = false;
@Input() isExpandable = false;
@ -32,11 +33,7 @@ export class CoreReportBuilderReportColumnComponent implements OnInit {
@Input() source!: string;
@Output() onToggleRow: EventEmitter<number> = new EventEmitter();
ngOnInit(): void {
if (typeof this.column === 'number') {
this.column = this.column.toString();
}
}
isString = (value: unknown): boolean => CoreReportBuilder.isString(value);
/**
* Emits row click

3
src/core/features/reportbuilder/components/report-detail/report-detail.html
View File

@ -34,9 +34,10 @@
<tbody>
<tr *ngFor="let row of state.report.data.rows">
<td *ngFor="let column of row.columns">
<core-format-text [text]="column" [contextLevel]="source$ | async"
<core-format-text *ngIf="isString(column); else notText" [text]="column" [contextLevel]="source$ | async"
[contextInstanceId]="state.report.details.contextid">
</core-format-text>
<ng-template #notText> {{ column }} </ng-template>
</td>
</tr>
</tbody>

56
src/core/features/reportbuilder/components/report-detail/report-detail.ts
View File

@ -58,6 +58,8 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
source$: Observable<string>;
isString = (value: unknown): boolean => CoreReportBuilder.isString(value);
constructor() {
this.source$ = this.state$.pipe(
map(state => {
@ -81,33 +83,37 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
* Get report data.
*/
async getReport(): Promise<void> {
if (!this.reportId) {
CoreDomUtils.showErrorModal(new CoreError('No report found'));
CoreNavigator.back();
try {
if (!this.reportId) {
CoreDomUtils.showErrorModal(new CoreError('No report found'));
CoreNavigator.back();
return;
return;
}
const { page } = this.state$.getValue();
const report = await CoreReportBuilder.loadReport(parseInt(this.reportId), page,this.perPage ?? REPORT_ROWS_LIMIT);
if (!report) {
CoreDomUtils.showErrorModal(new CoreError('No report found'));
CoreNavigator.back();
return;
}
await CoreReportBuilder.viewReport(this.reportId);
this.updateState({
report,
cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns,
cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle,
});
this.onReportLoaded.emit(report.details);
} catch (err) {
await CoreDomUtils.showErrorModal(err);
}
const { page } = this.state$.getValue();
const report = await CoreReportBuilder.loadReport(parseInt(this.reportId), page,this.perPage ?? REPORT_ROWS_LIMIT);
if (!report) {
CoreDomUtils.showErrorModal(new CoreError('No report found'));
CoreNavigator.back();
return;
}
await CoreReportBuilder.viewReport(this.reportId);
this.updateState({
report,
cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns,
cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle,
});
this.onReportLoaded.emit(report.details);
}
updateState(state: Partial<CoreReportBuilderReportDetailState>): void {

6
src/core/features/reportbuilder/services/reportbuilder.ts
View File

@ -162,6 +162,10 @@ export class CoreReportBuilderService {
return ROOT_CACHE_KEY + 'report';
}
isString(value: unknown): boolean {
return typeof value === 'string';
}
}
export const CoreReportBuilder = makeSingleton(CoreReportBuilderService);
@ -232,7 +236,7 @@ export interface CoreReportBuilderRetrieveReportMapped extends Omit<CoreReportBu
export type CoreReportBuilderReportDataWSResponse = {
headers: string[]; // Headers.
rows: { // Rows.
columns: string | number[]; // Columns.
columns: (string | number)[]; // Columns.
isExpanded: boolean;
}[];
totalrowcount: number; // Totalrowcount.