diff --git a/SAS/TMSS/client/bin/tmss_cancel_subtask b/SAS/TMSS/client/bin/tmss_cancel_subtask old mode 100644 new mode 100755 diff --git a/SAS/TMSS/client/bin/tmss_unschedule_subtask b/SAS/TMSS/client/bin/tmss_unschedule_subtask old mode 100644 new mode 100755 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 c7a593b4994d98008a4863eba2809a3cf3fb03b7..16196049dd975a89d39abb83101794416a594834 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 @@ -77,6 +77,7 @@ class WorkflowList extends Component{ this.filterslist=[{'name': 'Assigned to me', 'code': 'Assigned to me'},{'name': 'Unassigned', 'code':'Unassigned'},{'name': 'Participated', 'code':'Participated'}]; this.notActiveStages = ['done', 'waiting to be scheduled', 'scheduled' ]; this.close = this.close.bind(this); + this.getFilterOptions = this.getFilterOptions.bind(this); } componentDidMount() { @@ -95,6 +96,7 @@ class WorkflowList extends Component{ } + toggleBySorting = (sortData) => { UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: sortData }); } @@ -112,6 +114,20 @@ class WorkflowList extends Component{ this.defaultSortColumn = this.defaultSortColumn || []; UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: [...this.defaultSortColumn] }); } + + /** + * Get Option-list values for Select Dropdown filter in 'Viewtable' + * @param {String} id : Column id + * @returns + */ + getFilterOptions(id) { + let options = null; + if(id && id === 'Scheduling Unit Status') { + options = UIConstants.SU_STATUS; + } + return options; + } + /** * Prepare Workflow Process data */ @@ -122,8 +138,8 @@ class WorkflowList extends Component{ const schedulingUnit = _.find(this.schedulingUnitList, {'id': wfSU.su}); if(schedulingUnit) { wfSU['suName'] = schedulingUnit.name; - wfSU['project'] = schedulingUnit.draft.scheduling_set.project.name; - + wfSU['project'] = schedulingUnit.draft.scheduling_set.project.name; + wfSU['status'] = schedulingUnit.status; } const workflowTasks = _.orderBy(this.workflowTasksList.filter(item => item.process === wfSU.id), ['id'], ['desc']); const workflowTask = workflowTasks[0]; @@ -140,7 +156,7 @@ class WorkflowList extends Component{ //TODO: this code commented and can be used to show only current task owner details when filter enabled //Get assigned name list - /* let assignedTo = ''; + /* let assignedTo = ''; workflowLastTasks.forEach(task => { if(task.owner) { assignedTo += task.owner+', '; @@ -307,6 +323,7 @@ class WorkflowList extends Component{ showTopTotal={true} showGlobalFilter={true} showColumnFilter={true} + showFilterOption={this.getFilterOptions} //Callback function to provide inputs for option-list in Select Dropdown filter lsKeySortColumn={this.lsKeySortColumn} toggleBySorting={(sortData) => this.toggleBySorting(sortData)} showFilterOption={this.getFilterOptions} //Callback function to provide inputs for option-list in Select Dropdown filter