diff --git a/GMW/GMW.suo b/GMW/GMW.suo index 8b7af415..996332eb 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 27988fed..291281d4 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -141,13 +141,6 @@ Test.aspx - - testFunzioni.aspx - ASPXCodeBehind - - - testFunzioni.aspx - unauthorized.aspx ASPXCodeBehind @@ -365,6 +358,13 @@ mod_filtro.ascx + + mod_funzioniVarieTest.ascx + ASPXCodeBehind + + + mod_funzioniVarieTest.ascx + mod_lemmiVocab.ascx ASPXCodeBehind @@ -781,10 +781,10 @@ - + diff --git a/GMW/GMW/Test.aspx b/GMW/GMW/Test.aspx index 0d6fa21d..0f03ef1b 100644 --- a/GMW/GMW/Test.aspx +++ b/GMW/GMW/Test.aspx @@ -5,6 +5,8 @@ <%@ Register src="WebUserControls/mod_creaDatiTest.ascx" tagname="mod_creaDatiTest" tagprefix="uc2" %> +<%@ Register src="WebUserControls/mod_funzioniVarieTest.ascx" tagname="mod_funzioniVarieTest" tagprefix="uc3" %> + @@ -13,4 +15,8 @@ + + + + diff --git a/GMW/GMW/Test.aspx.designer.cs b/GMW/GMW/Test.aspx.designer.cs index e40f6790..9adf8c13 100644 --- a/GMW/GMW/Test.aspx.designer.cs +++ b/GMW/GMW/Test.aspx.designer.cs @@ -21,5 +21,14 @@ namespace GMW { /// To modify move field declaration from designer file to code-behind file. /// protected global::GMW.WebUserControls.mod_creaDatiTest mod_creaDatiTest1; + + /// + /// mod_funzioniVarieTest1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_funzioniVarieTest mod_funzioniVarieTest1; } } diff --git a/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx new file mode 100644 index 00000000..a60daa2e --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx @@ -0,0 +1,20 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_funzioniVarieTest.ascx.cs" Inherits="GMW.WebUserControls.mod_funzioniVarieTest" %> +
+ + + +
+ +
+ +
+ +
+ +

+ +

\ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.cs b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.cs new file mode 100644 index 00000000..4f94efea --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using GMW_data; + +namespace GMW.WebUserControls +{ + public partial class mod_funzioniVarieTest : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + protected void Button1_Click(object sender, EventArgs e) + { + // testa la creazione lista prelievo + MagClass.magazzino.creaListaPrelievo("MA", "20", "P00505005162", "NEUTRO", "10", 200, "I0054"); + } + + protected void Button2_Click(object sender, EventArgs e) + { + // testa inizio lista prelievo + MagClass.magazzino.iniziaListaPrelievo("MA", "KMA100600005", "0000000000000080"); + } + + protected void Button3_Click(object sender, EventArgs e) + { + // testa fine e scaricamento - indicando completata - lista prelievo + MagClass.magazzino.scaricaListaPrelievo("MA", "KMA100600019"); + } + + protected void Button4_Click(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.designer.cs new file mode 100644 index 00000000..729e261f --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_funzioniVarieTest.ascx.designer.cs @@ -0,0 +1,61 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_funzioniVarieTest { + + /// + /// lblTest control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTest; + + /// + /// Button1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Button1; + + /// + /// Button2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Button2; + + /// + /// Button3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Button3; + + /// + /// Button4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button Button4; + } +} diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index f962f3b4..cfaaee12 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index f962f3b4..cfaaee12 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