fixing js error missing brackets, adding AND OR operators to the get params for the...

diff --git a/css/front.css b/css/front.css
index 7c36c20..f85f65f 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -95,7 +95,7 @@
 .search-results-label{
     max-width: 105px;
     display: inline;
-    margin-left: 100px !important;
+/*    margin-left: 100px !important;*/
     font-weight: bold;
 }
 .search-container .results-limit-container {
@@ -161,6 +161,9 @@ input.sidebar-criteria{
     max-width: 250px;
     float: left !important;
 }
+table.footable{
+/*    margin-top: 85px;*/
+}
 .glm-alpha-link, .detail-link{
     color: #1d3961;
 }
@@ -193,4 +196,36 @@ input.sidebar-criteria{
 }
 .search-container .placeholder{
     padding: 2px;
+}
+.results-page .results-limit-container{
+    float: right;
+}
+.print-results-container{
+    float: right;
+    margin-right: 20px;
+    margin-top: 15px;
+}
+.pagination-nav{
+    margin: 20px 0;
+    float: left;
+}
+.display-number{
+    margin-top: 10px;
+}
+
+@media(min-width: 1024px ){
+    .alpha-header{
+        padding-left: 0;
+    }
+    .search-limit-container{
+        padding-left: 0;
+    }
+    .pagination-header{
+        padding-left: 0;
+    }
+}
+@media(min-width: 643px){
+    .search-limit-container{
+        margin-top: 30px;
+    }
 }
\ No newline at end of file

diff --git a/js/front.js b/js/front.js
index 742a93c..53d0c98 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -1,4 +1,5 @@
 $(document).ready(function(){
+    
     $(".expand-collapse").on("click", function(e){
         if( $(this).text() === "Show Options" ){
            $(this).text("Hide Options");
@@ -31,7 +32,6 @@ $(document).ready(function(){
     $('.alpha-link').on("click", function(){
          console.log("test");
         $('#obits-search').submit(); 
-        console.log("test");
     });
     
     if( $(window).width() < 1024 ){
@@ -40,8 +40,36 @@ $(document).ready(function(){
         });
     }
     
+    $(window).on("resize", function(){
+        if( $(window).width() > 1024){
+            if( $('.sidebar-container').css("display") === "none" ){
+               $('.sidebar-container').css("display","block");
+            }
+            
+        } else {
+            $('.sidebar-container').css("display","none");
+           
+        }
+        if( $(window).width() > 640 ) {
+            if($('.not-input').css("display") === "none"){
+                $('.not-input').css("display","block");
+            }
+            if($('.logic-input').css("display") === "none"){
+                $('.logic-input').css("display","block");
+            }
+        } else {
+            $('.not-input').css("display","none");
+            $('.logic-input').css("display","none");
+        }
+    });
+    
     $('#results-limit').on('change', function(){
 //        $('#obits-search').submit(); 
     });
     
+    $('.print-results-link').on("click", function(e){
+        
+        e.preventDefault();
+    });
+    
 });
\ No newline at end of file

diff --git a/models/front/obits/search.php b/models/front/obits/search.php
index 5fba23d..dcdefb8 100644 (file)
--- a/models/front/obits/search.php
+++ b/models/front/obits/search.php
@@ -115,7 +115,6 @@ class GlmMembersFront_obits_search extends GlmDataObits
         
         $per_page   = isset( $_REQUEST['results-limit']) ? (int)filter_var( $_REQUEST['results-limit'], FILTER_SANITIZE_STRING) : 50;
 
-        
         // only execute search if the search button is clicked or there are search params in the url
         if ( isset( $_REQUEST['searchButton'] ) || !empty( $_GET['alpha'] ) || !empty( $_GET['pageSelect'] ) ){
    
@@ -152,6 +151,7 @@ class GlmMembersFront_obits_search extends GlmDataObits
                 'spouse_partner'    => isset($_GET['spouse']) ? filter_var($_GET['spouse'],FILTER_SANITIZE_STRING) : '', 
                 'maiden_other'      => isset($_GET['maiden']) ? filter_var($_GET['maiden'],FILTER_SANITIZE_STRING) : '', 
             );
+   
             // get the alpha key
             if ( isset( $_REQUEST['alpha'] ) ){
                 $alpha_key = filter_var( $_REQUEST['alpha'], FILTER_SANITIZE_STRING );
@@ -241,12 +241,12 @@ class GlmMembersFront_obits_search extends GlmDataObits
                 foreach($get_values as $key=>$value){
                     
                     if($value !== ''){
-                         $where .= "$key LIKE '%$value%' AND ";
+                         $where .= "$key LIKE '%$value%' $clause ";
                     }
                     
                 }
                 // remove the last AND or OR statement from the query string
-                $where = substr($where, 0, -5);
+//                $where = substr($where, 0, -5);
                 
             } else {
                
@@ -272,7 +272,7 @@ class GlmMembersFront_obits_search extends GlmDataObits
             }
       
             $obits = $this->getList($where, 'last_name', $fieldVals = true, $idField = 'id', $start, $per_page);
-
+            echo $where;
             $returned = $obits['returned'];
             
             // Get paging results
@@ -325,7 +325,7 @@ class GlmMembersFront_obits_search extends GlmDataObits
             $view = 'searchResults';
         }
     
-
+        $clause = preg_replace('/\s+/', '', $clause);
         // Compile template data
         $templateData = array(
             'birth_death_range' => $birth_death_range,
@@ -346,8 +346,8 @@ class GlmMembersFront_obits_search extends GlmDataObits
             'alpha_key'         => $alpha_key,
             'search'            => $form_fields,
             'get_params'        => $get_fields,
-            'empty_search'      => $empty_search
-
+            'empty_search'      => $empty_search,
+            'clause'            => $clause
         );
              // Return status, any suggested view, and any data to controller
         return array(

diff --git a/views/front/obits/searchResults.html b/views/front/obits/searchResults.html
index d1e2864..bc16001 100644 (file)
--- a/views/front/obits/searchResults.html
+++ b/views/front/obits/searchResults.html
@@ -6,8 +6,8 @@
     <!--            {include file='front/obits/search.html'}-->
                 <div class="search-container sidebar-container row">
                     <div class="small-12 columns">
-                       <input class="sidebar-criteria" type="radio" checked value="all" name="conditions[]">All 
-                       <input class="sidebar-criteria" type="radio" value="any" name="conditions[]">Any 
+                       <input class="sidebar-criteria" type="radio" {if $clause == ' AND '}checked {/if} value="all" name="conditions[]">All 
+                       <input class="sidebar-criteria" type="radio" {if $clause == ' OR '}checked {/if} value="any" name="conditions[]">Any 
                    
                            <a href="#" class="expand-collapse">Show Options</a>
              
@@ -215,28 +215,44 @@
             </div>
         </div>
         <div class="small-12 large-9 columns results-container">
-            <div class="glm-alpha-links">
-                {foreach $alphaList as $a}
-                    <a href="{$thisUrl}?alpha={$a.alpha}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
-                {/foreach}
+            <div class="row">
+               <div class="small-12 columns alpha-header">
+                    <div class="glm-alpha-links">
+                        {foreach $alphaList as $a}
+                            <a href="{$thisUrl}?alpha={$a.alpha}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&results-limit={$limit}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+                        {/foreach}
+                </div>
+                </div>
+                {if $paging}
+                <div class="small-12 medium-6 columns pagination-header">
+                    <div class="pagination-nav">
+                        <a href="{$thisUrl}?pageSelect=Previous&prevStart={$prevStart}{if $search.last}&last={$search.last}{/if}{if $search.first}&first={$search.first}{/if}{if $search.d_yr}&d_yr={$search.d_yr}{/if}{if $search.b_yr}&b_yr={$search.b_yr}{/if}{if $search.spouse}&spouse={$search.spouse}{/if}{if $search.maiden}maiden={$search.maiden}{/if}{if $search.b_range}&b_range={$search.b_range}{/if}{if $search.d_range}&d_range={$search.d_range}{/if}{if $get_params.last_name}&last={$get_params.last_name}{/if}{if $get_params.first_mid}&first={$get_params.first_mid}{/if}{if $get_params.d_year}&d_yr={$get_params.d_year}{/if}{if $get_params.b_year}&b_yr={$get_params.b_year}{/if}{if $get_params.spouse_partner}&spouse={$get_params.spouse_partner}{/if}{if $get_params.maiden_other}maiden={$get_params.maiden_other}{/if}{if $get_params.b_yr_range}&b_range={$get_params.b_yr_range}{/if}{if $get_params.d_yr_range}&d_range={$get_params.d_yr_range}{/if}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}&clause={$clause}" class="glm-alpha-link obits-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
+
+                        <a href="{$thisUrl}?pageSelect=Next&prevStart={$prevStart}{if $search.last}&last={$search.last}{/if}{if $search.first}&first={$search.first}{/if}{if $search.d_yr}&d_yr={$search.d_yr}{/if}{if $search.b_yr}&b_yr={$search.b_yr}{/if}{if $search.spouse}&spouse={$search.spouse}{/if}{if $search.maiden}maiden={$search.maiden}{/if}{if $search.b_range}&b_range={$search.b_range}{/if}{if $search.d_range}&d_range={$search.d_range}{/if}{if $get_params.last_name}&last={$get_params.last_name}{/if}{if $get_params.first_mid}&first={$get_params.first_mid}{/if}{if $get_params.d_year}&d_yr={$get_params.d_year}{/if}{if $get_params.b_year}&b_yr={$get_params.b_year}{/if}{if $get_params.spouse_partner}&spouse={$get_params.spouse_partner}{/if}{if $get_params.maiden_other}maiden={$get_params.maiden_other}{/if}{if $get_params.b_yr_range}&b_range={$get_params.b_yr_range}{/if}{if $get_params.d_yr_range}&d_range={$get_params.d_yr_range}{/if}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}&clause={$clause}" class="glm-alpha-link obits-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
+                        <div class="display-number">
+                             showing {$start} through {$lastDisplayed} of {$total}
+                        </div>
+                    </div>
+                </div>
+       
+                <div class="small-12 medium-6 columns results-page search-limit-container">
+                     <div class="print-results-container">
+                        <a class="print-results-link" href="#">Print Results</a>
+                    </div>
+                    <div class="results-limit-container">
+                        <label class="search-results-label" for="results-limit">Results per page</label>
+                        <select id="results-limit" class="results-limit" name="results-limit">
+                            <option value="10">10</option>
+                            <option value="20">20</option>
+                            <option value="30">30</option>
+                            <option value="50">50</option>
+                            <option value="100">100</option>
+                            <option value="500">500</option>
+                        </select>
+                    </div>
+                </div>        
             </div>
-            {if $paging}
-                <br>
-                <a href="{$thisUrl}?pageSelect=Previous&prevStart={$prevStart}{if $search.last}&last={$search.last}{/if}{if $search.first}&first={$search.first}{/if}{if $search.d_yr}&d_yr={$search.d_yr}{/if}{if $search.b_yr}&b_yr={$search.b_yr}{/if}{if $search.spouse}&spouse={$search.spouse}{/if}{if $search.maiden}maiden={$search.maiden}{/if}{if $search.b_range}&b_range={$search.b_range}{/if}{if $search.d_range}&d_range={$search.d_range}{/if}{if $get_params.last_name}&last={$get_params.last_name}{/if}{if $get_params.first_mid}&first={$get_params.first_mid}{/if}{if $get_params.d_year}&d_yr={$get_params.d_year}{/if}{if $get_params.b_year}&b_yr={$get_params.b_year}{/if}{if $get_params.spouse_partner}&spouse={$get_params.spouse_partner}{/if}{if $get_params.maiden_other}maiden={$get_params.maiden_other}{/if}{if $get_params.b_yr_range}&b_range={$get_params.b_yr_range}{/if}{if $get_params.d_yr_range}&d_range={$get_params.d_yr_range}{/if}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>Previous page</a>
-                
-                <a href="{$thisUrl}?pageSelect=Next&prevStart={$prevStart}{if $search.last}&last={$search.last}{/if}{if $search.first}&first={$search.first}{/if}{if $search.d_yr}&d_yr={$search.d_yr}{/if}{if $search.b_yr}&b_yr={$search.b_yr}{/if}{if $search.spouse}&spouse={$search.spouse}{/if}{if $search.maiden}maiden={$search.maiden}{/if}{if $search.b_range}&b_range={$search.b_range}{/if}{if $search.d_range}&d_range={$search.d_range}{/if}{if $get_params.last_name}&last={$get_params.last_name}{/if}{if $get_params.first_mid}&first={$get_params.first_mid}{/if}{if $get_params.d_year}&d_yr={$get_params.d_year}{/if}{if $get_params.b_year}&b_yr={$get_params.b_year}{/if}{if $get_params.spouse_partner}&spouse={$get_params.spouse_partner}{/if}{if $get_params.maiden_other}maiden={$get_params.maiden_other}{/if}{if $get_params.b_yr_range}&b_range={$get_params.b_yr_range}{/if}{if $get_params.d_yr_range}&d_range={$get_params.d_yr_range}{/if}&nextStart={$nextStart}&results-limit={$limit}{if $alpha_key}&alpha={$alpha_key}{/if}" class="glm-alpha-link obits-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page</a>
-                <br>
-                showing {$start} through {$lastDisplayed} of {$total}
             {/if}
-            <label class="search-results-label" for="results-limit">Results per page</label>
-            <select id="results-limit" class="results-limit" name="results-limit">
-                <option value="10">10</option>
-                <option value="20">20</option>
-                <option value="30">30</option>
-                <option value="50">50</option>
-                <option value="100">100</option>
-                <option value="500">500</option>
-            </select>
         {if $obits}
            <table class="footable results-table" data-paging="false">
              <thead>