This commit is contained in:
@@ -292,7 +292,7 @@ namespace AyaNova.Biz
|
|||||||
|
|
||||||
var qFrom = "FROM AWIDGET";
|
var qFrom = "FROM AWIDGET";
|
||||||
|
|
||||||
//FILTER AND SORT
|
//FILTERED?
|
||||||
DataFilter TheFilter = null;
|
DataFilter TheFilter = null;
|
||||||
if (listOptions.DataFilterId > 0)
|
if (listOptions.DataFilterId > 0)
|
||||||
{
|
{
|
||||||
@@ -306,7 +306,6 @@ namespace AyaNova.Biz
|
|||||||
qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId);
|
qWhere = SqlFilterCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, ObjectFields.ObjectFieldsList(ObjectFields.WIDGET_KEY), UserId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//ORDER BY CLAUSE - SORT
|
//ORDER BY CLAUSE - SORT
|
||||||
var qOrderBy = string.Empty;
|
var qOrderBy = string.Empty;
|
||||||
if (listOptions.DataFilterId > 0)
|
if (listOptions.DataFilterId > 0)
|
||||||
@@ -326,10 +325,23 @@ namespace AyaNova.Biz
|
|||||||
var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
|
var qLimitOffset = $"LIMIT {listOptions.Limit} OFFSET {listOptions.Offset}";
|
||||||
|
|
||||||
//PUT IT ALL TOGETHER
|
//PUT IT ALL TOGETHER
|
||||||
var qDataQuery = $"{qSelectColumns} {qFrom} {qWhereAndOrderBy} {qLimitOffset}";
|
string qDataQuery = string.Empty;
|
||||||
var qCountQuery = $"";
|
string qTotalRecordsQuery = string.Empty;
|
||||||
|
if (TheFilter != null)
|
||||||
|
{
|
||||||
|
qDataQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
|
||||||
|
qTotalRecordsQuery = $"{qSelectColumns} {qFrom} {qWhere} {qOrderBy} {qLimitOffset}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
qDataQuery = $"{qSelectColumns} {qFrom} {qLimitOffset}";
|
||||||
|
qTotalRecordsQuery = $"{qSelectColumns} {qFrom} {qLimitOffset}";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//RETURN OBJECTS
|
||||||
List<object[]> items = new List<object[]>();
|
List<object[]> items = new List<object[]>();
|
||||||
|
long totalRecordCount = 0;
|
||||||
|
|
||||||
//RUN THE QUERY
|
//RUN THE QUERY
|
||||||
using (var command = ct.Database.GetDbConnection().CreateCommand())
|
using (var command = ct.Database.GetDbConnection().CreateCommand())
|
||||||
@@ -346,9 +358,20 @@ namespace AyaNova.Biz
|
|||||||
items.Add(row);
|
items.Add(row);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
command.CommandText = qTotalRecordsQuery;
|
||||||
|
using (var dr = command.ExecuteReader())
|
||||||
|
{
|
||||||
|
dr.Read();
|
||||||
|
// {
|
||||||
|
// object[] row = new object[dr.FieldCount];
|
||||||
|
// dr.GetValues(row);
|
||||||
|
// items.Add(row);
|
||||||
|
// }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
long totalRecordCount = 10;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
"SELECT id AS df, name, serial, dollaramount, roles, startdate, active FROM AWIDGET ORDER BY ID DESC LIMIT 2 OFFSET 1"
|
"SELECT id AS df, name, serial, dollaramount, roles, startdate, active FROM AWIDGET ORDER BY ID DESC LIMIT 2 OFFSET 1"
|
||||||
|
|||||||
Reference in New Issue
Block a user