changing dropdowns to be browser default, adding ajax model to populate memberEdit...
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Jan 2019 15:26:15 +0000 (10:26 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Jan 2019 15:26:15 +0000 (10:26 -0500)
css/admin.css
models/admin/ajax/adminSearch.php [deleted file]
models/admin/ajax/memberManagement.php
models/admin/member/memberInfo.php
views/admin/manageDashboard/index.html
views/admin/member/memberInfo.html
views/admin/member/memberInfo/editProfileAddress.html
views/admin/member/memberInfo/editProfileMailing.html
views/admin/member/memberInfo/editProfileStatus.html

index 8b10921..6eccf13 100755 (executable)
@@ -377,7 +377,7 @@ td.glm-nowrap {
     border: 1px black solid;
     border-radius: 7px;
     padding: 5px;
-    z-index: 1000 !important;
+    z-index: 100000 !important;
 }
 .glm-dialog-no-close .ui-dialog-titlebar-close {
     display: none;
@@ -803,4 +803,7 @@ td.glm-nowrap {
 {
     cursor: pointer;
 }
-.glm-import-td { padding:15px !important; margin: 0; }
\ No newline at end of file
+.glm-import-td { padding:15px !important; margin: 0; }
+textarea{
+    color: black !important;
+}
\ No newline at end of file
diff --git a/models/admin/ajax/adminSearch.php b/models/admin/ajax/adminSearch.php
deleted file mode 100644 (file)
index add6988..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/**
- * Gaslight Media Members Database
- * Members List Export by AJAX
- *
- * PHP version 5.5
- *
- * @category glmWordPressPlugin
- * @entity  glmMembersDatabase
- * @author   Chuck Scott <cscott@gaslightmedia.com>
- * @license  http://www.gaslightmedia.com Gaslightmedia
- * @version  0.1
- */
-require_once GLM_MEMBERS_PLUGIN_PATH . '/controllers/admin.php';
-/**
- *
- * This class exports the currently selected members list
- * to a printable HTML file, to a CSV file, or otherwise.
- */
-class GlmMembersAdmin_ajax_adminSearch extends glmMembersAdmin
-{
-
-    /**
-     * WordPress Database Object
-     *
-     * @var $wpdb
-     * @access public
-     */
-    public $wpdb;
-    /**
-     * Plugin Configuration Data
-     *
-     * @var $config
-     * @access public
-     */
-    public $config;
-
-    /**
-     * Constructor
-     *
-     * This constructor sets up this model. At this time that only includes
-     * storing away the WordPress data object.
-     *
-     * @return object Class object
-     *
-     */
-    public function __construct ($wpdb, $config)
-    {
-
-        // Save WordPress Database object
-        $this->wpdb = $wpdb;
-
-        // Save plugin configuration object
-        $this->config = $config;
-
-        //parent::__construct(false, false);
-
-    }
-    function write_log ( $log )  {
-        if ( true === WP_DEBUG ) {
-            if ( is_array( $log ) || is_object( $log ) ) {
-                error_log( print_r( $log, true ) );
-            } else {
-                error_log( $log );
-            }
-        }
-    }
-    /**
-     * Perform Model Action
-     *
-     * This modelAction takes an AJAX image upload and stores the image in the
-     * media/images directory of the plugin.
-     *
-     * This model action does not return, it simply does it's work then calls die();
-     *
-     * @param $actionData
-     *
-     * Echos JSON string as response and does not return
-     */
-    public function modelAction ($actionData = false)
-    {
-        global $wpdb;
-
-        $where              = ' true ';
-        $alphaWhere         = ' true ';
-        $start = 1;
-        $limit = 20;
-
-        $status = $this->config['status_numb']['Active'];
-        // $list   = apply_filters('glm-member-db-admin-search', '');
-        $list  = $this->controller( 'manageDashboard', 'members', false, true, true);
-     
-        
-        $return = array(
-            'searchData'    => $list     // Where our events list will go
-        );
-
-        //header('Content-type:application/json;charset=utf-8', true);
-        echo json_encode($return);
-        wp_die();
-    }
-}
index 66516e0..e80f5ed 100644 (file)
@@ -87,6 +87,7 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
             $memberID = $_REQUEST['memberID'];
             $data = $this->controller( 'member', 'index', array("memberID" => $memberID), true, true);
         }
+
         if($_REQUEST['option'] == 'list'){
             $where              = ' true ';
             $alphaWhere         = ' true ';
@@ -94,12 +95,17 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
             $limit = 20;
     
             $status = $this->config['status_numb']['Active'];
-            // $list   = apply_filters('glm-member-db-admin-search', '');
             $data  = $this->controller( 'manageDashboard', 'members', false, true, true);
         }
-        
+
+        if($_REQUEST['option'] == 'edit'){
+            $memberID = $_REQUEST['memberID'];
+            $memberInfo = $_REQUEST['memberInfo'];
+            $data  = $this->controller( 'member', 'memberInfo',  false, true, true);
+        }
+
         $return = array(
-            "test"          => $sql,
+            "test"          => [$memberID, $memberInfo],
             'searchData'    => $data,       // Where our events list will go
         );
 
index d3a8f95..aaf2c2b 100755 (executable)
@@ -243,10 +243,9 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
             if (isset($_REQUEST['memberInfo'])) {
                 $this->memberInfoID = $_REQUEST['memberInfo']-0;
                 $this->haveMemberInfo = true;
-
             }
         }
-
+    
         // Check to see if the user is locked to a particular member
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
 
@@ -430,7 +429,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
 
             // Default is to display the currently selected member information record in a form for updates
             default:
-
+                
                 // Edit the existing member
                 $this->memberInfo = $this->editEntry($this->memberInfoID);
 
index 1846ed4..aa49add 100644 (file)
@@ -31,7 +31,7 @@
             glm_action  : defaultData.glm_action,
         }
 
-        var Glma = (function() {  
+        window.Glma = (function() {  
             var xhr = function(data, complete, success, error, type){
                 $.ajax({
                     dataType: "json",
@@ -81,7 +81,7 @@
             outDuration        : 400
         });
 
-
+        var memberInfo, memberID;
         /*
             *  Text Search Autocomplete
             */
         $(document).on("click",".member-record-name", function(){
             $(".edit-screen").html('');
             editData.option     = "manage";
-            editData.memberID   = $(this).parent().data('id')
+            editData.memberID   = $(this).parent().data('id');
+            memberID            = editData.memberID;
             Glma.memberEdit(
                 editData,
                 function(complete) {},
         $(document).on("click","#edit-member-profile",function(e){
             e.preventDefault();
             $(".edit-screen").html('');
-            editData.option = "edit";
+            editData.option     = "edit";
+            editData.memberInfo = $(this).data("memberinfo");
+            editData.member     = memberID;
             Glma.memberEdit(
                 editData,
                 function(complete) {},
                 function(success) {
+                    console.log(success);
+                    
                     $(".edit-screen").html(success.searchData);
+                    
                 },
                 function(error) {
                     console.log(error);
                 },
                 "POST",
-            )
+            );
         });
     });
 </script>
index 31e3894..03e6a96 100755 (executable)
         {if $errorMessage}<span class="glm-error glm-flash-updated glm-right">{$errorMessage}</span>{/if}
     </h2>
 
-        <input class="updateMemberProfile button-primary glm-right" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">
+        <button class="updateMemberProfile button-primary glm-right b" value="">{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if} </button>
         <br>
         <br>
         <!-- **** Status, Address and Location **** -->
       {/if}
 
         <p><span class="glm-required">*</span> Required</p>
-        <input class="updateMemberProfile button-primary" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">
+        <button class="updateMemberProfile btn" value="">{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}</button>
 
     </form>
 
         </div>
 {/if} <!-- glm_members_permit_admin_member_info_edit -->
 
-    <script type="text/javascript">
-        jQuery(document).ready(function($) {
-
+    <script >
+        jQuery(function($) {
+            $('select').formSelect();
             /*
              * Edit area tabs
              */
 
                 // Get new city name
                 var newCityName = $('#newCityName').val();
-
+               
                 // If no name is supplied, notify used it's required
                 if (newCityName == '') {
                     $('#newCityNameTD').addClass('glm-form-bad-input');
                     newMailingCityAdded = true;
 
                 }
-
+                
                 // Clear new city name from form
                 $('#newMailingCityName').val('');
 
                 $("#newMailingCityDialog").dialog("close");
-
+                
             });
              
             // Flash certain elements for a short time after display
                 glmSubmitRequired = true;
             }
             // When submit button is clicked, disable the beforeunload message
-            $('.updateMemberProfile').on('click', function() {
+            $('.updateMemberProfile').on('click', function(e) {
+                e.preventDefault();
+                
                 glmSubmitRequired = false;
                 return true;
             });
index 409183a..1505014 100755 (executable)
@@ -40,7 +40,7 @@
                                     <!-- City Selection -->
                                     <input id="cityName" type="hidden" name="newCityName" value="">
                                 {/if}<!-- this field is only used if adding a new city to pass the new name -->
-                                <select name="city" id="city" class="glm-left">
+                                <select name="city" id="city" class="glm-left browser-default">
                                     <option value="0"></option>
                                     {foreach from=$memberInfo.fieldData.city.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
@@ -52,7 +52,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</h4>
                             <div {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <select name="county">
+                                <select name="county" class="browser-default">
                                         <option value="0"{if $v.default} selected="selected"{/if}></option>
                                     {foreach from=$memberInfo.fieldData.county.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
@@ -65,7 +65,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</h4>
                             <div {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <select name="region">
+                                <select name="region" class="browser-default">
                     {foreach from=$memberInfo.fieldData.region.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                     {/foreach}
@@ -76,7 +76,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.state}class="glm-required"{/if}>State:</h4>
                             <div {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <select id="state" name="state">
+                                <select id="state" name="state" class=" browser-default">
                                     <option value=""></option>
                     {foreach from=$memberInfo.fieldData.state.list item=v}
                                     <option value="{$v.value}"{if $memberInfo.fieldData.state.value == $v.value} selected="selected"{/if}>
@@ -97,7 +97,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.country}class="glm-required"{/if}>Country:</h4>
                             <div {if $memberInfo.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
-                                <select id="country" name="country">
+                                <select id="country" name="country" class=" browser-default">
                                     <option value=""></option>
                     {foreach from=$memberInfo.fieldData.country.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
index 25ff9bc..d641d2c 100644 (file)
@@ -39,7 +39,7 @@
                                 
                                     <input id="mailingCityName" type="hidden" name="newMailingCityName" value=""><!-- this field is only used if adding a new mailing city to pass the new name -->
                                 {/if}
-                                <select name="mailing_city" id="mailing_city" class="glm-left">
+                                <select name="mailing_city" id="mailing_city" class="glm-left browser-default">
                                     <option value="0"></option>
                                     {foreach from=$memberInfo.fieldData.mailing_city.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
@@ -53,7 +53,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.mailing_state}class="glm-required"{/if}>Mailing State:</h4>
                             <div {if $memberInfo.fieldFail.mailing_state}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                                <select id="mailing_state" name="mailing_state">
+                                <select id="mailing_state" name="mailing_state" class="browser-default">
                                     <option value=""></option>
                                     {foreach from=$memberInfo.fieldData.mailing_state.list item=v}
                                         <option value="{$v.value}"{if $memberInfo.fieldData.mailing_state.value == $v.value} selected="selected"{/if}>
index 51fbcf1..07b16c9 100644 (file)
@@ -2,7 +2,7 @@
             <div class="glm-row">
                 <h2>Profile Status:</h2>
                 <div class="glm-small-12">
-                    <select name="status">
+                    <select name="status" class="browser-default">
                         {foreach from=$memberInfo.fieldData.status.list item=v}
                             <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
                         {/foreach}