From 310be49d001a032785911e4ee41fd9170db74397 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 20 Sep 2018 12:57:21 -0400
Subject: [PATCH] Count and list items correctly compiled from their query

---
 models/admin/newDashboard/index.php           | 12 +++++++-----
 views/admin/newDashboard/components/list.html |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/models/admin/newDashboard/index.php b/models/admin/newDashboard/index.php
index 33c1b886..e7b8f766 100644
--- a/models/admin/newDashboard/index.php
+++ b/models/admin/newDashboard/index.php
@@ -253,14 +253,16 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers
             var_dump($widgetComponent);
             if ( $widgetComponent['component'] == 'list' && isset($widgetComponent['fields']) && isset($widgetComponent['table']) ) {
                 
-                if ( isset($widgetComponent) ) {
+                if ( isset($widgetComponent['where']) && $widgetComponent['where'] !== "" ) {
                     $where = $widgetComponent['where'];
                 } else {
-                    $where = ' TRUE ';
+                    $where = " TRUE ";
                 }
-                $sql = "'SELECT " . $widgetComponent['fields'] . " FROM " . $widgetComponent['table'] . " WHERE " . $where . "'";
-                $widgetComponent['extra'] = 'test';
-                $widgetComponent['sql'] = $sql;
+                $resultsQuery = "SELECT " . $widgetComponent['fields'] . " FROM " . $widgetComponent['table'] . " WHERE " . $where . " LIMIT 5;";
+                $widgetComponent['sql'] = $resultsQuery;
+                $widgetComponent['listItems'] = $this->wpdb->get_results($resultsQuery);
+                $countQuery = "SELECT COUNT(id) FROM " . $widgetComponent['table'] . " WHERE " . $where . ";";
+                $widgetComponent['count'] = $this->wpdb->get_var($countQuery);
 
             }
         }
diff --git a/views/admin/newDashboard/components/list.html b/views/admin/newDashboard/components/list.html
index 86895235..42dfb398 100644
--- a/views/admin/newDashboard/components/list.html
+++ b/views/admin/newDashboard/components/list.html
@@ -1,10 +1,10 @@
 <br>List component was called
-<div class="{$widgetField}-list list-header"> {$widgetField.title} <a href="#">5</a> </div>
+<div class="{$widgetField}-list list-header"> {$widgetField.title} <a href="#">{$widgetField.count}</a> </div>
 <ul class="collection">
-{foreach $widgetField as $listFieldName => $listFieldData}
+{foreach $widgetField['listItems'] as $listItem}
     <li class="collection-item" style="line-height: 1;padding : 5px 15px;">
-        <a href="#">
-            {$listFieldName} - {$listFieldData}
+        <a href="{$widgetField.resultUrl}?member={$listItem->ref_dest}?packageID={$listItem->id}">
+            {$listItem->title}
         </a>
     </li>
 {/foreach}
-- 
2.17.1