From 33a75bee0b91794f83c0e1f150945ad3881a3225 Mon Sep 17 00:00:00 2001
From: Muthu <rspmkn@gmail.com>
Date: Fri, 7 Aug 2020 12:14:02 +0530
Subject: [PATCH] TMSS-243: Updated for quantity for unit convertion
Unit convertion based on quanity values
---
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js | 2 +-
SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js | 2 +-
SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
index cfb08e5d9ff..41f0f97e5bf 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -105,7 +105,7 @@ export class ProjectEdit extends Component {
let projectQuota = {};
if (project) {
// Get project_quota for the project and asssign to the component variable
- for (const id of project.project_quota_ids) {
+ for (const id of project.quota_ids) {
let quota = await ProjectService.getProjectQuota(id);
let resource = _.find(resourceList, ['name', quota.resource_type_id]);
quota.resource = resource;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
index cfcfe65aa8a..5cf4e6312a1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
@@ -59,7 +59,7 @@ export class ProjectView extends Component {
}
// For every project quota, get the resource type & assign to the resource variable of the quota object
- for (const id of project.project_quota_ids) {
+ for (const id of project.quota_ids) {
let quota = await ProjectService.getProjectQuota(id);
let resource = _.find(resources, ['name', quota.resource_type_id]);
quota.resource = resource;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
index 328c7b20ee0..b2cb23bfc8e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
@@ -152,7 +152,7 @@ const ProjectService = {
try{
await resourceTypes.forEach(resourcetype => {
if(resourcetype.name === resource_type_id){
- res_unit_type = resourcetype.name;
+ res_unit_type = resourcetype.quantity_value;
return res_unit_type;
}
});
@@ -172,7 +172,7 @@ const ProjectService = {
})
.then( async ()=>{
for(const project of projects){
- for(const id of project.project_quota_ids){
+ for(const id of project.quota_ids){
await ProjectService.getProjectQuota(id).then(async quota =>{
await this.getResourceUnitType(quota.resource_type_id, results.resourcetypes)
.then(resourceType =>{
--
GitLab