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 cfb08e5d9ff078c263694a391dffbf76b91db01c..41f0f97e5bf3ae358e021295527633c977e65a45 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 cfcfe65aa8a907f3b12c4e39e49c3bd04e066f67..5cf4e6312a1b43466aec1fdf2d9e1c07ec6e7623 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 328c7b20ee06f20c2c310457e962e5840790e1ea..b2cb23bfc8e74a85193c95a4f29fdced19a7ff21 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 =>{