From 51e5c2dade9f2bb34aedf4fb70e91d7306ddb45e Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 4 Feb 2019 08:51:53 -0500
Subject: [PATCH] Adding city and region search form options

Adding management options for adding city and regions to the front end
search form.
---
 classes/data/dataManagement.php                  | 16 ++++++++++++++++
 index.php                                        |  2 +-
 ...e_V0.1.12.sql => create_database_V0.1.13.sql} |  2 +-
 setup/databaseScripts/dbVersions.php             |  1 +
 .../databaseScripts/update_database_V0.1.13.sql  | 13 +++++++++++++
 views/admin/management/events.html               |  7 +++++++
 6 files changed, 39 insertions(+), 2 deletions(-)
 rename setup/databaseScripts/{create_database_V0.1.12.sql => create_database_V0.1.13.sql} (99%)
 create mode 100644 setup/databaseScripts/update_database_V0.1.13.sql

diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php
index 467ccb9..6fd7e2f 100644
--- a/classes/data/dataManagement.php
+++ b/classes/data/dataManagement.php
@@ -289,6 +289,22 @@ class GlmDataEventsManagement extends GlmDataAbstract
                 'use'     => 'a'
             ),
 
+            // Show city in search form
+            'show_search_city' => array(
+                'field'   => 'show_search_city',
+                'type'    => 'checkbox',
+                'default' => false,
+                'use'     => 'a'
+            ),
+
+            // Show region in search form
+            'show_search_region' => array(
+                'field'   => 'show_search_region',
+                'type'    => 'checkbox',
+                'default' => false,
+                'use'     => 'a'
+            ),
+
             // Turn on required fields for Michigan.org
             'michigan_org_requirements' => array(
                 'field'   => 'michigan_org_requirements',
diff --git a/index.php b/index.php
index d7b0d1f..98117e2 100755
--- a/index.php
+++ b/index.php
@@ -44,7 +44,7 @@ if (!defined('ABSPATH')) {
  *  version from this plugin.
  */
 define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.7.18');
-define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.12');
+define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.13');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15');
diff --git a/setup/databaseScripts/create_database_V0.1.12.sql b/setup/databaseScripts/create_database_V0.1.13.sql
similarity index 99%
rename from setup/databaseScripts/create_database_V0.1.12.sql
rename to setup/databaseScripts/create_database_V0.1.13.sql
index 9252e16..46f5e3a 100644
--- a/setup/databaseScripts/create_database_V0.1.12.sql
+++ b/setup/databaseScripts/create_database_V0.1.13.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database - Events Add-On
 -- File Created: 08/18/17
--- Database Version: 0.1.12
+-- Database Version: 0.1.13
 -- Database Creation Script
 --
 -- This file is called to create a new set of tables for this
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 578dd2c..104236c 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -48,5 +48,6 @@ $glmMembersEventsDbVersions = array(
     '0.1.10' => array('version' => '0.1.10', 'tables' => 13, 'date' => '10/19/2018'),
     '0.1.11' => array('version' => '0.1.11', 'tables' => 13, 'date' => '01/07/2019'),
     '0.1.12' => array('version' => '0.1.12', 'tables' => 13, 'date' => '01/30/2019'),
+    '0.1.13' => array('version' => '0.1.13', 'tables' => 13, 'date' => '02/04/2019'),
 );
 
diff --git a/setup/databaseScripts/update_database_V0.1.13.sql b/setup/databaseScripts/update_database_V0.1.13.sql
new file mode 100644
index 0000000..5f40281
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.1.13.sql
@@ -0,0 +1,13 @@
+-- Gaslight Media Members Database  - Events Add-On
+-- File Created: 02/04/19
+-- Database Version: 0.1.13
+-- Database Update From Previous Version Script
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+ALTER TABLE {prefix}management ADD COLUMN show_search_city BOOLEAN DEFAULT '0';       -- Show city in search form
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN show_search_region BOOLEAN DEFAULT '0';       -- Show region in search form
diff --git a/views/admin/management/events.html b/views/admin/management/events.html
index 57dd5eb..bf8b127 100644
--- a/views/admin/management/events.html
+++ b/views/admin/management/events.html
@@ -110,6 +110,13 @@
                                 <label> <input type="checkbox" name="sort_by_featured_in_agenda" {if $eventsSettings.fieldData.sort_by_featured_in_agenda.value}checked{/if}> Sort first by featured events in agenda view </label><br><br>
                             </td>
                         </tr>
+                        <tr>
+                            <th>Front-End Event Search Form</th>
+                            <td>
+                                <label> <input type="checkbox" name="show_search_city" {if $eventsSettings.fieldData.show_search_city.value}checked{/if}> Show City Search</label><br><br>
+                                <label> <input type="checkbox" name="show_search_region" {if $eventsSettings.fieldData.show_search_region.value}checked{/if}> Show Region Search</label><br><br>
+                            </td>
+                        </tr>
                         <tr>
                             <th>Front-End View Styles</th>
                             <td>
-- 
2.17.1