diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js index e8df560a75cc56560d2eb39adc94a404697e259d..64a96b3f0a9b6ba7ff8a99cf52d416e0e49a23a0 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js @@ -255,10 +255,12 @@ export class ProjectCreate extends Component { let projectQuota = []; for (const resource in this.state.projectQuota) { let resourceType = _.find(this.state.resources, {'name': resource}); - let quota = { project: this.state.project.name, - resource_type: resourceType['url'], - value: this.state.projectQuota[resource] * (this.resourceUnitMap[resourceType.quantity_value]?this.resourceUnitMap[resourceType.quantity_value].conversionFactor:1)}; - projectQuota.push(quota); + if(resourceType){ + let quota = { project: this.state.project.name, + resource_type: resourceType['url'], + value: this.state.projectQuota[resource] * (this.resourceUnitMap[resourceType.quantity_value]?this.resourceUnitMap[resourceType.quantity_value].conversionFactor:1)}; + projectQuota.push(quota); + } } ProjectService.saveProject(this.state.project, this.defaultResourcesEnabled?projectQuota:[]) .then(project => { @@ -306,11 +308,12 @@ export class ProjectCreate extends Component { this.setState({ dialog: { header: '', detail: ''}, project: { + url: '', name: '', description: '', trigger_priority: 1000, priority_rank: null, - project_quota: [] + quota: [] }, projectQuota: projectQuota, validFields: {}, diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/ScheduleService.js b/SAS/TMSS/frontend/tmss_webapp/src/services/ScheduleService.js deleted file mode 100644 index d2d5285744fd955b4ea115424a322b3be51976cf..0000000000000000000000000000000000000000 --- a/SAS/TMSS/frontend/tmss_webapp/src/services/ScheduleService.js +++ /dev/null @@ -1,52 +0,0 @@ -import axios from 'axios' - -export async function getScheduling_Unit_Draft(){ - let res = []; - await axios.get('/api/scheduling_unit_draft/?ordering=id', { - headers: { - "Content-Type": "application/json", - "Authorization": "Basic dGVzdDp0ZXN0" - } - } - ).then(function(response) { - res= response; - - }).catch(function(error) { - console.log('Error on Authentication',error); - }); - return res; -} - -export async function getScheduling_Unit_Draft_By_Id(id){ - let res = []; - await axios.get('/api/scheduling_unit_draft/'+id, { - headers: { - "Content-Type": "application/json", - "Authorization": "Basic dGVzdDp0ZXN0" - } - } - ).then(function(response) { - res= response; - }).catch(function(error) { - console.log('Error on Authentication',error); - }); - return res; -} - -export async function getTasks_Draft_By_scheduling_Unit_Id(id){ - let res=[]; - await axios.get('/api/scheduling_unit_draft/'+id+'/task_draft/?ordering=id', { - headers: { - "Content-Type": "application/json", - "Authorization": "Basic dGVzdDp0ZXN0" - } - } - ).then(function(response) { - res= response; - }).catch(function(error) { - console.log('Error on Authentication',error); - }); - return res; -} - - \ No newline at end of file