diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/17d07c06-c751-4057-8038-625eff7d9f45.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/17d07c06-c751-4057-8038-625eff7d9f45.vsidx new file mode 100644 index 0000000..3e784dc Binary files /dev/null and b/.vs/Fab2ApprovalSystem/FileContentIndex/17d07c06-c751-4057-8038-625eff7d9f45.vsidx differ diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/87b89757-701e-43d9-8dac-6b71b74b18a7.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/87b89757-701e-43d9-8dac-6b71b74b18a7.vsidx new file mode 100644 index 0000000..fc8f9f5 Binary files /dev/null and b/.vs/Fab2ApprovalSystem/FileContentIndex/87b89757-701e-43d9-8dac-6b71b74b18a7.vsidx differ diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/9f432593-2d58-4094-bcba-f4559dc8e991.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/9f432593-2d58-4094-bcba-f4559dc8e991.vsidx new file mode 100644 index 0000000..fa8e7dc Binary files /dev/null and b/.vs/Fab2ApprovalSystem/FileContentIndex/9f432593-2d58-4094-bcba-f4559dc8e991.vsidx differ diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/b1b06aa2-337d-4b25-b834-714517ed0fe0.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/b1b06aa2-337d-4b25-b834-714517ed0fe0.vsidx new file mode 100644 index 0000000..570f490 Binary files /dev/null and b/.vs/Fab2ApprovalSystem/FileContentIndex/b1b06aa2-337d-4b25-b834-714517ed0fe0.vsidx differ diff --git a/.vs/Fab2ApprovalSystem/v17/.suo b/.vs/Fab2ApprovalSystem/v17/.suo index 872dbf5..c800dda 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/.suo and b/.vs/Fab2ApprovalSystem/v17/.suo differ diff --git a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs index 1283175..cb83a15 100644 --- a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs +++ b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs @@ -321,6 +321,25 @@ namespace Fab2ApprovalSystem.Controllers return View(ca); + } + public void ReleaseLockOnDocumentAdmin(int issueID) + { + try + { + caDMO.ReleaseLockOnDocument(-1, issueID); + } + catch (Exception e) + { + try + { + Functions.WriteEvent(@User.Identity.Name + "\r\n ReleaseLockOnDocument CA\r\n" + issueID.ToString() + "\r\n" + e.Message, System.Diagnostics.EventLogEntryType.Error); + } + catch { } + caDMO.ReleaseLockOnDocument(-1, issueID); + + } + + } /// /// diff --git a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs index 2c0bafd..c4b8f97 100644 --- a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs +++ b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs @@ -884,6 +884,7 @@ namespace Fab2ApprovalSystem.DMO } } + public IEnumerable GetECNList() { var parameters = new DynamicParameters(); diff --git a/Fab2ApprovalSystem/Models/EightDModel.cs b/Fab2ApprovalSystem/Models/EightDModel.cs index 10f1c6f..414e2e5 100644 --- a/Fab2ApprovalSystem/Models/EightDModel.cs +++ b/Fab2ApprovalSystem/Models/EightDModel.cs @@ -213,6 +213,7 @@ namespace Fab2ApprovalSystem.Models public DateTime? ApprovedDate { get; set; } public bool RecordLockIndicator { get; set; } public int RecordLockedBy { get; set; } + public string RecordLockByName { get; set; } public bool RecordLocked { get; set; } public DateTime RecordLockedDate { get; set; } public DateTime LastUpdateDate { get; set; } diff --git a/Fab2ApprovalSystem/Views/Admin/Index.cshtml b/Fab2ApprovalSystem/Views/Admin/Index.cshtml index 57912d4..27d4c6d 100644 --- a/Fab2ApprovalSystem/Views/Admin/Index.cshtml +++ b/Fab2ApprovalSystem/Views/Admin/Index.cshtml @@ -160,6 +160,32 @@
+
+
+
+
+
+ + +

*Please assign a delegate if this user will be assigned tasks while Out of Office.

+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
@@ -465,6 +491,10 @@ diff --git a/Fab2ApprovalSystem/Views/ECN/Edit.cshtml b/Fab2ApprovalSystem/Views/ECN/Edit.cshtml index d4166f4..dad4f10 100644 --- a/Fab2ApprovalSystem/Views/ECN/Edit.cshtml +++ b/Fab2ApprovalSystem/Views/ECN/Edit.cshtml @@ -153,10 +153,10 @@
@Html.TextBoxFor(model => model.Title, new { id = "txtTitle", @class = "k-textbox", style = "width:100%" })
-
+
*(DO NOT USE Rev I, O, Q, S, X, and Z)
-
+
Revision Y is followed by AA. YY is followed by AAA
@@ -170,7 +170,7 @@ .Value(ViewBag.Nothing) )
-
+
Add minimum of Quality, Si Production, and Dept Specfic
diff --git a/Fab2ApprovalSystem/Views/Manager/Index.cshtml b/Fab2ApprovalSystem/Views/Manager/Index.cshtml index de4ec07..d9cd08d 100644 --- a/Fab2ApprovalSystem/Views/Manager/Index.cshtml +++ b/Fab2ApprovalSystem/Views/Manager/Index.cshtml @@ -371,17 +371,12 @@ var delegate = ""; var isChecked = $("#AssignDelegate").is(":checked"); - console.log(isChecked); - if (isChecked === true) delegate = $("#DelegateTo").data("kendoDropDownList").value(); else delegate = "0"; - console.log(delegate); - - if (userid == delegate) { alert('The OOO person cannot be same as the delegate to person');