text filter, category filter, pending filter, member types working after the refactoring

diff --git a/js/memberManagement.js b/js/memberManagement.js
index f6fee4c..fd30c61 100644 (file)
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -106,7 +106,6 @@ window.Glma = (function() {
             }
         }
         return data;
-        
     }
     var resetStandardFilters = function(){
         var searchFields = $(".glm-admin-search-field");
@@ -133,7 +132,7 @@ window.Glma = (function() {
     }
     var resetAllFilters = function(){
         resetStandardFilters();
-        $("#quickSearchForm-pending").prop("checked", false).parent().css({color: "#9E9E9E"})
+        $("#quickSearchForm-pending").prop("checked", false).parent().css({color: "#9E9E9E"});
         $("#bad-map-location").prop("checked", false).parent().css({color: "#9E9E9E"});
     }
     var updateSearchFilterValues = function(){
@@ -234,6 +233,7 @@ window.Glma = (function() {
         confirmAction               : confirmAction,
         closeModalOverlay           : closeModalOverlay,
         clearQueryStorage           : clearQueryStorage,
+        clearActiveRecord           : clearActiveRecord,
         /*
         * call this function with a data object to configure the logic
         * # glmAction
@@ -263,7 +263,7 @@ window.Glma = (function() {
                     updateSearchFilterValues();
                     var queries = getSearchFieldValues();
                     mergeProps(listData, queries);
- 
+                    
                     jQuery.ajax({
                         dataType: "json",
                         type : 'POST',

diff --git a/views/admin/manageDashboard/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
index 856bd3e..245e2ed 100644 (file)
--- a/views/admin/manageDashboard/adminSearch/searchHeader.html
+++ b/views/admin/manageDashboard/adminSearch/searchHeader.html
@@ -31,14 +31,14 @@
 
                     <div class="switch">
                         <label>
-                            <input id="quickSearchForm-pending" type="checkbox" data-glmevent="change">
+                            <input id="quickSearchForm-pending" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterPending" data-view="list" data-separate-query>
                             <span class="lever"></span>
                             Pending Members Only{if isset($pendingMembersCount) && $pendingMembersCount}: {$pendingMembersCount}{/if}
                         </label>
                     </div>
                     <div class="switch">
                         <label>
-                            <input id="bad-map-location" type="checkbox" data-glmevent="change">
+                            <input id="bad-map-location" type="checkbox" data-glmevent="change" data-overlay="search" data-route="list" data-option="list" data-search="filterBadLocation" data-view="list" data-separate-query>
                             <span class="lever"></span>
                             Bad Map Location Only{if isset($badMapLocationCount) && $badMapLocationCount}: {$badMapLocationCount}{/if}
                         </label>

diff --git a/views/admin/manageDashboard/components/category.html b/views/admin/manageDashboard/components/category.html
index c4b13e6..3679e8e 100644 (file)
--- a/views/admin/manageDashboard/components/category.html
+++ b/views/admin/manageDashboard/components/category.html
@@ -1,6 +1,6 @@
 <div class="glm-admin-search-filter glm-admin-category-filter">
 
-    <select id="filterCategories" data-searchType="select2" name="filterCategories[]" multiple="multiple" size="1" class="glm-admin-search-field" data-search="categorySearch" data-glmevent="change">
+    <select id="filterCategories" data-searchType="select2" name="filterCategories[]" multiple="multiple" size="1" class="glm-admin-search-field" data-search="categorySearch" data-glmevent="change" data-route="list" data-option="list" data-view="list" data-multi-select data-overlay="search">
     {foreach from=$categories item=v}
         <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
             {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}

diff --git a/views/admin/manageDashboard/components/dropdown.html b/views/admin/manageDashboard/components/dropdown.html
index 13244a4..d138585 100644 (file)
--- a/views/admin/manageDashboard/components/dropdown.html
+++ b/views/admin/manageDashboard/components/dropdown.html
@@ -1,6 +1,6 @@
 
 <!-- <b>{$terms.term_member_cap} Types</b> -->
-<select id="filterMemberTypes" data-searchType="select" name="filterMemberTypes" class="browser-default glm-admin-search-filter glm-admin-search-field" data-search="filterMemberTypes" data-glmevent="change">
+<select id="filterMemberTypes" data-searchType="select" name="filterMemberTypes" class="browser-default glm-admin-search-filter glm-admin-search-field" data-search="filterMemberTypes" data-glmevent="change" data-overlay="search" data-route="list" data-view="list">
     <option value="">{$terms.term_member_cap} Types</option>
     {foreach $member_types as $type}
     <option value="{$type.id}"{if $type.id == $mTypeSelected} selected{/if}>{$type.name}</option>

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index 90fa324..4bfed2e 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -112,7 +112,6 @@
             listData,
             '', 
             function(data) {
-
                 $("#member-results-container").html(data.searchData);
                 $("#glm-admin-search-overlay").fadeOut('slow')
             },
@@ -246,28 +245,63 @@
          *  ON CHANGE EVENTS
          * 
          **********************/
-        $(document).on("change","[data-glmevent='change']", function(e, data){
-            // console.log( $(this) );
-            // console.log(e.target);
-        });
-        $(document).on('change',"#filterCategories", function (e, clear) {
-            if(!clear){
-                $("#glm-admin-search-overlay").fadeIn('fast');
-                if( $(this).select2("val")){
-                    listData.categorySearch = $(this).select2("val").join(",");
+        $(document).on("change","[data-glmevent='change']", function(e, dropdownReset){
+            if( typeof dropdownReset == 'undefined' ){
+                var target          = $(this);
+                var type            = target.attr("type");
+                var searchType      = target.data("search");
+                var separateSearch  = ( typeof target.data("separateQuery") !==  "undefined") ? true : false;
+                var selected;
+                var overlay = target.attr("data-overlay") || null;
+ 
+                var listData = window.Glma.setXHRData({ 
+                    route           : target.attr("data-route")         || null,
+                    member          : target.attr("data-member")        || null,
+                    option          : target.attr('data-option')        || null,
+                    view            : target.attr('data-view')          || null,
+                    mergingObjects  : [actionData] 
+                });
+                window.Glma.startTransition({
+                    overlay     :  overlay ? $("#glm-admin-" + overlay + "-overlay") : null
+                });
+        
+                if( separateSearch ){
+                    window.Glma.resetStandardFilters();
+                    window.Glma.deleteStandardFilterFields(listData);
                 }else{
-                    listData.categorySearch = "";
+                    window.Glma.deleteAllFilterFields(listData);
+                    window.Glma.updateSearchFilterValues();
+                    var queries = window.Glma.getSearchFieldValues();
+                    window.Glma.mergeProps(listData, queries);
                 }
-                window.Glma.deleteAllFilterFields(listData);
-                window.Glma.updateSearchFilterValues();
-                var queries = window.Glma.getSearchFieldValues();
-                window.Glma.mergeProps(listData, queries);
-                Glma.manageMember(
+                if(typeof target.data("multiSelect") !== "undefined"){
+                    if( target.select2("val")){
+                        listData['categorySearch'] = target.select2("val").join(",");
+                    }else{
+                        listData['categorySearch'] = "";
+                    }
+                }
+
+                if( type == "checkbox"){
+                    selected = target.prop('checked');
+                    if(selected && type == "checkbox" ){
+                        listData[searchType] = 'true';
+                        {literal} target.parent().css({color: "#26A69A"}) {/literal}
+                    }else{
+                        delete listData[searchType];
+                        {literal} target.parent().css({color: "#9E9E9E"}) {/literal}
+                    }
+                }
+
+                window.Glma.manageMember(
                     listData,
                     '', 
-                    function(data) {
-                        $("#member-results-container").html(data.searchData);
-                        $("#glm-admin-search-overlay").fadeOut('slow');
+                    function(success) {
+                        window.Glma.endTransition({
+                            overlay     : overlay ? $("#glm-admin-" + overlay + "-overlay") : null,
+                            container   : $("#member-results-container"),
+                            content     :  success.searchData
+                        });
                     },
                     function(error) {
                         console.log(error);
@@ -277,101 +311,75 @@
             }
         });
 
-        $(document).on("change", "#quickSearchForm-pending", function(e){
-            console.log()
-            var selected = $(this).prop('checked');
-            $("#glm-admin-search-overlay").fadeIn('fast');
-            // window.Glma.resetAllFilters();
-            if(selected){
-                listData.filterPending = 'true';
-                {literal}$(this).parent().css({color: "#26A69A"}){/literal}
-            }else{
-                delete listData.filterPending;
-                {literal}$(this).parent().css({color: "#9E9E9E"}){/literal}
-            }
-            window.Glma.manageMember(
-                listData,
-                '', 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    $("#glm-admin-search-overlay").fadeOut('slow');
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
-        });
-        
         $(document).on("change", "#bad-map-location", function(){
-            var selected = $(this).prop('checked');
-            $("#glm-admin-search-overlay").fadeIn('fast');
-            // window.Glma.resetAllFilters();
-            if(selected){
-                listData.filterBadLocation = 'true';
-                {literal}$(this).parent().css({color: "#26A69A"}){/literal}
-            }else{
-                delete listData.filterBadLocation;
-                {literal}$(this).parent().css({color: "#9E9E9E"}){/literal}
-            }
-            console.log(listData);
-            window.Glma.manageMember(
-                listData,
-                '', 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    $("#glm-admin-search-overlay").fadeOut('slow');
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
+            // var selected = $(this).prop('checked');
+            // $("#glm-admin-search-overlay").fadeIn('fast');
+            // // window.Glma.resetAllFilters();
+            // if(selected){
+            //     listData.filterBadLocation = 'true';
+            //     {literal}$(this).parent().css({color: "#26A69A"}){/literal}
+            // }else{
+            //     delete listData.filterBadLocation;
+            //     {literal}$(this).parent().css({color: "#9E9E9E"}){/literal}
+            // }
+   
+            // window.Glma.manageMember(
+            //     listData,
+            //     '', 
+            //     function(data) {
+            //         $("#member-results-container").html(data.searchData);
+            //         $("#glm-admin-search-overlay").fadeOut('slow');
+            //     },
+            //     function(error) {
+            //         console.log(error);
+            //     },
+            //     "POST"
+            // );
         });
 
         $('#filterMemberTypes').on('change', function (e) {
-            $("#glm-admin-search-overlay").fadeIn('fast');
-            listData.memberTypeSearch = $(this).val();
-            window.Glma.deleteAllFilterFields(listData);
-            window.Glma.updateSearchFilterValues();
-            var queries = window.Glma.getSearchFieldValues();
-            window.Glma.mergeProps(listData, queries);
-            Glma.manageMember(
-                listData,
-                $("#glm-admin-search-overlay").fadeOut('slow'), 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    $("#glm-admin-search-overlay").fadeOut('slow');
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
+            // $("#glm-admin-search-overlay").fadeIn('fast');
+            // listData.memberTypeSearch = $(this).val();
+            // window.Glma.deleteAllFilterFields(listData);
+            // window.Glma.updateSearchFilterValues();
+            // var queries = window.Glma.getSearchFieldValues();
+            // window.Glma.mergeProps(listData, queries);
+            // Glma.manageMember(
+            //     listData,
+            //     $("#glm-admin-search-overlay").fadeOut('slow'), 
+            //     function(data) {
+            //         $("#member-results-container").html(data.searchData);
+            //         $("#glm-admin-search-overlay").fadeOut('slow');
+            //     },
+            //     function(error) {
+            //         console.log(error);
+            //     },
+            //     "POST"
+            // );
         });
 
         $(".glm-search-checkbox").on("change", function(){
-            $("#glm-admin-search-overlay").fadeIn('fast');
+            // $("#glm-admin-search-overlay").fadeIn('fast');
             var filterData = {};
-            filterData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined;
-            filterData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined;
-            window.Glma.deleteAllFilterFields(listData);
-            window.Glma.updateSearchFilterValues();
-            var queries = window.Glma.getSearchFieldValues();
-            window.Glma.mergeProps(listData, filterData);
-            window.Glma.mergeProps(listData, queries);
-            Glma.manageMember(
-                listData,
-                '', 
-                function(data) {
-                    $("#member-results-container").html(data.searchData);
-                    $("#glm-admin-search-overlay").fadeOut('slow')
-                },
-                function(error) {
-                    console.log(error);
-                },
-                "POST"
-            );
+            // filterData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined;
+            // filterData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined;
+            // window.Glma.deleteAllFilterFields(listData);
+            // window.Glma.updateSearchFilterValues();
+            // var queries = window.Glma.getSearchFieldValues();
+            // window.Glma.mergeProps(listData, filterData);
+            // window.Glma.mergeProps(listData, queries);
+            // Glma.manageMember(
+            //     listData,
+            //     '', 
+            //     function(data) {
+            //         $("#member-results-container").html(data.searchData);
+            //         $("#glm-admin-search-overlay").fadeOut('slow')
+            //     },
+            //     function(error) {
+            //         console.log(error);
+            //     },
+            //     "POST"
+            // );
         });
     });
 </script>

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 5ec65bb..6a8b646 100755 (executable)
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -435,9 +435,9 @@
                 $('#categorySelect').val('');
 
             });
-            $("#categorySelect").select2({
-                width: '100%' 
-            });
+            // $("#categorySelect").select2({
+            //     width: '100%' 
+            // });
             // Action to de-select a category
             $('.catDelete').live('click', function() {
                 $(this).parent().remove();

diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html
index c33d95e..6f98fa3 100644 (file)
--- a/views/admin/member/memberInfo/editCategory.html
+++ b/views/admin/member/memberInfo/editCategory.html
@@ -42,7 +42,7 @@
                     </div>
                     <!-- Category Selection -->
                     {if apply_filters('glm_members_menu_members', true)}
-                        <select name="categorySelect" id="categorySelect">
+                        <select name="categorySelect" id="categorySelect" class="browser-default">
                             {if $availableCategories}
                                 <option id="categoryNone" value=""></option>
                                 {foreach from=$availableCategories item=v}
@@ -119,6 +119,6 @@
          $("#amenitySelect").select2();
          $('#filterCategories').select2( );
          $('#exportFilterCategories').multiselect();
-
+        $('#categorySelect').formSelect();
     });
 </script>