From 6565ed3fb3cfe4583c6b76ab2f683dd54c2a2140 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 12 Apr 2016 11:22:41 -0400 Subject: [PATCH] Now have file uploads working. Requires updates to the main plugin. --- classes/data/dataEvents.php | 50 ++++++++++- index.php | 2 +- ...0.0.12.sql => create_database_V0.0.16.sql} | 6 ++ setup/databaseScripts/dbVersions.php | 4 +- setup/databaseScripts/readme.txt | 2 + .../update_database_V0.0.15.sql | 15 ++++ .../update_database_V0.0.16.sql | 35 ++++++++ views/admin/events/edit.html | 14 +-- views/admin/events/editFiles.html | 89 ++++++++++++------- views/admin/events/editSchedule.html | 6 +- 10 files changed, 179 insertions(+), 44 deletions(-) rename setup/databaseScripts/{create_database_V0.0.12.sql => create_database_V0.0.16.sql} (94%) create mode 100644 setup/databaseScripts/update_database_V0.0.15.sql create mode 100644 setup/databaseScripts/update_database_V0.0.16.sql diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index 6e36e18..73d092f 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -295,6 +295,54 @@ class GlmDataEvents extends GlmDataAbstract 'use' => 'a' ), + // Event File #1 file name + 'file1' => array( + 'field' => 'file1', + 'type' => 'file', + 'maxSize' => 10000, + 'use' => 'a' + ), + + // Event File #1 description + 'file1_descr' => array( + 'field' => 'file1_descr', + 'type' => 'text', + 'maxLength'=> 250, + 'use' => 'a' + ), + + // Event File #2 file name + 'file2' => array( + 'field' => 'file2', + 'type' => 'file', + 'maxSize' => 10000, + 'use' => 'a' + ), + + // Event File #2 description + 'file2_descr' => array( + 'field' => 'file2_descr', + 'type' => 'text', + 'maxLength'=> 250, + 'use' => 'a' + ), + + // Event File #3 file name + 'file3' => array( + 'field' => 'file3', + 'type' => 'file', + 'maxSize' => 10000, + 'use' => 'a' + ), + + // Event File #3 description + 'file3_descr' => array( + 'field' => 'file3_descr', + 'type' => 'text', + 'maxLength'=> 250, + 'use' => 'a' + ), + // Event Image 'image' => array( 'field' => 'image', @@ -486,7 +534,7 @@ class GlmDataEvents extends GlmDataAbstract foreach ( $recurrences as $recurrence ) { $r['recurrences'][] = $recurrence; } - } + } } diff --git a/index.php b/index.php index 7bca092..b474015 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ * version from this plugin. */ define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '0.0.1'); -define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.12'); +define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.16'); // 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/setup/databaseScripts/create_database_V0.0.12.sql b/setup/databaseScripts/create_database_V0.0.16.sql similarity index 94% rename from setup/databaseScripts/create_database_V0.0.12.sql rename to setup/databaseScripts/create_database_V0.0.16.sql index 5673ee4..d810e2a 100644 --- a/setup/databaseScripts/create_database_V0.0.12.sql +++ b/setup/databaseScripts/create_database_V0.0.16.sql @@ -127,6 +127,12 @@ CREATE TABLE {prefix}events ( 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 diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 9793aa7..7b9bc2e 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -25,6 +25,8 @@ $glmMembersEventsDbVersions = array( '0.0.9' => array('version' => '0.0.9', 'tables' => 7), '0.0.10' => array('version' => '0.0.10', 'tables' => 7), '0.0.11' => array('version' => '0.0.11', 'tables' => 7), - '0.0.12' => array('version' => '0.0.12', 'tables' => 7) + '0.0.12' => array('version' => '0.0.12', 'tables' => 7), + '0.0.15' => array('version' => '0.0.15', 'tables' => 7, 'date' => '4/11/2016'), + '0.0.16' => array('version' => '0.0.16', 'tables' => 7, 'date' => '4/11/2016') ); diff --git a/setup/databaseScripts/readme.txt b/setup/databaseScripts/readme.txt index 38ec539..141d8b5 100644 --- a/setup/databaseScripts/readme.txt +++ b/setup/databaseScripts/readme.txt @@ -28,6 +28,8 @@ Procedure to update database needed to update database content. (i.e. to make changes to database content) 6) Edit the "dbVersions.php" file and add a new line for the new version. + *** Now please be sure to add a date for each entry *** + i.e. '1.1.2' => array('version' => '1.1.2', 'tables' => 14, 'date' => '4/11/16') 7) When this is all done, edit the index.php file for the plugin/add-on and change "GLM_MEMBERS_{addon}_PLUGIN_DB_VERSION" defined parameter where diff --git a/setup/databaseScripts/update_database_V0.0.15.sql b/setup/databaseScripts/update_database_V0.0.15.sql new file mode 100644 index 0000000..2733594 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.15.sql @@ -0,0 +1,15 @@ +-- Gaslight Media Members Database - Events Add-On +-- Database Version: 0.0.12 +-- 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 dashses + + +-- Add a single file upload field +ALTER TABLE {prefix}events ADD COLUMN file TINYTEXT; + +---- + +-- Add a description for the file upload field +ALTER TABLE {prefix}events ADD COLUMN file_descr TINYTEXT; diff --git a/setup/databaseScripts/update_database_V0.0.16.sql b/setup/databaseScripts/update_database_V0.0.16.sql new file mode 100644 index 0000000..f897c49 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.16.sql @@ -0,0 +1,35 @@ +-- Gaslight Media Members Database - Events Add-On +-- Database Version: 0.0.12 +-- 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 dashses + + +-- Rename events file field to file1 field +ALTER TABLE {prefix}events CHANGE file file1 TINYTEXT; + +---- + +-- Rename events file_descr field to file1_descr field +ALTER TABLE {prefix}events CHANGE file_descr file1_descr TINYTEXT; + +---- + +-- Add a single file upload field +ALTER TABLE {prefix}events ADD COLUMN file2 TINYTEXT; + +---- + +-- Add a description for the file upload field +ALTER TABLE {prefix}events ADD COLUMN file2_descr TINYTEXT; + +---- + +-- Add a single file upload field +ALTER TABLE {prefix}events ADD COLUMN file3 TINYTEXT; + +---- + +-- Add a description for the file upload field +ALTER TABLE {prefix}events ADD COLUMN file3_descr TINYTEXT; diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index f1989be..7cdf87e 100644 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -6,13 +6,13 @@ {if apply_filters('glm_members_permit_admin_members_packaging_edit_package', true)} {if $haveMember} - Return to Events List + Return to Events List {else} Return to Events List {/if} {if $option == 'edit'} - Delete this Event + Delete this Event

