From dabb4d5c5ee0848361e7651663195be60554e8b9 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 18 Apr 2017 14:23:05 -0400 Subject: [PATCH] Sort events by First Date If they select the show archived it will empty the From date. From date will be set to the current date automatically. --- models/admin/events/list.php | 8 +++++++- views/admin/events/list.html | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/models/admin/events/list.php b/models/admin/events/list.php index 0a9002d..7e99a1f 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -645,6 +645,10 @@ class GlmMembersAdmin_events_list extends GlmDataEvents $fromDate = date('m/d/Y', strtotime($_REQUEST['fromDate'])); $fromMYSQL = date('Y-m-d', strtotime($fromDate)); $dateWhere = " end_time >= '$fromMYSQL' "; + } else if ( !$filterArchived ) { + $fromDate = date('m/d/Y'); + $fromMYSQL = date('Y-m-d', strtotime($fromDate)); + $dateWhere = " end_time >= '$fromMYSQL' "; } // If we have a to Date @@ -711,7 +715,9 @@ class GlmMembersAdmin_events_list extends GlmDataEvents // Get the list of events and determine number of events in list $saveFLT = $this->postFirstAndLastTimes; $this->postFirstAndLastTimes = true; - $eventsResult = $this->getList($where, 'name', true, 'id', $start, $limit); + $orderBy = 'name'; + $orderBy = "(select min(start_time) FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times WHERE T.id = event),name"; + $eventsResult = $this->getList($where, $orderBy, true, 'id', $start, $limit); $this->postFirstAndLastTimes = $saveFLT; // Get paging results diff --git a/views/admin/events/list.html b/views/admin/events/list.html index dc4b90c..cf0dc0a 100644 --- a/views/admin/events/list.html +++ b/views/admin/events/list.html @@ -148,6 +148,7 @@ $("#filterArchived").on('click', function() { $("#filterPending").attr('checked', false); + $('input[name=fromDate]').val(''); }); $("#filterPending").on('click', function() { -- 2.17.1