phares3757/mesa-fab-approval
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added ControllerExtensions to be used instead of HtmlViewRenderer for net8

Browse Source 
Added HttpException class for missing HttpException for net8

Wrapped HttpContext.Session, GetJsonResult, IsAjaxRequest and GetUserIdentityName in controllers for net8

Added AuthenticationService to test Fab2ApprovalMKLink code for net8

Compile conditionally flags to debug in dotnet core
This commit is contained in:
Mike Phares
2025-05-19 13:29:54 -07:00
parent 8bae94de96
commit 83789cdd91
89 changed files with 3939 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Fab2ApprovalSystem/Views/LotTraveler/Edit.cshtml
View File

@ -133,7 +133,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.OriginatorName, new { id = "txtOriginatorName", @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}
@ -901,9 +901,9 @@
<div class="panel-body bg-warning">
<div class="col-sm-offset-0">
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
if ((bool)Session[GlobalVars.IS_ADMIN] && (Request.IsAuthenticated))
if (GlobalVars.IsAdmin(Session) && (Request.IsAuthenticated))
{
@(Html.Kendo().Grid<Fab2ApprovalSystem.ViewModels.ApproversListViewModel>()
.Name("ApproversList")

2
Fab2ApprovalSystem/Views/LotTraveler/LotTravelerExecute.cshtml
View File

@ -125,7 +125,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.Originator, new { @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}

2
Fab2ApprovalSystem/Views/LotTraveler/LotTravelerReadOnly.cshtml
View File

@ -166,7 +166,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.Originator, new { @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}

2
Fab2ApprovalSystem/Views/LotTraveler/LotTravelerUpdate.cshtml
View File

@ -146,7 +146,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.Originator, new { @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}

8
Fab2ApprovalSystem/Views/LotTraveler/WorkRequestApproval.cshtml
View File

@ -152,7 +152,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.OriginatorName, new { id = "txtOriginatorName", @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}
@ -818,7 +818,7 @@
</div>
<div class="panel-heading">
@if (((bool)Session[GlobalVars.IS_ADMIN] && (Request.IsAuthenticated)))
@if ((GlobalVars.IsAdmin(Session) && (Request.IsAuthenticated)))
{
<button class="btn btn-warning btn-xs" data-toggle="modal" id="additionalApprovers" style="font-size:x-small">
Additional Approvers
@ -839,9 +839,9 @@
<div class="panel-body bg-warning">
<div class="col-sm-offset-0">
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
if ((bool)Session[GlobalVars.IS_ADMIN] && (Request.IsAuthenticated))
if (GlobalVars.IsAdmin(Session) && (Request.IsAuthenticated))
{
@(Html.Kendo().Grid<Fab2ApprovalSystem.ViewModels.ApproversListViewModel>()
.Name("ApproversList")

2
Fab2ApprovalSystem/Views/LotTraveler/WorkRequestReadOnly.cshtml
View File

@ -196,7 +196,7 @@
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.OriginatorName, new { id = "txtOriginatorName", @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
<a href="javascript:undefined" id="lnkReassignOriginator" class="linkbutton edit" title="Re-assign Originator"></a>
}

26
Fab2ApprovalSystem/Views/LotTraveler/WorkRequestRevision.cshtml
View File

@ -929,9 +929,9 @@
<div class="panel-body bg-warning">
<div class="col-sm-offset-0">
@if (Session[GlobalVars.IS_ADMIN] != null)
@if (GlobalVars.IsAdminValueNotNull(Session))
{
if ((bool)Session[GlobalVars.IS_ADMIN] && (Request.IsAuthenticated))
if (GlobalVars.IsAdmin(Session) && (Request.IsAuthenticated))
{
@(Html.Kendo().Grid<Fab2ApprovalSystem.ViewModels.ApproversListViewModel>()
.Name("ApproversList")
@ -1711,7 +1711,7 @@
$("#UploadWRAttchmentRev").on('click', function (e) {
e.preventDefault();
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
wrAttachmentOperation = "Add";
if (model == "true") {
$("#WinWorkReqAttRevComments").modal('show');
@ -1787,7 +1787,7 @@
data.RevisionComments = $("#revisionWRAttachComments").val();
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
var urlString = '/LotTraveler/UpdateWorkRequestAttachmentRevision';
$.ajax({
@ -1851,7 +1851,7 @@
function on_WorkReqAttachmentsGridSuccess() {
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$.ajax({
@ -1887,7 +1887,7 @@
var dataItem = this.dataItem($(e.currentTarget).closest("tr"));
currentWrkReqAttachID = dataItem.ID;
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$("#WinWorkReqAttRevComments").modal('show');
@ -1910,7 +1910,7 @@
if (confirm("Do you really wish to delete the attachment record")) {
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$("#WinWorkReqAttRevComments").modal('show');
}
@ -2009,7 +2009,7 @@
if (confirm("Do you really wish to delete the record?")) {
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$("#WinHoldStepRevisionComments").modal("show");
}
@ -2180,7 +2180,7 @@
else {
// save
$("#AddHoldStepForm").modal('hide');
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$("#WinHoldStepRevisionComments").modal("show");
}
@ -2451,7 +2451,7 @@
var dataItem = this.dataItem($(e.currentTarget).closest("tr"));
currentHoldStepID = dataItem.ID;
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$("#WinHoldStepAttRevComments").modal('show');
@ -2769,7 +2769,7 @@
return;
}
var model = '@Session["CreateNewRevision"]';
var model = '@GlobalVars.GetCreateNewRevision(Session)';
$('#submitRevisionComments').attr("disabled", false);
@ -2919,7 +2919,7 @@
if (confirm("Do you really wish to delete?")) {
var model = '@Session["CreateNewRevision"]';
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true")
$("#WinEPIRevisionComments").modal('show');
else {
@ -2968,7 +2968,7 @@
var Quantity = $("#txtEPiQuantity").val();
$("#EPIForm").modal('hide');
var model = '@Session["CreateNewRevision"]';
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true")
$("#WinEPIRevisionComments").modal('show');

2
Fab2ApprovalSystem/Views/LotTraveler/_HoldStepAttachmentsRevision.cshtml
View File

@ -118,7 +118,7 @@
function SetDocType(e) {
var model = "@Session["CreateNewRevision"]";
var model = '@GlobalVars.GetCreateNewRevision(Session)';
if (model == "true") {
$.ajax({