From d8b641e46109e91eb751c0c12adb58975e5b9368 Mon Sep 17 00:00:00 2001 From: DebaucheryLibrarian Date: Fri, 25 Feb 2022 22:20:28 +0100 Subject: [PATCH] Removed references to effective date for older databases. --- assets/js/entities/actions.js | 2 +- assets/js/get-date-range.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js index d5ab782a..185ed646 100644 --- a/assets/js/entities/actions.js +++ b/assets/js/entities/actions.js @@ -96,7 +96,7 @@ function initEntitiesActions(store, router) { } } ] - effectiveDate: { + date: { lessThan: $before, greaterThan: $after } diff --git a/assets/js/get-date-range.js b/assets/js/get-date-range.js index e43215a1..98af2279 100644 --- a/assets/js/get-date-range.js +++ b/assets/js/get-date-range.js @@ -7,22 +7,22 @@ const dateRanges = { latest: () => ({ after: '1900-01-01', before: dayjs.utc().toDate(), - orderBy: ['EFFECTIVE_DATE_DESC'], + orderBy: ['DATE_DESC'], }), upcoming: () => ({ after: dayjs.utc().toDate(), before: '2100-01-01', - orderBy: ['EFFECTIVE_DATE_DESC'], + orderBy: ['DATE_DESC'], }), new: () => ({ after: '1900-01-01 00:00:00', before: '2100-01-01', - orderBy: ['CREATED_AT_DESC', 'EFFECTIVE_DATE_ASC'], + orderBy: ['CREATED_AT_DESC', 'DATE_ASC'], }), all: () => ({ after: '1900-01-01', before: '2100-01-01', - orderBy: ['EFFECTIVE_DATE_DESC'], + orderBy: ['DATE_DESC'], }), };