diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index d149c51f..a8fc849e 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -74,6 +74,8 @@ Default.aspx + + bilance.asmx Component diff --git a/GMW/GMW/Type/Impianto.cs b/GMW/GMW/Type/Impianto.cs new file mode 100644 index 00000000..87de2d9b --- /dev/null +++ b/GMW/GMW/Type/Impianto.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using GMW_data; + +namespace GMW.Type +{ + public class Impianto + { + public Impianto() + { + } + + protected string _CodImpianto; + protected string _DescrImpianto; + protected string _CodCompany; + protected string _CodSito; + /// + /// Codice impianto + /// + public string CodImpianto + { + get + { + return _CodImpianto; + } + set + { + _CodImpianto = value; + } + } + /// + /// Descrizione impianto + /// + public string DescrImpianto + { + get + { + return _DescrImpianto; + } + set + { + _DescrImpianto = value; + } + } + /// + /// Codice COmpany + /// + public string CodCompany + { + get + { + return _CodCompany; + } + set + { + _CodCompany = value; + } + } + /// + /// Codice sito + /// + public string CodSito + { + get + { + return _CodSito; + } + set + { + _CodSito = value; + } + } + /// + /// inizializza a partire da una riga impianto tipizzata + /// + /// + public void setFromTabRow(DS_Applicazione.AnagImpiantiRow riga) + { + CodImpianto = riga.CodImpianto; + DescrImpianto = riga.DescrImpianto; + CodCompany = riga.CodCompany; + CodSito= riga.CodSito; + } + + } +} diff --git a/GMW/GMW/Type/elenchi.cs b/GMW/GMW/Type/elenchi.cs new file mode 100644 index 00000000..1853d923 --- /dev/null +++ b/GMW/GMW/Type/elenchi.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using GMW_data; + +namespace GMW.Type +{ + public class elenchi + { + public elenchi() + { + } + + protected Impianto[] _elencoImpianti; + /// + /// legge una tab di tipo AnagImpianti e la converte ad un array di tipo Impianto[] + /// + /// + public void caricaImpianti(DS_Applicazione.AnagImpiantiDataTable tabImpianti) + { + // conto quanti elementi ha la tab x inizializzare l'array... + int numRighe = tabImpianti.Rows.Count; + _elencoImpianti = new Impianto[numRighe]; + // prendo un obj impianto da valorizzare di volta in volta... + Impianto singoloImpianto = new Impianto(); + for (int i = 0; i < numRighe; i++) + { + singoloImpianto.setFromTabRow(tabImpianti[i]); + _elencoImpianti[i] = singoloImpianto; + } + } + + public Impianto[] elencoImpianti + { + get + { + return _elencoImpianti; + } + } + + } +} diff --git a/GMW/GMW/WS/bilance.asmx.cs b/GMW/GMW/WS/bilance.asmx.cs index 3d9ea5c2..d4623e8e 100644 --- a/GMW/GMW/WS/bilance.asmx.cs +++ b/GMW/GMW/WS/bilance.asmx.cs @@ -4,6 +4,7 @@ using System.Web; using System.Web.Services; using System.Data; using GMW_data; +using GMW; namespace GMW.WS { @@ -23,8 +24,10 @@ namespace GMW.WS /// public bilance() { + gestEl = new GMW.Type.elenchi(); } + protected GMW.Type.elenchi gestEl; #endregion @@ -46,6 +49,17 @@ namespace GMW.WS { return DataProxy.obj.taAnagImp.GetData(); } + + /// + /// fornisce l'anagrafica impianti (no dataset) + /// + [WebMethod(Description = "Elenco anagrafico impianti (no dataset)")] + public GMW.Type.Impianto[] ElencoImpianti() + { + gestEl.caricaImpianti(DataProxy.obj.taAnagImp.GetData()); + return gestEl.elencoImpianti; + } + /// /// fornisce l'anagrafica bilance /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index 9b6a4249..1ab030a2 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll new file mode 100644 index 00000000..f968b823 Binary files /dev/null and b/GMW/GMW_data/obj/Release/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_deploy/Release/GMW.csproj b/GMW/GMW_deploy/Release/GMW.csproj index d149c51f..a8fc849e 100644 --- a/GMW/GMW_deploy/Release/GMW.csproj +++ b/GMW/GMW_deploy/Release/GMW.csproj @@ -74,6 +74,8 @@ Default.aspx + + bilance.asmx Component diff --git a/GMW/GMW_deploy/Release/bin/GMW.dll b/GMW/GMW_deploy/Release/bin/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW_deploy/Release/bin/GMW.dll and b/GMW/GMW_deploy/Release/bin/GMW.dll differ diff --git a/GMW/GMW_deploy/Release/obj/Release/GMW.dll b/GMW/GMW_deploy/Release/obj/Release/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW_deploy/Release/obj/Release/GMW.dll and b/GMW/GMW_deploy/Release/obj/Release/GMW.dll differ diff --git a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache index 9b6a4249..1ab030a2 100644 Binary files a/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Release/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_deploy/Source/GMW.csproj b/GMW/GMW_deploy/Source/GMW.csproj index d149c51f..a8fc849e 100644 --- a/GMW/GMW_deploy/Source/GMW.csproj +++ b/GMW/GMW_deploy/Source/GMW.csproj @@ -74,6 +74,8 @@ Default.aspx + + bilance.asmx Component diff --git a/GMW/GMW_deploy/Source/Type/Impianto.cs b/GMW/GMW_deploy/Source/Type/Impianto.cs new file mode 100644 index 00000000..87de2d9b --- /dev/null +++ b/GMW/GMW_deploy/Source/Type/Impianto.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using GMW_data; + +namespace GMW.Type +{ + public class Impianto + { + public Impianto() + { + } + + protected string _CodImpianto; + protected string _DescrImpianto; + protected string _CodCompany; + protected string _CodSito; + /// + /// Codice impianto + /// + public string CodImpianto + { + get + { + return _CodImpianto; + } + set + { + _CodImpianto = value; + } + } + /// + /// Descrizione impianto + /// + public string DescrImpianto + { + get + { + return _DescrImpianto; + } + set + { + _DescrImpianto = value; + } + } + /// + /// Codice COmpany + /// + public string CodCompany + { + get + { + return _CodCompany; + } + set + { + _CodCompany = value; + } + } + /// + /// Codice sito + /// + public string CodSito + { + get + { + return _CodSito; + } + set + { + _CodSito = value; + } + } + /// + /// inizializza a partire da una riga impianto tipizzata + /// + /// + public void setFromTabRow(DS_Applicazione.AnagImpiantiRow riga) + { + CodImpianto = riga.CodImpianto; + DescrImpianto = riga.DescrImpianto; + CodCompany = riga.CodCompany; + CodSito= riga.CodSito; + } + + } +} diff --git a/GMW/GMW_deploy/Source/Type/elenchi.cs b/GMW/GMW_deploy/Source/Type/elenchi.cs new file mode 100644 index 00000000..1853d923 --- /dev/null +++ b/GMW/GMW_deploy/Source/Type/elenchi.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using GMW_data; + +namespace GMW.Type +{ + public class elenchi + { + public elenchi() + { + } + + protected Impianto[] _elencoImpianti; + /// + /// legge una tab di tipo AnagImpianti e la converte ad un array di tipo Impianto[] + /// + /// + public void caricaImpianti(DS_Applicazione.AnagImpiantiDataTable tabImpianti) + { + // conto quanti elementi ha la tab x inizializzare l'array... + int numRighe = tabImpianti.Rows.Count; + _elencoImpianti = new Impianto[numRighe]; + // prendo un obj impianto da valorizzare di volta in volta... + Impianto singoloImpianto = new Impianto(); + for (int i = 0; i < numRighe; i++) + { + singoloImpianto.setFromTabRow(tabImpianti[i]); + _elencoImpianti[i] = singoloImpianto; + } + } + + public Impianto[] elencoImpianti + { + get + { + return _elencoImpianti; + } + } + + } +} diff --git a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs index 3d9ea5c2..d4623e8e 100644 --- a/GMW/GMW_deploy/Source/WS/bilance.asmx.cs +++ b/GMW/GMW_deploy/Source/WS/bilance.asmx.cs @@ -4,6 +4,7 @@ using System.Web; using System.Web.Services; using System.Data; using GMW_data; +using GMW; namespace GMW.WS { @@ -23,8 +24,10 @@ namespace GMW.WS /// public bilance() { + gestEl = new GMW.Type.elenchi(); } + protected GMW.Type.elenchi gestEl; #endregion @@ -46,6 +49,17 @@ namespace GMW.WS { return DataProxy.obj.taAnagImp.GetData(); } + + /// + /// fornisce l'anagrafica impianti (no dataset) + /// + [WebMethod(Description = "Elenco anagrafico impianti (no dataset)")] + public GMW.Type.Impianto[] ElencoImpianti() + { + gestEl.caricaImpianti(DataProxy.obj.taAnagImp.GetData()); + return gestEl.elencoImpianti; + } + /// /// fornisce l'anagrafica bilance /// diff --git a/GMW/GMW_deploy/Source/bin/GMW.dll b/GMW/GMW_deploy/Source/bin/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW_deploy/Source/bin/GMW.dll and b/GMW/GMW_deploy/Source/bin/GMW.dll differ diff --git a/GMW/GMW_deploy/Source/obj/Release/GMW.dll b/GMW/GMW_deploy/Source/obj/Release/GMW.dll index 6d879925..8d9878c5 100644 Binary files a/GMW/GMW_deploy/Source/obj/Release/GMW.dll and b/GMW/GMW_deploy/Source/obj/Release/GMW.dll differ diff --git a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache index 9b6a4249..1ab030a2 100644 Binary files a/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_deploy/Source/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index fdce0f38..5e66c5ba 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -350,7 +350,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" "ProductCode" = "8:{C5C879CD-188C-4018-AEDC-E5D9897F966A}" - "PackageCode" = "8:{2F0415CB-AEC6-4AC9-BD6A-CCF178B3ADC9}" + "PackageCode" = "8:{240D4EF0-0D19-4EA5-9B0A-D9C4909A8809}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -801,7 +801,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" @@ -829,7 +829,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index 85a8706b..7a1f02e4 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