From 4eaa8906a435bf3a2f5a1ea21879f8bb6bc12b45 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 16 Jan 2020 18:28:01 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/WidgetBiz.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index e24e0390..7e3587fa 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -272,8 +272,7 @@ namespace AyaNova.Biz
         //get many (paged)
         internal async Task<ApiPagedResponse> GetList(IUrlHelper Url, string routeName, ListOptions listOptions)
         {
-            listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
-            listOptions.Limit = listOptions.Limit ?? ListOptions.DefaultLimit;
+
 
 
             //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT)          
@@ -292,10 +291,7 @@ namespace AyaNova.Biz
 
             var qFrom = " FROM AWIDGET";
 
-
-
             //WHERE CLAUSE and SORT CLAUSE - FILTER / SORT 
-
             var qWhereAndOrderBy = string.Empty;
             if (listOptions.DataFilterId > 0)
             {
@@ -313,6 +309,11 @@ namespace AyaNova.Biz
                 qWhereAndOrderBy = qWhereAndOrderBy + SqlFilterOrderByBuilder.DefaultGetManyOrderBy();
             }
 
+            listOptions.Offset = listOptions.Offset ?? ListOptions.DefaultOffset;
+            listOptions.Limit = listOptions.Limit ?? ListOptions.DefaultLimit;
+            var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
+
+            //PUT IT ALL TOGETHER
             var qQuery = qSelectColumns + qFrom + qWhereAndOrderBy;
 
             using (var command = ct.Database.GetDbConnection().CreateCommand())
@@ -325,7 +326,7 @@ namespace AyaNova.Biz
                     while (dr.Read())
                     {
                         //Build return here row by row
-                    }                   
+                    }
                 }
 
             }