diff --git a/Archive/Views/Shared/_Layout.cshtml b/Archive/Views/Shared/_Layout.cshtml index a51a4d8..d592c48 100644 --- a/Archive/Views/Shared/_Layout.cshtml +++ b/Archive/Views/Shared/_Layout.cshtml @@ -71,7 +71,7 @@
  • @Html.ActionLink("Export", "Index", "Export", new { area = "" }, null)
  • diff --git a/Server/Repositories/InfinityQSV3Repository.cs b/Server/Repositories/InfinityQSV3Repository.cs index 664e004..ff3b80b 100644 --- a/Server/Repositories/InfinityQSV3Repository.cs +++ b/Server/Repositories/InfinityQSV3Repository.cs @@ -432,6 +432,8 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository Reactor? reactor; string loadedRDS; int reactorNumber; + TimeSpan timeSpan; + long ticks = DateTime.Now.Ticks; IInfinityQSV3Repository infinityQSV3Repository = this; string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers); StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText); @@ -446,6 +448,7 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository continue; if (!eppReactors.TryGetValue(reactorNumber, out reactor)) continue; + timeSpan = new(ticks - infinityQS1090FullLoad.SubGroupIdFormated.Ticks); loadedCount = reactor.LoadedRDS is null ? 0 : reactor.LoadedRDS.Count; loadedRDS = reactor.LoadedRDS is null ? "" : reactor.LoadedRDS[0].ToString(); _ = result.Append(""). @@ -455,6 +458,7 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository Append("").Append(infinityQS1090FullLoad.Value).Append(""). Append("").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append(""). Append("").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append(""). + Append("").Append(Math.Floor(timeSpan.TotalHours)).Append(""). Append(""); } } diff --git a/Server/wwwroot/js/site.js b/Server/wwwroot/js/site.js index b5c3c07..60eb1da 100644 --- a/Server/wwwroot/js/site.js +++ b/Server/wwwroot/js/site.js @@ -382,15 +382,16 @@ function GetMinMax(profilePoints, index) { function appendDiv() { const div = document.createElement("div"); div.innerHTML = ` - +
    - - + + - - + + + @@ -403,8 +404,8 @@ function appendDiv() { type: "GET", url: _apiUrl + '/InfinityQSV3/epi-pro-temp-verification', success: function (r) { - if ((r.Results == null) || (r.Results.ToolType == null) || (r.Results.Metadata == null)) - ShowErrorMessage("Invalid tool type: " + toolTypeID); + if (r == null) + ShowErrorMessage("Invalid data"); else { tbody.innerHTML = r; } @@ -593,7 +594,7 @@ function detailSelectionChangedRunInfo(evt, ui) { } } else { - if (ui.row.index == 5) + if (ui.row.index == 4) appendDiv(); else { var ctx = document.getElementById('DataAttachmentCanvas'); diff --git a/Shared/DataModels/InfinityQS1090FullLoad.cs b/Shared/DataModels/InfinityQS1090FullLoad.cs index dbdf072..f0a715f 100644 --- a/Shared/DataModels/InfinityQS1090FullLoad.cs +++ b/Shared/DataModels/InfinityQS1090FullLoad.cs @@ -2,12 +2,12 @@ using System.Text.Json.Serialization; namespace OI.Metrology.Shared.DataModels; -public record InfinityQS1090FullLoad([property: JsonPropertyName("se_sgrp")] int SubGroupId, - [property: JsonPropertyName("se_date_time")] DateTime SubGroupIdFormated, +public record InfinityQS1090FullLoad([property: JsonPropertyName("f_sgrp")] int SubGroupId, + [property: JsonPropertyName("date_time")] DateTime SubGroupIdFormated, [property: JsonPropertyName("pr_name")] string Reactor, [property: JsonPropertyName("pd_name")] string Part, - [property: JsonPropertyName("se_value")] float Value, - [property: JsonPropertyName("se_temp_offset_percent")] float TemperatureOffsetPercentage); + [property: JsonPropertyName("iq_value")] float Value, + [property: JsonPropertyName("iq_temp_offset_percent")] float TemperatureOffsetPercentage); [JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)] [JsonSerializable(typeof(InfinityQS1090FullLoad))]
    ReactorNoE10StateloadedRDSStateRDS ValueTemperatureOffsetPercentageSubGroupIdFormatedTemperature Offset PercentageEntered DateHours