From 5d8c608e70b7bd4e7e9aa8bd301370c9ddfc00ad Mon Sep 17 00:00:00 2001
From: Leonardo Campos <leonardoscampos@gmail.com>
Date: Tue, 14 Feb 2017 23:50:46 -0200
Subject: [PATCH] LT-412: Study list needs default date filter

---
 .../ohif-study-list/both/schema/servers.js    |  7 +++++-
 .../studylistResult/studylistResult.js        | 22 ++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Packages/ohif-study-list/both/schema/servers.js b/Packages/ohif-study-list/both/schema/servers.js
index 439ad5123..1b884000b 100644
--- a/Packages/ohif-study-list/both/schema/servers.js
+++ b/Packages/ohif-study-list/both/schema/servers.js
@@ -158,7 +158,12 @@ export const UISettings = new SimpleSchema({
         type: String,
         label: 'Auto position text call-outs for measurements when creating them.',
         defaultValue: 'TRBL'
-    }
+    },
+    studyListDateFilterNumDays: {
+        type: Number,
+        label: 'Number of days to be used on Study List date filter',
+        min: 1
+    }    
 });
 
 export const PublicServerConfig = new SimpleSchema({
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
index 3b5acf465..1772921f0 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
+++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
@@ -234,9 +234,20 @@ Template.studylistResult.onRendered(() => {
     const today = moment();
     const lastWeek = moment().subtract(6, 'days');
     const lastMonth = moment().subtract(29, 'days');
-    const datePicker = instance.$('#studyDate').daterangepicker({
+    const $studyDate = instance.$('#studyDate');
+    const dateFilterNumDays = OHIF.uiSettings.studyListDateFilterNumDays;
+    let startDate, endDate;
+
+    if (dateFilterNumDays) {
+        startDate = moment().subtract(dateFilterNumDays - 1, 'days');
+        endDate = today;
+    }
+
+    const datePicker = $studyDate.daterangepicker({
         maxDate: today,
         autoUpdateInput: true,
+        startDate: startDate,
+        endDate: endDate,
         ranges: {
             Today: [today, today],
             'Last 7 Days': [lastWeek, today],
@@ -244,8 +255,13 @@ Template.studylistResult.onRendered(() => {
         }
     }).data('daterangepicker');
 
-    // Retrieve all studies
-    search();
+    if (startDate && endDate) {
+        datePicker.updateInputText();
+        $studyDate.trigger('change');
+    } else {
+        // Retrieve all studies
+        search();
+    }
 });
 
 function resetSortingColumns(instance, sortingColumn) {