diff --git a/ETS_Data/DataProxy_ProjEts.cs b/ETS_Data/DataProxy_ProjEts.cs index 1bbb463..4e85b5e 100644 --- a/ETS_Data/DataProxy_ProjEts.cs +++ b/ETS_Data/DataProxy_ProjEts.cs @@ -13,6 +13,7 @@ namespace ETS_Data #region area table adapters /* Ds_ProjEts */ + public Ds_ProjEtsTableAdapters.AnagLabelsTableAdapter taAL; public Ds_ProjEtsTableAdapters.AnagProgettiTableAdapter taAP; public Ds_ProjEtsTableAdapters.AnagFasiTableAdapter taAF; public Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter taDC; @@ -38,6 +39,7 @@ namespace ETS_Data /// protected void initTA() { + taAL = new Ds_ProjEtsTableAdapters.AnagLabelsTableAdapter(); taAP = new Ds_ProjEtsTableAdapters.AnagProgettiTableAdapter(); taAF = new Ds_ProjEtsTableAdapters.AnagFasiTableAdapter(); taDC = new Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter(); @@ -63,6 +65,7 @@ namespace ETS_Data protected virtual void setupConnectionStringBase() { // connections del db + taAL.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taAP.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taAF.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); taDC.Connection.ConnectionString = utils.obj.confReadString("ETS_PROJConnectionString"); diff --git a/ETS_Data/Ds_ProjEts.Designer.cs b/ETS_Data/Ds_ProjEts.Designer.cs index 8a5e84a..63f656c 100644 --- a/ETS_Data/Ds_ProjEts.Designer.cs +++ b/ETS_Data/Ds_ProjEts.Designer.cs @@ -20832,11 +20832,25 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodLabel, DescrLabel FROM dbo.AnagLabels"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_AL_DeleteQuery"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_AL_UpdateQuery"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -21014,6 +21028,76 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; public virtual int Update(string DescrLabel, string Original_CodLabel, string Original_DescrLabel) { return this.Update(Original_CodLabel, DescrLabel, Original_CodLabel, Original_DescrLabel); } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, false)] + public virtual int DeleteQuery(string Original_CodLabel) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_CodLabel == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_CodLabel)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] + public virtual int UpdateQuery(string CodLabel, string DescrLabel, string Original_CodLabel) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((CodLabel == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodLabel)); + } + if ((DescrLabel == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(DescrLabel)); + } + if ((Original_CodLabel == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Original_CodLabel)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// @@ -21178,7 +21262,7 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idxFase, CodLabel FROM dbo.LabelsComm"; @@ -21191,17 +21275,23 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_L2C_getByIdxFase"; + this._commandCollection[2].CommandText = "dbo.stp_L2C_getByCodLabel"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_L2C_UpsertQuery"; + this._commandCollection[3].CommandText = "dbo.stp_L2C_getByIdxFase"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_L2C_UpsertQuery"; + this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodLabel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -21232,8 +21322,25 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual Ds_ProjEts.LabelsCommDataTable getByIdxFase(global::System.Nullable idxFase) { + public virtual Ds_ProjEts.LabelsCommDataTable getByCodLabel(string CodLabel) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((CodLabel == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodLabel)); + } + Ds_ProjEts.LabelsCommDataTable dataTable = new Ds_ProjEts.LabelsCommDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual Ds_ProjEts.LabelsCommDataTable getByIdxFase(global::System.Nullable idxFase) { + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((idxFase.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxFase.Value)); } @@ -21407,7 +21514,7 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel)"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)] public virtual int UpsertQuery(global::System.Nullable idxFase, string CodLabel) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((idxFase.HasValue == true)) { command.Parameters[1].Value = ((int)(idxFase.Value)); } diff --git a/ETS_Data/Ds_ProjEts.cs b/ETS_Data/Ds_ProjEts.cs index ecb40d3..57d033a 100644 --- a/ETS_Data/Ds_ProjEts.cs +++ b/ETS_Data/Ds_ProjEts.cs @@ -12,3 +12,10 @@ namespace ETS_Data { public partial class Ds_ProjEts { } } + +namespace ETS_Data.Ds_ProjEtsTableAdapters { + + + public partial class LabelsCommTableAdapter { + } +} diff --git a/ETS_Data/Ds_ProjEts.xsd b/ETS_Data/Ds_ProjEts.xsd index ecdf584..8ae6d60 100644 --- a/ETS_Data/Ds_ProjEts.xsd +++ b/ETS_Data/Ds_ProjEts.xsd @@ -1554,7 +1554,32 @@ SELECT CodLabel, DescrLabel FROM AnagLabels WHERE (CodLabel = @CodLabel) - + + + + + dbo.stp_AL_DeleteQuery + + + + + + + + + + + dbo.stp_AL_UpdateQuery + + + + + + + + + + @@ -1614,6 +1639,17 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa + + + + dbo.stp_L2C_getByCodLabel + + + + + + + @@ -1647,7 +1683,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -1690,7 +1726,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -1740,7 +1776,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -1836,7 +1872,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -1887,7 +1923,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -1939,7 +1975,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2042,7 +2078,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2090,7 +2126,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2107,7 +2143,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2128,7 +2164,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2149,7 +2185,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2284,7 +2320,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2303,7 +2339,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2314,7 +2350,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2330,7 +2366,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2359,7 +2395,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2379,7 +2415,7 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - + @@ -2476,13 +2512,13 @@ SELECT idxFase, CodLabel FROM LabelsComm WHERE (CodLabel = @CodLabel) AND (idxFa - - - - - - - + + + + + + + \ No newline at end of file diff --git a/ETS_Data/Ds_ProjEts.xss b/ETS_Data/Ds_ProjEts.xss index 9c319c6..b2a69a2 100644 --- a/ETS_Data/Ds_ProjEts.xss +++ b/ETS_Data/Ds_ProjEts.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -17,12 +17,12 @@ - + - - + + @@ -116,12 +116,12 @@ - 1259 - 773 + 1298 + 811 - 1259 - 813 + 1298 + 841 diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index 2567090..7436e83 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index 799076d..6cba620 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index 2567090..7436e83 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/TempPE/Ds_ProjEts.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/Ds_ProjEts.Designer.cs.dll index 4816a0e..451c4f7 100644 Binary files a/ETS_Data/obj/ETS/TempPE/Ds_ProjEts.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/Ds_ProjEts.Designer.cs.dll differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 7e2e6b7..cf52abd 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -464,11 +464,13 @@ + + @@ -704,6 +706,13 @@ WS_Data.asmx Component + + Setup.aspx + ASPXCodeBehind + + + Setup.aspx + Site.Mobile.Master ASPXCodeBehind @@ -760,6 +769,13 @@ Site.Master + + mod_AnagLabels.ascx + ASPXCodeBehind + + + mod_AnagLabels.ascx + mod_autocomplete.ascx ASPXCodeBehind diff --git a/PROJ-ETS/PROJ-ETS/Progetti.sitemap b/PROJ-ETS/PROJ-ETS/Progetti.sitemap index 806fc02..7a4f9cf 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.sitemap +++ b/PROJ-ETS/PROJ-ETS/Progetti.sitemap @@ -8,6 +8,7 @@ - + + diff --git a/PROJ-ETS/PROJ-ETS/Setup.aspx b/PROJ-ETS/PROJ-ETS/Setup.aspx new file mode 100644 index 0000000..0219103 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/Setup.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Progetti.master" AutoEventWireup="true" CodeBehind="Setup.aspx.cs" Inherits="PROJ_ETS.Setup" %> + +<%@ Register Src="~/WebUserControls/mod_AnagLabels.ascx" TagPrefix="uc1" TagName="mod_AnagLabels" %> + + +

