Commit 604998a9 authored by Rajeev's avatar Rajeev
Browse files

Issue #SB-19636 [Admin_dashboard_Reports] The 'file size' and 'created on'...

Issue #SB-19636 [Admin_dashboard_Reports] The 'file size' and 'created on' values should not be empty
parent 58590513
master Dark_theme SB-25589 SB-28090 aws_fileRead contributions dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/express-4.17.3 dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3 dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3 dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/express-4.17.3 dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/qs-6.10.3 filters_5.1.1 gcp gcp_test keshavprasadms-patch-1 keshavprasadms-patch-2 release-3.0.0 release-3.0.1 release-3.0.2 release-3.0.3 release-3.0.4 release-3.0.4-sso release-3.1.0 release-3.1.1 release-3.1.2 release-3.2.0 release-3.2.1 release-3.2.10 release-3.2.11 release-3.2.12 release-3.2.13 release-3.2.14 release-3.2.2 release-3.2.3 release-3.2.4 release-3.3.0 release-3.3.0-telemetry-fix release-3.3.1 release-3.3.2 release-3.4.0 release-3.4.1 release-3.4.2 release-3.4.3 release-3.4.4 release-3.4.5 release-3.4.6 release-3.4.7 release-3.5.0 release-3.5.1 release-3.5.2 release-3.5.3 release-3.6.0 release-3.6.1 release-3.6.5 release-3.6.6 release-3.7.0 release-3.7.1 release-3.7.2 release-3.8.0 release-3.8.1 release-3.8.2 release-3.8.3 release-3.9.0 release-3.9.1 release-3.9.2 release-3.9.3 release-4.0.0 release-4.0.1 release-4.0.2 release-4.1 release-4.1.0 release-4.1.1 release-4.10.0 release-4.10.0.1 release-4.10.1 release-4.10.2 release-4.10.2.1 release-4.10.2.2 release-4.10.3 release-4.2.0 release-4.2.1 release-4.3.0 release-4.3.1 release-4.4.0 release-4.4.1 release-4.5.0 release-4.5.1 release-4.5.2 release-4.6.0 release-4.7.0 release-4.7.1 release-4.8.0 release-4.8.5 release-4.9.0 release-4.9.1 release-5.0.0 release-5.0.0.1 release-5.0.0.2 release-5.0.0.3 release-5.0.1 release-5.0.2 release-5.1.0 release-5.1.1 revert-4427-player-cache-issue revert-4537-SB-19763 revert-5244-sh-809 revert-5260-SB-table-3.3.0 revert-8284-release-5.0.0 sharathkashyap-patch-1 Tags unavailable
No related merge requests found
Showing with 31 additions and 6 deletions
+31 -6
import { Observable } from 'rxjs';
import { IInteractEventEdata, IInteractEventObject, TelemetryInteractDirective, IImpressionEventInput } from '@sunbird/telemetry';
import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
import { UsageService } from './../../services';
import { CourseProgressService, UsageService } from './../../services';
import * as _ from 'lodash-es';
import * as dayjs from 'dayjs';
import { DomSanitizer } from '@angular/platform-browser';
import { UserService } from '@sunbird/core';
import { ToasterService, ResourceService, INoResultMessage, NavigationHelperService } from '@sunbird/shared';
......@@ -29,13 +31,16 @@ export class UsageReportsComponent implements OnInit, AfterViewInit {
telemetryInteractEdata: IInteractEventEdata;
telemetryInteractDownloadEdata: IInteractEventEdata;
downloadUrl;
public courseProgressService: CourseProgressService;
@ViewChild(TelemetryInteractDirective) telemetryInteractDirective;
constructor(private usageService: UsageService, private sanitizer: DomSanitizer,
public userService: UserService, private toasterService: ToasterService,
public resourceService: ResourceService, activatedRoute: ActivatedRoute, private router: Router,
public navigationhelperService: NavigationHelperService
public navigationhelperService: NavigationHelperService,
courseProgressService: CourseProgressService
) {
this.activatedRoute = activatedRoute;
this.courseProgressService = courseProgressService;
}
ngOnInit() {
......@@ -108,7 +113,7 @@ export class UsageReportsComponent implements OnInit, AfterViewInit {
renderFiles(files, data) {
this.files = [];
_.forEach(files, file => {
_.forEach(files, file => {
const fileData: any = {};
fileData.id = _.get(file, 'id');
fileData.name = _.get(file, 'name');
......@@ -123,6 +128,25 @@ export class UsageReportsComponent implements OnInit, AfterViewInit {
} else {
this.isFileDataLoaded = false;
}
_.forEach(this.files, file => {
const path = (file.downloadUrl).replace('/reports/', '');
const requestParams = {
params: {
fileNames: JSON.stringify({ path })
},
telemetryData: this.activatedRoute
};
this.courseProgressService.getReportsMetaData(requestParams).subscribe((response) => {
if (_.get(response, 'responseCode') === 'OK') {
file.size = (_.get(response, 'result.path.fileSize')) / 1024;
if (_.get(response, 'result.path.lastModified')) {
file.createdOn = dayjs(new Date(_.get(response, 'result.path.lastModified'))).format('DD MMM YYYY');
} else {
file.createdOn = '';
}
}
});
});
}
createChartData(charts, data, downloadUrl) {
......
......@@ -182,6 +182,7 @@ const getLastModifiedDate = async (req, res) => {
lastModified: _.get(blob, 'value.lastModified'),
reportname: _.get(blob, 'value.reportname'),
statusCode: _.get(blob, 'value.statusCode'),
fileSize: _.get(blob, 'value.contentLength')
}
}
});
......
......@@ -262,7 +262,7 @@ frmelmnts.lbl.dashboard.description = Description
frmelmnts.lbl.dashboard.download = Download
frmelmnts.lbl.dashboard.downloadfile = Download file
frmelmnts.lbl.dashboard.fileName = File name
frmelmnts.lbl.dashboard.fileSize = File Size
frmelmnts.lbl.dashboard.fileSize = File Size (KB)
frmelmnts.lbl.dashboardcertificateStatus = Certificate Status
frmelmnts.lbl.dashboardfiveweeksfilter = LAST 5 WEEKS
frmelmnts.lbl.dashboardfourteendaysfilter = LAST 14 DAYS
......
This diff is collapsed.
......@@ -55,7 +55,7 @@ module.exports = function (app) {
app.get('/course-reports/metadata',
proxyUtils.verifyToken(),
reportHelper.validateRoles(['CONTENT_CREATOR', 'REPORT_VIEWER', 'REPORT_ADMIN']),
reportHelper.validateRoles(['CONTENT_CREATOR', 'REPORT_VIEWER', 'REPORT_ADMIN', 'ORG_ADMIN']),
reportHelper.getLastModifiedDate);
app.get(`/reports/fetch/:slug/:filename`,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment