From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 8 Mar 2018 19:01:28 +0000 (-0500)
Subject: wrapping up the settings, still need to be converted to css grid and the new smarty... 
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=acd8fe1c84a92219abbbdad912b6ee7e28be34f8;p=WP-Plugins%2Fglm-member-db-assets.git

wrapping up the settings, still need to be converted to css grid and the new smarty template
processing method for ajax.
---

diff --git a/models/admin/settings/assetTypes.php b/models/admin/settings/assetTypes.php
index ab3f565..a9c4110 100644
--- a/models/admin/settings/assetTypes.php
+++ b/models/admin/settings/assetTypes.php
@@ -127,10 +127,11 @@ class GlmMembersAdmin_settings_assetTypes extends GlmDataAssetsAssetTypes
         // Get number of obits
 
         $assetTypes = $this->getList();
-
+        $types = array("use_type"=>$this->config['use_type'], "map_item_type"=>$this->config['map_item_type']);
         // Compile template data
         $templateData = array(
             'assetTypes'      => $assetTypes,
+            'useTypes'        => $types
         );
              // Return status, any suggested view, and any data to controller
         return array(
diff --git a/views/admin/settings/assetTypes.html b/views/admin/settings/assetTypes.html
index 6950061..bc701bf 100644
--- a/views/admin/settings/assetTypes.html
+++ b/views/admin/settings/assetTypes.html
@@ -3,6 +3,7 @@
 <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
     <a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=assetTypes" class="glm-settings-tab nav-tab nav-tab-active">Asset Types</a>
 </h2>
+
 <table class="glm-admin-table glm-settings-table" style="width: 90%;">
     <tr><td colspan="2">
         <!-- Add Registration Payment Code Button and Dialog Box -->
@@ -11,20 +12,32 @@
             <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
                 <input type="hidden" name="glm_action" value="assetTypes">
                 <input type="hidden" name="option" value="addNew">
-
+                
                 <!-- This is only temporary until we reinstate the "Used With" selection below -->
                 <table class="glm-admin-table">
                     <tr>
                         <th class="glm-required">Asset Type Name: </th>
                         <td>
-                            <input id="edit-name" data-id="code" type="text" name="name" class="glm-form-text-input">
-                            <input id="edit-cost" data-id="code" type="text" name="cost" class="glm-form-text-input">
-                            <input id="edit-descr" data-id="code" type="text" name="descr" class="glm-form-text-input">
-                            <input id="edit-lead_time" data-id="code" type="text" name="lead_time" class="glm-form-text-input">
-                            <input id="edit-reuse_time" data-id="code" type="text" name="reuse_time" class="glm-form-text-input">
-                            <input id="edit-hold_time" data-id="code" type="text" name="hold_time" class="glm-form-text-input">
-                            <input id="edit-map_item_type" data-id="code" type="text" name="map_item_type" class="glm-form-text-input">
-                            <input id="edit-state" data-id="code" type="text" name="use_type" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="name" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="cost" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="descr" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="lead_time" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="reuse_time" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="hold_time" class="glm-form-text-input">
+                            <input data-id="code" type="text" name="use_type" class="glm-form-text-input">
+                            <select name="map_item_type" data-id="map-item-type">
+                                <option value="">Select Map Item Type</option>
+                                {foreach $useTypes.map_item_type as $mapItem=>$name}
+                                    <option value="$mapItem">{$name}</option>
+                                {/foreach}
+                            </select>
+                            <select name="use_type" data-id="use-type">
+                                <option value="">Select Use Type</option>
+                                {foreach $useTypes.use_type as $useType=>$name}
+                                    <option value="{$useType}">{$name}</option>
+                                {/foreach}
+                            </select>
+                      
                         </td>
                     </tr>
                 </table>
@@ -39,7 +52,7 @@
         <div id="deleteAssetTypeDialog" class="glm-dialog-box" title="Delete AssetType">
             <center>
                 <p>Are you sure you want to delete this Asset Type?</p>
-                <p><div id="deleteAssetTypeConfirm" class="button button-primary">Yes, delete this AssetType</div></p>
+                <p><div id="deleteAssetTypeConfirm" class="button button-primary">Yes, delete this Asset Type</div></p>
                 <p><div id="deleteAssetTypeCancel" class="button button-primary">Cancel</div></p>
             </center>
         </div>
@@ -54,7 +67,7 @@
                 <!-- This is only temporary until we reinstate the "Used With" selection below -->
                 <table class="glm-admin-table">
                       <tr>
-                        <th class="glm-required">AssetType Name:</th>
+                        <th class="glm-required">Asset Type Name:</th>
                         <td>
                             <input id="edit-name" data-id="code" type="text" name="name" class="glm-form-text-input">
                             <input id="edit-cost" data-id="code" type="text" name="cost" class="glm-form-text-input">
@@ -62,15 +75,24 @@
                             <input id="edit-lead_time" data-id="code" type="text" name="lead_time" class="glm-form-text-input">
                             <input id="edit-reuse_time" data-id="code" type="text" name="reuse_time" class="glm-form-text-input">
                             <input id="edit-hold_time" data-id="code" type="text" name="hold_time" class="glm-form-text-input">
-                            <input id="edit-map_item_type" data-id="code" type="text" name="map_item_type" class="glm-form-text-input">
-                            <input id="edit-state" data-id="code" type="text" name="state" class="glm-form-text-input">
+                            <select name="map_item_type" id="edit-map_item_type" data-id="map-item-type">
+                                <option value="">Select Map Item Type</option>
+                                {foreach $useTypes.map_item_type as $mapItem=>$name}
+                                    <option value="{$mapItem}">{$name}</option>
+                                {/foreach}
+                            </select>
+                            <select name="use_type" id="edit-use_type" data-id="use-type">
+                                <option value="">Select Use Type</option>
+                                {foreach $useTypes.use_type as $useType=>$name}
+                                    <option value="{$useType}">{$name}</option>
+                                {/foreach}
+                            </select>
                         </td>
-                    </tr>
-                    <tr>
+                      </tr>
                 </table>
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="editAssetTypeCancel" class="button button-primary glm-right">Cancel</a>
-                <input type="submit" value="Update this AssetType">
+                <input type="submit" value="Update this Asset Type">
 
             </form>
         </div>
@@ -78,12 +100,12 @@
         <table class="wp-list-table wideFat fixed posts glm-admin-table" style="width: 90%;">
             <thead>
                 <tr>
-                    <th> AssetType Name </th>
+                    <th> Asset Type Name </th>
                     <th>&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
-               {$assetTypes|@print_r}
+
             {if $assetTypes}
             
                 {assign var="i" value="0"}
@@ -94,7 +116,8 @@
                         <tr class="alternate">
                     {/if}
                             <td>
-                                <div class="assettype-record" id="assettype_{$n.id}" data-assettypeID="{$n.id}" >{$n.name}</div>
+                                <input id="editAssetID_{$n.id}"type="hidden" data-assetID="{$n.id}" data-assetName='{$n.name}' data-assetUseType='{$n.use_type.value}' data-assetMapItem='{$n.map_item_type.value}' data-assetDescr='{$n.descr}' data-assetLead="{$n.lead_time}" data-assetReuse="{$n.reuse_time}" data-assetCost="{$n.cost}" data-assetHold="{$n.hold_time}">
+                                <div class="assettype-record" id="assettype_{$n.id}" data-assettypeID="{$n.id}" data-assettypeID="{$n.id}" >{$n.name}</div>
                                 <div class="editAssetTypeButton editAssetType button button-secondary glm-button-small glm-right" data-assettypeID="{$n.id}">Edit</div> 
                                 <div class="deleteAssetTypeButton button button-secondary glm-button-small glm-right" data-assettypeID="{$n.id}">Delete</div>
                             </td>
@@ -133,7 +156,25 @@
         });
         $('.editAssetType').click( function() {
             var assettypeID        = $(this).attr('data-assettypeID');
-
+            var assetTypeName      = $("#editAssetID_" + assettypeID).data('assetname');
+            var assetTypeCost      = $("#editAssetID_" + assettypeID).data('assetcost');
+            var assetTypeUseType   = $("#editAssetID_" + assettypeID).data('assetusetype');
+            var assetTypeMapItem   = $("#editAssetID_" + assettypeID).data('assetmapitem');
+            var assetTypeDescr     = $("#editAssetID_" + assettypeID).data('assetdescr');
+            var assetTypeLead      = $("#editAssetID_" + assettypeID).data('assetlead');
+            var assetTypeReuse     = $("#editAssetID_" + assettypeID).data('assetreuse');
+            var assetTypeHold      = $("#editAssetID_" + assettypeID).data('assethold');
+            
+            $("#edit-name").val(assetTypeName);
+            $("#edit-cost").val(assetTypeCost);
+            $("#edit-descr").val(assetTypeDescr);
+            $("#edit-lead_time").val(assetTypeLead);
+            $("#edit-reuse_time").val(assetTypeReuse);
+            $("#edit-hold_time").val(assetTypeHold);
+            console.log(assetTypeUseType);
+            $("#edit-use_type").val(assetTypeUseType);
+            $("#edit-map_item_type").val(assetTypeMapItem);
+            
             $('#editAssetTypeID').val(assettypeID);
 
             $("#editAssetTypeDialog").dialog("open");