FEATURE: It's now possible to define a filter end date.

symbiote-library · Jan 14, 2019 · 7a99f2d · 7a99f2d
1 parent 2f32b92
commit 7a99f2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/code/model/ListFilterCalendarEventDateRange.php b/code/model/ListFilterCalendarEventDateRange.php
@@ -5,6 +5,7 @@
 if (class_exists('CalendarDateTime')) {
 
 class ListFilterCalendarEventDateRange extends ListFilterDateRange {
+
 	/**
 	 * Use 'StartDate' from CalendarDateTime class.
 	 *
@@ -74,7 +75,7 @@ public function getFilterData(DataObject $record) {
 	 */
 	public function applyFilter(SS_List $list, array $data) {
 		$start = isset($data['StartDate']) ? $data['StartDate'] : null;
-		$end = isset($data['EndDate']) ? $data['EndDate'] : null;
+		$end = isset($data['EndDate']) ? $data['EndDate'] : $this->getEndDateDefault();
 
 		// Get `CalendarDateTime` class used. Defaults to `CalendarDateTime`.
 		$class = $list->dataClass();

diff --git a/code/model/ListFilterDateRange.php b/code/model/ListFilterDateRange.php
@@ -4,6 +4,7 @@ class ListFilterDateRange extends ListFilterBase {
 	private static $db = array(
 		'StartDateField' => 'Varchar(60)',
 		'EndDateField'   => 'Varchar(60)',
+		'DefaultDaysToDisplay' => 'Int'
 	);
 
 	private static $defaults = array(
@@ -30,8 +31,10 @@ public function getCMSFields() {
 				$classDbFields = ArrayLib::valuekey($classDbFields);
 				$dbFields = array_merge($dbFields, $classDbFields);
 			}
-			$fields->addFieldToTab('Root.Main', $field = DropdownField::create('StartDateField', 'Start Date Field', $dbFields));
-			$fields->addFieldToTab('Root.Main', $field = DropdownField::create('EndDateField', 'End Date Field', $dbFields));
+			$fields->addFieldToTab('Root.Main', DropdownField::create('StartDateField', 'Start Date Field', $dbFields));
+			$fields->addFieldToTab('Root.Main', DropdownField::create('EndDateField', 'End Date Field', $dbFields));
+			$fields->addFieldToTab('Root.Main', NumericField::create('DefaultDaysToDisplay')
+		);
 		});
 		$fields = parent::getCMSFields();
 		return $fields;
@@ -43,7 +46,7 @@ public function getCMSFields() {
 	public function getFilterFields() {
 		$fields = parent::getFilterFields();
 		$fields->push(DateField::create('StartDate', _t('ListFilterDateRange.START_DATE', 'Start Date')));
-		$fields->push(DateField::create('EndDate', _t('ListFilterDateRange.END_DATE', 'End Date')));
+		$fields->push(DateField::create('EndDate', _t('ListFilterDateRange.END_DATE', 'End Date'), $this->getEndDateDefault()));
 		return $fields;
 	}
 
@@ -73,7 +76,7 @@ public function getFilterData(DataObject $record) {
 	 */
 	public function applyFilter(SS_List $list, array $data) {
 		$start = isset($data['StartDate']) ? $data['StartDate'] : null;
-		$end = isset($data['EndDate']) ? $data['EndDate'] : null;
+		$end = isset($data['EndDate']) ? $data['EndDate'] : $this->getEndDateDefault();
 		if (!$start && !$end) {
 			return;
 		}
@@ -142,4 +145,8 @@ public function getContext() {
 			return implode(',', $result);
 		}
 	}
+
+	public function getEndDateDefault() {
+		return $this->DefaultDaysToDisplay ? date('Y-m-d', strtotime("+{$this->DefaultDaysToDisplay} days")) : null;
+	}
 }
diff --git a/code/model/ListFilterSolrDateRange.php b/code/model/ListFilterSolrDateRange.php
@@ -18,7 +18,7 @@ public function getCMSFields()
 	 */
 	public function applyFilter(SS_List $list, array $data) {
         $start = isset($data['StartDate']) ? $data['StartDate'] : null;
-		$end = isset($data['EndDate']) ? $data['EndDate'] : null;
+		$end = isset($data['EndDate']) ? $data['EndDate'] : $this->getEndDateDefault();
 
 		if (!$start && !$end) {
 			return;