Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
70e21af
paginate substation images
nbeatty-gpa May 11, 2026
ba391c0
reset to first page on sort
nbeatty-gpa May 19, 2026
e8c018c
reset to first page on sort
nbeatty-gpa May 19, 2026
c72ef2e
reset to first page on sort
nbeatty-gpa May 19, 2026
5a6ee14
reset to first page on sort
nbeatty-gpa May 19, 2026
d4245d0
reset to first page on sort
nbeatty-gpa May 19, 2026
3d4738f
fix styling for paging
nbeatty-gpa May 22, 2026
ef016c0
paginate value list group item
nbeatty-gpa May 26, 2026
4d10b22
page asset ConnectedChannels endpoint
nbeatty-gpa May 27, 2026
f595ec1
page Asset Channels table
nbeatty-gpa May 27, 2026
bb747c7
paginate tables tab of external db
nbeatty-gpa May 28, 2026
fbbdb87
Fix error filtering users by additional fields
nbeatty-gpa Jun 5, 2026
0d8bc87
Refactor byUser page from slices to local state with Generic Controller
nbeatty-gpa Jun 5, 2026
e399758
clean up byUser
nbeatty-gpa Jun 5, 2026
b4f19da
move ByUserGroup from GenericSlice to GenericController
nbeatty-gpa Jun 5, 2026
02c5331
paginate GroupUsers
nbeatty-gpa Jun 8, 2026
ad4fea4
paginate ExternalDBTableFields
nbeatty-gpa Jun 8, 2026
3b729d9
paginate byAssetGroup
nbeatty-gpa Jun 9, 2026
75935fd
paginate assetGroupSubGroups
nbeatty-gpa Jun 9, 2026
c7b91d2
paginate assetGroupsAssets
nbeatty-gpa Jun 9, 2026
f27fcff
paginate assetGroupMeters
nbeatty-gpa Jun 9, 2026
1d6aec6
paginate assetSubstations
nbeatty-gpa Jun 9, 2026
25c12ee
paginate assetMeters
nbeatty-gpa Jun 9, 2026
3fa6e00
paginate assetConnections
nbeatty-gpa Jun 9, 2026
bdc94c2
paginate customerMeter
nbeatty-gpa Jun 9, 2026
4ff20e6
paginate customerAsset
nbeatty-gpa Jun 9, 2026
1bffa65
paginate MeterTrendChannel
nbeatty-gpa Jun 9, 2026
703542a
remove accidental comment
nbeatty-gpa Jun 9, 2026
d125b10
paginate meterChannelScaling table
nbeatty-gpa Jun 9, 2026
410b242
paginate meterEventChannels
nbeatty-gpa Jun 10, 2026
b99388d
Paginate remoteXDA assets
nbeatty-gpa Jun 10, 2026
3bcbdd9
Paginate remoteXDA meters
nbeatty-gpa Jun 10, 2026
a10a2ba
simplify settings sort
nbeatty-gpa Jun 10, 2026
8c276b8
clean up user and userGroup
nbeatty-gpa Jun 10, 2026
05f6d1e
fix generic controller typing
nbeatty-gpa Jun 10, 2026
eb6adb9
fix dependency array
nbeatty-gpa Jun 10, 2026
43e6c44
use stricter typing in EventChannelSlice
nbeatty-gpa Jun 10, 2026
83553b8
changes to store typing
nbeatty-gpa Jun 10, 2026
f945b34
cleanup import
nbeatty-gpa Jun 10, 2026
3c483c6
fix typing
nbeatty-gpa Jun 10, 2026
565e0e2
refresh on changed
nbeatty-gpa Jun 10, 2026
74d8c49
fix broken Additional Field selector in ExternalDBTable
nbeatty-gpa Jun 11, 2026
b4c7a4c
fix decimal page
nbeatty-gpa Jun 15, 2026
de09c01
fix grammar mistakes in ExternalDBUpdate
nbeatty-gpa Jun 15, 2026
73a24e6
do not error out completely on uncompleted search
nbeatty-gpa Jun 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,14 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net.Http;
using System.Transactions;
using System.Reflection;
using System.Web.Http;
using GSF.Data;
using GSF.Data.Model;
using GSF.Web.Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using openXDA.Model;
using SystemCenter.Model;

namespace SystemCenter.Controllers.OpenXDA
{
Expand Down Expand Up @@ -105,6 +104,71 @@ GROUP BY
return Unauthorized();
}

[HttpPost, Route("{assetGroupID:int}/Assets/{page:int}")]
public IHttpActionResult GetAssetsPaged([FromBody] PostData postData, [FromUri] int assetGroupID, [FromUri] int page)
{

if (!GetAuthCheck())
return Unauthorized();

int recordsPerPage = Take ?? 50;

PagedResults results = new PagedResults();
results.RecordsPerPage = recordsPerPage;

using (AdoDataConnection connection = new AdoDataConnection(Connection))
{
string sql = $@"SELECT
DISTINCT
Asset.ID,
AssetAssetGroup.AssetGroupID,
Asset.AssetKey,
Asset.AssetName,
Asset.VoltageKV,
AssetType.Name as AssetType,
COUNT(DISTINCT Meter.ID) as Meters,
COUNT(DISTINCT Location.ID) as Locations
FROM
Asset Join
AssetType ON Asset.AssetTypeID = AssetType.ID LEFT JOIN
MeterAsset ON MeterAsset.AssetID = Asset.ID LEFT JOIN
Meter ON MeterAsset.MeterID = Meter.ID LEFT JOIN
AssetLocation ON AssetLocation.AssetID = Asset.ID LEFT JOIN
Location ON AssetLocation.LocationID = Location.ID LEFT JOIN
AssetAssetGroup ON Asset.ID = AssetAssetGroup.AssetID
GROUP BY
Asset.ID,
Asset.AssetKey,
Asset.AssetName,
Asset.VoltageKV,
AssetType.Name,
AssetAssetGroup.AssetGroupID
HAVING AssetAssetGroup.AssetGroupID = {{0}}
ORDER BY {postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}
";

DataTable records = connection.RetrieveData(sql, assetGroupID);

int totalRecords = records.Rows.Count;

DataRow[] rows = records.AsEnumerable()
.Skip((page) * recordsPerPage)
.Take(recordsPerPage)
.ToArray();

DataTable pagedTable = records.Clone();

foreach (DataRow row in rows)
pagedTable.ImportRow(row);

results.TotalRecords = totalRecords;
results.NumberOfPages = (totalRecords + recordsPerPage - 1) / recordsPerPage;
results.Data = JsonConvert.SerializeObject(pagedTable);
}

return Ok(results);
}

