From: Chuck Scott Date: Tue, 24 May 2016 20:15:30 +0000 (-0400) Subject: Fixed problem with saving Don't show location address flag, adding stuff for ajax... X-Git-Tag: v1.0.0^2~15 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=89ec55e77fa215e85e7fc04872bf03e58577266d;p=WP-Plugins%2Fglm-member-db-events.git Fixed problem with saving Don't show location address flag, adding stuff for ajax calendar functionality --- diff --git a/classes/data/dataTimes.php b/classes/data/dataTimes.php index 82c3680..8367a0f 100644 --- a/classes/data/dataTimes.php +++ b/classes/data/dataTimes.php @@ -232,6 +232,57 @@ class GlmDataEventsTimes extends GlmDataAbstract return $r; } + /** + * Get event times simplified + * + * @param integer $categoryID Select by Category (optional) + * @param string $startDate Date formatted to be used in MySQL + * @param string $endDate Date formatted to be used in MySQL + * + * @return object Class object + */ + public function getEventTimesSimplified($categoryID = false, $startDate = false, $endDate = false) + { + + $savedFields = $this->fields; + + $this->fields = array( + 'id' => $savedFields['id'], + 'event' => $savedFields['event'], + 'event_name' => $savedFields['event_name'], + 'start_time' => $savedFields['start_time'], + 'end_time' => $savedFields['end_time'], + 'all_day' => $savedFields['all_day'] + ); + + // Only display times from start date + if (!$startDate) { + $startDate = date('Y-m-d H:i:s'); + } + $where = " T.start_time >= '$startDate' "; + if ($endDate) { + $where .= " AND T.start_time <= '$endDate' "; + } + + if ($categoryID) { + $where .= " + AND + T.event IN ( + SELECT event + FROM " .GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "event_categories + WHERE category = $categoryID + ) + "; + } + + $eventsSimplified = $this->getList($where); + + $this->fields = $savedFields; + + return $eventsSimplified; + + } + } ?> diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php new file mode 100644 index 0000000..db838be --- /dev/null +++ b/models/admin/ajax/eventsCalMonthAJAX.php @@ -0,0 +1,94 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Event Times data abstract +require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'); + +/* + * This class performs the work of handling images passed to it via + * an AJAX call that goes through the WorPress AJAX Handler. + * + */ +class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + /* + * Constructor + * + * This contructor sets up this model. At this time that only includes + * storing away the WordPress data object. + * + * @return object Class object + * + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct(false, false); + + } + + /* + * Perform Model Action + * + * This modelAction takes an AJAX image upload and stores the image in the + * media/images directory of the plugin. + * + * This model action does not return, it simply does it's work then calls die(); + * + * @param $actionData + * + * Echos JSON string as response and does not return + */ + public function modelAction ($actionData = false) + { + + $return = array( + 'status' => false, // Assume nothing works + 'events' => false, // Where our events list will go + 'message' => '' + ); + +$return['message'] = 'Made it Here!'; + + // Return stored image data + echo json_encode($return); + wp_die(); + } + + +} diff --git a/models/front/events/list.php b/models/front/events/list.php index 9c54133..d80b7f4 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -48,6 +48,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $status = $categoryId = null; $action = ''; $settings = $events = $event = $categoryEvents = array(); + $calDates = false; // If a memberID has been specified, limit to that member $memberId = $actionData['request']['member'] - 0; @@ -445,6 +446,14 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction default: $view = 'agenda.html'; $events = $this->getModelEventsData($categoryId, null, $memberId); + + /* *** NOT USING AT THIS TIME - Moving to AJAX - REMOVE WHEN DONE + // Also get event times for calendar display + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataTimes.php'; + $Times = new GlmDataEventsTimes($this->wpdb, $this->config); + $calDates = $Times->getEventTimesSimplified($categoryID); + */ + break; } @@ -508,7 +517,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $view = 'listForMemberDetail.html'; break; default: - // No changes otherwis + // No changes otherwise break; } @@ -525,7 +534,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction 'fromDate' => $fromDate, 'toDate' => $toDate, 'eventName' => $eventNameSearch, - 'imgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/' + 'imgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/small/', + 'calDates' => $calDates ); error_reporting(E_ALL ^ E_NOTICE); diff --git a/setup/validActions.php b/setup/validActions.php index bae7db6..6aff891 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -50,6 +50,9 @@ $glmMembersEventsAddOnValidActions = array( ), 'management' => array( 'events' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG + ), + 'ajax' => array( + 'eventsCalMonthAJAX' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG ) ), 'frontActions' => array( diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index 9c42604..f453774 100644 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -12,7 +12,7 @@ Return to Events List {/if} - {if $option == 'edit'} + {if $option == 'edit' || $option == 'update'} Delete this Event

Edit Event

{else} @@ -215,8 +215,6 @@ timeFormat : 'h:mma', fixedWeekCount : false, eventClick: function(calEvent, jsEvent, view) { - -// alert('Event: ' + calEvent.title); $("#occurrences").dialog(); $(this).css('border-color', 'red'); } @@ -249,7 +247,7 @@ fullCalendarLoaded = true; } - + }); /* @@ -1054,7 +1052,11 @@ initLocations(); } }); - + + // Set masking for phone number fields - see http://digitalbush.com/projects/masked-input-plugin/ + $.mask.definitions['e'] = "[A-Za-z0-9: ]"; + $(".glm-phone-input").mask("999-999-9999? eeeeeeeeeee"); + // 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); diff --git a/views/admin/events/editAdminContact.html b/views/admin/events/editAdminContact.html index df0f0f7..7b3e873 100644 --- a/views/admin/events/editAdminContact.html +++ b/views/admin/events/editAdminContact.html @@ -29,7 +29,7 @@ Admin Contact Phone: - + {if $event.fieldFail.admin_phone}

{$event.fieldFail.admin_phone}

{/if}
diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index dab0722..d3ba261 100644 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -35,6 +35,13 @@ + + + + - - - - diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html index fd2a9d6..92f2e3f 100644 --- a/views/admin/events/editStatus.html +++ b/views/admin/events/editStatus.html @@ -194,7 +194,7 @@ @@ -223,7 +223,7 @@ diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index f6dd292..1e4cffe 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -42,6 +42,71 @@ {/foreach} + + + +
+ + + + + \ No newline at end of file
Hide Location Address: + + Don't show location address to site visitors. +
Use {$terms.term_member_cap} location: @@ -66,13 +73,6 @@
Hide Location Address: - - Don't show location address to site visitors. -
Address: @@ -139,7 +139,7 @@
Phone: - +
Event Phone #: - + {if $event.fieldFail.contact_phone}

{$event.fieldFail.contact_phone}

{/if}
Contact Phone: - +