server/AyaNova/biz/WidgetBiz.cs

@@ -180,7 +180,7 @@ namespace AyaNova.Biz
             //base query
             var q = "SELECT *, xmin FROM AWIDGET ";
 
-            //GET THE FILTER
+            //GET THE FILTER / SORT
             if (pagingOptions.DataFilterId > 0)
             {
                 var TheFilter = await ct.DataFilter.FirstOrDefaultAsync(x => x.Id == pagingOptions.DataFilterId);
@@ -188,6 +188,9 @@ namespace AyaNova.Biz
                 //BUILD WHERE AND APPEND IT
                 q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), UserId);
 
+                //BUILD ORDER BY AND APPEND IT
+                q = q + FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), UserId);
+
                 //TESTING:
                 // //TODO: remove this from production build
                 // //LOG THE CRIT AND QUERY
@@ -196,14 +199,15 @@ namespace AyaNova.Biz
                 // log.LogInformation(TheFilter.Filter);
                 // log.LogInformation("Generated SQL:");
                 // log.LogInformation(q);
+            }else{
+                //GET DEFAULT ORDER BY
             }
 
-            //BUILD ORDER BY AND APPEND IT
-            //TODO: Code a separate order by builder block
-
-
             
 
+
+
+
 #pragma warning disable EF1000  
 
             var items = await ct.Widget