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

Test on ec server

Browse Source
This commit is contained in:
Mike Phares 2023-02-16 10:01:48 -07:00
parent 45ea70212e
commit 2e416ce8ab
4 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,9 +52,6 @@
<div class="col-xs-1"> <div class="col-xs-1">
<input type="button" class="btn" id="PinButton" value="Pin" disabled /> <input type="button" class="btn" id="PinButton" value="Pin" disabled />
</div> </div>
<div class="col-xs-1">
<table style="min-width:600px; min-height:300px;" id="PinnedGrid"></table>
</div>
</div> </div>
<div id="DetailsDiv" hidden> <div id="DetailsDiv" hidden>

2
Server/wwwroot/js/common.js
View File

@ -121,6 +121,8 @@ function ConstructMessageDialog() {
' </div> ' + ' </div> ' +
' <div class="modal-body"> ' + ' <div class="modal-body"> ' +
' <span id="spanMessageText"></span> ' + ' <span id="spanMessageText"></span> ' +
' <table id="ModalHeaderGrid"></table> ' +
' <table id="ModalBodyGrid"></table> ' +
' </div> ' + ' </div> ' +
' <div class="modal-footer"> ' + ' <div class="modal-footer"> ' +
' <button type="button" data-dismiss="modal">OK</button> ' + ' <button type="button" data-dismiss="modal">OK</button> ' +

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

@ -467,14 +467,45 @@ function pinButtonRunInfo() {
var rowData = $("#HeaderGrid").data("igGrid").dataSource.dataView()[selectedRow.index]; var rowData = $("#HeaderGrid").data("igGrid").dataSource.dataView()[selectedRow.index];
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: _apiUrl + '/pin/' + toolTypeId + "/markAsPinned", url: "http://localhost:5126/api" + '/pin/' + toolTypeId + "/markAsPinned",
data: rowData, data: rowData,
success: function (e) { success: function (e) {
DisplayWSMessage("info", "Marked as pinned", e); DisplayWSMessage("info", "Marked as pinned", e);
$("#PinButton").prop("disabled", false); $("#PinButton").prop("disabled", false);
$.getJSON(_apiUrl + '/pin/' + toolTypeId + "/pinned?biorad_id=" + _BioRadId + "&cde_id=" + _CdeId + "&rds=" + rowData.RDS, function (data) { $.getJSON("http://localhost:5126/api" + '/pin/' + toolTypeId + "/pinned?biorad_id=" + _BioRadId + "&cde_id=" + _CdeId + "&rds=" + rowData.RDS, function (data) {
$("#PinnedGrid").igGrid({ $("#ModalHeaderGrid").igGrid({
dataSource: data, dataSource: data,
features: [
{ name: 'Resizing' }
],
columns: [
{ key: "ID", dataType: "number", hidden: true, },
{ key: "ToolTypeID", dataType: "number", hidden: true, },
{ key: "Reactor", dataType: "string", width: "10%" },
{ key: "RDS", dataType: "string", width: "10%" },
{ key: "PSN", dataType: "string", width: "10%" },
{ key: "Layer", dataType: "string", width: "10%" },
{ key: "Zone", dataType: "string", width: "10%" }
],
responseDataKey: "Results",
});
$("#ModalBodyGrid").igGrid({
dataSource: data,
features: [
{ name: 'Resizing' }
],
columns: [
{ key: "ID", dataType: "number", hidden: true, },
{ key: "ToolTypeID", dataType: "number", hidden: true, },
{ key: "PointA", dataType: "number", width: "10%" },
{ key: "PointB", dataType: "number", width: "10%" },
{ key: "PointC", dataType: "number", width: "10%" },
{ key: "PointD", dataType: "number", width: "10%" },
{ key: "PointE", dataType: "number", width: "10%" },
{ key: "PointF", dataType: "number", width: "10%" },
{ key: "PointG", dataType: "number", width: "10%" },
{ key: "PointI", dataType: "number", width: "10%" },
],
responseDataKey: "Results", responseDataKey: "Results",
}); });
}); });

28
Server/wwwroot/styles/Site.css
View File

@ -104,3 +104,31 @@ div.modal-content-warning {
.icon-bar { .icon-bar {
background-color: black; background-color: black;
} }
@media screen and (min-width: 1024px) {
.modal-dialog {
right: auto;
left: 50%;
width: 768px;
padding-top: 30px;
padding-bottom: 30px;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
}
}
@media screen and (min-width: 1368px) {
.modal-dialog {
right: auto;
left: 50%;
width: 1280px;
padding-top: 30px;
padding-bottom: 30px;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
}
}