From ca2cd85329214962c0321599cda28e2bf7d5022a Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 12 Apr 2016 16:10:09 -0400
Subject: [PATCH] Fixed multi-picklist layout issues, date search now working
 in admin.

---
 models/admin/events/list.php         | 64 +++++++++++++++++++++-
 views/admin/events/editSchedule.html |  8 +--
 views/admin/events/index.html        |  2 +-
 views/admin/events/list.html         | 81 +++++++++++++---------------
 4 files changed, 105 insertions(+), 50 deletions(-)

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index f1168de..07dbc43 100644
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -103,6 +103,8 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
         $eventAdded = false;
         $eventAddError = false;
         $view = 'list';
+        $fromDate = false;
+        $toDate = false;
         $filterArchived = false;
         $filterPending = false;
         $eventDeleted = false;
@@ -467,7 +469,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             case 'list':
             default:
 
-                $where = '';
+                $where = 'true';
 
                 // Add "selected" element default false;
                 reset($categories);
@@ -475,6 +477,64 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
                     $categories[$k]['selected'] = false;
                 }
 
+                // Check if there is a category filter (multi-select)
+                if (isset($_REQUEST['filterCategories']) && count($_REQUEST['filterCategories']) > 0) {
+
+                    $cats = '';
+                    $catsSep = '';
+
+                    // For each selected category
+                    foreach($_REQUEST['filterCategories'] as $c) {
+                        $cats .= $catsSep.$c;
+                        $catsSep = ',';
+                        $categories[$c]['selected'] = true;
+                    }
+
+                    $where .= " AND T.id in (
+                            SELECT DISTINCT(EC.event)
+                              FROM ".GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX."event_categories EC,
+                                   ".GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX."categories C
+                             WHERE (
+                                   EC.category in ($cats)
+                                   OR (C.parent in ($cats) AND EC.category = C.id)
+                                   )
+                    )";
+                }
+
+                // If we have a From date
+                if (isset($_REQUEST['fromDate']) && trim($_REQUEST['fromDate']) != '') {
+                    $fromDate = date('m/d/Y', strtotime($_REQUEST['fromDate']));
+                    $fromMYSQL = date('Y-m-d', strtotime($fromDate));
+                }
+
+                // If we have a to Date
+                if (isset($_REQUEST['toDate']) && trim($_REQUEST['toDate']) != '') {
+                    $toDate = date('m/d/Y', strtotime($_REQUEST['toDate']));
+                    $toMYSQL = date('Y-m-d', strtotime($toDate." +1 day"));
+
+                // If we have a from but not a to date, use from as the to but don't populate the to field
+                } elseif ($fromDate) {
+                    $toDate = date('m/d/Y', strtotime($_REQUEST['fromDate']));
+                    $toMYSQL = date('Y-m-d', strtotime($toDate." +1 day"));
+                    $toDate = false;
+                }
+
+                // If we have from and to dates, do search for those inclusive
+                if ($fromDate) {
+                    $where .= "
+                        AND T.id in (
+                            SELECT DISTINCT(event)
+                              FROM ".GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX."times
+                             WHERE (
+                                    start_time BETWEEN '$fromMYSQL' AND '$toMYSQL'
+                                    OR
+                                    end_time BETWEEN '$fromMYSQL' AND '$toMYSQL'
+                                    )
+                               AND active
+                        )
+                    ";
+                }
+
                 // Check if the list is for a specific member
                 if (defined('GLM_EVENTS_MEMBER_MENU') && $memberID) {
                     $where .= "T.ref_dest = $memberID";
@@ -539,6 +599,8 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             'eventAddError' => $eventAddError,
             'numbEvents' => $numbEvents,
             'categories' => $categories,
+            'fromDate' => $fromDate,
+            'toDate' => $toDate,
             'filterArchived' => $filterArchived,
             'filterPending' => $filterPending,
             'eventDeleted' => $eventDeleted,
diff --git a/views/admin/events/editSchedule.html b/views/admin/events/editSchedule.html
index 49915f8..7e2b496 100644
--- a/views/admin/events/editSchedule.html
+++ b/views/admin/events/editSchedule.html
@@ -34,25 +34,25 @@
                                 </td>
                             </tr>
                             <tr class="not-all-day-{$r.id}{if $r.all_day.value} glm-hidden{/if}">
-                                <th>Start Time:</th>
+                                <th {if $newRecurrence.fieldRequired.start_time}class="glm-required"{/if}>Start Time:</th>
                                 <td>
                                     <input data-id="{$r.id}" type="text" name="Recur{$r.id}_start_time" value="{trim($r.start_time.time)}" class="glm-form-text-input-veryshort glm-time-input recurrence-input">
                                     <input data-id="{$r.id}" type="checkbox" name="Recur{$r.id}_start_time_only" class="start-time-only-checkbox recurrence-input" {if $r.start_time_only.value} checked{/if}> Start time only
                                 </td>
                             </tr>
                             <tr id="endTimeRow_{$r.id}" class="not-all-day-{$r.id}{if $r.all_day.value} glm-hidden{/if}">
-                                <th>End Time:</th>
+                                <th {if $newRecurrence.fieldRequired.end_time}class="glm-required"{/if}>End Time:</th>
                                 <td><input data-id="{$r.id}" type="text" name="Recur{$r.id}_end_time" value="{trim($r.end_time.time)}" class="glm-form-text-input-veryshort glm-time-input recurrence-input"></td>
                             </tr>
                             <tr><td colspan="2">&nbsp;</td></tr>
                             <tr>
-                                <th>Start Date:</th>
+                                <th {if $newRecurrence.fieldRequired.from_date}class="glm-required"{/if}>Start Date:</th>
                                 <td>
                                     <input data-id="{$r.id}" type="text" name="Recur{$r.id}_from_date" value="{$r.from_date.date}" class="glm-form-text-input-small glm-date-input recurrence-input" placeholder="Click to Select Date/Time">
                                 </td>
                             </tr>
                             <tr>
-                                <th>End Date:</th>
+                                <th {if $newRecurrence.fieldRequired.to_date}class="glm-required"{/if}>End Date:</th>
                                 <td>
                                     <input data-id="{$r.id}" type="text" name="Recur{$r.id}_to_date" value="{$r.to_date.date}" class="glm-form-text-input-small glm-date-input recurrence-input" placeholder="Click to Select Date/Time">
                                 </td>
diff --git a/views/admin/events/index.html b/views/admin/events/index.html
index ae3a3e0..303b398 100644
--- a/views/admin/events/index.html
+++ b/views/admin/events/index.html
@@ -36,7 +36,7 @@
     </table>
 
 {if $pending}
-    <h3 class="glm-error">&nbsp;<br>Pending Events</h3>
+    <h3 class="glm-error">&nbsp;<br>Events Pending Review</h3>
     
     <table class="wp-list-table widefat fixed posts glm-admin-table"">
         <thead>
diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index 4bbc513..2cb8736 100644
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -3,7 +3,7 @@
 {else}
     {include file='admin/events/header.html'}
 {/if}
-    
+
 
 {if apply_filters('glm_members_permit_admin_events_index_add_event', true)}
     <h2 style="margin-bottom: 1em;">
@@ -18,27 +18,27 @@
     </h2>
 {/if}
 
-    <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm" class="glm-right">
+    <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
         <input type="hidden" name="glm_action" value="list">
-        <table>
-            <tr>
-                <th>Events Found:</th><td><span style="margin-right: 2em;">{$numbEvents}</span></td>
-                <th>Categories:</th>
-                <td style="min-width: 25em; padding-right: 1em;">
-                    <select id="filterCategories" name="filterCategories[]" multiple="multiple">
-    {foreach from=$categories item=v}
-                        <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
-                            {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                        </option>
-    {/foreach}
-                    </select>
-                </td>
-                <td><input type="submit" value="Submit" style="margin-right: 2em;"></td>
-                <th>Show Archived:</th><td><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;"></td>
-                <th>Pending Only:</th><td><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if} style="margin-right: 1em;"></td>
-                <th>Text Search:</th><td><input  id="glmEventsSearch" type="text" id="autoTest"></td>
-            </tr>
-       </table>
+        <div class="glm-right" style="text-align: right;">
+            <p>
+                <b>From Date: </b><input type="text" name="fromDate" value="{$fromDate}" class="glm-form-text-input-short glm-date-input">
+                <b>To Date: </b><input type="text" name="toDate" value="{$toDate}" class="glm-form-text-input-short glm-date-input">
+                <b>Categories:&nbsp;</b>
+                <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
+        {foreach from=$categories item=v}
+                    <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
+                        {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
+                    </option>
+        {/foreach}
+                </select>
+                <input type="submit" value="Submit">
+            </p><p>
+                <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
+                <b>Pending Only: </b><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if} style="margin-right: 1em;">
+                <b>Text Search: </b><input  id="glmEventsSearch" type="text" id="autoTest"><br>
+            <p>
+        </div>
     </form>
     
     <table class="wp-list-table striped glm-admin-table">
@@ -46,7 +46,7 @@
             <tr>
                 <th>ID</th>
                 <th>Event Name</th>
-                <th>Member</th>                
+                <th>Member</th>
                 <th>Status</th>
                 <th>Created</th>
                 <th>Updated</th>
@@ -57,7 +57,7 @@
 {if $events}
     {assign var="i" value="0"}
     {foreach $events as $e}
-        {if $i++ is odd by 1} 
+        {if $i++ is odd by 1}
             <tr>
         {else}
             <tr class="alternate">
@@ -97,44 +97,44 @@
 
     <script type="text/javascript">
         jQuery(document).ready(function($) {
-            
+
             // Add Event Button Action
             $('#addEventButton').click( function() {
                 window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=list&option=add";
             });
-            
+
             // Date Input
             $('.glm-date-input').datepicker();
-            
-            // Flash certain elements for a short time after display      
+
+            // Flash certain elements for a short time after display
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
 
             // Filter triggers
             $(".listFilter" ).change( function() {
-                
+
                 var filter = '';
-                
+
                 // Check for archived filter
                 if ($("#filterArchived").attr('checked')) {
                     filter += '&filterArchived=true';
                 }
-                
+
                 // Check for pending data filter
                 if ($("#filterPending").attr('checked')) {
                     filter += '&filterPending=true';
                 }
-                
+
                 window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=list" + filter;
-                
+
                 return false;
             });
-            
+
             /*
              * Do autocomplete search for member
              * label: What will be searched
              * value: What will be displayed when selected
              * id: Member id added so we can go to the member while showing what was selected
-             * Also note that autocomplete does not properly render HTML codes, so we 
+             * Also note that autocomplete does not properly render HTML codes, so we
              * "unescape" them for HTML in Smarty.
              */
 
@@ -159,17 +159,10 @@
              });
 
              // Expand multi-select on hover
-             $('#filterCategories').multiselect({
-                 columns: 1,
-                 placeholder: 'Click to select categories',
-                 search: 1,
-                 selectAll: true,
-                 maxWidth: 200
-             });
-             
-             
+             $('#filterCategories').multiselect();
+
         });
     </script>
-            
+
 
 {include file='admin/footer.html'}
-- 
2.17.1