From d45ce90c0f1239ce2841f8e82312c5023b40a823 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 2 Mar 2016 15:47:27 -0500 Subject: [PATCH] added search file for drop down and name search elements. --- models/admin/events/add.php | 38 ++++++++++++++++++++---- models/admin/events/categories.php | 5 +--- models/admin/events/index.php | 25 ++++++++++++---- models/admin/member/add.php | 41 ++++++-------------------- views/admin/events/categories.html | 5 ++-- views/admin/events/index.html | 12 +++++--- views/admin/member/events.html | 6 ++++ views/admin/search.html | 47 ++++++++++++++++++++++++++++++ 8 files changed, 126 insertions(+), 53 deletions(-) create mode 100644 views/admin/search.html diff --git a/models/admin/events/add.php b/models/admin/events/add.php index eccb64d..628962f 100644 --- a/models/admin/events/add.php +++ b/models/admin/events/add.php @@ -105,34 +105,62 @@ class GlmMembersAdmin_events_add extends GlmDataEvents { $displayData = 'Welcome to more information!
This is the Events Add-On "events" model with action "more" talking to you from inside WordPress.'; + + // loop through the form field values $eventsArray = array_filter($_REQUEST, function($k) { return preg_match('/^events_/',$k); }, ARRAY_FILTER_USE_KEY); + echo "
EventsArray:"; echo "
";print_r($eventsArray,true);echo "
"; foreach($eventsArray as $key=>$value) { - echo(""); - + echo(""); + $fieldString .= "'" . $value . "'" . ","; } + echo $fieldString; + echo $columnString; echo "
$key$value
$value
"; + // get the table column names for a string to be used in a query + $dbFields = " + SELECT column_name + FROM information_schema.columns + WHERE table_name = '" .GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events' + AND table_schema = 'worddb' + ;"; + $alldbFields = $this->wpdb->get_results($dbFields, ARRAY_A); + + // Store field names in an array for later use + foreach($alldbFields as $key=>$value){ + $field[] = $value['column_name']; + } +// echo '
', print_r($field, true), '
'; + foreach($field as $column){ + $columnString .= $column . ','; + } + echo $columnString; $option = $_REQUEST['option']; if($option == 'submit'){ if (isset($_REQUEST['events_name']) && $_REQUEST['events_name'] != '') { $title = trim(filter_var($_REQUEST['events_name'],FILTER_SANITIZE_STRING)); + $url = trim(filter_var($_REQUEST['events_website'],FILTER_SANITIZE_STRING)); + $notes = trim(filter_var($_REQUEST['events_notes'],FILTER_SANITIZE_STRING)); + $hide = trim(filter_var($_REQUEST['events_hide'],FILTER_SANITIZE_STRING)); + $active = trim(filter_var($_REQUEST['events_active'],FILTER_SANITIZE_STRING)); // sql query $sql = " INSERT INTO ". GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events - (name) - VALUES (" . "'$title '". ") + (name,url,notes,hide_address, status) + VALUES (" . "'$title'". "," . "'$url'"."," . "'$notes'"."," . "'$hide'". "," . "'$active'".") ;"; $this->wpdb->query($sql); } } // Compile template data $templateData = array( - 'displayData' => $displayData + 'displayData' => $displayData, + ); // Return status, any suggested view, and any data to controller diff --git a/models/admin/events/categories.php b/models/admin/events/categories.php index 5348e2c..4b5bbdc 100644 --- a/models/admin/events/categories.php +++ b/models/admin/events/categories.php @@ -98,7 +98,6 @@ class GlmMembersAdmin_events_categories extends GlmDataEventsCategories */ // parent::__construct(false, false, true); - } public function modelAction($actionData = false) @@ -122,9 +121,7 @@ class GlmMembersAdmin_events_categories extends GlmDataEventsCategories $this->wpdb->query($sql); } } - - - + // retrieve category names $entries = $Categories->getList(); foreach($entries as $keys=>$value){ diff --git a/models/admin/events/index.php b/models/admin/events/index.php index 5205998..f489d57 100644 --- a/models/admin/events/index.php +++ b/models/admin/events/index.php @@ -14,6 +14,7 @@ */ // Load Contacts data abstract +require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); class GlmMembersAdmin_events_index extends GlmDataEvents @@ -119,9 +120,9 @@ class GlmMembersAdmin_events_index extends GlmDataEvents // // // 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); +// $eventCategories = new GlmDataEventsEventCategories($this->wpdb, $this->config); +// $eventCategoriesStats = $eventCategories->getStats(); +// $eventHaveCategories = ($eventCategoriesStats > 0); require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'); $Locations = new GlmDataEventsLocations($this->wpdb, $this->config); @@ -146,16 +147,28 @@ class GlmMembersAdmin_events_index extends GlmDataEvents foreach($entries as $keys=>$value){ $index[] = $keys; } - + foreach($index as $id){ $entries[] = $eventEntries->getEntry($id); $names[] = $entries[$id]['name']; } -// echo '
', print_r($names, true), '
'; + + $eventCategories = new GlmDataEventsCategories($this->wpdb, $this->config); + $entries = $eventCategories->getList(); + foreach($entries as $keys=>$value){ + $index[] = $keys; + } + + foreach($index as $id){ + $entries[] = $eventCategories->getEntry($id); + $cat[] = $entries[$id]['name']; + } + // Compile template data $templateData = array( 'displayData' => $displayData, - 'title' => $names + 'title' => $names , + 'category' => $cat ); // Return status, any suggested view, and any data to controller return array( diff --git a/models/admin/member/add.php b/models/admin/member/add.php index ec7a5c8..cdfb1dc 100644 --- a/models/admin/member/add.php +++ b/models/admin/member/add.php @@ -121,45 +121,22 @@ class GlmMembersAdmin_member_add extends GlmDataEvents ); } - $option = $_REQUEST['option']; - - $eventFields = array_filter($_REQUEST, function($k) { - return preg_match('/^events_/',$k); - }, ARRAY_FILTER_USE_KEY); - -// echo "
EventsArray:"; - foreach($eventFields as $key=>$value) { -// echo(""); - $formFields[] = $value; - } -// echo "
$key$value
"; - - // Get field names for each column - $dbFields = " - SELECT column_name - FROM information_schema.columns - WHERE table_name = '" .GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events' - AND table_schema = 'worddb' - ;"; - $alldbFields = $this->wpdb->get_results($dbFields, ARRAY_A); - - // Store field names in an array for later use - foreach($alldbFields as $key=>$value){ - $field[] = $value['column_name']; - } - if($option == 'submit'){ - if (isset($_REQUEST['events_name'])) { + + $option = $_REQUEST['option']; + if($option == 'submit'){ + if (isset($_REQUEST['events_name']) && $_REQUEST['events_name'] != '') { $title = trim(filter_var($_REQUEST['events_name'],FILTER_SANITIZE_STRING)); - } - - // sql query + + // sql query $sql = " INSERT INTO ". GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events (id,name) - VALUES (" . "'$memberID '". "," . "'$title '". ") + VALUES (" . "'$memberID '" . "'$title '". ") ;"; $this->wpdb->query($sql); + } } + $templateData = array( 'displayData' => $displayData, 'haveMember' => $haveMember, diff --git a/views/admin/events/categories.html b/views/admin/events/categories.html index 4fb15a7..bdd7edc 100644 --- a/views/admin/events/categories.html +++ b/views/admin/events/categories.html @@ -10,10 +10,11 @@ - + {foreach from=$categoryNames key=k item=category} - + + {/foreach} diff --git a/views/admin/events/index.html b/views/admin/events/index.html index 28a6313..32cda60 100644 --- a/views/admin/events/index.html +++ b/views/admin/events/index.html @@ -1,4 +1,6 @@ {include file='admin/events/header.html'} +{include file='admin/search.html'} +
@@ -17,10 +19,12 @@ {foreach from=$title key=k item=name} - - - - {/foreach} + {$name} + {/foreach} + {foreach from=$category key=k item=name} + {$name} + {/foreach} +
diff --git a/views/admin/member/events.html b/views/admin/member/events.html index f23c370..8021238 100644 --- a/views/admin/member/events.html +++ b/views/admin/member/events.html @@ -4,6 +4,7 @@ Add Event Event Categories +{include file='admin/search.html'}
@@ -20,6 +21,11 @@ End Date   + {foreach from=$title key=k item=name} + + + + {/foreach}
diff --git a/views/admin/search.html b/views/admin/search.html new file mode 100644 index 0000000..a9fa5a7 --- /dev/null +++ b/views/admin/search.html @@ -0,0 +1,47 @@ +
+ From + + + + + + + + + To + + + + + + + + + + \ No newline at end of file -- 2.17.1