From 8df738128dbe31123d3da89efe6051c3708cadcf Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Tue, 1 Mar 2016 09:59:35 -0500 Subject: [PATCH] added buttons and tabs for events menu not associated with a member --- models/admin/events/index.php | 48 +++++++++++++++++++----------- setup/validActions.php | 1 - views/admin/events/add.html | 1 - views/admin/events/categories.html | 32 ++++++++++---------- views/admin/events/header.html | 4 ++- views/admin/events/index.html | 18 +++++++++-- views/admin/member/add.html | 2 +- views/admin/member/categories.html | 20 +++++++++---- views/admin/member/events.html | 12 ++++++-- views/admin/member/header.html | 8 +++++ 10 files changed, 97 insertions(+), 49 deletions(-) create mode 100644 views/admin/member/header.html diff --git a/models/admin/events/index.php b/models/admin/events/index.php index e33a297..ebe7266 100644 --- a/models/admin/events/index.php +++ b/models/admin/events/index.php @@ -111,45 +111,57 @@ class GlmMembersAdmin_events_index // extends GlmDataContacts 'displayData' => $displayData ); - // Return status, any suggested view, and any data to controller - return array( - 'status' => true, - 'modelRedirect' => false, - 'view' => 'admin/events/index.html', - 'data' => $templateData - ); - +// // Return status, any suggested view, and any data to controller +// return array( +// 'status' => true, +// 'modelRedirect' => false, +// 'view' => 'admin/events/index.html', +// 'data' => $templateData +// ); +// // Check for required Categories - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); - $Categories = new GlmDataCategories($this->wpdb, $this->config); + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + $Categories = new GlmDataEventsCategories($this->wpdb, $this->config); $categoriesStats = $Categories->getStats(); $haveCategories = ($categoriesStats > 0); - - // Check for required Event Categories - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php'); +// +// // Check for required Event Categories + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php'); $eventCategories = new GlmDataEventsEventCategories($this->wpdb, $this->config); $eventCategoriesStats = $eventCategories->getStats(); $eventHaveCategories = ($eventCategoriesStats > 0); - - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +// + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); $Events = new GlmDataEvents($this->wpdb, $this->config); $eventsStats = $Events->getStats(); $haveEvents = ($eventsStats > 0); - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'); + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'); $Locations = new GlmDataEventsLocations($this->wpdb, $this->config); $locationsStats = $Locations->getStats(); $haveLocations = ($locationsStats > 0); - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/Recurrences.php'); + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php'); $Recurrences = new GlmDataEventsRecurrences($this->wpdb, $this->config); $recurrencesStats = $Recurrences->getStats(); $haveRecurrences = ($recurrencesStats > 0); - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/Times.php'); + require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'); $Times = new GlmDataEventsTimes($this->wpdb, $this->config); $timesStats = $Times->getStats(); $haveTimes = ($timesStats > 0); + + // Compile template data + $templateData = array( + 'displayData' => $displayData + ); + // Return status, any suggested view, and any data to controller + return array( + 'status' => true, + 'modelRedirect' => false, + 'view' => 'admin/events/index.html', + 'data' => $templateData + ); } diff --git a/setup/validActions.php b/setup/validActions.php index 2419db7..be5cd48 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -41,7 +41,6 @@ $glmMembersEventsAddOnValidActions = array( ), 'events' => array( 'index' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG, - 'more' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG, 'add' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG, 'categories' => GLM_MEMBERS_EVENTS_PLUGIN_SLUG ), diff --git a/views/admin/events/add.html b/views/admin/events/add.html index f8ac4d3..c96c91b 100644 --- a/views/admin/events/add.html +++ b/views/admin/events/add.html @@ -1,5 +1,4 @@ {include file='admin/events/header.html'} -
{$memberID}
Event Details
diff --git a/views/admin/events/categories.html b/views/admin/events/categories.html index c627c24..81113cf 100644 --- a/views/admin/events/categories.html +++ b/views/admin/events/categories.html @@ -1,16 +1,16 @@ - - - - - TODO supply a title - - - - -
TODO write content
- - +{include file='admin/events/header.html'} +
+
+
+ + + + + + + +
Add New Category:
+ +
+
+
\ No newline at end of file diff --git a/views/admin/events/header.html b/views/admin/events/header.html index b400e92..acff8b2 100644 --- a/views/admin/events/header.html +++ b/views/admin/events/header.html @@ -1,6 +1,8 @@

- Events + All Events + Add Event + Event Categories

diff --git a/views/admin/events/index.html b/views/admin/events/index.html index e18433a..10aa376 100644 --- a/views/admin/events/index.html +++ b/views/admin/events/index.html @@ -1,8 +1,20 @@ {include file='admin/events/header.html'}
-

Events Model

-

{$displayData}

- Click me to see more! + + + + + + + + + + + + + + + diff --git a/views/admin/member/add.html b/views/admin/member/add.html index a7167b8..59c147a 100644 --- a/views/admin/member/add.html +++ b/views/admin/member/add.html @@ -1,6 +1,6 @@ -{include file='admin/events/header.html'} +{include file='admin/member/header.html'} Event Details
diff --git a/views/admin/member/categories.html b/views/admin/member/categories.html index 3a404ff..82d9067 100644 --- a/views/admin/member/categories.html +++ b/views/admin/member/categories.html @@ -1,8 +1,18 @@ {include file='admin/events/header.html'} +
+
+
+
+
Event TitleCategoryTimesDaysStart DateEnd Date 
+ + + + + +
Add New Category:
+ +
+
+
- - - - -
TODO write content
diff --git a/views/admin/member/events.html b/views/admin/member/events.html index 9939a4e..f23c370 100644 --- a/views/admin/member/events.html +++ b/views/admin/member/events.html @@ -3,9 +3,12 @@

Add Event Event Categories -

-

Events

+
+
+ + +

Events

@@ -18,7 +21,10 @@ - + + + + diff --git a/views/admin/member/header.html b/views/admin/member/header.html new file mode 100644 index 0000000..b400e92 --- /dev/null +++ b/views/admin/member/header.html @@ -0,0 +1,8 @@ + +

+ Events + +

+
+ + \ No newline at end of file -- 2.17.1