diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 7b83e6b0..5785f5ed 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -106,6 +106,13 @@ menu.aspx + + SearchMag.aspx + ASPXCodeBehind + + + SearchMag.aspx + Test.aspx ASPXCodeBehind @@ -216,6 +223,13 @@ mod_confMag.ascx + + mod_execUDC.ascx + ASPXCodeBehind + + + mod_execUDC.ascx + mod_filtro.ascx ASPXCodeBehind @@ -272,6 +286,13 @@ mod_menuTop.ascx + + mod_metodiNoSearch.ascx + ASPXCodeBehind + + + mod_metodiNoSearch.ascx + mod_pageTitleAndSearch.ascx ASPXCodeBehind @@ -286,6 +307,13 @@ mod_ricercaGenerica.ascx + + mod_searchMag.ascx + ASPXCodeBehind + + + mod_searchMag.ascx + mod_selettore_ajax.ascx ASPXCodeBehind @@ -293,6 +321,13 @@ mod_selettore_ajax.ascx + + mod_showUDC.ascx + ASPXCodeBehind + + + mod_showUDC.ascx + mod_tipoCella.ascx ASPXCodeBehind @@ -446,6 +481,7 @@ + @@ -461,6 +497,7 @@ + @@ -469,9 +506,12 @@ + + + diff --git a/GMW/GMW/SearchMag.aspx b/GMW/GMW/SearchMag.aspx new file mode 100644 index 00000000..d6208ac9 --- /dev/null +++ b/GMW/GMW/SearchMag.aspx @@ -0,0 +1,5 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Ajax.master" AutoEventWireup="true" CodeBehind="SearchMag.aspx.cs" Inherits="GMW.SearchMag" %> +<%@ Register src="WebUserControls/mod_searchMag.ascx" tagname="mod_searchMag" tagprefix="uc1" %> + + + diff --git a/GMW/GMW/SearchMag.aspx.cs b/GMW/GMW/SearchMag.aspx.cs new file mode 100644 index 00000000..017dc55b --- /dev/null +++ b/GMW/GMW/SearchMag.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 GMW +{ + public partial class SearchMag : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/SearchMag.aspx.designer.cs b/GMW/GMW/SearchMag.aspx.designer.cs new file mode 100644 index 00000000..5164c229 --- /dev/null +++ b/GMW/GMW/SearchMag.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// 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 { + + + public partial class SearchMag { + + /// + /// mod_searchMag1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_searchMag mod_searchMag1; + } +} diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx b/GMW/GMW/WebUserControls/mod_execUDC.ascx new file mode 100644 index 00000000..ac5ea86f --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_execUDC" %> +modulo operazioni consentite su UDC \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs new file mode 100644 index 00000000..74b41abd --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx.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 GMW.WebUserControls +{ + public partial class mod_execUDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs new file mode 100644 index 00000000..392ff1ad --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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_execUDC { + } +} diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx new file mode 100644 index 00000000..817c5141 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx @@ -0,0 +1,18 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_metodiNoSearch.ascx.cs" + Inherits="GMW.WebUserControls.mod_metodiNoSearch" %> + + + + + + + +
+ + + + + + + +
diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs new file mode 100644 index 00000000..da8af9eb --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.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 GMW.WebUserControls +{ + public partial class mod_metodiNoSearch : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs new file mode 100644 index 00000000..b08e6ba5 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs @@ -0,0 +1,52 @@ +//------------------------------------------------------------------------------ +// +// 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_metodiNoSearch { + + /// + /// 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/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx new file mode 100644 index 00000000..5dcf9a1e --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -0,0 +1,53 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_searchMag.ascx.cs" + Inherits="GMW.WebUserControls.mod_searchMag" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %> +<%@ Register Src="mod_showUDC.ascx" TagName="mod_showUDC" TagPrefix="uc1" %> +<%@ Register src="mod_metodiNoSearch.ascx" tagname="mod_metodiNoSearch" tagprefix="uc3" %> +
+
+ GMWmag +
+
+   + + +
+
+
+ +
+ + +
+
+ + + + + + + + +
+ +

+ +

+ + + + + 		+ + metodi ammessi + +
+ +
+
+
diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs new file mode 100644 index 00000000..61008981 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace GMW.WebUserControls +{ + public partial class mod_searchMag : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + doTraduci(); + pnlEmpty.Visible = true; + pnlResults.Visible = false; + pnlMethod.Visible = false; + } + //mod_elencoObj1.eh_selValore += new EventHandler(mod_elencoObj1_eh_selValore); + //mod_elencoObj1.eh_resetSelezione += new EventHandler(mod_elencoObj1_eh_resetSelezione); + } + + void mod_elencoObj1_eh_resetSelezione(object sender, EventArgs e) + { + //mod_dettaglioImpieghiObj1.Visible = false; + //mod_elencoObj1.noBorder(); + } + + void mod_elencoObj1_eh_selValore(object sender, EventArgs e) + { + //if (!mod_dettaglioImpieghiObj1.Visible) + //{ + // mod_dettaglioImpieghiObj1.Visible = true; + //} + //mod_dettaglioImpieghiObj1.doUpdate(); + //mod_elencoObj1.addBorder(); + } + + private void doTraduci() + { + btnSearch.Text = traduci("btnSearch"); + TBWE_search.WatermarkText = traduci("insertCod4search"); + } + protected void txtSearch_TextChanged(object sender, EventArgs e) + { + doSearch(); + } + protected void btnSearch_Click(object sender, EventArgs e) + { + doSearch(); + } + + private void doSearch() + { + string testoCercato = txtSearch.Text.Trim(); + if (testoCercato != "") + { + pnlEmpty.Visible = false; + pnlResults.Visible = true; + // in base al tipo di richiesta determino che risultati visualizzare... + switch (testoCercato.Substring(0,1)) + { + case "I": + lblTipoSearch.Text = traduci("RicercaImballi"); + mod_showUDC1.Visible = false; + break; + case "M": + lblTipoSearch.Text = traduci("RicercaMagazzino"); + mod_showUDC1.Visible = false; + break; + case "O": + lblTipoSearch.Text = traduci("RicercaOperatore"); + mod_showUDC1.Visible = false; + break; + case "U": + lblTipoSearch.Text = traduci("RicercaUDC"); + mod_showUDC1.Visible = true; + break; + default: + lblTipoSearch.Text = traduci("RicercaGenerica"); + mod_showUDC1.Visible = false; + break; + } + + //mod_elencoObj1.testoCercato = testoCercato; + pnlMethod.Visible = false; + //mod_elencoObj1.noBorder(); + } + else + { + pnlEmpty.Visible = true; + pnlResults.Visible = false; + } + } + /// + /// wrapper metodo traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs new file mode 100644 index 00000000..3b300a85 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -0,0 +1,106 @@ +//------------------------------------------------------------------------------ +// +// 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_searchMag { + + /// + /// txtSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSearch; + + /// + /// btnSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSearch; + + /// + /// TBWE_search control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.TextBoxWatermarkExtender TBWE_search; + + /// + /// updtRicerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.UpdateProgress updtRicerca; + + /// + /// pnlResults control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlResults; + + /// + /// lblTipoSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTipoSearch; + + /// + /// mod_showUDC1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_showUDC mod_showUDC1; + + /// + /// pnlEmpty control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlEmpty; + + /// + /// pnlMethod control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlMethod; + + /// + /// mod_metodiNoSearch1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_metodiNoSearch mod_metodiNoSearch1; + } +} diff --git a/GMW/GMW/WebUserControls/mod_showUDC.ascx b/GMW/GMW/WebUserControls/mod_showUDC.ascx new file mode 100644 index 00000000..fa705188 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_showUDC.ascx @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_showUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_showUDC" %> +risultati di dettaglio per UDC \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_showUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_showUDC.ascx.cs new file mode 100644 index 00000000..04b42230 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_showUDC.ascx.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 GMW.WebUserControls +{ + public partial class mod_showUDC : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_showUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_showUDC.ascx.designer.cs new file mode 100644 index 00000000..ebbe7aa3 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_showUDC.ascx.designer.cs @@ -0,0 +1,16 @@ +//------------------------------------------------------------------------------ +// +// 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_showUDC { + } +} diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 20b71414..1b7f9915 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 05681461..862163dd 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index fa95249a..2843a925 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 1679eebd..1b7f9915 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index e4087c36..98376c07 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" - "ProductCode" = "8:{149D4565-B13E-4B8B-8820-163E5CA363F5}" - "PackageCode" = "8:{110CA267-F673-44EE-AAD9-343A88C16DCF}" + "ProductCode" = "8:{665D9EA2-CE5A-43EF-88BA-7909D7E2419E}" + "PackageCode" = "8:{45BB2054-D9C9-445E-A379-BAF8551B513D}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.37" + "ProductVersion" = "8:1.0.50" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net"