diff --git a/project/XPS/Style.css b/project/XPS/Style.css index 99c4b31..8c8f62a 100644 --- a/project/XPS/Style.css +++ b/project/XPS/Style.css @@ -1571,9 +1571,10 @@ A:hover } .ctrHeaderPager { - background-color: #b8b8b8; + background-color: #C8C8C8; font-weight: bold; color: White; + padding-left:4px; } .ctrHeaderPagerRight { @@ -1725,6 +1726,7 @@ A:hover background-color: #D15B5B; font-weight: bold; color: White; + padding-left:4px; } .ctrFooterRed @@ -1799,6 +1801,7 @@ A:hover background-color: #5BD15B; font-weight: bold; color: White; + padding-left:4px; } .ctrFooterGreen diff --git a/project/XPS/Web.config b/project/XPS/Web.config index fe4b459..5dcb877 100644 --- a/project/XPS/Web.config +++ b/project/XPS/Web.config @@ -153,7 +153,7 @@ - + @@ -165,8 +165,8 @@ - - + + @@ -185,10 +185,8 @@ - - - - + + @@ -199,7 +197,7 @@ connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Equa_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" /> diff --git a/project/XPS/WebUserControls/mod_completate.ascx b/project/XPS/WebUserControls/mod_completate.ascx index ee628fd..135947e 100644 --- a/project/XPS/WebUserControls/mod_completate.ascx +++ b/project/XPS/WebUserControls/mod_completate.ascx @@ -1,7 +1,9 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="XPS.WebUserControls.mod_completate" Codebehind="mod_completate.ascx.cs" %> - - +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_completate" + CodeBehind="mod_completate.ascx.cs" %> +
+ + +
diff --git a/project/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx b/project/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx index c3c7fc2..c065174 100644 --- a/project/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx +++ b/project/XPS/WebUserControls/mod_dettaglioGiornaliero.ascx @@ -1,9 +1,11 @@ -<%@ Control Language="C#" AutoEventWireup="true" - Inherits="XPS.WebUserControls.mod_dettaglioGiornaliero" Codebehind="mod_dettaglioGiornaliero.ascx.cs" %> - - +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_dettaglioGiornaliero" + CodeBehind="mod_dettaglioGiornaliero.ascx.cs" %> +
+ + +
+ DataSourceID="odsCorr" Width="100%" Font-Size="8pt"> @@ -17,7 +19,7 @@ + ReadOnly="true" ItemStyle-Width="150px" /> @@ -25,13 +27,16 @@ - - + + - + +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_scadenziarioCommesse" + CodeBehind="mod_scadenziarioCommesse.ascx.cs" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_dettaglioGiornaliero.ascx" TagName="mod_dettaglioGiornaliero" TagPrefix="uc1" %> <%@ Register Src="mod_scadute.ascx" TagName="mod_scadute" TagPrefix="uc2" %> -<%@ Register Src="mod_completate.ascx" tagname="mod_completate" tagprefix="uc3" %> +<%@ Register Src="mod_completate.ascx" TagName="mod_completate" TagPrefix="uc3" %>
+ AutoPostBack="True" DataSourceID="odsValLav" DataTextField="label" DataValueField="value"> @@ -25,26 +24,38 @@
-
- - -
-
- - - - - -
-
-
- - - - - - - +
+ + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + +
diff --git a/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs b/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs index 673739e..0cb993f 100644 --- a/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs +++ b/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.cs @@ -19,6 +19,10 @@ namespace XPS.WebUserControls base.traduciObj(); lblFromDate.Text = traduci("lblFromDate"); txtFromDate.Text = DateTime.Now.ToString("dd/MM/yyyy"); + // traduco tab panels + tabPnlScadute.HeaderText = traduci("tabPnlScadute"); + tabPnlCompletate.HeaderText = traduci("tabPnlCompletate"); + tabPnlProxScadenze.HeaderText = traduci("tabPnlProxScadenze"); } /// diff --git a/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.designer.cs b/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.designer.cs index e7c62af..d458cfc 100644 --- a/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.designer.cs +++ b/project/XPS/WebUserControls/mod_scadenziarioCommesse.ascx.designer.cs @@ -58,6 +58,24 @@ namespace XPS.WebUserControls { /// protected global::AjaxControlToolkit.CalendarExtender CalendarExtender1; + /// + /// tcDetails control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.TabContainer tcDetails; + + /// + /// tabPnlScadute control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.TabPanel tabPnlScadute; + /// /// mod_scadute1 control. /// @@ -67,6 +85,15 @@ namespace XPS.WebUserControls { /// protected global::XPS.WebUserControls.mod_scadute mod_scadute1; + /// + /// tabPnlCompletate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.TabPanel tabPnlCompletate; + /// /// mod_completate1 control. /// @@ -76,6 +103,15 @@ namespace XPS.WebUserControls { /// protected global::XPS.WebUserControls.mod_completate mod_completate1; + /// + /// tabPnlProxScadenze control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.TabPanel tabPnlProxScadenze; + /// /// repScadenze control. /// diff --git a/project/XPS/WebUserControls/mod_scadute.ascx b/project/XPS/WebUserControls/mod_scadute.ascx index 64f7e80..cba9b7c 100644 --- a/project/XPS/WebUserControls/mod_scadute.ascx +++ b/project/XPS/WebUserControls/mod_scadute.ascx @@ -1,6 +1,9 @@ -<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_scadute" Codebehind="mod_scadute.ascx.cs" %> - - +<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_scadute" + CodeBehind="mod_scadute.ascx.cs" %> +
+ + +
diff --git a/project/XPS/bin/SteamWare.dll b/project/XPS/bin/SteamWare.dll index a6fe76f..817eda1 100644 Binary files a/project/XPS/bin/SteamWare.dll and b/project/XPS/bin/SteamWare.dll differ diff --git a/project/XPS/bin/XPS.dll b/project/XPS/bin/XPS.dll index d3f329e..d94f2fd 100644 Binary files a/project/XPS/bin/XPS.dll and b/project/XPS/bin/XPS.dll differ diff --git a/project/XPS/bin/XPS_data.dll b/project/XPS/bin/XPS_data.dll index a66fecd..18886e6 100644 Binary files a/project/XPS/bin/XPS_data.dll and b/project/XPS/bin/XPS_data.dll differ diff --git a/project/XPS/equaAppSettings.config b/project/XPS/equaAppSettings.config index dd40524..a601bda 100644 --- a/project/XPS/equaAppSettings.config +++ b/project/XPS/equaAppSettings.config @@ -19,7 +19,7 @@ - + diff --git a/project/XPS/obj/Debug/XPS.dll b/project/XPS/obj/Debug/XPS.dll index cf2fa7b..bcdedc9 100644 Binary files a/project/XPS/obj/Debug/XPS.dll and b/project/XPS/obj/Debug/XPS.dll differ diff --git a/project/XPS/obj/Release/ResolveAssemblyReference.cache b/project/XPS/obj/Release/ResolveAssemblyReference.cache index 9b5bc76..6a68f69 100644 Binary files a/project/XPS/obj/Release/ResolveAssemblyReference.cache and b/project/XPS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPS/obj/Release/XPS.dll b/project/XPS/obj/Release/XPS.dll index d3f329e..d94f2fd 100644 Binary files a/project/XPS/obj/Release/XPS.dll and b/project/XPS/obj/Release/XPS.dll differ diff --git a/project/XPS/tmp/ReportSchedaIdentificazione_1.emf b/project/XPS/tmp/ReportSchedaIdentificazione_1.emf index 34fec73..ef1a6ca 100644 Binary files a/project/XPS/tmp/ReportSchedaIdentificazione_1.emf and b/project/XPS/tmp/ReportSchedaIdentificazione_1.emf differ diff --git a/project/XPST/Web.config b/project/XPST/Web.config index ca3a52f..d657c67 100644 --- a/project/XPST/Web.config +++ b/project/XPST/Web.config @@ -153,7 +153,7 @@ - + diff --git a/project/XPST/bin/SteamWare.dll b/project/XPST/bin/SteamWare.dll index a6fe76f..817eda1 100644 Binary files a/project/XPST/bin/SteamWare.dll and b/project/XPST/bin/SteamWare.dll differ diff --git a/project/XPST/bin/XPST.dll b/project/XPST/bin/XPST.dll index c74e45a..dc91d95 100644 Binary files a/project/XPST/bin/XPST.dll and b/project/XPST/bin/XPST.dll differ diff --git a/project/XPST/bin/XPS_data.dll b/project/XPST/bin/XPS_data.dll index a66fecd..18886e6 100644 Binary files a/project/XPST/bin/XPS_data.dll and b/project/XPST/bin/XPS_data.dll differ diff --git a/project/XPST/equaAppSettings.config b/project/XPST/equaAppSettings.config index f68b473..fc21b11 100644 --- a/project/XPST/equaAppSettings.config +++ b/project/XPST/equaAppSettings.config @@ -19,7 +19,7 @@ - + diff --git a/project/XPST/obj/Debug/ResolveAssemblyReference.cache b/project/XPST/obj/Debug/ResolveAssemblyReference.cache index f9c3e21..382ae98 100644 Binary files a/project/XPST/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/Debug/XPST.dll b/project/XPST/obj/Debug/XPST.dll index c74e45a..4c6b1ba 100644 Binary files a/project/XPST/obj/Debug/XPST.dll and b/project/XPST/obj/Debug/XPST.dll differ diff --git a/project/XPST/obj/Release/ResolveAssemblyReference.cache b/project/XPST/obj/Release/ResolveAssemblyReference.cache index 2643b6d..415bc00 100644 Binary files a/project/XPST/obj/Release/ResolveAssemblyReference.cache and b/project/XPST/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST/obj/Release/XPST.dll b/project/XPST/obj/Release/XPST.dll index 0d1bac2..dc91d95 100644 Binary files a/project/XPST/obj/Release/XPST.dll and b/project/XPST/obj/Release/XPST.dll differ diff --git a/project/XPST_deploy/Release/bin/SteamWare.dll b/project/XPST_deploy/Release/bin/SteamWare.dll index 643366a..817eda1 100644 Binary files a/project/XPST_deploy/Release/bin/SteamWare.dll and b/project/XPST_deploy/Release/bin/SteamWare.dll differ diff --git a/project/XPST_deploy/Release/bin/XPST.dll b/project/XPST_deploy/Release/bin/XPST.dll index c74e45a..dc91d95 100644 Binary files a/project/XPST_deploy/Release/bin/XPST.dll and b/project/XPST_deploy/Release/bin/XPST.dll differ diff --git a/project/XPST_deploy/Release/bin/XPS_data.dll b/project/XPST_deploy/Release/bin/XPS_data.dll index 3815798..18886e6 100644 Binary files a/project/XPST_deploy/Release/bin/XPS_data.dll and b/project/XPST_deploy/Release/bin/XPS_data.dll differ diff --git a/project/XPST_deploy/Release/equaAppSettings.config b/project/XPST_deploy/Release/equaAppSettings.config index a4cdea5..fc21b11 100644 --- a/project/XPST_deploy/Release/equaAppSettings.config +++ b/project/XPST_deploy/Release/equaAppSettings.config @@ -19,7 +19,7 @@ - + diff --git a/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache b/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache index 5a16243..382ae98 100644 Binary files a/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST_deploy/Release/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Release/obj/Debug/XPST.dll b/project/XPST_deploy/Release/obj/Debug/XPST.dll index c74e45a..4c6b1ba 100644 Binary files a/project/XPST_deploy/Release/obj/Debug/XPST.dll and b/project/XPST_deploy/Release/obj/Debug/XPST.dll differ diff --git a/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache index 2643b6d..415bc00 100644 Binary files a/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/project/XPST_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Release/obj/Release/XPST.dll b/project/XPST_deploy/Release/obj/Release/XPST.dll index 0d1bac2..dc91d95 100644 Binary files a/project/XPST_deploy/Release/obj/Release/XPST.dll and b/project/XPST_deploy/Release/obj/Release/XPST.dll differ diff --git a/project/XPST_deploy/Release/web.config b/project/XPST_deploy/Release/web.config index 0a62887..20bab94 100644 --- a/project/XPST_deploy/Release/web.config +++ b/project/XPST_deploy/Release/web.config @@ -152,7 +152,7 @@ - + diff --git a/project/XPST_deploy/Source/Web.config b/project/XPST_deploy/Source/Web.config index 0d4bed5..d657c67 100644 --- a/project/XPST_deploy/Source/Web.config +++ b/project/XPST_deploy/Source/Web.config @@ -153,7 +153,7 @@ - + diff --git a/project/XPST_deploy/Source/bin/SteamWare.dll b/project/XPST_deploy/Source/bin/SteamWare.dll index 643366a..817eda1 100644 Binary files a/project/XPST_deploy/Source/bin/SteamWare.dll and b/project/XPST_deploy/Source/bin/SteamWare.dll differ diff --git a/project/XPST_deploy/Source/bin/XPST.dll b/project/XPST_deploy/Source/bin/XPST.dll index c74e45a..dc91d95 100644 Binary files a/project/XPST_deploy/Source/bin/XPST.dll and b/project/XPST_deploy/Source/bin/XPST.dll differ diff --git a/project/XPST_deploy/Source/bin/XPS_data.dll b/project/XPST_deploy/Source/bin/XPS_data.dll index 3815798..18886e6 100644 Binary files a/project/XPST_deploy/Source/bin/XPS_data.dll and b/project/XPST_deploy/Source/bin/XPS_data.dll differ diff --git a/project/XPST_deploy/Source/equaAppSettings.config b/project/XPST_deploy/Source/equaAppSettings.config index a4cdea5..fc21b11 100644 --- a/project/XPST_deploy/Source/equaAppSettings.config +++ b/project/XPST_deploy/Source/equaAppSettings.config @@ -19,7 +19,7 @@ - + diff --git a/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache b/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache index 5a16243..382ae98 100644 Binary files a/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache and b/project/XPST_deploy/Source/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Source/obj/Debug/XPST.dll b/project/XPST_deploy/Source/obj/Debug/XPST.dll index c74e45a..4c6b1ba 100644 Binary files a/project/XPST_deploy/Source/obj/Debug/XPST.dll and b/project/XPST_deploy/Source/obj/Debug/XPST.dll differ diff --git a/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache index 2643b6d..415bc00 100644 Binary files a/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/project/XPST_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPST_deploy/Source/obj/Release/XPST.dll b/project/XPST_deploy/Source/obj/Release/XPST.dll index 0d1bac2..dc91d95 100644 Binary files a/project/XPST_deploy/Source/obj/Release/XPST.dll and b/project/XPST_deploy/Source/obj/Release/XPST.dll differ diff --git a/project/XPST_installer/Release/XPST_installer.msi b/project/XPST_installer/Release/XPST_installer.msi index 17ef9f7..1842e08 100644 Binary files a/project/XPST_installer/Release/XPST_installer.msi and b/project/XPST_installer/Release/XPST_installer.msi differ diff --git a/project/XPST_installer/XPST_installer.vdproj b/project/XPST_installer/XPST_installer.vdproj index 88a6a04..9fa5c89 100644 --- a/project/XPST_installer/XPST_installer.vdproj +++ b/project/XPST_installer/XPST_installer.vdproj @@ -19,6 +19,12 @@ "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0CE19C12E4E1462E8B0BCD8A280AD49B" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -238,7 +244,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPST" "ProductCode" = "8:{8CB36A61-7539-4409-95F4-1733CB89B6E7}" - "PackageCode" = "8:{07C54154-2635-4C68-9016-96197A326980}" + "PackageCode" = "8:{27A90F35-0A98-44DD-8208-0F0E736ADE79}" "UpgradeCode" = "8:{1F4D37F4-ED5E-41B7-9D58-560A137B61D4}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -689,7 +695,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0CE19C12E4E1462E8B0BCD8A280AD49B" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_E35AFFF682D748C396E33E5EED19CA36" diff --git a/project/XPS_data/DS_applicazione.Designer.cs b/project/XPS_data/DS_applicazione.Designer.cs index 2c68546..a544d10 100644 --- a/project/XPS_data/DS_applicazione.Designer.cs +++ b/project/XPS_data/DS_applicazione.Designer.cs @@ -5221,7 +5221,7 @@ namespace XPS_data { this.columnIdxObj.Unique = true; this.columnIdxObj.MaxLength = 50; this.columnCliente.ReadOnly = true; - this.columnCliente.MaxLength = 50; + this.columnCliente.MaxLength = 250; this.columnDDT.MaxLength = 50; this.columnCodProdotto.ReadOnly = true; this.columnCodProdotto.MaxLength = 50; @@ -8253,11 +8253,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Cliente { get { - try { - return ((string)(this[this.tablesp_schedaIdent.ClienteColumn])); + if (this.IsClienteNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Cliente\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.ClienteColumn])); } } set { @@ -8268,11 +8268,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string DDT { get { - try { - return ((string)(this[this.tablesp_schedaIdent.DDTColumn])); + if (this.IsDDTNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'DDT\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.DDTColumn])); } } set { @@ -8313,11 +8313,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodProdotto { get { - try { - return ((string)(this[this.tablesp_schedaIdent.CodProdottoColumn])); + if (this.IsCodProdottoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodProdotto\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.CodProdottoColumn])); } } set { @@ -8358,11 +8358,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string FosfManganese { get { - try { - return ((string)(this[this.tablesp_schedaIdent.FosfManganeseColumn])); + if (this.IsFosfManganeseNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'FosfManganese\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.FosfManganeseColumn])); } } set { @@ -8373,11 +8373,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Brunitura { get { - try { - return ((string)(this[this.tablesp_schedaIdent.BrunituraColumn])); + if (this.IsBrunituraNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Brunitura\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.BrunituraColumn])); } } set { @@ -8388,11 +8388,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string FosfTeflon { get { - try { - return ((string)(this[this.tablesp_schedaIdent.FosfTeflonColumn])); + if (this.IsFosfTeflonNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'FosfTeflon\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.FosfTeflonColumn])); } } set { @@ -8403,11 +8403,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Sabbiatura { get { - try { - return ((string)(this[this.tablesp_schedaIdent.SabbiaturaColumn])); + if (this.IsSabbiaturaNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Sabbiatura\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.SabbiaturaColumn])); } } set { @@ -8418,11 +8418,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string F1 { get { - try { - return ((string)(this[this.tablesp_schedaIdent.F1Column])); + if (this.IsF1Null()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'F1\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.F1Column])); } } set { @@ -8433,11 +8433,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string F2 { get { - try { - return ((string)(this[this.tablesp_schedaIdent.F2Column])); + if (this.IsF2Null()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'F2\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.F2Column])); } } set { @@ -8448,11 +8448,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string FosfZinco { get { - try { - return ((string)(this[this.tablesp_schedaIdent.FosfZincoColumn])); + if (this.IsFosfZincoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'FosfZinco\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.FosfZincoColumn])); } } set { @@ -8463,11 +8463,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Teflon { get { - try { - return ((string)(this[this.tablesp_schedaIdent.TeflonColumn])); + if (this.IsTeflonNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Teflon\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.TeflonColumn])); } } set { @@ -8478,11 +8478,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string FosfPreVern { get { - try { - return ((string)(this[this.tablesp_schedaIdent.FosfPreVernColumn])); + if (this.IsFosfPreVernNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'FosfPreVern\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.FosfPreVernColumn])); } } set { @@ -8493,11 +8493,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string PzRoto { get { - try { - return ((string)(this[this.tablesp_schedaIdent.PzRotoColumn])); + if (this.IsPzRotoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'PzRoto\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.PzRotoColumn])); } } set { @@ -8508,11 +8508,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Zinchlorex { get { - try { - return ((string)(this[this.tablesp_schedaIdent.ZinchlorexColumn])); + if (this.IsZinchlorexNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Zinchlorex\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.ZinchlorexColumn])); } } set { @@ -8523,11 +8523,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string PeekVicote { get { - try { - return ((string)(this[this.tablesp_schedaIdent.PeekVicoteColumn])); + if (this.IsPeekVicoteNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'PeekVicote\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.PeekVicoteColumn])); } } set { @@ -8538,11 +8538,11 @@ namespace XPS_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodCli { get { - try { - return ((string)(this[this.tablesp_schedaIdent.CodCliColumn])); + if (this.IsCodCliNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodCli\' in table \'sp_schedaIdent\' is DBNull.", e); + else { + return ((string)(this[this.tablesp_schedaIdent.CodCliColumn])); } } set { diff --git a/project/XPS_data/DS_applicazione.xsd b/project/XPS_data/DS_applicazione.xsd index 7771a94..1431c47 100644 --- a/project/XPS_data/DS_applicazione.xsd +++ b/project/XPS_data/DS_applicazione.xsd @@ -990,7 +990,7 @@ WHERE (IdxObj = @IdxObj) - + dbo.sp_schedaIdent @@ -1070,14 +1070,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1090,14 +1090,14 @@ WHERE (IdxObj = @IdxObj) - + - + @@ -1110,21 +1110,21 @@ WHERE (IdxObj = @IdxObj) - + - + - + @@ -1137,98 +1137,98 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - - - + + + - - - - - - + + + + + + - + - + - + - + - + @@ -1239,385 +1239,6 @@ WHERE (IdxObj = @IdxObj) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1634,6 +1255,29 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + + + + + + + + + + @@ -1642,6 +1286,13 @@ WHERE (IdxObj = @IdxObj) + + + + + + + @@ -1656,28 +1307,54 @@ WHERE (IdxObj = @IdxObj) - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + + + + @@ -1691,6 +1368,20 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + @@ -1698,98 +1389,85 @@ WHERE (IdxObj = @IdxObj) - + - + - - - + + + + + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1800,20 +1478,342 @@ WHERE (IdxObj = @IdxObj) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/project/XPS_data/DS_applicazione.xss b/project/XPS_data/DS_applicazione.xss index c8893b3..bd05609 100644 --- a/project/XPS_data/DS_applicazione.xss +++ b/project/XPS_data/DS_applicazione.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/project/XPS_data/SqlScript/V 1.2/Vocabolario_134.sql b/project/XPS_data/SqlScript/V 1.2/Vocabolario_134.sql new file mode 100644 index 0000000..8535999 --- /dev/null +++ b/project/XPS_data/SqlScript/V 1.2/Vocabolario_134.sql @@ -0,0 +1,29 @@ +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'tabPnlCompletate', N'Completate (da spedire)') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'tabPnlProxScadenze', N'Scadenze') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'tabPnlScadute', N'Commesse scadute') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'tabPnlCompletate', N'Completate (da spedire)') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'tabPnlProxScadenze', N'Scadenze') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'tabPnlScadute', N'Commesse scadute') +go + +commit transaction +go + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(134, GETDATE()) +GO diff --git a/project/XPS_data/SqlScript/V 1.2/sqlUpdate_133.sql b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_133.sql new file mode 100644 index 0000000..6aec8a3 --- /dev/null +++ b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_133.sql @@ -0,0 +1,80 @@ +set xact_abort on +go + +begin transaction +go + +UPDATE dbo.AnagLav SET + DescrLav=N'Teflonatura' + WHERE IdxLav=N'Fosf_Tefl' +UPDATE dbo.AnagLav SET + DescrLav=N'Sabbiatura' + WHERE IdxLav=N'Sabb' +go + +commit transaction +go + +set xact_abort on; +go + +begin transaction; +go + +alter table LogStatoIstObj alter column + CodStato nvarchar(50); +go + +exec sp_rename 'PK_LogStatoIstObj_1', 'PK_LogStatoIstObj', 'object'; +go + +alter table LogStatoIstObj drop + constraint FK_LogStatoIstObj_IstObj ; +go + +alter table LogStatoIstObj add + constraint FK_LogStatoIstObj_IstObj foreign key(IdxObj) references IstObj(IdxObj) on update cascade; +go + +set ANSI_NULLS on; +go + +alter TRIGGER trgStateUpd +ON IstObj +FOR UPDATE +AS +IF UPDATE (CodStato) + +DECLARE @dataMod DATETIME + +SET @dataMod = GETDATE() + +/* verifico che non sia già esistente il record (esempio cambio stato multiplo...) */ +SELECT l.IdxObj +FROM LogStatoIstObj AS l INNER JOIN + inserted AS i ON l.IdxObj = i.IdxObj AND l.CodStato = i.CodStato +if(@@ROWCOUNT = 0) + begin + INSERT INTO LogStatoIstObj + (IdxObj, DataOra, Username, CodStato) + SELECT DISTINCT i.IdxObj, @dataMod, i.UserMod, i.CodStato + FROM inserted AS i + end +else + begin + UPDATE LogStatoIstObj + SET DataOra = @dataMod + FROM LogStatoIstObj AS l INNER JOIN inserted AS i ON l.IdxObj = i.IdxObj AND l.CodStato = i.CodStato + end +go + +commit; +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(133, GETDATE()) +GO diff --git a/project/XPS_data/SqlScript/V 1.2/sqlUpdate_134.sql b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_134.sql new file mode 100644 index 0000000..a218282 --- /dev/null +++ b/project/XPS_data/SqlScript/V 1.2/sqlUpdate_134.sql @@ -0,0 +1,88 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/************************************* +* STORED PROCEDURE sp_delRow +* elimina un set di dati a partire dalla riga di una commessa +* +* modif.: S.E.L. +* il: 2008.10.23 +**************************************/ +alter PROCEDURE sp_delRow +( + @Original_Cod VARCHAR(50) +) +AS + +BEGIN TRAN + + -- cancello log stati... + DELETE FROM LogStatoIstObj + WHERE (IdxObj = @Original_Cod) + + -- cancello ULP child + DELETE FROM IstObj + WHERE (IdxObjMamma = @Original_Cod) + + -- cancello riga... + DELETE FROM IstObj + WHERE (IdxObj = @Original_Cod) + +COMMIT TRAN + +RETURN +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/************************************* +* STORED PROCEDURE sp_delObj +* elimina un set di dati di una commessa +* +* modif.: S.E.L. +* il: 2008.10.23 +**************************************/ +alter PROCEDURE sp_delObj +( + @Original_Cod VARCHAR(50) +) +AS + + -- cancello log stati... + DELETE FROM LogStatoIstObj + WHERE (IdxObj LIKE REPLACE(@Original_Cod,'D','%')) + + -- cancello il resto! + DELETE FROM IstObj + WHERE (IdxObj LIKE REPLACE(@Original_Cod,'D','%')) + +RETURN +go + +commit; +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(134, GETDATE()) +GO diff --git a/project/XPS_data/XPS_data.csproj b/project/XPS_data/XPS_data.csproj index 4cb9dfd..c294fd1 100644 --- a/project/XPS_data/XPS_data.csproj +++ b/project/XPS_data/XPS_data.csproj @@ -152,6 +152,9 @@ Always + + + diff --git a/project/XPS_data/bin/Debug/SteamWare.dll b/project/XPS_data/bin/Debug/SteamWare.dll index 643366a..71c329f 100644 Binary files a/project/XPS_data/bin/Debug/SteamWare.dll and b/project/XPS_data/bin/Debug/SteamWare.dll differ diff --git a/project/XPS_data/bin/Debug/XPS_data.dll b/project/XPS_data/bin/Debug/XPS_data.dll index 7c71a26..27c0b90 100644 Binary files a/project/XPS_data/bin/Debug/XPS_data.dll and b/project/XPS_data/bin/Debug/XPS_data.dll differ diff --git a/project/XPS_data/bin/Release/SteamWare.dll b/project/XPS_data/bin/Release/SteamWare.dll index a6fe76f..817eda1 100644 Binary files a/project/XPS_data/bin/Release/SteamWare.dll and b/project/XPS_data/bin/Release/SteamWare.dll differ diff --git a/project/XPS_data/bin/Release/XPS_data.dll b/project/XPS_data/bin/Release/XPS_data.dll index a66fecd..18886e6 100644 Binary files a/project/XPS_data/bin/Release/XPS_data.dll and b/project/XPS_data/bin/Release/XPS_data.dll differ diff --git a/project/XPS_data/obj/Debug/ResolveAssemblyReference.cache b/project/XPS_data/obj/Debug/ResolveAssemblyReference.cache index bf522f4..a175bd6 100644 Binary files a/project/XPS_data/obj/Debug/ResolveAssemblyReference.cache and b/project/XPS_data/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll index 02ab185..f6a74e0 100644 Binary files a/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Debug/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Debug/XPS_data.dll b/project/XPS_data/obj/Debug/XPS_data.dll index 7c71a26..27c0b90 100644 Binary files a/project/XPS_data/obj/Debug/XPS_data.dll and b/project/XPS_data/obj/Debug/XPS_data.dll differ diff --git a/project/XPS_data/obj/Release/ResolveAssemblyReference.cache b/project/XPS_data/obj/Release/ResolveAssemblyReference.cache index 98a7835..aebb558 100644 Binary files a/project/XPS_data/obj/Release/ResolveAssemblyReference.cache and b/project/XPS_data/obj/Release/ResolveAssemblyReference.cache differ diff --git a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll index 4cd6abc..ded2374 100644 Binary files a/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll and b/project/XPS_data/obj/Release/TempPE/DS_applicazione.Designer.cs.dll differ diff --git a/project/XPS_data/obj/Release/XPS_data.dll b/project/XPS_data/obj/Release/XPS_data.dll index a66fecd..18886e6 100644 Binary files a/project/XPS_data/obj/Release/XPS_data.dll and b/project/XPS_data/obj/Release/XPS_data.dll differ diff --git a/project/XPS_installer/Release/XPS_installer.msi b/project/XPS_installer/Release/XPS_installer.msi index ee9b3e9..0905b1c 100644 Binary files a/project/XPS_installer/Release/XPS_installer.msi and b/project/XPS_installer/Release/XPS_installer.msi differ diff --git a/project/XPS_installer/XPS_installer.vdproj b/project/XPS_installer/XPS_installer.vdproj index 88756d1..e18de9e 100644 --- a/project/XPS_installer/XPS_installer.vdproj +++ b/project/XPS_installer/XPS_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPS" - "ProductCode" = "8:{4E4CB326-A1B0-44CC-94D9-CAC89A2AD218}" - "PackageCode" = "8:{FE3D2542-8ABB-4CF5-A0FD-DB03418D42F5}" + "ProductCode" = "8:{233F9769-448E-42FF-98A5-3D00643A3D9F}" + "PackageCode" = "8:{3A26D743-D7D2-4AA4-B445-BA0832324073}" "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.2.131" + "ProductVersion" = "8:1.2.134" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:www.steamware.net"