From: Anthony Talarico Date: Fri, 15 Mar 2019 15:09:24 +0000 (-0400) Subject: adding showArchived check to the member profile list X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=916d724663061d4ef0615e27537150d503d66b02;p=WP-Plugins%2Fglm-member-db.git adding showArchived check to the member profile list --- diff --git a/models/admin/member/index.php b/models/admin/member/index.php index e8ce6b21..cc308950 100644 --- a/models/admin/member/index.php +++ b/models/admin/member/index.php @@ -320,7 +320,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers // Get member name for title $memberName = $memberData['fieldData']['name']; - + $support->write_log($_REQUEST); // Hide archived unless instructed otherwise $hideArchived = ''; if (!isset($_REQUEST['showArchived']) || $_REQUEST['showArchived'] != 'true') { @@ -328,11 +328,11 @@ class GlmMembersAdmin_member_index extends GlmDataMembers } else { $showArchived = true; } - + $support->write_log($_REQUEST['showArchived'] . "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH"); require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php'; $MemberInfo = new GlmDataMemberInfo($this->wpdb, $this->config); $memberInfoRecords = $MemberInfo->getList("T.member = $memberID".$hideArchived, 'T.status'); - + $support->write_log($memberInfoRecords); // Check if there's any member information records if (is_array($memberInfoRecords) && count($memberInfoRecords) > 0) { $haveInfoRecords = true; diff --git a/scss/admin/_edit.scss b/scss/admin/_edit.scss index f57ee493..c697dbf9 100644 --- a/scss/admin/_edit.scss +++ b/scss/admin/_edit.scss @@ -206,7 +206,7 @@ body{ text-align: center; padding: 10px 0; border-top-left-radius: inherit; - border-top-right-radius: inherit; + border-top-right-radius: inherit; } } diff --git a/views/admin/manageDashboard/edit.html b/views/admin/manageDashboard/edit.html index ddbdd28e..76165f0c 100644 --- a/views/admin/manageDashboard/edit.html +++ b/views/admin/manageDashboard/edit.html @@ -169,7 +169,7 @@ @@ -297,13 +297,13 @@ return false; }); - $('#showArchived').click( function() { - checked = 'false'; - if ($(this).attr('checked') == 'checked') { - checked = 'true'; - } - window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked); - }); + // $('#showArchived').click( function() { + // checked = 'false'; + // if ($(this).attr('checked') == 'checked') { + // checked = 'true'; + // } + // window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked); + // }); $('.message').on('click', function() { var notice = $(this).attr('data-notice'); diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html index 7300d5c5..453fce17 100644 --- a/views/admin/manageDashboard/index.html +++ b/views/admin/manageDashboard/index.html @@ -93,20 +93,18 @@ edge : 'right', outDuration : 400 }); - // window.Glma.updateSearchFilterValues(); var memberInfo, memberID; var actionData = { action : Glma.defaultData.action, glm_action : Glma.defaultData.glm_action, } - // remove when finshed refactoring - var listData = { - view : 'list', - option : 'list', - route : 'list' - }; window.Glma.clearQueryStorage(); + var listData = { + view : 'list', + option: 'list', + route: 'list' + } window.Glma.mergeProps(listData, actionData); window.Glma.manageMember( listData, @@ -120,8 +118,7 @@ }, "POST" ); - - // New Monolithic click handler + $(document).on("click", "[data-glmevent='click']",function(e){ e.preventDefault(); var target = $(this); @@ -152,7 +149,6 @@ }); if( target.hasClass("member-record-name")){ window.Glma.setActiveRecord( target ); - } if( typeof target.data("confirm") !== "undefined"){ window.Glma.confirmAction({ @@ -199,11 +195,6 @@ ajaxContentTypeOff ); } - // if( typeof target.data("close") !== "undefined"){ - // M.Sidenav.getInstance($('.edit-screen')[0]).close(); - // var queries = window.Glma.getSearchFieldValues(); - // console.log(queries); - // } }); $(document).on("click", ".pagination", function(e){ @@ -211,20 +202,17 @@ listData.pageSelect = $(this).text(); listData.prevStart = $("#pagination-data").attr("data-prevStart"); listData.nextStart = $("#pagination-data").attr("data-nextStart"); - Glma.manageMember( listData, $("#glm-admin-search-overlay").fadeOut('slow'), function(data) { $("#member-results-container").html(data.searchData); - var newPrevStart = $("#pagination-data").attr("data-prevStart"); if (newPrevStart) { $(".pagination.previous-button").removeClass("disabled"); } else { $(".pagination.previous-button").addClass("disabled"); } - var newNextStart = $("#pagination-data").attr("data-nextStart"); if (newNextStart) { $(".pagination.next-button").removeClass("disabled"); @@ -239,21 +227,16 @@ ); } }); - /*********************** - * * ON CHANGE EVENTS - * **********************/ $(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, @@ -264,12 +247,10 @@ window.Glma.startTransition({ overlay : overlay ? $("#glm-admin-" + overlay + "-overlay") : null }); - window.Glma.deleteAllFilterFields(listData); window.Glma.updateSearchFilterValues(); var queries = window.Glma.getSearchFieldValues(); window.Glma.mergeProps(listData, queries); - if(typeof target.data("multiSelect") !== "undefined"){ if( target.select2("val")){ listData['categorySearch'] = target.select2("val").join(","); @@ -277,7 +258,6 @@ listData['categorySearch'] = ""; } } - if( type == "checkbox"){ selected = target.prop('checked'); if(selected && type == "checkbox" ){ @@ -295,7 +275,7 @@ function(success) { window.Glma.endTransition({ overlay : overlay ? $("#glm-admin-" + overlay + "-overlay") : null, - container : $("#member-results-container"), + container : (typeof target.data("container") !== "undefined" ) ? $(target.data("container")) : $("#member-results-container"), content : success.searchData }); }, @@ -306,77 +286,6 @@ ); } }); - - $(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} - // } - - // 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-search-checkbox").on("change", function(){ - // $("#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" - // ); - }); }); {include file='admin/footer.html'} \ No newline at end of file diff --git a/views/admin/member/index.html b/views/admin/member/index.html index 39134262..e4ec1d28 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -170,7 +170,7 @@
- Show archived information   + Show archived information  

@@ -292,13 +292,13 @@ return false; }); - $('#showArchived').click( function() { - checked = 'false'; - if ($(this).attr('checked') == 'checked') { - checked = 'true'; - } - window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked); - }); + // $('#showArchived').click( function() { + // checked = 'false'; + // if ($(this).attr('checked') == 'checked') { + // checked = 'true'; + // } + // window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&showArchived=" + checked); + // }); $('.message').on('click', function() { var notice = $(this).attr('data-notice');