diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js index 0ba2ef4aba472b929be1553ebe02246e69ea8f87..a361f586398fd29c58f1665fa1df6e282024d603 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js @@ -481,30 +481,6 @@ class ViewSchedulingUnit extends Component { scheduletask.type_value = task.specifications_template.type_value; scheduletask.produced_by = task.produced_by; scheduletask.produced_by_ids = task.produced_by_ids; - - for (const blueprint of task['task_blueprints']) { - let taskblueprint = {}; - taskblueprint['tasktype'] = 'Blueprint'; - taskblueprint['actionpath'] = '/task/view/blueprint/' + blueprint['id']; - taskblueprint['blueprint_draft'] = this.getLinksList(blueprint['draft_id'], 'draft');; - taskblueprint['status'] = blueprint['status']; - - for (const key of commonkeys) { - taskblueprint[key] = blueprint[key]; - } - taskblueprint['created_at'] = moment(blueprint['created_at'], moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT); - taskblueprint['updated_at'] = moment(blueprint['updated_at'], moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT); - taskblueprint.duration = moment.utc((taskblueprint.duration || 0) * 1000).format(UIConstants.CALENDAR_TIME_FORMAT); - taskblueprint.relative_start_time = moment.utc(taskblueprint.relative_start_time * 1000).format(UIConstants.CALENDAR_TIME_FORMAT); - taskblueprint.relative_stop_time = moment.utc(taskblueprint.relative_stop_time * 1000).format(UIConstants.CALENDAR_TIME_FORMAT); - taskblueprint.template = scheduletask.template; - taskblueprint.subTasks = blueprint.subtasks; - for (const subtask of taskblueprint.subTasks) { - subtask.subTaskTemplate = _.find(this.subtaskTemplates, ['id', subtask.specifications_template_id]); - } - //Add Blue print details to array - scheduletasklist.push(taskblueprint); - } //Add Task Draft details to array scheduletasklist.push(scheduletask); } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js index 72352a6a07c1dc2c3609b92bf570d40c38686f3f..7ea92a0c80ac26671b836799d5a9e971d9970280 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js @@ -182,7 +182,7 @@ class WorkflowList extends Component{ }); assignedTo = assignedTo.slice(0, -2); wfSU['assignedTo'] = assignedTo; */ - wfSU['actionpath'] = `/schedulingunit/${wfSU.id}/workflow`; + wfSU['actionpath'] = `/schedulingunit/${wfSU.su}/workflow`; workflowProcessList.push(wfSU); } }