From 8249cd572e4a919faa5e12e141f318d53169363e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 5 Sep 2018 21:12:10 +0200 Subject: tascquelystte --- app/client/common/taskList.component.js | 35 +++++++++++++++++++++++++++++--- app/client/common/textInput.component.js | 1 + 2 files changed, 33 insertions(+), 3 deletions(-) (limited to 'app/client/common') diff --git a/app/client/common/taskList.component.js b/app/client/common/taskList.component.js index f6383e0..710753f 100644 --- a/app/client/common/taskList.component.js +++ b/app/client/common/taskList.component.js @@ -10,6 +10,15 @@ class TaskList extends Component { constructor(props){ super() } + shouldComponentUpdate(nextProps){ + if (nextProps.tasks.length !== this.props.tasks.length) { + return true + } + if (nextProps.tasks[0] !== this.props.tasks[0]) { + return true + } + return false + } render(){ const { title, tasks } = this.props let time = 0 @@ -17,14 +26,34 @@ class TaskList extends Component { const taskList = tasks.map(mapFn).sort(sortFn).map(pair => { const task = pair[1] const { dataset } = task - let dataset_link; + let dataset_link, label = dataset; + console.log(task) + switch (task.activity) { + case 'train': + if (task.epoch === 0) { + label += ', latest' + } else { + label += ', ' + task.epoch + } + label += ' + ' + task.epochs + break + case 'augment': + try { + const opt = JSON.parse(task.opt) + label += ', ' + opt.augment_take + ' x ' + opt.augment_make + } catch (e) { + // + } + default: + break + } if (task.folder_id) { const href = '/' + task.module + '/' + (task.module === 'samplernn' ? 'datasets' : 'sequences') + '/' + task.folder_id + '/' - dataset_link = {dataset} + dataset_link = {label} } else { - dataset_link = dataset + dataset_link = label } return (
diff --git a/app/client/common/textInput.component.js b/app/client/common/textInput.component.js index 44e1349..d429944 100644 --- a/app/client/common/textInput.component.js +++ b/app/client/common/textInput.component.js @@ -36,6 +36,7 @@ class TextInput extends Component { onKeydown={this.handleKeydown} placeholder={this.props.placeholder} autofocus={this.props.autofocus} + className={this.props.className || ''} />
-- cgit v1.2.3-70-g09d2