archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Refactored Date columns to have a common base

Browse Source
This commit is contained in:
Tobias Johansson
2019-03-28 14:36:30 +01:00
parent b43bb8a696
commit 120ea251bd
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/scripts/js/es6/common/vuecomponents/attracttable/columns/TaskDueDate.js
View File

@@ -1,5 +1,4 @@
let ColumnBase = pillar.vuecomponents.table.columns.ColumnBase; let DateColumnBase = pillar.vuecomponents.table.columns.DateColumnBase;
let CellPrettyDate = pillar.vuecomponents.table.cells.renderer.CellPrettyDate;
function firstDate(prevDate, task) { function firstDate(prevDate, task) {
let candidate = task.properties.due_date; let candidate = task.properties.due_date;
@@ -29,11 +28,7 @@ function nextDate(prevDate, task) {
return prevDate; return prevDate;
} }
class DueDate extends ColumnBase { class DueDate extends DateColumnBase {
getCellRenderer(rowObject) {
return CellPrettyDate.options.name;
}
getCellClasses(dueDate, rowObject) { getCellClasses(dueDate, rowObject) {
let classes = super.getCellClasses(dueDate, rowObject); let classes = super.getCellClasses(dueDate, rowObject);
let isPostDueDate = false; let isPostDueDate = false;
@@ -43,20 +38,6 @@ class DueDate extends ColumnBase {
classes['warning'] = isPostDueDate; classes['warning'] = isPostDueDate;
return classes; 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 { export class FirstTaskDueDate extends DueDate {