From: Steve Sutton Date: Fri, 18 Oct 2019 21:04:25 +0000 (-0400) Subject: Working on tables X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1ff4284fd81f3820477cd4cdeef53b4dfbb7a280;p=WP-Plugins%2Fglm-member-db-plugins.git Working on tables setup tables to update data --- diff --git a/models/admin/plugins/plugins.php b/models/admin/plugins/plugins.php index 9040b68..5c0a874 100644 --- a/models/admin/plugins/plugins.php +++ b/models/admin/plugins/plugins.php @@ -109,6 +109,7 @@ class GlmMembersAdmin_plugins_plugins extends GlmDataPlugins wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Lead Tabulater js library wp_enqueue_style( 'Tabulator', GLM_MEMBERS_PLUGINS_PLUGIN_URL . '/js/tabulator/dist/css/tabulator.min.css' ); wp_enqueue_script( 'Tabulator', GLM_MEMBERS_PLUGINS_PLUGIN_URL . '/js/tabulator/dist/js/tabulator.min.js' ); diff --git a/models/admin/plugins/servers.php b/models/admin/plugins/servers.php index d8e9b28..0b8f1d6 100644 --- a/models/admin/plugins/servers.php +++ b/models/admin/plugins/servers.php @@ -140,7 +140,7 @@ class GlmMembersAdmin_plugins_servers extends GlmDataServers if ( $server['fieldData']['production']['value'] ) { $tData['sites'] = $this->wpdb->get_results( $this->wpdb->prepare( - "SELECT S.name as site_name,S.prod_url as url + "SELECT S.id,S.name as site_name,S.prod_url as url FROM " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "sites S LEFT OUTER JOIN " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "servers PS ON (PS.id = S.prod_server) WHERE PS.id = %d @@ -152,7 +152,7 @@ class GlmMembersAdmin_plugins_servers extends GlmDataServers } else { $tData['sites'] = $this->wpdb->get_results( $this->wpdb->prepare( - "SELECT S.name as site_name,S.dev_url as url + "SELECT S.id,S.name as site_name,S.dev_url as url FROM " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "sites S LEFT OUTER JOIN " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "servers DS ON (DS.id = S.dev_server) WHERE DS.id = %d diff --git a/models/admin/plugins/sites.php b/models/admin/plugins/sites.php index c160d7c..bff1d15 100644 --- a/models/admin/plugins/sites.php +++ b/models/admin/plugins/sites.php @@ -104,10 +104,11 @@ class GlmMembersAdmin_plugins_sites extends GlmDataSites $option2 = false; $viewPath = 'admin/plugins/'; - // Setup Foundation 6 + // Setup Foundation 6. wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . 'css/foundation-6.min.css' ); wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . 'js/foundation-6.min.js' ); + // Load Tabulator js library. wp_enqueue_style( 'Tabulator', GLM_MEMBERS_PLUGINS_PLUGIN_URL . '/js/tabulator/dist/css/tabulator.min.css' ); wp_enqueue_script( 'Tabulator', GLM_MEMBERS_PLUGINS_PLUGIN_URL . '/js/tabulator/dist/js/tabulator.min.js' ); @@ -132,7 +133,6 @@ class GlmMembersAdmin_plugins_sites extends GlmDataSites $plugin = $this->updateEntry( $id ); } - case 'view': $view = 'site-detail'; if ( isset( $_REQUEST['site_id'] ) && $id = filter_var( $_REQUEST['site_id'], FILTER_VALIDATE_INT ) ) { @@ -140,7 +140,7 @@ class GlmMembersAdmin_plugins_sites extends GlmDataSites $tData['site'] = $site; $tData['plugins'] = $this->wpdb->get_results( $this->wpdb->prepare( - "SELECT P.name,P.latest_version,SP.prod_version,SP.dev_version + "SELECT SP.id as site_plugin_id,P.id,P.name,P.latest_version,SP.prod_version,SP.dev_version FROM " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "site_plugins SP LEFT OUTER JOIN " . GLM_MEMBERS_PLUGINS_PLUGIN_DB_PREFIX . "plugins P ON (P.id = SP.plugin) WHERE SP.site = %d diff --git a/views/admin/plugins/plugin-detail.html b/views/admin/plugins/plugin-detail.html index 20bf74b..c7ed7bc 100644 --- a/views/admin/plugins/plugin-detail.html +++ b/views/admin/plugins/plugin-detail.html @@ -36,75 +36,90 @@ {$data = $plugin} - {* Name *} - {$ui = [ - 'value' => $data.fieldData.name, - 'field' => 'name', - 'label' => 'Name', - 'required' => $data.fieldRequired.name, - 'errorText' => 'Name is Required', - 'dataError' => $data.fieldFail.name - ]} - {include file='ui/f6/text.html'} - - {* Latest Version *} - {$ui = [ - 'value' => $data.fieldData.latest_version, - 'field' => 'latest_version', - 'label' => 'Latest Version', - 'required' => $data.fieldRequired.latest_version, - 'errorText' => 'Latest Version is Required', - 'dataError' => $data.fieldFail.latest_version - ]} - {include file='ui/f6/text.html'} - - {* Notes *} - {$ui = [ - 'value' => $data.fieldData.notes, - 'field' => 'notes', - 'label' => 'Notes', - 'height' => '250', - 'teeny' => true, - 'required' => $data.fieldRequired.notes, - 'errorText' => 'Notes is Required', - 'dataError' => $data.fieldFail.notes - ]} - {include file='ui/f6/editor.html'} - - {* GLMA *} - {$ui = [ - 'value' => $data.fieldData.glm_associate.value|default:'', - 'field' => 'glm_associate', - 'label' => 'GLMA', - 'required' => $data.fieldRequired.glm_associate, - 'errorText' => 'GLMA is Required', - 'dataError' => $data.fieldFail.glm_associate - ]} - {include file='ui/f6/checkbox.html'} - - {* Plugin Submit *} - {$ui = [ - 'class' => 'primary', - 'label' => 'Save', - 'submit' => true, - 'id' => 'plugin-submit', - 'cancel' => "" - ]} - {include file='ui/f6/submit.html'} +
+ + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '5', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* Name *} + {$ui = [ + 'value' => $data.fieldData.name, + 'field' => 'name', + 'label' => 'Name', + 'required' => $data.fieldRequired.name, + 'errorText' => 'Name is Required', + 'dataError' => $data.fieldFail.name + ]} + {include file='ui/f6/text.html'} + + {* Latest Version *} + {$ui = [ + 'value' => $data.fieldData.latest_version, + 'field' => 'latest_version', + 'label' => 'Latest Version', + 'required' => $data.fieldRequired.latest_version, + 'errorText' => 'Latest Version is Required', + 'dataError' => $data.fieldFail.latest_version + ]} + {include file='ui/f6/text.html'} + + {* GLMA *} + {$ui = [ + 'value' => $data.fieldData.glm_associate.value|default:'', + 'field' => 'glm_associate', + 'label' => 'GLMA', + 'required' => $data.fieldRequired.glm_associate, + 'errorText' => 'GLMA is Required', + 'dataError' => $data.fieldFail.glm_associate + ]} + {include file='ui/f6/checkbox.html'} + + {include file="ui/f6/section-end.html"} + + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '7', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* Notes *} + {$ui = [ + 'value' => $data.fieldData.notes, + 'field' => 'notes', + 'label' => 'Notes', + 'height' => '250', + 'teeny' => true, + 'required' => $data.fieldRequired.notes, + 'errorText' => 'Notes is Required', + 'dataError' => $data.fieldFail.notes + ]} + {include file='ui/f6/editor.html'} + + {include file="ui/f6/section-end.html"} + + {* Plugin Submit *} + {$ui = [ + 'class' => 'primary', + 'label' => 'Save', + 'submit' => true, + 'id' => 'plugin-submit', + 'cancel' => "" + ]} + {include file='ui/f6/submit.html'} + +
{* Form End *} {include file='ui/f6/form-end.html'} - - {if $newEntry} {$baseUrl = "{$thisUrl}?page={$thisPage}&glm_action={$thisAction}&option=view"} {else} @@ -113,28 +128,7 @@ Add Site -{if !empty($sites) && !$newEntry} - - - - - - - - - {foreach $sites as $site} - - - - - - - - {/foreach} -
Site NameProd ServerProd VersionDev ServerDev Version
{$site.site_name}{$site.prod_server}{$site.prod_version}{$site.dev_server}{$site.dev_version}
- -
-{/if} +
{* Grid End *} {include file='ui/f6/grid-end.html'} @@ -143,16 +137,30 @@ $(document).foundation(); var tabledata = [ {foreach $sites as $site} - { id:"{$site.site_plugin_id}", siteId: "{$site.id}", name:"{$site.site_name|escape:'quotes'}", - prodServer: "{$site.prod_server}", prodVersion: "{$site.prod_version}", - prodUpToDate: {if !empty($site.prod_version) && version_compare( $plugin.fieldData.latest_version, $site.prod_version, '>' )}false{elseif !empty($site.prod_version)}true{else}null{/if}, - devServer: "{$site.dev_server}", devVersion: "{$site.dev_version}", - devUpToDate: {if !empty($site.dev_version) && version_compare( $plugin.fieldData.latest_version, $site.dev_version, '>' )}false{elseif !empty($site.dev_version)}true{else}null{/if} + { + id:"{$site.site_plugin_id}", + siteId: "{$site.id}", + name:"{$site.site_name|escape:'quotes'}", + prodServer: "{$site.prod_server}", + prodVersion: "{$site.prod_version}", + prodUpToDate: {if !empty($site.prod_version) && version_compare( $plugin.fieldData.latest_version, $site.prod_version, '>' )}false{elseif !empty($site.prod_version)}true{else}null{/if}, + devServer: "{$site.dev_server}", + devVersion: "{$site.dev_version}", + devUpToDate: {if !empty($site.dev_version) && version_compare( $plugin.fieldData.latest_version, $site.dev_version, '>' )}false{elseif !empty($site.dev_version)}true{else}null{/if} }, {/foreach} ]; {literal} + /** + * Function updateVersion. Calls the ajax handler to save tho date for the version. + * + * Saves the data for prod and dev versions for the site_plugin record of that row. + * + * @param Object cell Tabulator cell object. + * + * @return void + */ function updateVersion( cell ) { if ( cell == undefined ) { console.log('ERROR'); diff --git a/views/admin/plugins/server-detail.html b/views/admin/plugins/server-detail.html index 9a7e50e..6febc6e 100644 --- a/views/admin/plugins/server-detail.html +++ b/views/admin/plugins/server-detail.html @@ -26,74 +26,98 @@ {$data = $server} - - - - - {* Production *} - {$ui = [ - 'value' => $data.fieldData.production.value, - 'field' => 'production', - 'label' => 'Production', - 'required' => $data.fieldRequired.production, - 'errorText' => 'Production is Required', - 'dataError' => $data.fieldFail.production - ]} - {include file='ui/f6/checkbox.html'} - - {* Name *} - {$ui = [ - 'value' => $data.fieldData.name, - 'field' => 'name', - 'label' => 'Name', - 'required' => $data.fieldRequired.name, - 'errorText' => 'Name is Required', - 'dataError' => $data.fieldFail.name - ]} - {include file='ui/f6/text.html'} - - {* Location *} - {$ui = [ - 'value' => $data.fieldData.location, - 'field' => 'location', - 'label' => 'Location', - 'required' => $data.fieldRequired.location, - 'errorText' => 'Location is Required', - 'dataError' => $data.fieldFail.location - ]} - {include file='ui/f6/text.html'} - - {* PHP Version *} - {$ui = [ - 'value' => $data.fieldData.php_version, - 'field' => 'php_version', - 'label' => 'PHP Version', - 'required' => $data.fieldRequired.php_version, - 'errorText' => 'PHP Version is Required', - 'dataError' => $data.fieldFail.php_version - ]} - {include file='ui/f6/text.html'} - - {* Mysql Version *} - {$ui = [ - 'value' => $data.fieldData.mysql_version, - 'field' => 'mysql_version', - 'label' => 'Mysql Version', - 'required' => $data.fieldRequired.mysql_version, - 'errorText' => 'Mysql Version is Required', - 'dataError' => $data.fieldFail.mysql_version - ]} - {include file='ui/f6/text.html'} - - {* Save *} - {$ui = [ - 'class' => 'primary', - 'label' => 'Save', - 'submit' => true, - 'id' => 'form-save', - 'cancel' => "" - ]} - {include file='ui/f6/submit.html'} +
+ + + + + + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '6', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* Production *} + {$ui = [ + 'value' => $data.fieldData.production.value, + 'field' => 'production', + 'label' => 'Production', + 'required' => $data.fieldRequired.production, + 'errorText' => 'Production is Required', + 'dataError' => $data.fieldFail.production + ]} + {include file='ui/f6/checkbox.html'} + + {* Name *} + {$ui = [ + 'value' => $data.fieldData.name, + 'field' => 'name', + 'label' => 'Name', + 'required' => $data.fieldRequired.name, + 'errorText' => 'Name is Required', + 'dataError' => $data.fieldFail.name + ]} + {include file='ui/f6/text.html'} + + {* Location *} + {$ui = [ + 'value' => $data.fieldData.location, + 'field' => 'location', + 'label' => 'Location', + 'required' => $data.fieldRequired.location, + 'errorText' => 'Location is Required', + 'dataError' => $data.fieldFail.location + ]} + {include file='ui/f6/text.html'} + + {include file="ui/f6/section-end.html"} + + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '6', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* PHP Version *} + {$ui = [ + 'value' => $data.fieldData.php_version, + 'field' => 'php_version', + 'label' => 'PHP Version', + 'required' => $data.fieldRequired.php_version, + 'errorText' => 'PHP Version is Required', + 'dataError' => $data.fieldFail.php_version + ]} + {include file='ui/f6/text.html'} + + {* Mysql Version *} + {$ui = [ + 'value' => $data.fieldData.mysql_version, + 'field' => 'mysql_version', + 'label' => 'Mysql Version', + 'required' => $data.fieldRequired.mysql_version, + 'errorText' => 'Mysql Version is Required', + 'dataError' => $data.fieldFail.mysql_version + ]} + {include file='ui/f6/text.html'} + + {include file="ui/f6/section-end.html"} + + {* Save *} + {$ui = [ + 'class' => 'primary', + 'label' => 'Save', + 'submit' => true, + 'id' => 'form-save', + 'cancel' => "" + ]} + {include file='ui/f6/submit.html'} + +
{* Form End *} {include file='ui/f6/form-end.html'} @@ -148,6 +172,7 @@ ], rowClick:function(e, row){ console.log('Row ' + row.getData().id + ' Clicked!!!'); + window.location.href="{/literal}{$thisUrl}?page={$thisPage}&glm_action=sites&option=view&site_id={literal}" + row.getData().id; } }); {/literal} diff --git a/views/admin/plugins/site-detail.html b/views/admin/plugins/site-detail.html index 0d7dc51..2ab42fc 100644 --- a/views/admin/plugins/site-detail.html +++ b/views/admin/plugins/site-detail.html @@ -8,7 +8,8 @@ {$ui = [ 'nowrap' => false, 'backgroundColor' => '', - 'sectionColor' => '' + 'sectionColor' => '', + 'startGridX' => false ]} {include file='ui/f6/grid-start.html'} @@ -30,112 +31,137 @@ {$data = $site} - {* Active *} - {$ui = [ - 'value' => $data.fieldData.active.value, - 'field' => 'active', - 'label' => 'Active', - 'required' => $data.fieldRequired.active, - 'errorText' => 'Active is Required', - 'dataError' => $data.fieldFail.active - ]} - {include file='ui/f6/checkbox.html'} - - {* Name *} - {$ui = [ - 'value' => $data.fieldData.name, - 'field' => 'name', - 'label' => 'Name', - 'required' => $data.fieldRequired.name, - 'errorText' => 'Name is Required', - 'dataError' => $data.fieldFail.name - ]} - {include file='ui/f6/text.html'} - - {* Prod Url *} - {$ui = [ - 'value' => $data.fieldData.prod_url, - 'field' => 'prod_url', - 'label' => 'Prod Url', - 'required' => $data.fieldRequired.prod_url, - 'errorText' => 'Prod Url is Required', - 'dataError' => $data.fieldFail.prod_url - ]} - {include file='ui/f6/text.html'} - - {* Dev Url *} - {$ui = [ - 'value' => $data.fieldData.dev_url, - 'field' => 'dev_url', - 'label' => 'Dev Url', - 'required' => $data.fieldRequired.dev_url, - 'errorText' => 'Dev Url is Required', - 'dataError' => $data.fieldFail.dev_url - ]} - {include file='ui/f6/text.html'} - - {* Prod Server *} - {$ui = [ - 'value' => $data.fieldData.prod_server.value, - 'field' => 'prod_server', - 'label' => 'Prod Server', - 'list' => $data.fieldData.prod_server.list, - 'l_label' => 'name', - 'l_value' => 'value', - 'l_blank' => false, - 'required' => $data.fieldRequired.prod_server, - 'errorText' => 'Prod Server is Required', - 'dataError' => $data.fieldFail.prod_server - ]} - {include file='ui/f6/select.html'} - - {* Dev Server *} - {$ui = [ - 'value' => $data.fieldData.dev_server.value, - 'field' => 'dev_server', - 'label' => 'Dev Server', - 'list' => $data.fieldData.dev_server.list, - 'l_label' => 'name', - 'l_value' => 'value', - 'l_blank' => false, - 'required' => $data.fieldRequired.dev_server, - 'errorText' => 'Dev Server is Required', - 'dataError' => $data.fieldFail.dev_server - ]} - {include file='ui/f6/select.html'} - - {* Map Key *} - {$ui = [ - 'value' => $data.fieldData.map_key, - 'field' => 'map_key', - 'label' => 'Map Key', - 'required' => $data.fieldRequired.map_key, - 'errorText' => 'Map Key is Required', - 'dataError' => $data.fieldFail.map_key - ]} - {include file='ui/f6/text.html'} - - {* Has Contacts *} - {$ui = [ - 'value' => $data.fieldData.has_contacts.value, - 'field' => 'has_contacts', - 'label' => 'Has Contacts', - 'required' => $data.fieldRequired.has_contacts, - 'errorText' => 'Has Contacts is Required', - 'dataError' => $data.fieldFail.has_contacts - ]} - {include file='ui/f6/checkbox.html'} - - {* Has Members *} - {$ui = [ - 'value' => $data.fieldData.has_members.value, - 'field' => 'has_members', - 'label' => 'Has Members', - 'required' => $data.fieldRequired.has_members, - 'errorText' => 'Has Members is Required', - 'dataError' => $data.fieldFail.has_members - ]} - {include file='ui/f6/checkbox.html'} +
+ + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '6', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* Active *} + {$ui = [ + 'value' => $data.fieldData.active.value, + 'field' => 'active', + 'label' => 'Active', + 'required' => $data.fieldRequired.active, + 'errorText' => 'Active is Required', + 'dataError' => $data.fieldFail.active + ]} + {include file='ui/f6/checkbox.html'} + + {* Has Contacts *} + {$ui = [ + 'value' => $data.fieldData.has_contacts.value, + 'field' => 'has_contacts', + 'label' => 'Has Contacts', + 'required' => $data.fieldRequired.has_contacts, + 'errorText' => 'Has Contacts is Required', + 'dataError' => $data.fieldFail.has_contacts + ]} + {include file='ui/f6/checkbox.html'} + + {* Has Members *} + {$ui = [ + 'value' => $data.fieldData.has_members.value, + 'field' => 'has_members', + 'label' => 'Has Members', + 'required' => $data.fieldRequired.has_members, + 'errorText' => 'Has Members is Required', + 'dataError' => $data.fieldFail.has_members + ]} + {include file='ui/f6/checkbox.html'} + + {* Name *} + {$ui = [ + 'value' => $data.fieldData.name, + 'field' => 'name', + 'label' => 'Name', + 'required' => $data.fieldRequired.name, + 'errorText' => 'Name is Required', + 'dataError' => $data.fieldFail.name + ]} + {include file='ui/f6/text.html'} + + {* Map Key *} + {$ui = [ + 'value' => $data.fieldData.map_key, + 'field' => 'map_key', + 'label' => 'Map Key', + 'required' => $data.fieldRequired.map_key, + 'errorText' => 'Map Key is Required', + 'dataError' => $data.fieldFail.map_key + ]} + {include file='ui/f6/text.html'} + + + {include file="ui/f6/section-end.html"} + + {* Section Start *} + {$ui = [ + 'title' => '', + 'wrapSize' => '6', + 'callout' => true + ]} + {include file="ui/f6/section-start.html"} + + {* Prod Server *} + {$ui = [ + 'value' => $data.fieldData.prod_server.value, + 'field' => 'prod_server', + 'label' => 'Prod Server', + 'list' => $data.fieldData.prod_server.list, + 'l_label' => 'name', + 'l_value' => 'value', + 'l_blank' => false, + 'required' => $data.fieldRequired.prod_server, + 'errorText' => 'Prod Server is Required', + 'dataError' => $data.fieldFail.prod_server + ]} + {include file='ui/f6/select.html'} + + {* Prod Url *} + {$ui = [ + 'value' => $data.fieldData.prod_url, + 'field' => 'prod_url', + 'label' => 'Prod Url', + 'required' => $data.fieldRequired.prod_url, + 'errorText' => 'Prod Url is Required', + 'dataError' => $data.fieldFail.prod_url + ]} + {include file='ui/f6/text.html'} + + {* Dev Server *} + {$ui = [ + 'value' => $data.fieldData.dev_server.value, + 'field' => 'dev_server', + 'label' => 'Dev Server', + 'list' => $data.fieldData.dev_server.list, + 'l_label' => 'name', + 'l_value' => 'value', + 'l_blank' => false, + 'required' => $data.fieldRequired.dev_server, + 'errorText' => 'Dev Server is Required', + 'dataError' => $data.fieldFail.dev_server + ]} + {include file='ui/f6/select.html'} + + {* Dev Url *} + {$ui = [ + 'value' => $data.fieldData.dev_url, + 'field' => 'dev_url', + 'label' => 'Dev Url', + 'required' => $data.fieldRequired.dev_url, + 'errorText' => 'Dev Url is Required', + 'dataError' => $data.fieldFail.dev_url + ]} + {include file='ui/f6/text.html'} + + {include file="ui/f6/section-end.html"} + +
{* Save *} {$ui = [ @@ -150,34 +176,7 @@ {* Form End *} {include file='ui/f6/form-end.html'} - - -{if !empty($plugins)} - - - - - - - {foreach $plugins as $plugin} - - - - - - {/foreach} -
Plugin NameProd VersionDev Version
{$plugin.name}{$plugin.prod_version}{$plugin.dev_version}
- -
-{/if} - +
{* Grid End *} {include file='ui/f6/grid-end.html'} @@ -185,38 +184,59 @@