diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/040c0f33-ed63-4380-abe1-b26fc1cae3a5.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/040c0f33-ed63-4380-abe1-b26fc1cae3a5.vsidx deleted file mode 100644 index a8e2eb2..0000000 Binary files a/.vs/Fab2ApprovalSystem/FileContentIndex/040c0f33-ed63-4380-abe1-b26fc1cae3a5.vsidx and /dev/null differ diff --git a/.vs/Fab2ApprovalSystem/FileContentIndex/5f0ce5a2-c27e-4d03-9e06-c1f704035194.vsidx b/.vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx similarity index 71% rename from .vs/Fab2ApprovalSystem/FileContentIndex/5f0ce5a2-c27e-4d03-9e06-c1f704035194.vsidx rename to .vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx index 1390a2d..0a01d93 100644 Binary files a/.vs/Fab2ApprovalSystem/FileContentIndex/5f0ce5a2-c27e-4d03-9e06-c1f704035194.vsidx and b/.vs/Fab2ApprovalSystem/FileContentIndex/325e1ae0-e623-481f-b34b-f1d6f7aac7f0.vsidx differ diff --git a/.vs/Fab2ApprovalSystem/v17/.suo b/.vs/Fab2ApprovalSystem/v17/.suo index d01fae1..cc69d2d 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/.suo and b/.vs/Fab2ApprovalSystem/v17/.suo differ diff --git a/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog b/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog index 8a18147..98a881f 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog and b/.vs/Fab2ApprovalSystem/v17/TestStore/0/000.testlog differ diff --git a/.vs/Fab2ApprovalSystem/v17/fileList.bin b/.vs/Fab2ApprovalSystem/v17/fileList.bin index 13b603d..f2f2c24 100644 Binary files a/.vs/Fab2ApprovalSystem/v17/fileList.bin and b/.vs/Fab2ApprovalSystem/v17/fileList.bin differ diff --git a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs index 9ab9fd4..1283175 100644 --- a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs +++ b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs @@ -336,7 +336,7 @@ namespace Fab2ApprovalSystem.Controllers public ActionResult Attachment_Read([DataSourceRequest] DataSourceRequest request, int caNO) { - return Json(caDMO.GetCAAttachmentsList(caNO, "").ToDataSourceResult(request), JsonRequestBehavior.AllowGet); + return Json(caDMO.GetCAAttachmentsList(caNO, "Main").ToDataSourceResult(request), JsonRequestBehavior.AllowGet); } /// @@ -409,14 +409,14 @@ namespace Fab2ApprovalSystem.Controllers /// /// /// - public ActionResult D2FilesAttachSave(IEnumerable D2Files, int caNo) + public ActionResult AttachSave(IEnumerable files, int caNo) { try { // The Name of the Upload component is "files" - if (D2Files != null) + if (files != null) { - foreach (var file in D2Files) + foreach (var file in files) { // Some browsers send file names with full path. // We are only interested in the file name. @@ -443,8 +443,7 @@ namespace Fab2ApprovalSystem.Controllers FileGUID = guid, FileName = fileName, UploadedByID = (int)Session[GlobalVars.SESSION_USERID], - Section = Functions.CASectionMapper(GlobalVars.CASection.D2) - + Section = Functions.CASectionMapper(GlobalVars.CASection.Main) }; diff --git a/Fab2ApprovalSystem/Controllers/HomeController.cs b/Fab2ApprovalSystem/Controllers/HomeController.cs index 00b4cf2..ea3370d 100644 --- a/Fab2ApprovalSystem/Controllers/HomeController.cs +++ b/Fab2ApprovalSystem/Controllers/HomeController.cs @@ -412,6 +412,21 @@ namespace Fab2ApprovalSystem.Controllers return Json(new[] { issue }.ToDataSourceResult(request, ModelState)); } + /// + /// + /// + /// + /// + /// + [AcceptVerbs(HttpVerbs.Post)] + public ActionResult DeleteCAItem([DataSourceRequest] DataSourceRequest request, CorrectiveAction ca) + { + ldDMO.DeleteCADocument(ca.CANo, int.Parse(Session[GlobalVars.SESSION_USERID].ToString()), "Corrective Action"); + + + return Json(new[] { ca }.ToDataSourceResult(request, ModelState)); + } + /// /// /// diff --git a/Fab2ApprovalSystem/Controllers/TrainingController.cs b/Fab2ApprovalSystem/Controllers/TrainingController.cs index bf7bcd1..e22e722 100644 --- a/Fab2ApprovalSystem/Controllers/TrainingController.cs +++ b/Fab2ApprovalSystem/Controllers/TrainingController.cs @@ -726,7 +726,7 @@ namespace Fab2ApprovalSystem.Controllers emailBody += "

" + training.ECN + " - " + ecnTitle + "