Gestione Labels

+ +
diff --git a/PROJ-ETS/PROJ-ETS/Setup.aspx.cs b/PROJ-ETS/PROJ-ETS/Setup.aspx.cs new file mode 100644 index 0000000..99513d2 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/Setup.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace PROJ_ETS +{ + public partial class Setup : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Setup.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/Setup.aspx.designer.cs new file mode 100644 index 0000000..8f99c22 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/Setup.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PROJ_ETS { + + + public partial class Setup { + + /// + /// mod_AnagLabels control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::PROJ_ETS.WebUserControls.mod_AnagLabels mod_AnagLabels; + } +} diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx new file mode 100644 index 0000000..513a8cb --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx @@ -0,0 +1,62 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_AnagLabels.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_AnagLabels" %> + + + + + + + + + + + + + + Nessun record + + + + +
+ +
+
+ + + + + + +
+ + + + +
+ +
+
+ + + + + + + +
+
+
+ + + + + + + + + + + + + + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.cs new file mode 100644 index 0000000..90ebdab --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.cs @@ -0,0 +1,76 @@ +using ETS_Data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace PROJ_ETS.WebUserControls +{ + public partial class mod_AnagLabels : System.Web.UI.UserControl + { + /// + /// pagina corrente (URL finale) + /// + public string _paginaCorrente { get; set; } + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + PagCorrente(); + //idxProgetto = utils.obj.confReadInt("idxProgetto_sel"); + //ddlPageSize.SelectedValue = utils.pageSize.ToString(); + } + //setDetVisibility(); + } + /// + /// salva in variabile pagina il nome della pagina corrente + /// + protected void PagCorrente() + { + Uri MyUrl = Request.Url; + string delimStr = "/"; + char[] delimiter = delimStr.ToCharArray(); + string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); + int n = finalUrl.Length; + _paginaCorrente = finalUrl[n - 1].ToString(); + } + /// + /// risponde alla domanda se l'utente abbia permesso tipo writable (S) nel permessi2funzione + /// + /// + public bool isWritable() + { + bool answ = false; + if (_paginaCorrente == null) + { + PagCorrente(); + } + answ = user_std.UtSn.isPageWriteEnabled(_paginaCorrente); + return answ; + } + /// + /// determina se sia eliminabile il record (=non usato) + /// + /// + /// + public bool delEnabled(object CodLabel) + { + // verifico NON ci siano record... + bool noRecord =DataProxy_ProjEts.DP.taL2C.getByCodLabel(CodLabel.ToString()).Rows.Count == 0; + return (isWritable() && noRecord); + } + /// + /// gestione evento richiesta nuovo valore QUANDO NON CI SIANO RECORDS! + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + DataProxy_ProjEts.DP.taAL.Insert("_NewLabel", "_NewLabel"); + grView.EditIndex = 0; + grView.DataBind(); + } + } +} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.designer.cs new file mode 100644 index 0000000..3b3f0f8 --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_AnagLabels.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace PROJ_ETS.WebUserControls { + + + public partial class mod_AnagLabels { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 2567090..6cba620 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 50ee686..29fc6a0 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip index 6c6c226..78e0d6a 100644 Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ diff --git a/VersGen/CodeVersion.cs b/VersGen/CodeVersion.cs index de92df0..f08b4a9 100644 --- a/VersGen/CodeVersion.cs +++ b/VersGen/CodeVersion.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.1.163")] -[assembly: AssemblyFileVersion("2.2.1.163")] +[assembly: AssemblyVersion("2.2.2.163")] +[assembly: AssemblyFileVersion("2.2.2.163")] [assembly: AssemblyCopyright("Steamware © 2013-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CodeVersion.tt b/VersGen/CodeVersion.tt index e8dfcde..b66b0b5 100644 --- a/VersGen/CodeVersion.tt +++ b/VersGen/CodeVersion.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.2.1.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.2.1.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.2.2.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.2.2.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 9c429e2..e49b4db 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/CodeVersion.cs.dll b/VersGen/obj/Release/TempPE/CodeVersion.cs.dll index dc458e2..4ced7da 100644 Binary files a/VersGen/obj/Release/TempPE/CodeVersion.cs.dll and b/VersGen/obj/Release/TempPE/CodeVersion.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 9c429e2..e49b4db 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