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

Need DB III

Browse Source
This commit is contained in:
Mike Phares
2023-02-08 10:50:03 -07:00
parent 78567f9e39
commit 131abcd3cd
5 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Server/ApiControllers/PinController.cs
View File

@ -40,4 +40,5 @@ public class PinController : Controller, IPinController<IActionResult>
string? bioRad = HttpContext.Session.GetString(((int)IPinRepository.ToolId.BioRad).ToString()); string? bioRad = HttpContext.Session.GetString(((int)IPinRepository.ToolId.BioRad).ToString());
return Json(_PinRepository.GetPinnedTable(_MetrologyRepository, id, bioRad, cde), new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true }); return Json(_PinRepository.GetPinnedTable(_MetrologyRepository, id, bioRad, cde), new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true });
} }
} }

6
Server/Views/Pages/RunInfo.cshtml
View File

@ -74,6 +74,12 @@
</div> </div>
<div id="PinnedDiv">
<div style="padding-bottom: 20px;" id="PinnedGridDiv">
<table id="PinnedGrid"></table>
</div>
</div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {

3
Server/appsettings.Development.json
View File

@ -1,6 +1,5 @@
{ {
"xConnectionString": "Data Source=MESSAD1001\\TEST1,59583;Integrated Security=True;Initial Catalog=Metrology;", "ConnectionString": "Data Source=MESSAD1001\\TEST1,59583;Integrated Security=True;Initial Catalog=Metrology;",
"ConnectionString": "Data Source=messv01ec.ec.local\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology;",
"IsDevelopment": true, "IsDevelopment": true,
"xMockRoot": "/Data/Tests", "xMockRoot": "/Data/Tests",
"MockRoot": "", "MockRoot": "",

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

@ -221,18 +221,30 @@ function loadHeaderGridRunInfo() {
DisplayWSMessage("error", "There was an error getting tooltype info.", e); DisplayWSMessage("error", "There was an error getting tooltype info.", e);
} }
}); });
$.ajax({ // $.ajax({
type: "GET", // type: "GET",
url: _apiUrl + "/pin/" + toolTypeID + "/pinned", // url: _apiUrl + "/pin/" + toolTypeID + "/pinned",
success: function (r) { // success: function (r) {
if ((r.Results == null) || (r.Results.HeaderId == null)) // if ((r.Results == null) || (r.Results.HeaderId == null))
DisplayWSMessage("error", "B) There was an error getting pinned info."); // DisplayWSMessage("error", "B) There was an error getting pinned info.");
else // else
DisplayWSMessage("info", r.Results.HeaderId); // DisplayWSMessage("info", r.Results.HeaderId);
}, // },
error: function (e) { // error: function (e) {
DisplayWSMessage("error", "There was an error getting pinned info.", e); // DisplayWSMessage("error", "There was an error getting pinned info.", e);
} // }
// });
$("#PinnedGrid").igGrid({
width: "70%",
height: "100%",
dataSource: _apiUrl + "/pin/" + toolTypeID + "/pinned",
responseDataKey: "Results",
tabIndex: 1,
features: [
{ name: "Selection", mode: "row", multipleSelection: false },
{ name: "Filtering", type: "local" },
{ name: "Sorting", type: "local" },
]
}); });
} }

0
Shared/DataModels/HeaderCommond.cs → Shared/DataModels/Pinned.cs
View File