phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ready to test - E

Browse Source
This commit is contained in:
Mike Phares
2023-11-09 11:41:33 -07:00
parent 1ab4316c22
commit 447f83f327
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Archive/Views/Shared/_Layout.cshtml
View File

@ -71,7 +71,7 @@
<li>@Html.ActionLink("Export", "Index", "Export", new { area = "" }, null)</li> <li>@Html.ActionLink("Export", "Index", "Export", new { area = "" }, null)</li>
</ul> </ul>
<p class="navbar-text navbar-right"> <p class="navbar-text navbar-right">
@User.Identity.Name @User.Identity?.Name
</p> </p>
</div> </div>
</div> </div>

4
Server/Repositories/InfinityQSV3Repository.cs
View File

@ -432,6 +432,8 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
Reactor? reactor; Reactor? reactor;
string loadedRDS; string loadedRDS;
int reactorNumber; int reactorNumber;
TimeSpan timeSpan;
long ticks = DateTime.Now.Ticks;
IInfinityQSV3Repository infinityQSV3Repository = this; IInfinityQSV3Repository infinityQSV3Repository = this;
string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers); string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers);
StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText); StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText);
@ -446,6 +448,7 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
continue; continue;
if (!eppReactors.TryGetValue(reactorNumber, out reactor)) if (!eppReactors.TryGetValue(reactorNumber, out reactor))
continue; continue;
timeSpan = new(ticks - infinityQS1090FullLoad.SubGroupIdFormated.Ticks);
loadedCount = reactor.LoadedRDS is null ? 0 : reactor.LoadedRDS.Count; loadedCount = reactor.LoadedRDS is null ? 0 : reactor.LoadedRDS.Count;
loadedRDS = reactor.LoadedRDS is null ? "" : reactor.LoadedRDS[0].ToString(); loadedRDS = reactor.LoadedRDS is null ? "" : reactor.LoadedRDS[0].ToString();
_ = result.Append("<tr>"). _ = result.Append("<tr>").
@ -455,6 +458,7 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
Append("<td>").Append(infinityQS1090FullLoad.Value).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.Value).Append("</td>").
Append("<td>").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append("</td>").
Append("<td>").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append("</td>").
Append("<td>").Append(Math.Floor(timeSpan.TotalHours)).Append("</td>").
Append("</tr>"); Append("</tr>");
} }
} }

17
Server/wwwroot/js/site.js
View File

@ -382,15 +382,16 @@ function GetMinMax(profilePoints, index) {
function appendDiv() { function appendDiv() {
const div = document.createElement("div"); const div = document.createElement("div");
div.innerHTML = ` div.innerHTML = `
<table> <table border = 1>
<thead> <thead>
<tr> <tr>
<th>ReactorNo</th> <th>ReactorNo</th>
<th>E10State</th> <th>State</th>
<th>loadedRDS</th> <th>RDS</th>
<th>Value</th> <th>Value</th>
<th>TemperatureOffsetPercentage</th> <th>Temperature Offset Percentage</th>
<th>SubGroupIdFormated</th> <th>Entered Date</th>
<th>Hours</th>
</tr> </tr>
</thead> </thead>
<tbody id ="EpiProTempVerification"></tbody> <tbody id ="EpiProTempVerification"></tbody>
@ -403,8 +404,8 @@ function appendDiv() {
type: "GET", type: "GET",
url: _apiUrl + '/InfinityQSV3/epi-pro-temp-verification', url: _apiUrl + '/InfinityQSV3/epi-pro-temp-verification',
success: function (r) { success: function (r) {
if ((r.Results == null) || (r.Results.ToolType == null) || (r.Results.Metadata == null)) if (r == null)
ShowErrorMessage("Invalid tool type: " + toolTypeID); ShowErrorMessage("Invalid data");
else { else {
tbody.innerHTML = r; tbody.innerHTML = r;
} }
@ -593,7 +594,7 @@ function detailSelectionChangedRunInfo(evt, ui) {
} }
} }
else { else {
if (ui.row.index == 5) if (ui.row.index == 4)
appendDiv(); appendDiv();
else { else {
var ctx = document.getElementById('DataAttachmentCanvas'); var ctx = document.getElementById('DataAttachmentCanvas');

8
Shared/DataModels/InfinityQS1090FullLoad.cs
View File

@ -2,12 +2,12 @@ using System.Text.Json.Serialization;
namespace OI.Metrology.Shared.DataModels; namespace OI.Metrology.Shared.DataModels;
public record InfinityQS1090FullLoad([property: JsonPropertyName("se_sgrp")] int SubGroupId, public record InfinityQS1090FullLoad([property: JsonPropertyName("f_sgrp")] int SubGroupId,
[property: JsonPropertyName("se_date_time")] DateTime SubGroupIdFormated, [property: JsonPropertyName("date_time")] DateTime SubGroupIdFormated,
[property: JsonPropertyName("pr_name")] string Reactor, [property: JsonPropertyName("pr_name")] string Reactor,
[property: JsonPropertyName("pd_name")] string Part, [property: JsonPropertyName("pd_name")] string Part,
[property: JsonPropertyName("se_value")] float Value, [property: JsonPropertyName("iq_value")] float Value,
[property: JsonPropertyName("se_temp_offset_percent")] float TemperatureOffsetPercentage); [property: JsonPropertyName("iq_temp_offset_percent")] float TemperatureOffsetPercentage);
[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)] [JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
[JsonSerializable(typeof(InfinityQS1090FullLoad))] [JsonSerializable(typeof(InfinityQS1090FullLoad))]