commit
666caca940
|
@ -30,7 +30,9 @@
|
||||||
<ion-item class="ion-text-wrap" *ngIf="badge.issuer">
|
<ion-item class="ion-text-wrap" *ngIf="badge.issuer">
|
||||||
<ion-label>
|
<ion-label>
|
||||||
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
|
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
|
||||||
<p>{{ badge.issuer }}</p>
|
<p>
|
||||||
|
<core-format-text [text]="badge.issuer" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true" />
|
||||||
|
</p>
|
||||||
</ion-label>
|
</ion-label>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
<ion-item class="ion-text-wrap" *ngIf="badge.coursefullname">
|
<ion-item class="ion-text-wrap" *ngIf="badge.coursefullname">
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
import { toBoolean } from '@/core/transforms/boolean';
|
import { toBoolean } from '@/core/transforms/boolean';
|
||||||
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
|
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
|
||||||
import { CoreError } from '@classes/errors/error';
|
import { CoreError } from '@classes/errors/error';
|
||||||
import {
|
import {
|
||||||
CoreReportBuilder,
|
CoreReportBuilder,
|
||||||
|
@ -37,7 +37,6 @@ import { map } from 'rxjs/operators';
|
||||||
selector: 'core-report-builder-report-detail',
|
selector: 'core-report-builder-report-detail',
|
||||||
templateUrl: './report-detail.html',
|
templateUrl: './report-detail.html',
|
||||||
styleUrls: ['./report-detail.scss'],
|
styleUrls: ['./report-detail.scss'],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
||||||
})
|
})
|
||||||
export class CoreReportBuilderReportDetailComponent implements OnInit {
|
export class CoreReportBuilderReportDetailComponent implements OnInit {
|
||||||
|
|
||||||
|
@ -55,7 +54,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
|
||||||
new BehaviorSubject<CoreReportBuilderReportDetailState>({
|
new BehaviorSubject<CoreReportBuilderReportDetailState>({
|
||||||
report: null,
|
report: null,
|
||||||
loaded: false,
|
loaded: false,
|
||||||
canLoadMoreRows: true,
|
canLoadMoreRows: false,
|
||||||
errorLoadingRows: false,
|
errorLoadingRows: false,
|
||||||
cardviewShowFirstTitle: false,
|
cardviewShowFirstTitle: false,
|
||||||
cardVisibleColumns: 1,
|
cardVisibleColumns: 1,
|
||||||
|
@ -126,6 +125,7 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
|
||||||
report,
|
report,
|
||||||
cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns,
|
cardVisibleColumns: report.details.settingsdata.cardviewVisibleColumns,
|
||||||
cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle,
|
cardviewShowFirstTitle: report.details.settingsdata.cardviewShowFirstTitle,
|
||||||
|
canLoadMoreRows: report.data.totalrowcount > report.data.rows.length,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.logView(report);
|
this.logView(report);
|
||||||
|
@ -175,7 +175,6 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
|
||||||
this.updateState({ page: 0, canLoadMoreRows: false });
|
this.updateState({ page: 0, canLoadMoreRows: false });
|
||||||
await CoreUtils.ignoreErrors(this.getReport());
|
await CoreUtils.ignoreErrors(this.getReport());
|
||||||
await ionRefresher?.complete();
|
await ionRefresher?.complete();
|
||||||
this.updateState({ canLoadMoreRows: true });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -225,12 +224,12 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
canLoadMoreRows: newReport.data.totalrowcount > report.data.rows.length + newReport.data.rows.length,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
CoreDomUtils.showErrorModalDefault(error, 'Error loading more reports');
|
CoreDomUtils.showErrorModalDefault(error, 'Error loading more reports');
|
||||||
|
|
||||||
this.updateState({ canLoadMoreRows: false });
|
this.updateState({ canLoadMoreRows: false, errorLoadingRows: true });
|
||||||
this.updateState({ errorLoadingRows: true });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
complete();
|
complete();
|
||||||
|
|
Loading…
Reference in New Issue