From: Anthony Talarico Date: Tue, 5 Mar 2019 04:35:52 +0000 (-0500) Subject: fixing bugs with the member info profile additions , cloning, activating functionality X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4d7f1cee46229afc86e892312e6c21a4fe07e7f7;p=WP-Plugins%2Fglm-member-db.git fixing bugs with the member info profile additions , cloning, activating functionality --- diff --git a/js/memberManagement.js b/js/memberManagement.js index 10d5d089..56670f9c 100644 --- a/js/memberManagement.js +++ b/js/memberManagement.js @@ -16,25 +16,25 @@ window.Glma = (function() { jQuery.ajax(config); } - var memberRecordHandler = function(data, callback){ - return function(e){ - jQuery(".edit-screen").html(''); - data.option = "manage"; - data.memberID = jQuery(this).parent().data('id'); - Glma.manageMember( - data, - function(complete) {}, - function(success) { - jQuery(".edit-screen").html(success.searchData); - }, - function(error) { - console.log(error); - }, - "POST", - ); - M.Sidenav.getInstance( $('.edit-screen')[0] ).open(); - } - } + // var memberRecordHandler = function(data, callback){ + // return function(e){ + // jQuery(".edit-screen").html(''); + // data.option = "manage"; + // data.memberID = jQuery(this).parent().data('id'); + // Glma.manageMember( + // data, + // function(complete) {}, + // function(success) { + // jQuery(".edit-screen").html(success.searchData); + // }, + // function(error) { + // console.log(error); + // }, + // "POST", + // ); + // M.Sidenav.getInstance( $('.edit-screen')[0] ).open(); + // } + // } var getSearchFieldValues = function(){ if( localStorage.getItem("glmaQueries") ){ var setQueries = {}; @@ -49,12 +49,13 @@ window.Glma = (function() { return false } } + // Merge the properties of obj2 into obj1. Obj1 is altered var mergeProps = function(obj1, obj2){ for(var prop in obj2){ obj1[prop] = obj2[prop]; } } - var deleteProps = function(obj){ + var deleteFilterFields = function(obj){ var searchFields = $(".glm-admin-search-field"); for(var i = 0; i < searchFields.length; i++){ var field = $(searchFields[i]).attr("data-search") ; @@ -106,11 +107,11 @@ window.Glma = (function() { content ); }, - updateSearchFilterValues: updateSearchFilterValues, - getSearchFieldValues: getSearchFieldValues, - getSearchFieldValues: getSearchFieldValues, - deleteProps : deleteProps, - mergeProps: mergeProps, + updateSearchFilterValues : updateSearchFilterValues, + getSearchFieldValues : getSearchFieldValues, + getSearchFieldValues : getSearchFieldValues, + deleteFilterFields : deleteFilterFields, + mergeProps : mergeProps, /* * call this function with a data object to configure the logic * # glmAction @@ -136,7 +137,7 @@ window.Glma = (function() { }else{ listData.query = request; } - deleteProps(listData); + deleteFilterFields(listData); updateSearchFilterValues(); var queries = getSearchFieldValues(); mergeProps(listData, queries); diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php index 73172b19..d1db5a72 100644 --- a/models/admin/manageDashboard/members.php +++ b/models/admin/manageDashboard/members.php @@ -169,7 +169,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers $prevStart = false; $nextStart = false; $start = 1; - $limit = 2; // Set to the number of listings per page + $limit = 100; // Set to the number of listings per page $namesList = false; $enable_members = $this->config['settings']['enable_members']; $textSearch = false; diff --git a/views/admin/manageDashboard/edit.html b/views/admin/manageDashboard/edit.html index 4d44db5b..7079bec3 100644 --- a/views/admin/manageDashboard/edit.html +++ b/views/admin/manageDashboard/edit.html @@ -197,7 +197,7 @@ {/if} - + Edit {if $m.status.name == 'Active'}Current{else}{$m.status.name}{/if} Profile @@ -218,7 +218,11 @@ {/if} {/foreach} {else} - Click here to start entering information for this {$terms.term_member}. + + + Click here to start entering information for this {$terms.term_member}. + + {/if} diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html index bbb58a44..62b74ead 100644 --- a/views/admin/manageDashboard/index.html +++ b/views/admin/manageDashboard/index.html @@ -9,10 +9,11 @@
Name + {if $paging} -
- {include file='admin/manageDashboard/adminSearch/pagination.html'} -
+
+ {include file='admin/manageDashboard/adminSearch/pagination.html'} +
{/if} Events Packages @@ -43,23 +44,19 @@ // window.Glma.updateSearchFilterValues(); var memberInfo, memberID; - var listData = { + var actionData = { action : Glma.defaultData.action, glm_action : Glma.defaultData.glm_action, - prevStart : Glma.defaultData.prevStart, - nextStart : Glma.defaultData.nextStart, - limit : Glma.defaultData.limit, - pageSelect : Glma.defaultData.pageSelect, - } - var editData = { - action : Glma.defaultData.action, - glm_action : Glma.defaultData.glm_action, } - + var listData = { + form_action : 'list', + view : 'list', + option : 'list', + }; + window.Glma.mergeProps(listData, actionData); /* * Init Materialize collapsible */ - $('.collapsible').collapsible(); // $('select').formSelect(); $('.modal').modal(); @@ -74,16 +71,11 @@ outDuration : 400 }); - listData.form_action = 'list'; - listData.view = 'list'; - listData.option = 'list'; - Glma.manageMember( listData, $("#glm-admin-search-overlay").fadeOut('slow'), function(data) { $("#member-results-container").html(data.searchData); - }, function(error) { console.log(error); @@ -92,12 +84,15 @@ ); $(".glm-search-checkbox").on("change", function(){ - listData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined; - listData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined; - listData.filterPending = $("input[name='pendingSearch']:checked").length > 0 ? true : undefined; - window.Glma.deleteProps(listData); + var filterData = {}; + filterData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined; + filterData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined; + filterData.filterPending = $("input[name='pendingSearch']:checked").length > 0 ? true : undefined; + + window.Glma.deleteFilterFields(listData); window.Glma.updateSearchFilterValues(); var queries = window.Glma.getSearchFieldValues(); + window.Glma.mergeProps(listData, filterData); window.Glma.mergeProps(listData, queries); Glma.manageMember( listData, @@ -111,61 +106,52 @@ "POST" ); }); + $(document).on("click", "#glm-close-drawer", function(){ + window.Glma.manageMember( + listData, + $("#glm-admin-search-overlay").fadeOut('slow'), + function(data) { + $("#member-results-container").html(data.searchData); + }, + function(error) { + console.log(error); + }, + "POST" + ); M.Sidenav.getInstance($('.edit-screen')[0]).close(); }); - var memberRecordHandler = function(data){ - return function(e){ - $(".edit-screen").html(''); - data.option = "manage"; - data.memberID = $(this).parent().data('id'); - memberID = data.memberID; - Glma.manageMember( - data, - function(complete) {}, - function(success) { - $(".edit-screen").html(success.searchData); - editData.option = ""; - editData.memberID = ""; - }, - function(error) { - console.log(error); - }, - "POST", - ); - M.Sidenav.getInstance($('.edit-screen')[0]).open(); - } - } - $(document).on("click",".member-record-name", memberRecordHandler(editData)); - $(document).on("click",".edit-member-profile",function(e){ - e.preventDefault(); + $(document).on("click",".member-record-name",function(){ $(".edit-screen").html(''); - editData.option = "edit"; - editData.memberInfo = $(this).data("memberinfo"); - editData.member = memberID; - editData.model = "memberInfo"; + var editData = {}; + editData.option = "manage"; + editData.memberID = $(this).parent().data('id'); + memberID = editData.memberID; + window.Glma.mergeProps(editData, actionData); Glma.manageMember( editData, function(complete) {}, function(success) { $(".edit-screen").html(success.searchData); - window.Glma.fileUploaderInit(); }, function(error) { console.log(error); }, "POST", - ); + ); + M.Sidenav.getInstance($('.edit-screen')[0]).open(); }); + + $('#filterCategories').on('change', function (e) { if( $(this).select2("val")){ listData.categorySearch = $(this).select2("val").join(","); }else{ listData.categorySearch = ""; } - window.Glma.deleteProps(listData); + window.Glma.deleteFilterFields(listData); window.Glma.updateSearchFilterValues(); var queries = window.Glma.getSearchFieldValues(); window.Glma.mergeProps(listData, queries); @@ -181,30 +167,10 @@ "POST" ); }); - $(document).on("click", ".glm-admin-profile-edit", function(e){ - e.preventDefault(); - $(".edit-screen").html(''); - editData.option = "addNew"; - editData.member = memberID; - editData.model = "memberInfo"; - Glma.manageMember( - editData, - function(complete) {}, - function(success) { - $(".edit-screen").html(success.searchData); - }, - function(error) { - console.log(error); - }, - "POST", - ); - }); + // console.log( $("#nextStart").attr("nextStart")); $(document).on("click", ".pagination", function(e){ if (!$(this).attr("disabled")) { - // listData.filterArchived = $("input[name='archivedSearch']:checked").length > 0 ? true : undefined; - // listData.filterFeatured = $("input[name='featuredSearch']:checked").length > 0 ? true : undefined; - // listData.filterPending = $("input[name='pendingSearch']:checked").length > 0 ? true : undefined; listData.pageSelect = $(this).text(); listData.prevStart = $("#pagination-data").attr("data-prevStart"); listData.nextStart = $("#pagination-data").attr("data-nextStart"); @@ -237,9 +203,6 @@ }, "POST" ); - - - } }); @@ -249,9 +212,11 @@ $(document).on("click", "#deleteMemberInfoSubmit", function(e){ e.preventDefault(); + var editData = {}; editData.option = "delete"; editData.member = $(this).data("member"); editData.deleteID = $(this).data("memberinfo"); + window.Glma.mergeProps(editData, actionData); Glma.manageMember( editData, function(complete) {}, @@ -267,10 +232,12 @@ $(document).on("click", ".glm-admin-clone-profile",function(e){ e.preventDefault(); + var editData = {}; editData.model = "memberInfo"; editData.option = "clone"; editData.member = $(this).data("member"); editData.memberInfo = $(this).data("memberinfo"); + window.Glma.mergeProps(editData, actionData); Glma.manageMember( editData, function(complete) {}, @@ -286,9 +253,11 @@ $(document).on("click", ".glm-admin-activate-profile",function(e){ e.preventDefault(); + var editData = {}; editData.option = "activate"; editData.member = $(this).data("member"); editData.activateID = $(this).data("memberinfo"); + window.Glma.mergeProps(editData, actionData); Glma.manageMember( editData, function(complete) {}, @@ -302,17 +271,15 @@ ); }); - // $(document).on("click", "#glm-admin-add-member-type", function(e){ - // e.preventDefault(); - // console.log("settings"); - - // }); + $(document).on("click", "#add-new-member",function(e){ $('.edit-screen').html(''); e.preventDefault(); + var editData = {}; editData.option = "add"; editData.model = "memberEdit"; + window.Glma.mergeProps(editData, actionData); Glma.manageMember( editData, function(complete) {}, @@ -329,45 +296,81 @@ // When submit button is clicked, disable the beforeunload message $(document).on('click', '.updateMemberProfile',function(e) { - e.preventDefault(); - var form = $("#member-info-form"); - var fileForm = new FormData(form[0]); - var option = form.find( $("#glm-admin-option") ).val(); - fileForm.set("action",'glm_members_admin_ajax'); - fileForm.set("glm_action" , 'memberManagement'); - fileForm.set("option" ,option); - fileForm.set("model" ,"memberProfile"); - console.log(form); - window.Glma.manageMember( - fileForm, - function(complete) {}, - function(success) { - console.log(success); - }, - function(error) { - console.log(error); - }, - "POST", - true - - ); - // glmSubmitRequired = false; - // return true; + e.preventDefault(); + var form = $("#member-info-form"); + var fileForm = new FormData(form[0]); + var option = form.find( $("#glm-admin-option") ).val(); + fileForm.set("action",'glm_members_admin_ajax'); + fileForm.set("glm_action" , 'memberManagement'); + fileForm.set("option" ,option); + fileForm.set("model" ,"memberProfile"); + + window.Glma.manageMember( + fileForm, + function(complete) {}, + function(success) { + console.log(success); + }, + function(error) { + console.log(error); + }, + "POST", + true + ); + }); + + $(document).on("click",".edit-member-profile",function(e){ + e.preventDefault(); + $(".edit-screen").html(''); + var editData = {}; + editData.option = "edit"; + editData.memberInfo = $(this).data("memberinfo"); + editData.member = memberID; + editData.model = "memberInfo"; + window.Glma.mergeProps(editData, actionData); + Glma.manageMember( + editData, + function(complete) {}, + function(success) { + $(".edit-screen").html(success.searchData); + window.Glma.fileUploaderInit(); + }, + function(error) { + console.log(error); + }, + "POST", + ); + }); + + $(document).on("click", ".glm-admin-profile-edit", function(e){ + e.preventDefault(); + $(".edit-screen").html(''); + var editData = {}; + editData.option = "addNew"; + editData.member = $(this).data("member"); + editData.model = "memberInfo"; + window.Glma.mergeProps(editData, actionData); + Glma.manageMember( + editData, + function(complete) {}, + function(success) { + $(".edit-screen").html(success.searchData); + }, + function(error) { + console.log(error); + }, + "POST", + ); }); - // $(document).on("click", "#glm-edit-member-status", function(e){ - // e.preventDefault(); - // }) $(document).on("click", "#updateMember", function(e){ e.preventDefault(); - // $(".edit-screen").html(''); var form = $("#member-edit-form"); var fileForm = new FormData(form[0]); fileForm.set("action",'glm_members_admin_ajax'); fileForm.set("glm_action" , 'memberManagement'); fileForm.set("option" ,"addNew"); fileForm.set("model" ,"memberEdit"); - console.log(form); window.Glma.manageMember( fileForm, function(complete) {}, diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index ace01c49..1a66a22c 100755 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -78,7 +78,7 @@ {if $memberInfoID && $memberInfo} - + {else}