From 2f225d672d6d7e7bcf224058bb7060478a069baa Mon Sep 17 00:00:00 2001
From: Ramesh Kumar <ramesh.p@matriotsolutions.com>
Date: Fri, 22 Oct 2021 19:29:08 +0530
Subject: [PATCH] TMSS-1063: Completed % field value taken form feedback doc.
Data size conversion changed as the value from backend will be in GB.
---
.../frontend/tmss_webapp/src/routes/Task/dataproduct.js | 6 ++++--
SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/dataproduct.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/dataproduct.js
index 11ef48d543d..497232b2dea 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/dataproduct.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/dataproduct.js
@@ -70,7 +70,8 @@ export class DataProduct extends Component{
await DataProductService.getSubtaskInputDataproduct(id).then(async inputdata =>{
for(const dataproduct of inputdata.data){
dataproduct['type'] = 'Input';
- dataproduct['size'] = UnitConverter.getUIResourceUnit('bytes', dataproduct['size']);
+ dataproduct['size'] = UnitConverter.getUIResourceUnit('gb', dataproduct['size']);
+ dataproduct['completed'] = dataproduct.feedback_doc.percentage_written;
dataproduct['fullpath'] = dataproduct['directory'];
dataproduct['storagelocation'] = storageLocation;
dataproducts.push(dataproduct);
@@ -79,7 +80,8 @@ export class DataProduct extends Component{
await DataProductService.getSubtaskOutputDataproduct(id).then(outputdata =>{
for(const dataproduct of outputdata.data){
dataproduct['type'] = 'Output';
- dataproduct['size'] = UnitConverter.getUIResourceUnit('bytes', dataproduct['size']);
+ dataproduct['size'] = UnitConverter.getUIResourceUnit('gb', dataproduct['size']);
+ dataproduct['completed'] = dataproduct.feedback_doc.percentage_written;
dataproduct['fullpath'] = dataproduct['directory'];
dataproduct['storagelocation'] = storageLocation;
dataproducts.push(dataproduct);
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
index a5f59b0b9d6..2a83e57ec72 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js
@@ -5,6 +5,7 @@ const UnitConverter = {
resourceUnitMap: {
'time': { display: 'Hours', conversionFactor: 3600, mode: 'decimal', minFractionDigits: 0, maxFractionDigits: 2 },
'bytes': { display: 'TB', conversionFactor: (1024 * 1024 * 1024 * 1024), mode: 'decimal', minFractionDigits: 0, maxFractionDigits: 3 },
+ 'gb': { display: 'TB', conversionFactor: (1024), mode: 'decimal', minFractionDigits: 0, maxFractionDigits: 3 },
'number': { display: 'Numbers', conversionFactor: 1, mode: 'decimal', minFractionDigits: 0, maxFractionDigits: 0 },
'days': { display: 'Days', conversionFactor: (3600 * 24), mode: 'decimal', minFractionDigits: 0, maxFractionDigits: 0 }
},
--
GitLab