diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 7b2545f..5892401 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -206,6 +206,7 @@ + @@ -373,9 +374,11 @@ + + @@ -419,6 +422,7 @@ + @@ -520,6 +524,13 @@ Bootstrap.Master + + Cost2Plant.aspx + ASPXCodeBehind + + + Cost2Plant.aspx + CsvExcelExporter.aspx ASPXCodeBehind @@ -757,6 +768,13 @@ UserAdmin.aspx + + Utilities.aspx + ASPXCodeBehind + + + Utilities.aspx + ViewSwitcher.ascx ASPXCodeBehind @@ -792,6 +810,13 @@ mod_autocompleteShort.ascx + + mod_Cost2Plant.ascx + ASPXCodeBehind + + + mod_Cost2Plant.ascx + mod_createNewStdCost.ascx ASPXCodeBehind @@ -1100,6 +1125,13 @@ mod_TranspCostMan.ascx + + mod_Utilities.ascx + ASPXCodeBehind + + + mod_Utilities.ascx + mod_vocabolario.ascx ASPXCodeBehind diff --git a/C2P/Cost2Plant.aspx b/C2P/Cost2Plant.aspx new file mode 100644 index 0000000..3a75525 --- /dev/null +++ b/C2P/Cost2Plant.aspx @@ -0,0 +1,32 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="Cost2Plant.aspx.cs" Inherits="C2P.Cost2Plant" %> +<%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc1" TagName="mod_ricercaGenerica" %> +<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_Cost2Plant.ascx" TagPrefix="uc1" TagName="mod_Cost2Plant" %> + + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ diff --git a/C2P/Cost2Plant.aspx.cs b/C2P/Cost2Plant.aspx.cs new file mode 100644 index 0000000..6c0c462 --- /dev/null +++ b/C2P/Cost2Plant.aspx.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P +{ + public partial class Cost2Plant : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + mod_righePag.numRowPag = 20; + mod_Cost2Plant.pageSize = mod_righePag.numRowPag; + } + mod_righePag.eh_newNum += mod_righePag_eh_newNum; + } + /// + /// aggiornato numero righe datagrid... aggiorno visualizzazione + /// + /// + /// + void mod_righePag_eh_newNum(object sender, EventArgs e) + { + mod_Cost2Plant.pageSize = mod_righePag.numRowPag; + } + } +} \ No newline at end of file diff --git a/C2P/Cost2Plant.aspx.designer.cs b/C2P/Cost2Plant.aspx.designer.cs new file mode 100644 index 0000000..2724226 --- /dev/null +++ b/C2P/Cost2Plant.aspx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 C2P { + + + public partial class Cost2Plant { + + /// + /// mod_ricercaGenerica control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica mod_ricercaGenerica; + + /// + /// mod_righePag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_righePag mod_righePag; + + /// + /// mod_Cost2Plant control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_Cost2Plant mod_Cost2Plant; + } +} diff --git a/C2P/Utilities.aspx b/C2P/Utilities.aspx new file mode 100644 index 0000000..b63e1dd --- /dev/null +++ b/C2P/Utilities.aspx @@ -0,0 +1,31 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="Utilities.aspx.cs" Inherits="C2P.Utilities" %> +<%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc1" TagName="mod_ricercaGenerica" %> +<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_Utilities.ascx" TagPrefix="uc1" TagName="mod_Utilities" %> + + + + + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ diff --git a/C2P/Utilities.aspx.cs b/C2P/Utilities.aspx.cs new file mode 100644 index 0000000..45cd9a4 --- /dev/null +++ b/C2P/Utilities.aspx.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P +{ + public partial class Utilities : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + mod_righePag.numRowPag = 20; + mod_Utilities.pageSize = mod_righePag.numRowPag; + } + mod_righePag.eh_newNum += mod_righePag_eh_newNum; + } + /// + /// aggiornato numero righe datagrid... aggiorno visualizzazione + /// + /// + /// + void mod_righePag_eh_newNum(object sender, EventArgs e) + { + mod_Utilities.pageSize = mod_righePag.numRowPag; + } + } +} \ No newline at end of file diff --git a/C2P/Utilities.aspx.designer.cs b/C2P/Utilities.aspx.designer.cs new file mode 100644 index 0000000..68f3a53 --- /dev/null +++ b/C2P/Utilities.aspx.designer.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 C2P { + + + public partial class Utilities { + + /// + /// mod_ricercaGenerica control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica mod_ricercaGenerica; + + /// + /// mod_righePag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_righePag mod_righePag; + + /// + /// mod_Utilities control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::C2P.WebUserControls.mod_Utilities mod_Utilities; + } +} diff --git a/C2P/WebUserControls/mod_Cost2Plant.ascx b/C2P/WebUserControls/mod_Cost2Plant.ascx new file mode 100644 index 0000000..2ea28c3 --- /dev/null +++ b/C2P/WebUserControls/mod_Cost2Plant.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Cost2Plant.ascx.cs" Inherits="C2P.WebUserControls.mod_Cost2Plant" %> +
+
+ <%: traduci("btnNewAgent") %> + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/C2P/WebUserControls/mod_Cost2Plant.ascx.cs b/C2P/WebUserControls/mod_Cost2Plant.ascx.cs new file mode 100644 index 0000000..bae4dbf --- /dev/null +++ b/C2P/WebUserControls/mod_Cost2Plant.ascx.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using C2P_Data; + +namespace C2P.WebUserControls +{ + public partial class mod_Cost2Plant : SteamWare.UserControl + { + /// + /// caricamento pagina + /// + protected void Page_Load() + { + if (!Page.IsPostBack) + { + txtNewVal.Text = ""; + } + } + /// + /// inserisco nel db il nuovo lemma... + /// + /// + /// + protected void lbtNew_Click(object sender, EventArgs e) + { + creaNuovo(); + } + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + /// + /// post bind grView + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} ({1})", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + /// + /// editing riga + /// + /// + /// + protected void grView_RowEditing(object sender, GridViewEditEventArgs e) + { + // seleziono la riga corrente... + grView.SelectedIndex = e.NewEditIndex; + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + } + + + /// + /// creazione nuovo lemma + /// + private void creaNuovo() + { + if (txtNewVal.Text != "") + { + // inserisco + DtProxy.man.taAgent.insertQuery(txtNewVal.Text.Trim(), "-", "-", 0); + // metto in campo ricerca... + memLayer.ML.setSessionVal("valoreCercato", txtNewVal.Text.Trim()); + // svuoto campo text + txtNewVal.Text = ""; + // riparto... + Response.Redirect(user_std.pagCorrente); + } + } + /// + /// verifica se i 2 vallori inseriti corrispondano + /// + /// + /// + /// + public bool checkValEq(object val1, object val2) + { + bool answ = false; + try + { + if (val1.ToString() == val2.ToString()) answ = true; + } + catch + { } + return answ; + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Cost2Plant.ascx.designer.cs b/C2P/WebUserControls/mod_Cost2Plant.ascx.designer.cs new file mode 100644 index 0000000..99ee42c --- /dev/null +++ b/C2P/WebUserControls/mod_Cost2Plant.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// 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 C2P.WebUserControls { + + + public partial class mod_Cost2Plant { + + /// + /// lbtNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtNew; + + /// + /// txtNewVal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNewVal; + + /// + /// 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; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// 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/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index 7f4a5ec..19a942d 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -138,7 +138,7 @@ <%-- --%> - + diff --git a/C2P/WebUserControls/mod_Utilities.ascx b/C2P/WebUserControls/mod_Utilities.ascx new file mode 100644 index 0000000..05b843f --- /dev/null +++ b/C2P/WebUserControls/mod_Utilities.ascx @@ -0,0 +1,64 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Utilities.ascx.cs" Inherits="C2P.WebUserControls.mod_Utilities" %> +
+
+ <%: traduci("btnNewAgent") %> + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/C2P/WebUserControls/mod_Utilities.ascx.cs b/C2P/WebUserControls/mod_Utilities.ascx.cs new file mode 100644 index 0000000..52535c6 --- /dev/null +++ b/C2P/WebUserControls/mod_Utilities.ascx.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using C2P_Data; + +namespace C2P.WebUserControls +{ + public partial class mod_Utilities : SteamWare.UserControl + { + /// + /// caricamento pagina + /// + protected void Page_Load() + { + if (!Page.IsPostBack) + { + txtNewVal.Text = ""; + } + } + /// + /// inserisco nel db il nuovo lemma... + /// + /// + /// + protected void lbtNew_Click(object sender, EventArgs e) + { + creaNuovo(); + } + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + /// + /// post bind grView + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} ({1})", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + /// + /// editing riga + /// + /// + /// + protected void grView_RowEditing(object sender, GridViewEditEventArgs e) + { + // seleziono la riga corrente... + grView.SelectedIndex = e.NewEditIndex; + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + } + + + /// + /// creazione nuovo lemma + /// + private void creaNuovo() + { + if (txtNewVal.Text != "") + { + // inserisco + DtProxy.man.taAgent.insertQuery(txtNewVal.Text.Trim(), "-", "-", 0); + // metto in campo ricerca... + memLayer.ML.setSessionVal("valoreCercato", txtNewVal.Text.Trim()); + // svuoto campo text + txtNewVal.Text = ""; + // riparto... + Response.Redirect(user_std.pagCorrente); + } + } + /// + /// verifica se i 2 vallori inseriti corrispondano + /// + /// + /// + /// + public bool checkValEq(object val1, object val2) + { + bool answ = false; + try + { + if (val1.ToString() == val2.ToString()) answ = true; + } + catch + { } + return answ; + } + } +} \ No newline at end of file diff --git a/C2P/WebUserControls/mod_Utilities.ascx.designer.cs b/C2P/WebUserControls/mod_Utilities.ascx.designer.cs new file mode 100644 index 0000000..6d5b842 --- /dev/null +++ b/C2P/WebUserControls/mod_Utilities.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// 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 C2P.WebUserControls { + + + public partial class mod_Utilities { + + /// + /// lbtNew control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtNew; + + /// + /// txtNewVal control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNewVal; + + /// + /// 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; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// 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/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 04ad697..9679a08 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -75,6 +75,8 @@
  • <%: traduci("AgentsMan") %>
  • <%: traduci("RawMatMan") %>
  • <%: traduci("PackageMan") %>
    • +
  • <%: traduci("Utilities") %>
    • +
  • <%: traduci("Cost2Plant") %>
  • <%: traduci("DiesGroupMan") %>
  • <%: traduci("TranspCostMan") %>
    • diff --git a/C2P/WebUserControls/mod_testata.ascx.designer.cs b/C2P/WebUserControls/mod_testata.ascx.designer.cs index 5e187ca..c858326 100644 --- a/C2P/WebUserControls/mod_testata.ascx.designer.cs +++ b/C2P/WebUserControls/mod_testata.ascx.designer.cs @@ -120,6 +120,24 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl liPackage; + /// + /// liUtilities control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl liUtilities; + + /// + /// liCost2Plant control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl liCost2Plant; + /// /// liDivider1 control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index eee0a45..559c4c7 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 5c61940..1fd999d 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.4.223.674")] -[assembly: AssemblyFileVersion("2.4.223.674")] +[assembly: AssemblyVersion("2.4.227.674")] +[assembly: AssemblyFileVersion("2.4.227.674")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index b5c4933..02975d8 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.4.223.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.4.223.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.4.227.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.4.227.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+