Skip to content

SC-376 openMIC Issues Page improvements #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elwills merged 8 commits into from
Apr 3, 2026
Merged

SC-376 openMIC Issues Page improvements #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77289a5
improve openMIC device issues layout, and include error and loading s…
nbeatty-gpa Apr 1, 2026
9d7b479
remove try/catch block from endpoint
nbeatty-gpa Apr 1, 2026
0e02317
Update Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCen…
nbeatty-gpa Apr 2, 2026
74bf178
use openXDA AppStatus
nbeatty-gpa Apr 3, 2026
e45329a
improve pass-through openMIC meter endpoint
nbeatty-gpa Apr 3, 2026
e477f81
remove unneeded table styling
nbeatty-gpa Apr 3, 2026
053ff75
Update Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCen…
nbeatty-gpa Apr 3, 2026
7f7514e
fix broken using
nbeatty-gpa Apr 3, 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
4 changes: 1 addition & 3 deletions Source/Applications/SystemCenter/Controllers/SystemCenter/PQIController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@
//******************************************************************************************************

using GSF.Data;
using Microsoft.Graph;
using openXDA.PQI;
using openXDA.Model.SystemCenter;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using System.Web.Http;
using static SystemCenter.Model.DeviceHealthReportController;

namespace SystemCenter.Controllers
{
Expand Down
68 changes: 27 additions & 41 deletions Source/Applications/SystemCenter/Model/DeviceHealthReport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
using GSF.Web.Model;
using Newtonsoft.Json;
using openXDA.APIAuthentication;
using openXDA.Model.SystemCenter;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Text.RegularExpressions;
Expand Down Expand Up @@ -137,19 +139,6 @@ public class DailyStatisticsRecord
public int TotalSuccessfulConnections { get; set; }
}

public class StatusItem
{
public string Status { get; set; }
public string Description { get; set; }
}

public class AppStatus
{
public string Status { get; set; }

public List<StatusItem> Details { get; set; }

}

public override IHttpActionResult GetPagedList([FromBody] PostData postData, int page)
{
Expand Down Expand Up @@ -529,40 +518,37 @@ void ConfigureRequest(HttpRequestMessage request)
public IHttpActionResult GetOpenMICMeterStatistics([FromUri] string meter)
{
DailyStatisticsRecord[] meterStatistics = [];
OpenMICDailyStatistic[] micDailyStatistics = [];
List<OpenMICDailyStatistic> micDailyStatistics = [];
void ConfigureRequest(HttpRequestMessage request)
{
request.Method = HttpMethod.Get;
}
try
{
APIQuery apiQuery = GetAPIQuery();
HttpResponseMessage response = apiQuery.SendWebRequestAsync(ConfigureRequest, $"api/DailyStatistics/Get/?meter={meter}").Result;
string responseContent = response.Content.ReadAsStringAsync().Result;
string trimmedResponse = responseContent.Trim('"');
string unescapedResponse = Regex.Unescape(trimmedResponse);
meterStatistics = JsonConvert.DeserializeObject<DailyStatisticsRecord[]>(unescapedResponse);
foreach (DailyStatisticsRecord record in meterStatistics)
{
micDailyStatistics = micDailyStatistics.Append(new()
{
ID = record.ID,
Date = record.Timestamp.ToString(),
Meter = record.Meter,
LastSuccessfulConnection = record.LastSuccessfulConnection,
LastUnsuccessfulConnection = record.LastUnsuccessfulConnection,
LastUnsuccessfulConnectionExplanation = record.LastUnsuccessfulConnectionExplanation,
TotalConnections = record.TotalConnections,
TotalSuccessfulConnections = record.TotalSuccessfulConnections,
TotalUnsuccessfulConnections = record.TotalUnsuccessfulConnections,
BadDays = record.BadDays,
Status = (record.TotalUnsuccessfulConnections >= 50) ? (record.TotalUnsuccessfulConnections >= 100) ? "Error" : "Warning" : ""
}).ToArray();
}
APIQuery apiQuery = GetAPIQuery();
HttpResponseMessage response = apiQuery.SendWebRequestAsync(ConfigureRequest, $"api/DailyStatistics/Get/?meter={meter}").Result;
Comment thread
elwills marked this conversation as resolved.
string responseContent = response.Content.ReadAsStringAsync().Result;
if (!response.IsSuccessStatusCode) {

return StatusCode(HttpStatusCode.BadGateway);
Comment thread
elwills marked this conversation as resolved.
}
catch (Exception e)
string trimmedResponse = responseContent.Trim('"');
string unescapedResponse = Regex.Unescape(trimmedResponse);
meterStatistics = JsonConvert.DeserializeObject<DailyStatisticsRecord[]>(unescapedResponse);
foreach (DailyStatisticsRecord record in meterStatistics)
Comment thread
nbeatty-gpa marked this conversation as resolved.
{
return Ok();
micDailyStatistics.Add(new()
{
ID = record.ID,
Date = record.Timestamp.ToString(),
Meter = record.Meter,
LastSuccessfulConnection = record.LastSuccessfulConnection,
LastUnsuccessfulConnection = record.LastUnsuccessfulConnection,
LastUnsuccessfulConnectionExplanation = record.LastUnsuccessfulConnectionExplanation,
TotalConnections = record.TotalConnections,
TotalSuccessfulConnections = record.TotalSuccessfulConnections,
TotalUnsuccessfulConnections = record.TotalUnsuccessfulConnections,
BadDays = record.BadDays,
Status = (record.TotalUnsuccessfulConnections >= 50) ? (record.TotalUnsuccessfulConnections >= 100) ? "Error" : "Warning" : ""
});
}
Comment thread
nbeatty-gpa marked this conversation as resolved.
return Ok(JsonConvert.SerializeObject(micDailyStatistics));
}
Expand Down
Loading