From ce42dbfc8aa8c14306d45f052b5f63c9f6f12597 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 30 Aug 2016 14:21:58 -0400 Subject: [PATCH] Default state selection added to admin mgmt In the admin management one can now select the default state for new events. This will use the main member db default state if it exists, and if the event default is unset. --- classes/data/dataManagement.php | 12 ++++++++++- index.php | 2 +- models/admin/events/list.php | 7 +++++-- models/admin/management/events.php | 5 +++++ ...0.0.21.sql => create_database_V0.0.22.sql} | 3 ++- setup/databaseScripts/dbVersions.php | 1 + .../update_database_V0.0.22.sql | 14 +++++++++++++ views/admin/events/editLocation.html | 6 +++--- views/admin/management/events.html | 21 +++++++++++++++++-- 9 files changed, 61 insertions(+), 10 deletions(-) rename setup/databaseScripts/{create_database_V0.0.21.sql => create_database_V0.0.22.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V0.0.22.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 541534a..8bcef63 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -129,7 +129,17 @@ class GlmDataEventsManagement extends GlmDataAbstract 'required' => true, 'use' => 'a' ), - + + // Default State + 'event_default_state' => array ( + 'field' => 'event_default_state', + 'type' => 'list', + 'list' => $this->config['states'], + 'default' => 'MI', + 'force_list' => true, + 'use' => 'a' + ), + // Logo for Event PDF 'pdf_logo' => array( 'field' => 'pdf_logo', diff --git a/index.php b/index.php index 07e5c33..427adca 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.3.2'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.21'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.22'); // This is the minimum version of the GLM Members DB plugin require for this plugin. define('GLM_MEMBERS_EVENTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '1.0.58'); diff --git a/models/admin/events/list.php b/models/admin/events/list.php index 379c7a7..ec1db08 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -699,7 +699,9 @@ class GlmMembersAdmin_events_list extends GlmDataEvents } } - + if (!$this->config['settings']['event_default_state']) { + $this->config['settings']['event_default_state'] = $this->config['settings']['default_state']; + } $templateData = array( 'lockedToMember' => $lockedToMember, 'option' => $option, @@ -743,7 +745,8 @@ class GlmMembersAdmin_events_list extends GlmDataEvents 'nextStart' => $nextStart, 'start' => $start = 1, 'limit' => $limit, - 'namesList' => $namesList + 'namesList' => $namesList, + 'eventDefaultState' => $this->config['settings']['event_default_state'] ); // Return status, any suggested view, and any data to controller diff --git a/models/admin/management/events.php b/models/admin/management/events.php index b08889d..d040f2d 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -386,6 +386,10 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement $feed['next_runtime'] = wp_next_scheduled( GLM_MEMBERS_EVENTS_PLUGIN_CRON_EVENT, array( (int)$feed['id'] ) ); } } + + // Populate the state list for event default state selection + $event_settings['event_default_state'] = $this->config['states']; + // Compile template data $template_data = array( 'import_feeds' => $import_feeds, @@ -1674,6 +1678,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } $return_string .= "

Adding $event_counter Events

"; } + echo $this->config['states']; $return_string .= "
             Start: $start
"; diff --git a/setup/databaseScripts/create_database_V0.0.21.sql b/setup/databaseScripts/create_database_V0.0.22.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.0.21.sql rename to setup/databaseScripts/create_database_V0.0.22.sql index 62bff53..50bcc8b 100644 --- a/setup/databaseScripts/create_database_V0.0.21.sql +++ b/setup/databaseScripts/create_database_V0.0.22.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Events Add-On -- File Created: 12/02/15 15:27:15 --- Database Version: 0.0.19 +-- Database Version: 0.0.22 -- Database Creation Script -- -- This file is called to create a new set of tables for this @@ -173,6 +173,7 @@ CREATE TABLE {prefix}management ( from_email TINYTEXT NULL, -- Email address of the sender email_notification TEXT NULL, -- Email notification message calendar_view TINYTEXT NULL, -- Default calendar view + event_default_state TINYTEXT NULL, -- Default calendar view PRIMARY KEY (id) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index a737ebf..b32cae7 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -33,5 +33,6 @@ $glmMembersEventsDbVersions = array( '0.0.19' => array('version' => '0.0.19', 'tables' => 8, 'date' => '8/05/2016'), '0.0.20' => array('version' => '0.0.20', 'tables' => 8, 'date' => '8/12/2016'), '0.0.21' => array('version' => '0.0.21', 'tables' => 8, 'date' => '8/25/2016'), + '0.0.22' => array('version' => '0.0.22', 'tables' => 8, 'date' => '8/30/2016'), ); diff --git a/setup/databaseScripts/update_database_V0.0.22.sql b/setup/databaseScripts/update_database_V0.0.22.sql new file mode 100644 index 0000000..4aa9e14 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.22.sql @@ -0,0 +1,14 @@ +-- Gaslight Media Members Database - Events Add-On +-- File Created: 08/30/16 09:47:15 +-- Database Version: 0.0.22 +-- 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 event_default_state TINYTEXT NULL; -- The default state selection + +---- + + diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index f0a3636..f0b7a05 100644 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -102,7 +102,7 @@ {foreach from=$loc.state.list item=v} {/foreach} @@ -243,8 +243,8 @@ diff --git a/views/admin/management/events.html b/views/admin/management/events.html index cd45f82..66acb68 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -51,9 +51,25 @@ {if $eventsSettings.fieldFail.footer_text}

{$eventsSettings.fieldFail.footer_text}

{/if} + + Default State for Events:
(will use plugin default '{$settings.default_state}' for events if unset) + + + + Front-End Calendar View -