From: Anthony Talarico Date: Thu, 25 Aug 2016 18:37:54 +0000 (-0400) Subject: Merge branch 'develop' into feature/frontCalendar X-Git-Tag: v1.3.3^2~35^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=80c39194dd3412e9f432d98dc1b54912e32b2eaa;p=WP-Plugins%2Fglm-member-db-events.git Merge branch 'develop' into feature/frontCalendar Conflicts: activate.php --- 80c39194dd3412e9f432d98dc1b54912e32b2eaa diff --cc activate.php index 5d1ed58,d460936..db1bb62 --- a/activate.php +++ b/activate.php @@@ -90,12 -89,22 +90,24 @@@ class glmMembersEventsPluginActivat public function create_cron_schedules() { - $importFeeds = new GlmDataFeedImport( $this->wpdb, $this->config ); - $import_feeds = $importFeeds->getList(); - if ( $import_feeds ) { - foreach ( $import_feeds as $key => &$feed ) { - // check the next run time - wp_schedule_event( time(), GLM_MEMBERS_EVENTS_PLUGIN_CRON_RECURRANCE, GLM_MEMBERS_EVENTS_PLUGIN_CRON_EVENT, array( (int)$feed['id'] ) ); ++ + // See if tables exists first + $result = $this->wpdb->get_results( + $this->wpdb->prepare( + "SHOW TABLES LIKE %s", + GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . 'feed_import' + ) + ); + if ( $result ) { + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataFeedImport.php'; + $importFeeds = new GlmDataFeedImport( $this->wpdb, $this->config ); + $import_feeds = $importFeeds->getList(); + if ( $import_feeds ) { + foreach ( $import_feeds as $key => &$feed ) { + // check the next run time + wp_schedule_event( time(), GLM_MEMBERS_EVENTS_PLUGIN_CRON_RECURRANCE, GLM_MEMBERS_EVENTS_PLUGIN_CRON_EVENT, array( (int)$feed['id'] ) ); + } ++ } } } diff --cc classes/data/dataManagement.php index faa7fd1,faa7fd1..541534a --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@@ -144,6 -144,6 +144,13 @@@ class GlmDataEventsManagement extends G 'required' => false, 'use' => 'a' ), ++ // calendar view ++ 'calendar_view' => array( ++ 'field' => 'calendar_view', ++ 'type' => 'text', ++ 'require' => false, ++ 'use' => 'a' ++ ), // Recipient Email 'to_email' => array( 'field' => 'to_email', diff --cc index.php index d40a3b1,d40a3b1..27c2853 --- a/index.php +++ b/index.php @@@ -39,7 -39,7 +39,7 @@@ * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.3.1'); --define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.20'); ++define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.21'); // 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 --cc models/admin/management/events.php index 4585756,4585756..b08889d --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@@ -386,7 -386,7 +386,6 @@@ class GlmMembersAdmin_management_event $feed['next_runtime'] = wp_next_scheduled( GLM_MEMBERS_EVENTS_PLUGIN_CRON_EVENT, array( (int)$feed['id'] ) ); } } -- // Compile template data $template_data = array( 'import_feeds' => $import_feeds, diff --cc models/front/events/list.php index 4c718d7,ed99308..dc4179b --- a/models/front/events/list.php +++ b/models/front/events/list.php @@@ -610,7 -610,7 +610,17 @@@ class GlmMembersFront_events_list exten if ( $event_page_id ) { $mainEventPageUrl = get_permalink( $event_page_id ); } - ++ ++ global $wpdb; ++ $sql = "SELECT calendar_view FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "management"; ++ $calendar_view = $wpdb->get_results($sql, ARRAY_A); ++ if($calendar_view[0]['calendar_view'] === "none" || empty($calendar_view[0]['calendar_view'])){ ++ $calendar_view = "calendar"; ++ } else { ++ $calendar_view = $calendar_view[0]['calendar_view']; ++ } ++ + print_r($calDates); // Compile template data $templateData = array( 'assetsUrl' => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/', @@@ -627,7 -627,7 +637,8 @@@ 'mainEventUrl' => $mainEventPageUrl, 'mainImgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/', 'imgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/', -- 'calDates' => $calDates ++ 'calDates' => $calDates, ++ 'cal_view' => $calendar_view ); error_reporting(E_ALL ^ E_NOTICE); diff --cc setup/databaseScripts/create_database_V0.0.20.sql index 96f0160,96f0160..0000000 deleted file mode 100644,100644 --- a/setup/databaseScripts/create_database_V0.0.20.sql +++ /dev/null @@@ -1,198 -1,198 +1,0 @@@ ---- Gaslight Media Members Database - Events Add-On ---- File Created: 12/02/15 15:27:15 ---- Database Version: 0.0.19 ---- Database Creation Script ---- ---- This file is called to create a new set of tables for this ---- add-on for the most recent database version for this add-on. ---- ---- There should only be one such file in this directory ---- ---- To permit each query below to be executed separately, ---- all queries must be separated by a line with four dashes -- ---- Categories - Categories for events --CREATE TABLE {prefix}categories ( -- id INT NOT NULL AUTO_INCREMENT, -- name TINYTEXT NULL, -- Name of event category -- descr TINYTEXT NULL, -- Description of this category -- parent INT NULL, -- Parent category, null or 0 if this is a top level category -- PRIMARY KEY (id), -- INDEX(parent) --); -- ------ -- ---- Event-Category - Categories for specific event records --CREATE TABLE {prefix}event_categories ( -- id INT NOT NULL AUTO_INCREMENT, -- event INT NULL, -- Pointer to the event -- category INT NULL, -- Pointer to the category -- PRIMARY KEY (id), -- INDEX(event), -- INDEX(category) --); -- ------ -- ---- Event Recurrence - Defines how an event recurs --CREATE TABLE {prefix}recurrences ( -- id INT NOT NULL AUTO_INCREMENT, -- event INTEGER NULL, -- Pointer to event -- name TINYTEXT NULL, -- Name of this recurrence schedule - used on admin calendar -- start_time TIME NULL, -- Start time of day for event -- start_time_only BOOLEAN NULL, -- Use end of first occurrence flag -- end_time TIME NULL, -- End time of day for event - If less than start time, assume a date boundry -- all_day BOOLEAN NULL, -- Flag indicating if this is an all-day event (informational only) -- start_date DATE NULL, -- Starting Date (if all_day is selected) Used instead of start_time -- from_date DATE NULL, -- From Date for recurrences -- to_date DATE NULL, -- To Date for recurrences -- recurring BOOLEAN NULL, -- Flag indicating that event recurs on a schedule rather than all dates -- month_of_year SMALLINT UNSIGNED NULL, -- Month of year (bitmap) -- week_of_month TINYINT UNSIGNED NULL, -- Week of the month (bitmap) -- day_of_week TINYINT UNSIGNED NULL, -- Day of the week (bitmap) -- by_day_of_month BOOLEAN NULL, -- Flag indicating if selecting by days of the month -- day_of_month INTEGER UNSIGNED NULL, -- Day of the month (bitmap) -- last_day_of_month BOOLEAN NULL, -- Last day of the month -- specific_dates TEXT NULL, -- Serialized array of specific dates added to the recurrence -- holiday INT NULL, -- Pointer to holidays list (for future development) -- holiday_offset TINYINT, -- Offset from holiday (from -128 to +127 days) -- PRIMARY KEY (id), -- INDEX(event) --); -- ------ -- ---- Times - List of actual event times for single and recurring events --CREATE TABLE {prefix}times ( -- id INT NOT NULL AUTO_INCREMENT, -- event INT NULL, -- Pointer to the primary record for the event -- custom_event INT NULL, -- Pointer to a customized copy of the event record (if set) -- recur_id INT NULL, -- Pointer to recurrence entry -- active BOOLEAN NULL, -- Active flag - normally set but used to temporarily disable a specific date -- start_time DATETIME NULL, -- Date and time event starts -- end_time DATETIME NULL, -- Date and time event ends -- all_day BOOLEAN NULL, -- All Day flag -- PRIMARY KEY (id), -- INDEX(event), -- INDEX(start_time), -- INDEX(end_time) --); -- ------ -- ---- Locations - Locations for event - If there's no location pointing to an event try to use the referenced entity in events table --CREATE TABLE {prefix}locations ( -- id INT NOT NULL AUTO_INCREMENT, -- event INT NULL, -- Pointer to the primary or custom event record -- name TINYTEXT NULL, -- Name of location -- address TINYTEXT NULL, -- Street Address -- city INT NULL, -- Pointer to city - references main plugin city table -- state TINYTEXT NULL, -- Two character state abbreviation -- zip TINYTEXT NULL, -- ZIP/Postal code -- country TINYTEXT NULL, -- Country Code -- lat FLOAT NULL, -- Latitude of location -- lon FLOAT NULL, -- Longitude of location -- region INT NULL, -- Pointer to Region - references main plugin region table -- phone TINYTEXT NULL, -- Location Phone # -- url TINYTEXT NULL, -- Location URL -- email TINYTEXT NULL, -- Location E-Mail Address -- contact_addon_id INT NULL, -- ID of Contact from contact add-on (optional and if available) -- contact_fname TINYTEXT NULL, -- Contact first name for this location (optional) -- contact_lname TINYTEXT NULL, -- Contact last name for this location (optional) -- contact_phone TINYTEXT NULL, -- Contact phone for this location (optional) -- contact_email TINYTEXT NULL, -- Contact E-Mail address (optional) -- PRIMARY KEY (id) --); -- ------ -- ---- Events - Base event information - May also be entries here referenced by the "times" table for a custom date. --CREATE TABLE {prefix}events ( -- id INT NOT NULL AUTO_INCREMENT, -- status INT NULL, -- Status for this event, see config['status'] -- custom_time INT NULL, -- If this is a custom record for a specific instance (date) this points to that times table entry -- root_event INT NULL, -- Root event pointer if this is a custom record for a specific instance (date) (if custom_time is set) -- created DATETIME NULL, -- Date/Time event was created or date custom event record was created if custom record -- updated DATETIME NULL, -- Date/Time this event record was last updated -- approved DATETIME NULL, -- Date/Ttime this event record was approved -- ref_type INT NULL, -- Type of entity this contact is associated with - See config['ref_type'] -- ref_dest INT NULL, -- Pointer to the specific entity of ref_type this contact is associated with -- hide_address BOOLEAN NULL, -- Option to hide address on front-end -- featured BOOLEAN NULL, -- Option to mark as featured event -- slideshow BOOLEAN NULL, -- Option to mark for use in slide show -- major BOOLEAN NULL, -- Option to mark as a major event -- name TINYTEXT NULL, -- Name of this event -- name_slug TINYTEXT NULL, -- Slug for this event -- header TINYTEXT NULL, -- Header text for front-end display - NOT CURRENTLY USED -- intro TINYTEXT NULL, -- Intro text for front-end display -- descr TEXT NULL, -- Full description text -- image TINYTEXT NULL, -- Image file name -- file1 TINYTEXT NULL, -- File name for a single uploaded file #1 -- file1_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #1 -- file2 TINYTEXT NULL, -- File name for a single uploaded file #2 -- file2_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #2 -- file3 TINYTEXT NULL, -- File name for a single uploaded file #3 -- file3_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #3 -- url TINYTEXT NULL, -- Event URL -- ticket_url TINYTEXT NULL, -- Ticket URL -- cost TINYTEXT NULL, -- Description of event cost -- admin_ref_type INT NULL, -- Type of admin contact if using a member contact -- admin_ref_dest INT NULL, -- Pointer to admin contact record if using a member contact -- admin_name TINYTEXT NULL, -- Admin Contact Name if not using a member contact -- admin_org TINYTEXT NULL, -- Admin Contact Organization if not using a member contact -- admin_email TINYTEXT NULL, -- Admin Contact E-Mail if not using a member contact -- admin_phone TINYTEXT NULL, -- Admin Contact Phone if not using a member contact -- free BOOLEAN NULL, -- Event is Free -- contact_email TINYTEXT NULL, -- Contact E-mail address -- contact_name TINYTEXT NULL, -- Contact name -- contact_phone TINYTEXT NULL, -- Event Phone -- use_member_location BOOLEAN NULL, -- Use location of the member (if provided) rather than location table data -- old_event_id INT NULL, -- ID of event from old site for reference -- ical_uid TINYTEXT NULL, -- The ical UID for this event. -- notes TEXT NULL, -- Internal notes for this event -- PRIMARY KEY (id), -- INDEX(custom_time), -- INDEX(root_event), -- INDEX(ref_type), -- INDEX(ref_dest), -- INDEX(featured), -- INDEX(slideshow), -- INDEX(major) --); -- ------ -- ---- Event Management Settings --CREATE TABLE {prefix}management ( -- id INT NOT NULL AUTO_INCREMENT, -- canonical_event_page TINYTEXT NULL, -- Canonical page slug for event detail -- pdf_logo TINYTEXT NULL, -- Image for the Top of the PDF -- footer_text TINYTEXT NULL, -- Image for the Top of the PDF -- to_email TINYTEXT NULL, -- Email address of the recipient -- from_email TINYTEXT NULL, -- Email address of the sender -- email_notification TEXT NULL, -- Email notification message -- PRIMARY KEY (id) --); -- ------ -- ---- Set default event management entry --INSERT INTO {prefix}management -- ( id, canonical_event_page ) -- VALUES -- ( 1, 'event-detail' ) --; -- ------ -- ---- Event iCal Feed imports --CREATE TABLE {prefix}feed_import ( -- id INT NOT NULL AUTO_INCREMENT, -- feed_url TEXT NOT NULL, -- The ical feed url to import -- created DATETIME NULL, -- The date this feed was created -- updated DATETIME NULL, -- Last time this feed was updated -- duration INT NULL, -- The time it took to fetch the feed -- events INT NULL, -- The number of events last fetched -- PRIMARY KEY (id) --); diff --cc setup/databaseScripts/create_database_V0.0.21.sql index 0000000,0000000..62bff53 new file mode 100644 --- /dev/null +++ b/setup/databaseScripts/create_database_V0.0.21.sql @@@ -1,0 -1,0 +1,199 @@@ ++-- Gaslight Media Members Database - Events Add-On ++-- File Created: 12/02/15 15:27:15 ++-- Database Version: 0.0.19 ++-- Database Creation Script ++-- ++-- This file is called to create a new set of tables for this ++-- add-on for the most recent database version for this add-on. ++-- ++-- There should only be one such file in this directory ++-- ++-- To permit each query below to be executed separately, ++-- all queries must be separated by a line with four dashes ++ ++-- Categories - Categories for events ++CREATE TABLE {prefix}categories ( ++ id INT NOT NULL AUTO_INCREMENT, ++ name TINYTEXT NULL, -- Name of event category ++ descr TINYTEXT NULL, -- Description of this category ++ parent INT NULL, -- Parent category, null or 0 if this is a top level category ++ PRIMARY KEY (id), ++ INDEX(parent) ++); ++ ++---- ++ ++-- Event-Category - Categories for specific event records ++CREATE TABLE {prefix}event_categories ( ++ id INT NOT NULL AUTO_INCREMENT, ++ event INT NULL, -- Pointer to the event ++ category INT NULL, -- Pointer to the category ++ PRIMARY KEY (id), ++ INDEX(event), ++ INDEX(category) ++); ++ ++---- ++ ++-- Event Recurrence - Defines how an event recurs ++CREATE TABLE {prefix}recurrences ( ++ id INT NOT NULL AUTO_INCREMENT, ++ event INTEGER NULL, -- Pointer to event ++ name TINYTEXT NULL, -- Name of this recurrence schedule - used on admin calendar ++ start_time TIME NULL, -- Start time of day for event ++ start_time_only BOOLEAN NULL, -- Use end of first occurrence flag ++ end_time TIME NULL, -- End time of day for event - If less than start time, assume a date boundry ++ all_day BOOLEAN NULL, -- Flag indicating if this is an all-day event (informational only) ++ start_date DATE NULL, -- Starting Date (if all_day is selected) Used instead of start_time ++ from_date DATE NULL, -- From Date for recurrences ++ to_date DATE NULL, -- To Date for recurrences ++ recurring BOOLEAN NULL, -- Flag indicating that event recurs on a schedule rather than all dates ++ month_of_year SMALLINT UNSIGNED NULL, -- Month of year (bitmap) ++ week_of_month TINYINT UNSIGNED NULL, -- Week of the month (bitmap) ++ day_of_week TINYINT UNSIGNED NULL, -- Day of the week (bitmap) ++ by_day_of_month BOOLEAN NULL, -- Flag indicating if selecting by days of the month ++ day_of_month INTEGER UNSIGNED NULL, -- Day of the month (bitmap) ++ last_day_of_month BOOLEAN NULL, -- Last day of the month ++ specific_dates TEXT NULL, -- Serialized array of specific dates added to the recurrence ++ holiday INT NULL, -- Pointer to holidays list (for future development) ++ holiday_offset TINYINT, -- Offset from holiday (from -128 to +127 days) ++ PRIMARY KEY (id), ++ INDEX(event) ++); ++ ++---- ++ ++-- Times - List of actual event times for single and recurring events ++CREATE TABLE {prefix}times ( ++ id INT NOT NULL AUTO_INCREMENT, ++ event INT NULL, -- Pointer to the primary record for the event ++ custom_event INT NULL, -- Pointer to a customized copy of the event record (if set) ++ recur_id INT NULL, -- Pointer to recurrence entry ++ active BOOLEAN NULL, -- Active flag - normally set but used to temporarily disable a specific date ++ start_time DATETIME NULL, -- Date and time event starts ++ end_time DATETIME NULL, -- Date and time event ends ++ all_day BOOLEAN NULL, -- All Day flag ++ PRIMARY KEY (id), ++ INDEX(event), ++ INDEX(start_time), ++ INDEX(end_time) ++); ++ ++---- ++ ++-- Locations - Locations for event - If there's no location pointing to an event try to use the referenced entity in events table ++CREATE TABLE {prefix}locations ( ++ id INT NOT NULL AUTO_INCREMENT, ++ event INT NULL, -- Pointer to the primary or custom event record ++ name TINYTEXT NULL, -- Name of location ++ address TINYTEXT NULL, -- Street Address ++ city INT NULL, -- Pointer to city - references main plugin city table ++ state TINYTEXT NULL, -- Two character state abbreviation ++ zip TINYTEXT NULL, -- ZIP/Postal code ++ country TINYTEXT NULL, -- Country Code ++ lat FLOAT NULL, -- Latitude of location ++ lon FLOAT NULL, -- Longitude of location ++ region INT NULL, -- Pointer to Region - references main plugin region table ++ phone TINYTEXT NULL, -- Location Phone # ++ url TINYTEXT NULL, -- Location URL ++ email TINYTEXT NULL, -- Location E-Mail Address ++ contact_addon_id INT NULL, -- ID of Contact from contact add-on (optional and if available) ++ contact_fname TINYTEXT NULL, -- Contact first name for this location (optional) ++ contact_lname TINYTEXT NULL, -- Contact last name for this location (optional) ++ contact_phone TINYTEXT NULL, -- Contact phone for this location (optional) ++ contact_email TINYTEXT NULL, -- Contact E-Mail address (optional) ++ PRIMARY KEY (id) ++); ++ ++---- ++ ++-- Events - Base event information - May also be entries here referenced by the "times" table for a custom date. ++CREATE TABLE {prefix}events ( ++ id INT NOT NULL AUTO_INCREMENT, ++ status INT NULL, -- Status for this event, see config['status'] ++ custom_time INT NULL, -- If this is a custom record for a specific instance (date) this points to that times table entry ++ root_event INT NULL, -- Root event pointer if this is a custom record for a specific instance (date) (if custom_time is set) ++ created DATETIME NULL, -- Date/Time event was created or date custom event record was created if custom record ++ updated DATETIME NULL, -- Date/Time this event record was last updated ++ approved DATETIME NULL, -- Date/Ttime this event record was approved ++ ref_type INT NULL, -- Type of entity this contact is associated with - See config['ref_type'] ++ ref_dest INT NULL, -- Pointer to the specific entity of ref_type this contact is associated with ++ hide_address BOOLEAN NULL, -- Option to hide address on front-end ++ featured BOOLEAN NULL, -- Option to mark as featured event ++ slideshow BOOLEAN NULL, -- Option to mark for use in slide show ++ major BOOLEAN NULL, -- Option to mark as a major event ++ name TINYTEXT NULL, -- Name of this event ++ name_slug TINYTEXT NULL, -- Slug for this event ++ header TINYTEXT NULL, -- Header text for front-end display - NOT CURRENTLY USED ++ intro TINYTEXT NULL, -- Intro text for front-end display ++ descr TEXT NULL, -- Full description text ++ image TINYTEXT NULL, -- Image file name ++ file1 TINYTEXT NULL, -- File name for a single uploaded file #1 ++ file1_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #1 ++ file2 TINYTEXT NULL, -- File name for a single uploaded file #2 ++ file2_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #2 ++ file3 TINYTEXT NULL, -- File name for a single uploaded file #3 ++ file3_descr TINYTEXT NULL, -- Description for file uploaded in field "file" #3 ++ url TINYTEXT NULL, -- Event URL ++ ticket_url TINYTEXT NULL, -- Ticket URL ++ cost TINYTEXT NULL, -- Description of event cost ++ admin_ref_type INT NULL, -- Type of admin contact if using a member contact ++ admin_ref_dest INT NULL, -- Pointer to admin contact record if using a member contact ++ admin_name TINYTEXT NULL, -- Admin Contact Name if not using a member contact ++ admin_org TINYTEXT NULL, -- Admin Contact Organization if not using a member contact ++ admin_email TINYTEXT NULL, -- Admin Contact E-Mail if not using a member contact ++ admin_phone TINYTEXT NULL, -- Admin Contact Phone if not using a member contact ++ free BOOLEAN NULL, -- Event is Free ++ contact_email TINYTEXT NULL, -- Contact E-mail address ++ contact_name TINYTEXT NULL, -- Contact name ++ contact_phone TINYTEXT NULL, -- Event Phone ++ use_member_location BOOLEAN NULL, -- Use location of the member (if provided) rather than location table data ++ old_event_id INT NULL, -- ID of event from old site for reference ++ ical_uid TINYTEXT NULL, -- The ical UID for this event. ++ notes TEXT NULL, -- Internal notes for this event ++ PRIMARY KEY (id), ++ INDEX(custom_time), ++ INDEX(root_event), ++ INDEX(ref_type), ++ INDEX(ref_dest), ++ INDEX(featured), ++ INDEX(slideshow), ++ INDEX(major) ++); ++ ++---- ++ ++-- Event Management Settings ++CREATE TABLE {prefix}management ( ++ id INT NOT NULL AUTO_INCREMENT, ++ canonical_event_page TINYTEXT NULL, -- Canonical page slug for event detail ++ pdf_logo TINYTEXT NULL, -- Image for the Top of the PDF ++ footer_text TINYTEXT NULL, -- Image for the Top of the PDF ++ to_email TINYTEXT NULL, -- Email address of the recipient ++ from_email TINYTEXT NULL, -- Email address of the sender ++ email_notification TEXT NULL, -- Email notification message ++ calendar_view TINYTEXT NULL, -- Default calendar view ++ PRIMARY KEY (id) ++); ++ ++---- ++ ++-- Set default event management entry ++INSERT INTO {prefix}management ++ ( id, canonical_event_page ) ++ VALUES ++ ( 1, 'event-detail' ) ++; ++ ++---- ++ ++-- Event iCal Feed imports ++CREATE TABLE {prefix}feed_import ( ++ id INT NOT NULL AUTO_INCREMENT, ++ feed_url TEXT NOT NULL, -- The ical feed url to import ++ created DATETIME NULL, -- The date this feed was created ++ updated DATETIME NULL, -- Last time this feed was updated ++ duration INT NULL, -- The time it took to fetch the feed ++ events INT NULL, -- The number of events last fetched ++ PRIMARY KEY (id) ++); diff --cc setup/databaseScripts/dbVersions.php index a64504a,a64504a..a737ebf --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@@ -32,5 -32,5 +32,6 @@@ $glmMembersEventsDbVersions = array '0.0.18' => array('version' => '0.0.18', 'tables' => 7, 'date' => '5/26/2016'), '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'), ); diff --cc setup/databaseScripts/update_database_V0.0.21.sql index 0000000,0000000..cc85583 new file mode 100644 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.21.sql @@@ -1,0 -1,0 +1,14 @@@ ++-- Gaslight Media Members Database - Events Add-On ++-- File Created: 12/09/14 15:27:15 ++-- Database Version: 0.0.21 ++-- 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 calendar_view TINYTEXT NULL; -- The time it took to fetch the feed ++ ++---- ++ ++ diff --cc views/admin/management/events.html index a281b0a,7b73488..3329f68 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@@ -52,24 -51,6 +52,26 @@@ {if $eventsSettings.fieldFail.footer_text}

{$eventsSettings.fieldFail.footer_text}

{/if} + + Front-End Calendar View + + + + + + + - ++
++ ++
+ + + +

E-Mail Notification Settings

diff --cc views/front/events/agenda.html index 5b8f26d,b70985c..960ee64 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@@ -55,117 -55,58 +55,126 @@@