Edit Event

{else}

Add new Event

@@ -383,7 +383,6 @@ // When adding a new recurrence is requested $("#addRecurrence").click( function() { addNewRecurrenceForm(); - $('#no-recurrence-msg').remove(); }); /* @@ -468,7 +467,7 @@ startTimeOnlyInit(); // All Dates Event selection - $('.all-dates-checkbox').click( function() { + $('.recurring-checkbox').click( function() { recurID = $(this).attr('data-id'); if ($("#recurringEvent_" + recurID)[0].checked) { $("#recurringExclude_" + recurID).removeClass('glm-hidden'); @@ -516,8 +515,11 @@ $('#recurCalendarDialog_' + recurID).attr('title', 'Select Dates for ' + recurName); $('#recurCalendarDialog_' + recurID).dialog({ + position: { my: 'top+75', of: '#recurSpecDates_' + recurID}, minWidth: 600 }); + // Color to change calendar cell to (in rgb so it compares to our test below) + var calClickColor = 'rgb(173, 216, 230)'; $('#recurCalendar_' + recurID).fullCalendar({ header : { left: 'title', @@ -537,8 +539,8 @@ start: date, title: 'New Date' }; - if (c == 'transparent') { - $(this).css('background-color', 'lightblue'); + if (c != calClickColor) { + $(this).css('background-color', calClickColor); $('#recurSpecDates_' + recurID).append( '' + date.format() + '' ); diff --git a/views/admin/events/editFiles.html b/views/admin/events/editFiles.html index 49fddfe..d7a57f6 100644 --- a/views/admin/events/editFiles.html +++ b/views/admin/events/editFiles.html @@ -2,40 +2,65 @@ + - + - + + + + + + + + + + + + + + + + + + + + +
 

(maximum description length 250 characters)

- - - -
 Attach Files to Event
+ 		File #1: + {if $event.fieldData.file1} + Replace this file: + {$event.fieldData.file1}    + Delete File
+ {else} + New file: + {/if} 		-   +
   Description: + + {if $event.fieldFail.file1_descr}

{$event.fieldFail.file1_descr}

{/if} +
 
File #2: + {if $event.fieldData.file2} + Replace this file: + {$event.fieldData.file2}    + Delete File
+ {else} + New file: + {/if} +
   Description: + + {if $event.fieldFail.file2_descr}

{$event.fieldFail.file2_descr}

{/if} +
 
File #3: + {if $event.fieldData.file3} + Replace this file: + {$event.fieldData.file3}    + Delete File
+ {else} + New file: + {/if} + {if $event.fieldFail.file3}

{$event.fieldFail.file3}

{/if} +
   Description: + + {if $event.fieldFail.file3_descr}

{$event.fieldFail.file3_descr}

{/if}
diff --git a/views/admin/events/editSchedule.html b/views/admin/events/editSchedule.html index a63ac4e..49915f8 100644 --- a/views/admin/events/editSchedule.html +++ b/views/admin/events/editSchedule.html @@ -60,7 +60,7 @@ Recurring Event: - + Setup a detailed schedule. @@ -232,7 +232,7 @@ Recurring Event: - + Setup a detailed schedule; @@ -247,7 +247,7 @@ Delete this Event Schedule - + Months -- 2.17.1