From 120ea251bdd8a9f6e8d87a315037d9c7bf052f95 Mon Sep 17 00:00:00 2001 From: Tobias Johansson Date: Thu, 28 Mar 2019 14:36:30 +0100 Subject: [PATCH] Refactored Date columns to have a common base --- .../attracttable/columns/TaskDueDate.js | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/scripts/js/es6/common/vuecomponents/attracttable/columns/TaskDueDate.js b/src/scripts/js/es6/common/vuecomponents/attracttable/columns/TaskDueDate.js index c08c3ed..018582f 100644 --- a/src/scripts/js/es6/common/vuecomponents/attracttable/columns/TaskDueDate.js +++ b/src/scripts/js/es6/common/vuecomponents/attracttable/columns/TaskDueDate.js @@ -1,5 +1,4 @@ -let ColumnBase = pillar.vuecomponents.table.columns.ColumnBase; -let CellPrettyDate = pillar.vuecomponents.table.cells.renderer.CellPrettyDate; +let DateColumnBase = pillar.vuecomponents.table.columns.DateColumnBase; function firstDate(prevDate, task) { let candidate = task.properties.due_date; @@ -29,11 +28,7 @@ function nextDate(prevDate, task) { return prevDate; } -class DueDate extends ColumnBase { - getCellRenderer(rowObject) { - return CellPrettyDate.options.name; - } - +class DueDate extends DateColumnBase { getCellClasses(dueDate, rowObject) { let classes = super.getCellClasses(dueDate, rowObject); let isPostDueDate = false; @@ -43,20 +38,6 @@ class DueDate extends ColumnBase { classes['warning'] = isPostDueDate; return classes; } - - compareRows(rowObject1, rowObject2) { - let dueDateStr1 = this.getRawCellValue(rowObject1); - let dueDateStr2 = this.getRawCellValue(rowObject2); - if (dueDateStr1 === dueDateStr2) return 0; - if (dueDateStr1 && dueDateStr2) { - return new Date(dueDateStr1) < new Date(dueDateStr2) ? -1 : 1; - } - return dueDateStr1 ? -1 : 1; - } - - getCellTitle(rawCellValue, rowObject) { - return rawCellValue; - } } export class FirstTaskDueDate extends DueDate {