added search file for drop down and name search elements.

diff --git a/models/admin/events/add.php b/models/admin/events/add.php
index eccb64d..628962f 100644 (file)
--- 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!<br>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 "<hr />EventsArray:<table>";
         echo "<pre>";print_r($eventsArray,true);echo "</pre>";
         foreach($eventsArray as $key=>$value) {
-            echo("<tr><td>$key</td><td>$value</td></tr>");
-            
+            echo("<tr><td>$value</td></tr>");
+            $fieldString .= "'" . $value . "'" . ",";
         }
+        echo $fieldString;
+        echo $columnString;
         echo "</table><hr />";
         
+        // 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 '<pre>', print_r($field, true), '</pre>';
+        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 (file)
--- 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 (file)
--- 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 '<pre>', print_r($names, true), '</pre>';
+        
+        $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 (file)
--- 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 "<hr />EventsArray:<table>";
-        foreach($eventFields as $key=>$value) {
-//            echo("<tr><td>$key</td><td>$value</td></tr>");
-              $formFields[] = $value;
-        }
-//        echo "</table><hr />";
-        
-        // 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 (file)
--- a/views/admin/events/categories.html
+++ b/views/admin/events/categories.html
@@ -10,10 +10,11 @@
                        <td><input name="topic" value=""></td>
                        <td><input name="Action" value="Add Topic" type="hidden"><input value="Create Category" type="submit"></td>
                     </tr>
-                   
+                   <?php $count = 0; ?>
                         {foreach from=$categoryNames key=k item=category}
                         <tr>
-                        <td><input class="catField" type="text" value="{$category}"></td>
+<!--                            <div class="topic-row"><form method="post" action="" name=""><table><tbody><tr><td></td></tr></tbody></table></form></div>-->
+                            <td><input class="catField" type="text" value="{$category}"></td><td><input type="button" value="Save"></td><td><input type="button" value="Delete"></td>
                         </tr>
                         {/foreach}
                  

diff --git a/views/admin/events/index.html b/views/admin/events/index.html
index 28a6313..32cda60 100644 (file)
--- 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'}
+
 <div class="wrap">
     <div id="glm-admin-content-container">
        <input class="button button-primary glm-button glm-right" type="button" value="Pending Events">
@@ -17,10 +19,12 @@
             </tr>
             {foreach from=$title key=k item=name}
             <tr>
-                <td><input class="catField" type="text" value="{$name}"></td>
-            </tr>
-                          
-            {/foreach}
+                <td><a href="{$thisURL}?page={$thisPage}&glm_action=add">{$name}</td>
+             {/foreach}
+             {foreach from=$category key=k item=name}
+                <td>{$name}</td>
+             {/foreach}
+             </tr>
         </thead>
         
     </div>

diff --git a/views/admin/member/events.html b/views/admin/member/events.html
index f23c370..8021238 100644 (file)
--- a/views/admin/member/events.html
+++ b/views/admin/member/events.html
@@ -4,6 +4,7 @@
         <a href="{$thisURL}?page={$thisPage}&glm_action=add&member={$memberID}" class="nav-tab{if $thisAction==add} nav-tab-active{/if}">Add Event</a>
         <a href="{$thisURL}?page={$thisPage}&glm_action=categories&member={$memberID}" class="nav-tab{if $thisAction==categories} nav-tab-active{/if}">Event Categories</a>
     </h2>
+{include file='admin/search.html'}
 <div class="wrap">
     <div id="glm-admin-content-container">
       <input class="button button-primary glm-button glm-right" type="button" value="Pending Events">
@@ -20,6 +21,11 @@
                 <th>End Date</th>
                 <th>&nbsp;</th>
             </tr>
+             {foreach from=$title key=k item=name}
+            <tr>
+                <td><input class="catField" type="text" value="{$name}"></td>
+            </tr>        
+            {/foreach}
         </thead>
     </div>
 </div>

diff --git a/views/admin/search.html b/views/admin/search.html
new file mode 100644 (file)
index 0000000..a9fa5a7
--- /dev/null
+++ b/views/admin/search.html
@@ -0,0 +1,47 @@
+<input type="text" placeholder="Event Name Search"> <input value="Event Name Search" type="submit"><br>
+<span> From </span>
+<select name="from_month" id="from_month" onchange="" size="1">
+    <option value="01">January</option>
+    <option value="02">February</option>
+    <option value="03">March</option>
+    <option value="04">April</option>
+    <option value="05">May</option>
+    <option value="06">June</option>
+    <option value="07">July</option>
+    <option value="08">August</option>
+    <option value="09">September</option>
+    <option value="10">October</option>
+    <option value="11">November</option>
+    <option value="12">December</option>
+</select>
+
+
+<select id="from_day" name="from_day"><option value="01">1</option><option value="02" selected="">2</option><option value="03">3</option><option value="04">4</option><option value="05">5</option><option value="06">6</option><option value="07">7</option><option value="08">8</option><option value="09">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
+
+
+<select id="from_year" name="from_year"><option value="2000">2000</option><option value="2001">2001</option><option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option><option value="2007">2007</option><option value="2008">2008</option><option value="2009">2009</option><option value="2010">2010</option><option value="2011">2011</option><option value="2012">2012</option><option value="2013">2013</option><option value="2014">2014</option><option value="2015">2015</option><option value="2016" selected="">2016</option><option value="2017">2017</option><option value="2018">2018</option><option value="2019">2019</option><option value="2020">2020</option><option value="2021">2021</option><option value="2022">2022</option></select>
+
+<span> To </span>
+
+<select name="to_month" id="to_month" onchange="" size="1">
+    <option value="01">January</option>
+    <option value="02">February</option>
+    <option value="03">March</option>
+    <option value="04">April</option>
+    <option value="05">May</option>
+    <option value="06">June</option>
+    <option value="07">July</option>
+    <option value="08">August</option>
+    <option value="09">September</option>
+    <option value="10">October</option>
+    <option value="11">November</option>
+    <option value="12">December</option>
+</select>
+
+
+<select id="to_day" name="to_day"><option value="01">1</option><option value="02" selected="">2</option><option value="03">3</option><option value="04">4</option><option value="05">5</option><option value="06">6</option><option value="07">7</option><option value="08">8</option><option value="09">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
+
+
+<select id="to_year" name="to_year"><option value="2000">2000</option><option value="2001">2001</option><option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option><option value="2007">2007</option><option value="2008">2008</option><option value="2009">2009</option><option value="2010">2010</option><option value="2011">2011</option><option value="2012">2012</option><option value="2013">2013</option><option value="2014">2014</option><option value="2015">2015</option><option value="2016" selected="">2016</option><option value="2017">2017</option><option value="2018">2018</option><option value="2019">2019</option><option value="2020">2020</option><option value="2021">2021</option><option value="2022">2022</option></select>
+
+<input value="Event Date Search" type="submit">
\ No newline at end of file