Skip to content

Commit c079207

Browse files
committed
correct format in datetime and and adjust comment
1 parent 93638b1 commit c079207

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/shared/components/ncTable/mixins/columnsTypes/datetime.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
4646
return super.getNextSortsResult(nextSorts, rowA, rowB)
4747
}
4848

49-
const valueA = new Moment(tmpA, 'YYY-MM-DD HH:mm')
50-
const valueB = new Moment(tmpB, 'YYY-MM-DD HH:mm')
49+
const valueA = new Moment(tmpA, 'YYYY-MM-DD HH:mm')
50+
const valueB = new Moment(tmpB, 'YYYY-MM-DD HH:mm')
5151
return (valueA.diff(valueB)) * factor || super.getNextSortsResult(nextSorts, rowA, rowB)
5252
}
5353
}
@@ -59,8 +59,8 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
5959

6060
isFilterFound(cell, filter) {
6161
const filterValue = filter.magicValuesEnriched ? filter.magicValuesEnriched : filter.value
62-
const filterDate = new Moment(filterValue, 'YYY-MM-DD HH:mm')
63-
const valueDate = new Moment(cell.value, 'YYY-MM-DD HH:mm')
62+
const filterDate = new Moment(filterValue, 'YYYY-MM-DD HH:mm')
63+
const valueDate = new Moment(cell.value, 'YYYY-MM-DD HH:mm')
6464

6565
const filterMethod = {
6666
[FilterIds.IsEqual]() { return filterDate.isSame(valueDate) },

src/shared/components/ncTable/partials/TableHeaderColumnOptions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ export default {
313313
}
314314
},
315315
submitFilterInput() {
316-
// Ignore contains filter with the same value es old contain filters
316+
// Prevents adding duplicate "Contains" or "DoesNotContain" filters with the same value on the same column
317317
if ([FilterIds.Contains, FilterIds.DoesNotContain].includes(this.selectedOperator.id)) {
318318
const columnFilters = this.getFilterForColumn(this.column)
319319
if (columnFilters && columnFilters

0 commit comments

Comments
 (0)