diff --git a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs
index cb83a15..fd661d8 100644
--- a/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs
+++ b/Fab2ApprovalSystem/Controllers/CorrectiveActionController.cs
@@ -628,7 +628,14 @@ namespace Fab2ApprovalSystem.Controllers
///
public ActionResult InsertD5D6CAItem(D5D6CorrectivetAction data)
{
- caDMO.InsertD5D6CorrectivetAction(data);
+ try
+ {
+ caDMO.InsertD5D6CorrectivetAction(data);
+ }
+ catch(Exception e)
+ {
+ return Content(e.Message + " Please try again...");
+ }
if (data.ResponsibilityOwnerID != null && data.ResponsibilityOwnerID != 0)
{
//NotifyActionItemOwner(data.CANo, data.ECD, data.ResponsibilityOwnerID, "CorrectiveActionAIAssigned.txt");
@@ -648,9 +655,14 @@ namespace Fab2ApprovalSystem.Controllers
{
D5D6CorrectivetAction previousData = caDMO.GetD5D5CAItem(data.ID);
CorrectiveAction caData = caDMO.GetCAItem(data.CANo, (int)Session[GlobalVars.SESSION_USERID]);
- caDMO.UpdateD5D6CorrectivetAction(data);
-
-
+ try
+ {
+ caDMO.UpdateD5D6CorrectivetAction(data);
+ }
+ catch(Exception e)
+ {
+ return Content(e.Message + " Please try again...");
+ }
if (data.ResponsibilityOwnerID != data.CurrentResponsibilityOwnerID && data.ResponsibilityOwnerID != 0)
{
NotifyActionItemOwner(data.CANo, data.ECD, data.ResponsibilityOwnerID, "CorrectiveActionAIAssigned.txt");
@@ -663,8 +675,6 @@ namespace Fab2ApprovalSystem.Controllers
NotifyActionItemCompletion(data.CANo, data.ECD, caData.QAID, "CorrectiveActionAICompleted.txt");
}
-
-
return Content("");
}
diff --git a/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml b/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml
index 6077afc..98602ab 100644
--- a/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml
+++ b/Fab2ApprovalSystem/Views/CorrectiveAction/Edit.cshtml
@@ -1692,7 +1692,8 @@
- @Html.TextBox("txtD5D6Result", null, new { @class = "k-textbox", style = "width:100%" })
+ @*@Html.TextBox("txtD5D6Result", null, new { @class = "k-textbox", style = "width:100%" })*@
+ @Html.TextArea("txtD5D6Result", "", 10, 40 , new { @class = "k-textbox", style = "width:100%" })
|
@@ -4325,6 +4326,7 @@
ResponsibilityOwnerID: $("#D5D6ResponsibilityOwnerIds").data("kendoDropDownList").value(),
ImprovementID: d5d6ImprovementIDs + ','
}
+ alert(objectData.Result);
}
return objectData;