[HttpPost, Route("{assetGroupID:int}/AddAssets")]
public IHttpActionResult AddAssets(int assetGroupID, [FromBody] IEnumerable<int> assets)
{
Expand Down Expand Up @@ -205,6 +269,68 @@ GROUP BY
return Unauthorized();
}

[HttpPost, Route("{assetGroupID:int}/Meters/{page:int}")]
public IHttpActionResult GetMetersPaged([FromBody] PostData postData, [FromUri] int assetGroupID, [FromUri] int page)
{
if (!GetAuthCheck())
return Unauthorized();

int recordsPerPage = Take ?? 50;

PagedResults results = new PagedResults();
results.RecordsPerPage = recordsPerPage;

using (AdoDataConnection connection = new AdoDataConnection(Connection))
{
string sql = $@"SELECT DISTINCT
Meter.ID,
MeterAssetGroup.AssetGroupID,
Meter.AssetKey,
Meter.Name,
Meter.Make,
Meter.Model,
Location.Name as Location,
COUNT(DISTINCT MeterAsset.AssetID) as MappedAssets
FROM
Meter LEFT JOIN
Location ON Meter.LocationID = Location.ID LEFT JOIN
MeterAsset ON Meter.ID = MeterAsset.MeterID LEFT JOIN
Asset ON MeterAsset.AssetID = Asset.ID LEFT JOIN
MeterAssetGroup ON Meter.ID = MeterAssetGroup.MeterID
GROUP BY
Meter.ID,
Meter.AssetKey,
Meter.Name,
Meter.Make,
Meter.Model,
Location.Name,
MeterAssetGroup.AssetGroupID
HAVING MeterAssetGroup.AssetGroupID = {{0}}
ORDER BY {postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}
";

DataTable records = connection.RetrieveData(sql, assetGroupID);

int totalRecords = records.Rows.Count;

DataRow[] rows = records.AsEnumerable()
.Skip((page) * recordsPerPage)
.Take(recordsPerPage)
.ToArray();

DataTable pagedTable = records.Clone();

foreach (DataRow row in rows)
pagedTable.ImportRow(row);

results.TotalRecords = totalRecords;
results.NumberOfPages = (totalRecords + recordsPerPage - 1) / recordsPerPage;
results.Data = JsonConvert.SerializeObject(pagedTable);
}

return Ok(results);
}

[HttpPost, Route("{assetGroupID:int}/AddMeters")]
public IHttpActionResult AddMeters(int assetGroupID, [FromBody] IEnumerable<int> meters)
{
Expand Down Expand Up @@ -293,7 +419,6 @@ public IHttpActionResult GetSubGroups(int assetGroupID)
try
{
IEnumerable<AssetGroupView> records = new TableOperations<AssetGroupView>(connection).QueryRecordsWhere("ID in (SELECT ChildAssetGroupID FROM AssetGroupAssetGroupView WHERE ParentAssetGroupID = {0})", assetGroupID);

return Ok(records);
}
catch (Exception ex)
Expand All @@ -306,6 +431,33 @@ public IHttpActionResult GetSubGroups(int assetGroupID)
return Unauthorized();
}

[HttpPost, Route("{assetGroupID:int}/AssetGroups/{page:int}")]
public IHttpActionResult GetSubGroupsPaged([FromBody] PostData postData, [FromUri] int assetGroupID, [FromUri] int page)
{
if (!GetAuthCheck())
return Unauthorized();

int recordsPerPage = Take ?? 50;

PagedResults results = new PagedResults();
results.RecordsPerPage = recordsPerPage;

using (AdoDataConnection connection = new AdoDataConnection(Connection))
{
IEnumerable<AssetGroupView> records = new TableOperations<AssetGroupView>(connection).QueryRecordsWhere("ID in (SELECT ChildAssetGroupID FROM AssetGroupAssetGroupView WHERE ParentAssetGroupID = {0})", assetGroupID);
if (postData.Ascending)
records = records.OrderBy(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record));
else
records = records.OrderByDescending(record => record.GetType().GetProperty(postData.OrderBy).GetValue(record));

results.TotalRecords = records.Count();
results.NumberOfPages = (records.Count() + recordsPerPage - 1) / recordsPerPage;
results.Data = JsonConvert.SerializeObject(records.Skip(page * recordsPerPage).Take(recordsPerPage));
}

return Ok(results);
}

[HttpPost, Route("{assetGroupID:int}/AddAssetGroups")]
public IHttpActionResult AddSubgroups(int assetGroupID, [FromBody] IEnumerable<int> subGroups)
{
Expand Down
Loading