"; emailBody += ""; - emailBody += ""; + emailBody += ""; List openAssignments = trainingDMO.GetOpenAssignmentsByTrainingID(training.TrainingID); foreach (TrainingAssignment assignment in openAssignments) { @@ -734,7 +734,14 @@ namespace Fab2ApprovalSystem.Controllers string DateAssigned = assignmentDate.HasValue ? assignmentDate.Value.ToString("MM/dd/yyyy") : ""; - emailBody += ""; + emailBody += ""; + + if (userDMO.GetUserByID(assignment.UserID).OOO) + emailBody += ""; + else + emailBody += ""; + + emailBody += ""; } emailBody += "
NameDate Assigned
NameDate AssignedOut of Office
" + assignment.FullName + "" + DateAssigned + "
" + assignment.FullName + "" + DateAssigned + "X
"; diff --git a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs index c26df41..2c0bafd 100644 --- a/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs +++ b/Fab2ApprovalSystem/DMO/CorrectiveActionDMO.cs @@ -325,7 +325,6 @@ namespace Fab2ApprovalSystem.DMO /// public IEnumerable GetCAAttachmentsList(int caNo, string section) { - var parameters = new DynamicParameters(); parameters.Add("@CANo", caNo); parameters.Add("@Section", section); diff --git a/Fab2ApprovalSystem/Misc/Functions.cs b/Fab2ApprovalSystem/Misc/Functions.cs index 9f52c90..3d8fa4b 100644 --- a/Fab2ApprovalSystem/Misc/Functions.cs +++ b/Fab2ApprovalSystem/Misc/Functions.cs @@ -359,6 +359,9 @@ namespace Fab2ApprovalSystem.Misc { switch (casection) { + case GlobalVars.CASection.Main: + return "Main"; + case GlobalVars.CASection.D1: return "D1"; diff --git a/Fab2ApprovalSystem/Misc/GlobalVars.cs b/Fab2ApprovalSystem/Misc/GlobalVars.cs index ef82574..6b76b25 100644 --- a/Fab2ApprovalSystem/Misc/GlobalVars.cs +++ b/Fab2ApprovalSystem/Misc/GlobalVars.cs @@ -107,7 +107,7 @@ namespace Fab2ApprovalSystem.Misc public enum CASection { - D1, D2, D3, D4, D5,D6, D7, D8, CF + Main, D1, D2, D3, D4, D5,D6, D7, D8, CF } diff --git a/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml b/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml index 597d89e..6077afc 100644 --- a/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml +++ b/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml @@ -435,9 +435,19 @@
- - - + @(Html.Kendo().Upload() + .Name("files") + .Async(a => a + .Save("AttachSave", "CorrectiveAction", new { caNo = Model.CANo }) + .AutoUpload(true) + ) + .ShowFileList(false) + .Events(events => events + .Success("onFileUploadSuccess") + .Upload("CheckFileType") + .Error("onFileUploadError") + ) + ) @(Html.Kendo().Grid() .Name("Attachments") .Columns(columns => @@ -452,7 +462,7 @@ columns.Command(command => command.Custom("Delete").Click("DeleteCAAttachment")); }) - + .Scrollable() .Sortable() .HtmlAttributes(new { style = "height:300px; width:100%; font-size: 10px", Readonly = "Readonly" }) .DataSource(dataSource => dataSource @@ -465,7 +475,7 @@ model.Id(p => p.ID); }) .PageSize(50) - .Read(read => read.Action("Attach_Read", "CorrectiveAction", new { caNO = Model.CANo })) + .Read(read => read.Action("Attachment_Read", "CorrectiveAction", new { caNO = Model.CANo })) .Destroy(destroy => destroy.Action("DeleteCAAttachment", "CorrectionAction")) ) ) @@ -3947,8 +3957,16 @@ } - - + function onFileUploadSuccess(e) { + //alert(e.message); + var grid = $("#Attachments").data("kendoGrid"); + grid.dataSource.read($('#txtCANo').val()); + } + function onFileUploadError(e) { + alert("Error Uploading File!!! Please Try Again..."); + var grid = $("#Attachments").data("kendoGrid"); + grid.dataSource.read($('#txtCANo').val()); + } function onD4FileUploadSuccess(e) { var grid = $("#D4Attachments").data("kendoGrid"); diff --git a/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml b/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml index 871bab0..2952255 100644 --- a/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml +++ b/Fab2ApprovalSystem/Views/CorrectiveAction/ReadOnlyCA.cshtml @@ -322,8 +322,7 @@
- - + @(Html.Kendo().Grid() .Name("Attachments") @@ -341,6 +340,7 @@ }) .Sortable() + .Scrollable() .HtmlAttributes(new { style = "height:300px; width:100%; font-size: 10px", Readonly = "Readonly" }) .DataSource(dataSource => dataSource .Ajax() @@ -1714,11 +1714,6 @@ } - - - - - function buildLinks(fileNames, caNo) { var template = ""; diff --git a/Fab2ApprovalSystem/Views/Home/AllDocuments.cshtml b/Fab2ApprovalSystem/Views/Home/AllDocuments.cshtml index a77f83e..a53076e 100644 --- a/Fab2ApprovalSystem/Views/Home/AllDocuments.cshtml +++ b/Fab2ApprovalSystem/Views/Home/AllDocuments.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNet.Identity +@using Microsoft.AspNet.Identity @{ Layout = "_HomeLayout.cshtml"; } @@ -163,110 +163,6 @@
- - -