diff --git a/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs b/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs index 3896726..0b68e5b 100644 --- a/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs +++ b/Controller/SCP_TA_LANGUAGE_CONTROLLER.cs @@ -208,14 +208,16 @@ namespace CK.SCP.Controller - public static ResultObject Del_TA_LANGUAGE(TA_LANGUAGE p_entity) + public static ResultObject Del_TA_LANGUAGE(string _ls) { ResultObject _ret = new ResultObject(); try { using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - var _entity = db.TA_LANGUAGE.Where(itm => itm.GUID == p_entity.GUID).FirstOrDefault(); + + + var _entity = db.TA_LANGUAGE.Where(p=>p.UID.ToString()==_ls).FirstOrDefault(); db.TA_LANGUAGE.Remove(_entity); if (db.SaveChanges() != -1) @@ -292,8 +294,6 @@ namespace CK.SCP.Controller } - - + } - diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index dcebee6..a07d889 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -255,6 +255,8 @@ + + @@ -5008,6 +5010,20 @@ SCP_LANGUAGE.aspx + + SCP_LANGUAGE_1.aspx + ASPXCodeBehind + + + SCP_LANGUAGE_1.aspx + + + SCP_LANGUAGE_DETAIL.aspx + ASPXCodeBehind + + + SCP_LANGUAGE_DETAIL.aspx + SCP_MoldSharing.aspx ASPXCodeBehind diff --git a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs b/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs index 99890cb..afe2987 100644 --- a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs +++ b/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs @@ -192,11 +192,11 @@ namespace SCP.BasicData protected void Btn_Delete_Click(object sender, EventArgs e) { - var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE(new TA_LANGUAGE { GUID = TXT_GUID.Text }); - if (ret.State == ReturnStatus.Succeed) - { - BindData(); - } + //var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE(new TA_LANGUAGE { GUID = TXT_GUID.Text }); + //if (ret.State == ReturnStatus.Succeed) + //{ + // BindData(); + //} } diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx new file mode 100644 index 0000000..73becf7 --- /dev/null +++ b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx @@ -0,0 +1,88 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_LANGUAGE_1.aspx.cs" Inherits="SCP.Views.BasicData.SCP_LANGUAGE_1" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +