Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
079849b
paginate substation images
nbeatty-gpa May 11, 2026
f9cf267
reset to first page on sort
nbeatty-gpa May 19, 2026
ec78cb2
reset to first page on sort
nbeatty-gpa May 19, 2026
3a7948f
reset to first page on sort
nbeatty-gpa May 19, 2026
205ceaf
reset to first page on sort
nbeatty-gpa May 19, 2026
40f2bf8
reset to first page on sort
nbeatty-gpa May 19, 2026
7d35794
fix styling for paging
nbeatty-gpa May 22, 2026
ef46020
paginate value list group item
nbeatty-gpa May 26, 2026
7de72bc
page asset ConnectedChannels endpoint
nbeatty-gpa May 27, 2026
f701623
page Asset Channels table
nbeatty-gpa May 27, 2026
c83fb4b
paginate tables tab of external db
nbeatty-gpa May 28, 2026
d63dd9e
Fix error filtering users by additional fields
nbeatty-gpa Jun 5, 2026
83788a9
Refactor byUser page from slices to local state with Generic Controller
nbeatty-gpa Jun 5, 2026
0ff1748
clean up byUser
nbeatty-gpa Jun 5, 2026
441f9c0
move ByUserGroup from GenericSlice to GenericController
nbeatty-gpa Jun 5, 2026
a613530
paginate GroupUsers
nbeatty-gpa Jun 8, 2026
e98b73f
paginate ExternalDBTableFields
nbeatty-gpa Jun 8, 2026
4ac602c
paginate byAssetGroup
nbeatty-gpa Jun 9, 2026
6041cf0
paginate assetGroupSubGroups
nbeatty-gpa Jun 9, 2026
176b489
paginate assetGroupsAssets
nbeatty-gpa Jun 9, 2026
f3d5679
paginate assetGroupMeters
nbeatty-gpa Jun 9, 2026
6a91625
paginate assetSubstations
nbeatty-gpa Jun 9, 2026
45e7e16
paginate assetMeters
nbeatty-gpa Jun 9, 2026
aae26db
paginate assetConnections
nbeatty-gpa Jun 9, 2026
9cf5285
paginate customerMeter
nbeatty-gpa Jun 9, 2026
97c916d
paginate customerAsset
nbeatty-gpa Jun 9, 2026
f8675e3
paginate MeterTrendChannel
nbeatty-gpa Jun 9, 2026
a717ead
remove accidental comment
nbeatty-gpa Jun 9, 2026
bccb9a5
paginate meterChannelScaling table
nbeatty-gpa Jun 9, 2026
6e5ad64
paginate meterEventChannels
nbeatty-gpa Jun 10, 2026
6cb8140
Paginate remoteXDA assets
nbeatty-gpa Jun 10, 2026
bd3a04a
Paginate remoteXDA meters
nbeatty-gpa Jun 10, 2026
3fa81df
simplify settings sort
nbeatty-gpa Jun 10, 2026
012629d
clean up user and userGroup
nbeatty-gpa Jun 10, 2026
2b39d13
fix generic controller typing
nbeatty-gpa Jun 10, 2026
48e7670
fix dependency array
nbeatty-gpa Jun 10, 2026
339b3df
use stricter typing in EventChannelSlice
nbeatty-gpa Jun 10, 2026
65898dd
changes to store typing
nbeatty-gpa Jun 10, 2026
c630416
cleanup import
nbeatty-gpa Jun 10, 2026
b3932c2
fix typing
nbeatty-gpa Jun 10, 2026
d8975c4
refresh on changed
nbeatty-gpa Jun 10, 2026
5770c54
fix broken Additional Field selector in ExternalDBTable
nbeatty-gpa Jun 11, 2026
85069e6
fix decimal page
nbeatty-gpa Jun 15, 2026
cb87bf1
fix grammar mistakes in ExternalDBUpdate
nbeatty-gpa Jun 15, 2026
3d7977f
do not error out completely on uncompleted search
nbeatty-gpa Jun 15, 2026
c09f9b9
fix utf-A typo
nbeatty-gpa Jun 19, 2026
c048ff9
remove companySlice from merged store
nbeatty-gpa Jun 19, 2026
00021a8
abort correct handle
nbeatty-gpa Jun 19, 2026
6ec222e
return empty PagedResults if no images found for substation
nbeatty-gpa Jun 19, 2026
9e91383
include 'loading' status during paged search
nbeatty-gpa Jun 19, 2026
6fac9b9
filter customer assets on customer ID
nbeatty-gpa Jun 19, 2026
9418b07
add filters to value list
nbeatty-gpa Jun 19, 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")}
";
Comment on lines +146 to +148

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")}
";
Comment on lines +308 to +310

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