From aad1dae0ea20985528fbf36c3d1ba44e870cb935 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 19 Sep 2018 14:46:58 -0400 Subject: [PATCH] reorganizing the data hierarchy names in so that the widget data is easily iterated --- models/admin/ajax/glmTextSearch.php | 87 +++++++++++++++++++ models/admin/newDashboard/index.php | 12 +-- setup/validActions.php | 3 +- .../newDashboard/components/widgetSearch.html | 31 +++++++ views/admin/newDashboard/index.html | 2 +- views/admin/newDashboard/summaryWidget.html | 16 +++- 6 files changed, 140 insertions(+), 11 deletions(-) create mode 100644 models/admin/ajax/glmTextSearch.php create mode 100644 views/admin/newDashboard/components/widgetSearch.html diff --git a/models/admin/ajax/glmTextSearch.php b/models/admin/ajax/glmTextSearch.php new file mode 100644 index 00000000..155b9f18 --- /dev/null +++ b/models/admin/ajax/glmTextSearch.php @@ -0,0 +1,87 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +/** + * + * This class exports the currently selected members list + * to a printable HTML file, to a CSV file, or otherwise. + */ +class GlmMembersAdmin_ajax_glmTextSearch +{ + + /** + * 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); + + } + + /** + * 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) + { + if( isset( $_REQUST['table'] ) ){ + + } + $data = "test"; + $return = array( + 'data' => $data , // Where our events list will go + ); + + header('Content-type:application/json;charset=utf-8', true); + echo json_encode($return); + wp_die(); + } +} diff --git a/models/admin/newDashboard/index.php b/models/admin/newDashboard/index.php index e5d9a52a..b351c7da 100644 --- a/models/admin/newDashboard/index.php +++ b/models/admin/newDashboard/index.php @@ -193,10 +193,10 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers foreach ( $this->config[ 'addOns' ] as $a ) { if ( has_filter( $a['slug'] . "-dashboard-widget") ) { //var_dump($a); - $addonData[$a['slug']]['name'] = $a['short_name']; - $addonData[$a['slug']]['slug'] = $a['slug']; - $addonData[$a['slug']]['index'] = $a['index']; - $addonData[$a['slug']]['widgetData'] = apply_filters($a['slug'] . "-dashboard-widget", ""); + $addons[$a['slug']]['name'] = $a['short_name']; + $addons[$a['slug']]['slug'] = $a['slug']; + $addons[$a['slug']]['index'] = $a['index']; + $addons[$a['slug']]['widgetData'] = apply_filters($a['slug'] . "-dashboard-widget", ""); } else { echo "
" . $a['slug'] . " has no filter called " . $a['slug'] . "-dashboard-widget"; @@ -218,8 +218,8 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers 'clickThroughCounts' => $clickThroughCounts, 'detailViewCounts' => $detailViewCounts, 'statusPending' => $this->config['status_numb']['Pending'], - //'widgetData' => $addonData['widgetData'], - 'addonData' => $addonData, + //'widgetData' => $addons['widgetData'], + 'addons' => $addons, ); // Return status, suggested view, and data to controller. diff --git a/setup/validActions.php b/setup/validActions.php index 831bd1b8..3be69eb9 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -44,7 +44,8 @@ $glmMembersValidActions = array( 'fileLibraryDownload' => 'glm-member-db', 'fileLibraryDelete' => 'glm-member-db', 'fileLibraryUpdate' => 'glm-member-db', - 'glmCron' => 'glm-member-db' + 'glmCron' => 'glm-member-db', + 'glmTextSearch' => 'glm-member-db', ), 'dashboard' => array( 'index' => 'glm-member-db', diff --git a/views/admin/newDashboard/components/widgetSearch.html b/views/admin/newDashboard/components/widgetSearch.html new file mode 100644 index 00000000..a25c84d4 --- /dev/null +++ b/views/admin/newDashboard/components/widgetSearch.html @@ -0,0 +1,31 @@ +
+
+ + +
+
+ \ No newline at end of file diff --git a/views/admin/newDashboard/index.html b/views/admin/newDashboard/index.html index 62bf0417..689f7391 100644 --- a/views/admin/newDashboard/index.html +++ b/views/admin/newDashboard/index.html @@ -4,7 +4,7 @@
- {foreach $addonData as $widgetData} + {foreach $addons as $addon} {include file='./summaryWidget.html'} {/foreach}
diff --git a/views/admin/newDashboard/summaryWidget.html b/views/admin/newDashboard/summaryWidget.html index b375cee0..bae05458 100644 --- a/views/admin/newDashboard/summaryWidget.html +++ b/views/admin/newDashboard/summaryWidget.html @@ -1,9 +1,16 @@
  • - 
     {$widgetData.name}
    + 
     {$addon.name}
    - {foreach $widgetData as $widgetField} - {$widgetField|var_dump} + {foreach $addon as $addonData} + { $addonData|var_dump} + {/foreach} + {foreach $addon.widgetData as $widgetField} + 
    {$widgetField|@print_r}
    + + {if $widgetField.type == 'textsearch'} + {include file='../newDashboard/components/widgetSearch.html'} + {/if} {/foreach}
    Dashboard @@ -35,6 +42,9 @@
    + 
     { $w|var_dump}
    +
    +
-- 2.17.1