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

Ready to test new column

Browse Source
This commit is contained in:
Mike Phares
2025-01-13 16:56:42 -07:00
committed by Tucker Chase (CSC FI SPS MESLEO)
parent 123bbdb9fe
commit 1b22ffa439
20 changed files with 315 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs
View File

@ -90,6 +90,7 @@ public class CorrectiveActionDMO {
parameters.Add("@EscapePoint", model.EscapePoint);
parameters.Add("@FollowUpDate", model.FollowUpDate);
parameters.Add("@CASubmitted", model.CASubmitted);
parameters.Add("@CAStandardType", model.CAStandardType);
db.Execute("_8DUpdateCorrectiveAction", parameters, commandType: CommandType.StoredProcedure);
EventLogDMO.Add(new WinEventLog { UserID = "System", Comments = "Saved Corrective Action", DocumentType = "9", IssueID = model.CANo, OperationType = "Status", SysDocumentID = 1 });

3
Fab2ApprovalSystem/DMO/ECN_DMO.cs
View File

@ -15,6 +15,7 @@ using Fab2ApprovalSystem.ViewModels;
namespace Fab2ApprovalSystem.DMO;
public class ECN_DMO {
private readonly IDbConnection db = new SqlConnection(GlobalVars.DB_CONNECTION_STRING);
private readonly WorkflowDMO wfDMO = new();
@ -367,7 +368,7 @@ public class ECN_DMO {
return ecnItem;
}
internal ECN GetECN(int ecnNumber) {
public ECN GetECN(int ecnNumber) {
ECN ecnItem = new();
DynamicParameters parameters = new();
parameters.Add("@ECNNumber", value: ecnNumber);

1
Fab2ApprovalSystem/Models/EightDModel.cs
View File

@ -231,6 +231,7 @@ public class CorrectiveAction {
public DateTime? NextDueDate { get; set; }
public DateTime? FollowUpDate { get; set; }
public bool CASubmitted { get; set; }
public string CAStandardType { get; set; }
public DateTime? ClosedDate { get; set; }
public CorrectiveAction() {
TeamMemberIDs = new List<int>();

39
Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml
View File

@ -380,6 +380,43 @@
</div>
</div>
</div>
<div class="col-sm-3">
<div class="row">
<div class="col-sm-3">
<label class="control-label pull-right">CA Standard Type:</label>
</div>
<div class="col-sm-9">
@(Html.Kendo().DropDownList()
.Name("CAStandardTypeList")
.DataTextField("Text")
.DataValueField("Value")
.BindTo(new List<SelectListItem>()
{
new SelectListItem()
{
Text = "IATF16949",
Value = "IATF16949"
},
new SelectListItem()
{
Text = "ISO14001",
Value = "ISO14001"
},
new SelectListItem()
{
Text = "ISO45001",
Value = "ISO45001"
}
}
)
.OptionLabel("Select")
.Value(Model.CAStandardType)
)
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-3">
@ -2176,6 +2213,7 @@
$('#txtApprovedDate').attr("disabled", true);
$('#txtRelatedMRB').attr("disabled", true);
$('#CATypeList').data("kendoDropDownList").enable(false);
$('#CAStandardTypeList').data("kendoDropDownList").enable(false);
$('#d0Comments').attr("disabled", true);
}
@ -3689,6 +3727,7 @@
TeamCaptainID: $("#TeamCaptainList").data("kendoDropDownList").value(),
CASponsorID: $("#CASponsorList").data("kendoDropDownList").value(),
CASubmitted: isCASubmitted,
CAStandardType : $("#CAStandardTypeList").data("kendoDropDownList").value(),
//D0
D0Comments : $("#d0Comments").val(),

10
Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml
View File

@ -325,6 +325,16 @@
</div>
</div>
</div>
<div class="col-sm-3">
<div class="row">
<div class="col-sm-3">
<label class="control-label pull-right">CA Standard Type:</label>
</div>
<div class="col-sm-9">
@Html.TextBoxFor(model => model.CAStandardType, new { id = "txtCAStandardType", @class = "k-textbox", Readonly = "Readonly", style = "background-color:lightblue" })
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-3">