diff --git a/Projects/WebGIM/WebGIM.suo b/Projects/WebGIM/WebGIM.suo index 596ba99..93ab809 100644 Binary files a/Projects/WebGIM/WebGIM.suo and b/Projects/WebGIM/WebGIM.suo differ diff --git a/Projects/WebGIM/WebGIM/WebGIM.vdproj b/Projects/WebGIM/WebGIM/WebGIM.vdproj index 806e15d..3357eb6 100644 --- a/Projects/WebGIM/WebGIM/WebGIM.vdproj +++ b/Projects/WebGIM/WebGIM/WebGIM.vdproj @@ -13,6 +13,54 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_002A939468284078BADBED4D96FCE1A3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5174F05C45D646ECB2CD7C2EE9460661" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6636778DCAD9439F9197E5DBD6764F5F" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_F19C7F423F6F41738CF54BFAD1FE7851" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6636778DCAD9439F9197E5DBD6764F5F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F19C7F423F6F41738CF54BFAD1FE7851" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5174F05C45D646ECB2CD7C2EE9460661" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_002A939468284078BADBED4D96FCE1A3" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -38,6 +86,19 @@ "PrerequisitesLocation" = "2:1" "Url" = "8:" "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5.SP1" + { + "Name" = "8:.NET Framework 3.5 SP1" + "ProductCode" = "8:Microsoft.Net.Framework.3.5.SP1" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1" + { + "Name" = "8:Windows Installer 3.1" + "ProductCode" = "8:Microsoft.Windows.Installer.3.1" + } + } } } "Release" @@ -82,6 +143,48 @@ { "CustomAction" { + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_8B5F3B0226EF478FAAEF9123DC00C8B6" + { + "Name" = "8:Primary output from IISConsoleVB (Active)" + "Condition" = "8:" + "Object" = "8:_002A939468284078BADBED4D96FCE1A3" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:WebGIM" + "EntryPoint" = "8:" + "Sequence" = "3:3" + "Identifier" = "8:_F7391713_2C26_4809_B437_434881435441" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_D9EA72E56194419EAD54A7CA80E34B06" + { + "Name" = "8:Primary output from SetDirectoryPermission (Active)" + "Condition" = "8:" + "Object" = "8:_5174F05C45D646ECB2CD7C2EE9460661" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:[TARGETDIR] temp" + "EntryPoint" = "8:" + "Sequence" = "3:2" + "Identifier" = "8:_D00177BA_8DC4_4B7D_B96F_E277B8F6011A" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_E4C01EA1C0764455931001829C95602B" + { + "Name" = "8:Primary output from SetDirectoryPermission (Active)" + "Condition" = "8:" + "Object" = "8:_5174F05C45D646ECB2CD7C2EE9460661" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:[TARGETDIR] logs " + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_4E468349_C919_40B7_9B8B_58FCD3D87A39" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } } "DefaultFeature" { @@ -93,10 +196,80 @@ { "LaunchCondition" { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_75736718DBD3445AB8B0881C42FBACBC" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "Version" = "8:2.0.50727" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617" + } } } "File" { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6636778DCAD9439F9197E5DBD6764F5F" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_6636778DCAD9439F9197E5DBD6764F5F" + { + "Name" = "8:System.Web.Extensions.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:C:\\Program Files\\Microsoft ASP.NET\\ASP.NET 2.0 AJAX Extensions\\v1.0.61025\\System.Web.Extensions.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_2D9D820F878A4DBCBFF52E477385858A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F19C7F423F6F41738CF54BFAD1FE7851" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.Web.Services2, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" + "ScatterAssemblies" + { + "_F19C7F423F6F41738CF54BFAD1FE7851" + { + "Name" = "8:Microsoft.Web.Services2.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:C:\\Program Files\\Microsoft WSE\\v2.0\\Microsoft.Web.Services2.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_2D9D820F878A4DBCBFF52E477385858A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } } "FileType" { @@ -178,14 +351,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:WebGIM" - "ProductCode" = "8:{60E49D12-12B1-45F1-8A2D-7AA1FAF281EE}" - "PackageCode" = "8:{DD64A7BC-D425-46E9-9B8C-E9D3FD1B101D}" + "ProductCode" = "8:{036CBC35-8D50-4733-8295-29359BA01EF1}" + "PackageCode" = "8:{74CA4C83-0330-4456-A9D5-7E79A7858C59}" "UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:0.9.0" + "ProductVersion" = "8:0.9.30" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:035-460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -628,6 +801,62 @@ } "ProjectOutput" { + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_002A939468284078BADBED4D96FCE1A3" + { + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_2D9D820F878A4DBCBFF52E477385858A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{67AF6121-D250-44E3-9C4E-0FC36599AAE4}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5174F05C45D646ECB2CD7C2EE9460661" + { + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_2D9D820F878A4DBCBFF52E477385858A" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{FB6006EA-4630-4ECB-82E4-FAC0866789D9}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_66F2406438284D4E87BA919F5BCF908C" { "SourcePath" = "8:" diff --git a/WebSites/WebGIM/App_Code/DS_applicazione.xsd b/WebSites/WebGIM/App_Code/DS_applicazione.xsd index 7e74c65..18aaf71 100644 --- a/WebSites/WebGIM/App_Code/DS_applicazione.xsd +++ b/WebSites/WebGIM/App_Code/DS_applicazione.xsd @@ -600,13 +600,14 @@ WHERE (numIntMtz = @numIntMtz) - + dbo.sp_setPresaInCarico + @@ -725,16 +726,16 @@ where idxStato=@idxStato - - + + - - + + @@ -747,15 +748,15 @@ where idxStato=@idxStato - - + + - + @@ -768,179 +769,7 @@ where idxStato=@idxStato - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -955,6 +784,23 @@ where idxStato=@idxStato + + + + + + + + + + + + + + + + + @@ -969,14 +815,169 @@ where idxStato=@idxStato - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -989,8 +990,8 @@ where idxStato=@idxStato - - + + @@ -1003,15 +1004,15 @@ where idxStato=@idxStato - - + + - + diff --git a/WebSites/WebGIM/App_Code/DS_applicazione.xss b/WebSites/WebGIM/App_Code/DS_applicazione.xss index 891cbc5..497b443 100644 --- a/WebSites/WebGIM/App_Code/DS_applicazione.xss +++ b/WebSites/WebGIM/App_Code/DS_applicazione.xss @@ -8,14 +8,14 @@ - + - - + + - - - + + + @@ -90,7 +90,7 @@ - + 297 diff --git a/WebSites/WebGIM/App_Code/reportExporter.cs b/WebSites/WebGIM/App_Code/reportExporter.cs index bf2cc7f..fe80aac 100644 --- a/WebSites/WebGIM/App_Code/reportExporter.cs +++ b/WebSites/WebGIM/App_Code/reportExporter.cs @@ -69,7 +69,7 @@ public class reportExporter { case reportRichiesto.RichiestaIntervento: report.ReportPath = @".\RichiestaIntervento.rdlc"; - report.DataSources.Add(new ReportDataSource("WebGIM", caricaDati(tipoReport, parametro))); // OCCHIO!!! va messa sorgente dati CORRETTA + report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); // OCCHIO!!! va messa sorgente dati CORRETTA deviceInfo = "" + " PDF" + " 21cm" + @@ -79,15 +79,15 @@ public class reportExporter " 0.2cm" + " 0.2cm" + ""; - break; - default: - break; - } #if false // setting parametro... ReportParameter[] idxObj = { new ReportParameter("numIntMtz", parametro) }; report.SetParameters(idxObj); #endif + break; + default: + break; + } // export in PDF string reportType = "PDF"; Warning[] warnings; diff --git a/WebSites/WebGIM/App_Code/reportPrinter.cs b/WebSites/WebGIM/App_Code/reportPrinter.cs index 8a17e6a..567702d 100644 --- a/WebSites/WebGIM/App_Code/reportPrinter.cs +++ b/WebSites/WebGIM/App_Code/reportPrinter.cs @@ -104,14 +104,14 @@ public class reportPrinter DataTable tab = new DataTable(); switch (tipoReport) { - #if false +#if false case reportRichiesto.Barcode: tab = (DataTable)XPS.obj.taDdt.GetData(idxObj); break; case reportRichiesto.SchedaIdentificazione: tab = (DataTable)XPS.obj.taSchedaIdent.GetData(idxObj); break; - #endif +#endif case reportRichiesto.RichiestaIntervento: tab = (DataTable)TA_app.obj.taInterventiMtz.getByIdx(Convert.ToInt32(idxObj)); break; @@ -133,7 +133,7 @@ public class reportPrinter { case reportRichiesto.RichiestaIntervento: report.ReportPath = @".\RichiestaIntervento.rdlc"; - report.DataSources.Add(new ReportDataSource("WebGIM", caricaDati(tipoReport, parametro))); + report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); deviceInfo = "" + " EMF" + " 21cm" + @@ -143,13 +143,15 @@ public class reportPrinter " 0.2cm" + " 0.2cm" + ""; +#if false + // setting parametro... + ReportParameter[] idxObj = { new ReportParameter("numIntMtz", parametro) }; + report.SetParameters(idxObj); +#endif break; default: break; } - // setting parametro... - ReportParameter[] idxObj = { new ReportParameter("numIntMtz", parametro) }; - report.SetParameters(idxObj); // export in EMF Export(report, deviceInfo); m_currentPageIndex = 0; @@ -157,7 +159,7 @@ public class reportPrinter Print(printerName); // do dispose? Dispose(); - } + } /// /// oggetto protected /// diff --git a/WebSites/WebGIM/Bin/SteamWare.dll b/WebSites/WebGIM/Bin/SteamWare.dll index f15bd59..5d0e268 100644 Binary files a/WebSites/WebGIM/Bin/SteamWare.dll and b/WebSites/WebGIM/Bin/SteamWare.dll differ diff --git a/WebSites/WebGIM/RichiestaIntervento.rdlc b/WebSites/WebGIM/RichiestaIntervento.rdlc index 94e8e87..26b81c5 100644 --- a/WebSites/WebGIM/RichiestaIntervento.rdlc +++ b/WebSites/WebGIM/RichiestaIntervento.rdlc @@ -1,38 +1,1341 @@  - 29.7cm + + + 74bf6fe5-ae22-4a3e-a2bf-9797dba8ca60 + WebGim + + + 11in true - 21cm + 8.5in 0.25cm true - 2.5cm - 2.5cm - 2.5cm - b5e89ed2-7fe4-4194-aa0d-b37d91344e81 + 0.2cm + 0.2cm + 0.2cm + 7184c39e-21ca-49d2-a97c-6c9d66413962 21cm - 16cm + + + + + numIntMtz + System.Int32 + + + richiesta + System.DateTime + + + dataLav + System.DateTime + + + turnoLav + System.Int32 + + + matr + System.String + + + guasto + System.DateTime + + + idxAmbito + System.Int32 + + + descrAmbitoGuasto + System.String + + + idxPriorita + System.Int32 + + + descrPriorita + System.String + + + isFermo + System.Boolean + + + idxTipo + System.Int32 + + + descrTipo + System.String + + + idxImpianto + System.Int32 + + + codImpianto + System.String + + + nomeImpianto + System.String + + + idxMacchina + System.Int32 + + + codMacchina + System.String + + + nomeMacchina + System.String + + + descrizione + System.String + + + idxStato + System.Int32 + + + DescrStato + System.String + + + presaInCarico + System.DateTime + + + inizioIntervento + System.DateTime + + + fineIntervento + System.DateTime + + + descrizioneIntervento + System.String + + + isPreventivabile + System.Boolean + + + idxCausale + System.Int32 + + + descrCausale + System.String + + + + WebGim + select * from v_intervExp + true + + + + + 20.25cm 1cm + + numIntMtz + 0.25cm + 2.53968cm + + 3 + true + 16.75cm + 0.63492cm + =Sum(Fields!numIntMtz.Value) + textbox1 - 0.5cm - 5.74074cm + 15.25cm + 2 + true + 0.91429cm + Richiesta di Intervento + + + + + =Fields!richiesta.Value + Ascending + + + 1 + WebGim + + + 17cm + 1cm + + 48 + true + 10.75cm + 0.63492cm + mm + + + 17cm + 1cm + + 47 + true + 9.25cm + 0.63492cm + hh + + + 17cm + 0.75cm + + 46 + true + 7cm + 0.63492cm + aa + + + 17cm + 1cm + + 45 + true + 5.5cm + 0.63492cm + mm + + + 17cm + 0.75cm + + 44 + true + 4.25cm + 0.63492cm + gg + + + 9.75cm + 1cm + + 43 + true + 10.75cm + 0.63492cm + mm + + + 9.75cm + 1cm + + 42 + true + 9.25cm + 0.63492cm + hh + + + 9.75cm + 0.75cm + + 41 + true + 7cm + 0.63492cm + aa + + + 9.75cm + 1cm + + 40 + true + 5.5cm + 0.63492cm + mm + + + textbox8 + 9.75cm + 0.75cm + + 39 + true + 4.25cm + 0.63492cm + gg + + + 10cm + 0cm + + 38 + 12.25cm + + + 25cm + 11cm + + 37 + 0.25cm + 0cm + + + 24.25cm + 11cm + + 36 + 0.25cm + 0cm + + + 23.5cm + 11cm + + 35 + 0.25cm + 0cm + + + 22.75cm + 11cm + + 34 + 0.25cm + 0cm + + + 21.5cm + 3.5cm + + 33 + true + 0.5cm + 0.63492cm + Note intervento + + + 20.75cm + 4.02116cm + + 32 + 6cm + 0cm + + + 20cm + 4cm + + 31 + true + 0.25cm + 0.63492cm + Firma responsabile produzione + + + 18.75cm + 3cm + + 30 + 9cm + 0cm + + + 18.75cm + 4.5cm + + 29 + 3.75cm + 0cm + + + 17.5cm + 0cm + + 28 + 10.5cm + 1.24339cm + + + 17.5cm + 0cm + + 27 + 9cm + 1.24339cm + + + 17.5cm + 0cm + + 26 + 12cm + 1.24339cm + + + 17.5cm + 0cm + + 25 + 6.75cm + 1.24339cm + + + 17.5cm + 0cm + + 24 + 5.25cm + 1.24339cm + + + 17.5cm + 0cm + + 23 + 8.25cm + 1.24339cm + + + 17.5cm + 0cm + + 22 + 3.75cm + 1.25cm + + + 17.25cm + 3.25cm + + 21 + true + 0.25cm + 0.63492cm + Fine intervento + + + 16.25cm + 4.02116cm + + 20 + 7.5cm + 0cm + + + 15.5cm + 4.02116cm + + 19 + 7.5cm + 0cm + + + 14.75cm + 4.02116cm + + 18 + 7.5cm + 0cm + + + 14cm + 4.02116cm + + 17 + 7.5cm + 0cm + + + 16.25cm + 4.02116cm + + 16 + 0.25cm + 0cm + + + 15.5cm + 4.02116cm + + 15 + 0.25cm + 0cm + + + 14.75cm + 4.02116cm + + 14 + 0.25cm + 0cm + + + 14cm + 4.02116cm + + 13 + 0.25cm + 0cm + + + 12.75cm + 3.5cm + + 12 + true + 7.75cm + 0.63492cm + Minuti intervento + + + 12.75cm + 3.5cm + + 11 + true + 0.25cm + 0.63492cm + Matr. tecnici + + + 10.5cm + 0cm + + 10 + 10.5cm + 1.24339cm + + + 10.5cm + 0cm + + 9 + 9cm + 1.24339cm + + + 10.5cm + 0cm + + 8 + 12cm + 1.24339cm + + + 11.75cm + 3cm + + 7 + 9cm + 0cm + + + 10.5cm + 0cm + + 6 + 6.75cm + 1.24339cm + + + 10.5cm + 0cm + + 5 + 5.25cm + 1.24339cm + + + 10.5cm + 0cm + + 4 + 8.25cm + 1.24339cm + + + 11.75cm + 4.5cm + + 3 + 3.75cm + 0cm + + + 10.5cm + 0cm + + 2 + 3.75cm + 1.25cm + + + 0.25cm + 1 + + + 5.75cm + 18.99471cm + + 28 + 0.5cm + 0cm + + + 4cm + 18.99471cm + + 27 + 0.5cm + 0cm + + + 1.75cm + 18.99471cm + + 26 + 0.5cm + 0cm + + + turnoLav + 0.75cm + 3.75cm + + 25 + true + 4.5cm + 0.63492cm + =Sum(Fields!turnoLav.Value) + + + dataLav + 0.75cm + 3cm + + 24 + true + 0.75cm + 0.63492cm + =First(Fields!dataLav.Value) + + + matr + 0.5cm + 2.53968cm + + 23 + true + 15.75cm + 0.63492cm + =First(Fields!matr.Value) + + + 0.5cm + 4.5cm + + 22 + true + 10.25cm + 0.63492cm + Matr. richiedente + + + descrPriorita + 7.75cm + 3.5cm + + 21 + true + 15.5cm + 0.63492cm + =First(Fields!descrPriorita.Value) + + + idxPriorita + 7cm + 2.25cm + + 20 + true + 15.5cm + 0.63492cm + =First(Fields!idxPriorita.Value) + + + descrCausale_1 + 8cm + 10cm + + 19 + true + 4.25cm + 0.63492cm + =First(Fields!descrCausale.Value) + + + 8cm + 3.5cm + + 18 + true + 0.25cm + 0.63492cm + Evento ipotizzato + + + 6.25cm + 3.5cm + + 17 + true + 15.5cm + 0.63492cm + Priorità + + + descrizione + 6.25cm + 10.5cm + + 16 + true + 3.75cm + 0.63492cm + =First(Fields!descrizione.Value) + + + 6.25cm + 3.25cm + + 15 + true + 0.25cm + 0.63492cm + Descrizione + + + descrTipo + 4.5cm + 2.53968cm + + 14 + true + 16.75cm + 0.63492cm + =First(Fields!descrTipo.Value) + + + 4.5cm + 3.25cm + + 13 + true + 13.25cm + 0.63492cm + Tipo guasto + + + descrAmbitoGuasto + 4.5cm + 3.5cm + + 12 + true + 9.5cm + 0.63492cm + =First(Fields!descrAmbitoGuasto.Value) + + + 4.5cm + 2.5cm + + 11 + true + 6.5cm + 0.63492cm + Casuale fermo + + + isFermo + 4.5cm + 2.53968cm + + 10 + true + 3.25cm + 0.63492cm + =First(Fields!isFermo.Value) + + + 4.5cm + 2.75cm + + 9 + true + 0.25cm + 0.5cm + Macchina ferma + + + codMacchina + 2.75cm + 2.53968cm + + 8 + true + 16.5cm + 0.63492cm + =First(Fields!codMacchina.Value) + + + codImpianto + 2cm + 2.53968cm + + 7 + true + 16.5cm + 0.63492cm + =First(Fields!codImpianto.Value) + + + 2cm + 3cm + + 6 + true + 13.25cm + 0.63492cm + cod impianto + + + 2.75cm + 3cm + + 5 + true + 13.25cm + 0.63492cm + cod macchina + + + nomeMacchina + 2.75cm + 3.75cm + + 4 + true + 9.25cm + 0.63492cm + =First(Fields!nomeMacchina.Value) + + + nomeImpianto + 2cm + 3.75cm + + 3 + true + 9.25cm + 0.63492cm + =First(Fields!nomeImpianto.Value) + + + 2.25cm + 2.25cm + + 2 + true + 6.75cm + 0.63492cm + Reparto + + + textbox11 + 2.25cm + 3.25cm + + 1 + true + 0.25cm + 0.63492cm + Ferma dalle + + + guasto_1 + 2.25cm + 2.53968cm + + true + 3.75cm + 0.63492cm + =First(Fields!guasto.Value) + + + 0.25cm + 19.75cm + + 9.25cm + + + 10.5cm + 3.25cm + + true + 0.25cm + 0.63492cm + Inizio intervento + + + 1.25cm + + + + =Fields!richiesta.Value + + true + + + + 0.25cm + 1cm + true - 3.75cm - 2.24868cm - Testing + 15.5cm + 0.63492cm + - 5cm + 27cm en-US - 2.5cm + 0.2cm 29.7cm \ No newline at end of file diff --git a/WebSites/WebGIM/Web.config b/WebSites/WebGIM/Web.config index 80f2ac7..eca60fd 100644 --- a/WebSites/WebGIM/Web.config +++ b/WebSites/WebGIM/Web.config @@ -122,6 +122,8 @@ + + diff --git a/WebSites/WebGIM/WebConfigSomaschini_AppSettings.config b/WebSites/WebGIM/WebConfigSomaschini_AppSettings.config index 5f28270..076a347 100644 --- a/WebSites/WebGIM/WebConfigSomaschini_AppSettings.config +++ b/WebSites/WebGIM/WebConfigSomaschini_AppSettings.config @@ -1 +1,58 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSites/WebGIM/WebConfigSomaschini_ConnectionStrings.config b/WebSites/WebGIM/WebConfigSomaschini_ConnectionStrings.config index 5f28270..0321ee8 100644 --- a/WebSites/WebGIM/WebConfigSomaschini_ConnectionStrings.config +++ b/WebSites/WebGIM/WebConfigSomaschini_ConnectionStrings.config @@ -1 +1,3 @@ - \ No newline at end of file + + + \ No newline at end of file diff --git a/WebSites/WebGIM/mod_assegnazioniMacchineImpianti.ascx b/WebSites/WebGIM/mod_assegnazioniMacchineImpianti.ascx index cc14a38..3454e21 100644 --- a/WebSites/WebGIM/mod_assegnazioniMacchineImpianti.ascx +++ b/WebSites/WebGIM/mod_assegnazioniMacchineImpianti.ascx @@ -5,24 +5,22 @@
- + - +
- +
+ +
@@ -30,8 +28,10 @@ - +
+ +
diff --git a/WebSites/WebGIM/mod_elencoRichieste.ascx b/WebSites/WebGIM/mod_elencoRichieste.ascx index 8041cec..73538d7 100644 --- a/WebSites/WebGIM/mod_elencoRichieste.ascx +++ b/WebSites/WebGIM/mod_elencoRichieste.ascx @@ -28,9 +28,8 @@ - + @@ -74,9 +73,7 @@ - + diff --git a/WebSites/WebGIM/mod_elencoRichieste.ascx.cs b/WebSites/WebGIM/mod_elencoRichieste.ascx.cs index 81c5a63..c1b0040 100644 --- a/WebSites/WebGIM/mod_elencoRichieste.ascx.cs +++ b/WebSites/WebGIM/mod_elencoRichieste.ascx.cs @@ -293,19 +293,14 @@ public partial class mod_elencoRichieste : ApplicationUserControl } return answ; } - /// - /// stampa la scheda selezionata come PDF + /// restituisce url contenente parametri per rendering pdf /// - /// - /// - protected void btnPrintScheda_Click(object sender, ImageClickEventArgs e) + /// + /// + public string formattaUrl(object idx) { -#if false - ImageButton imgBtn = (ImageButton)sender; - // esporto pdf! - reportPrinter.obj.printReport(reportRichiesto.Barcode, memLayer.ML.confReadstring("printerBarcode"), imgBtn.CommandArgument); -#endif + return String.Format("~/ExportPdf.aspx?tipo={0}&idx={1}", Convert.ToInt32(reportRichiesto.RichiestaIntervento), idx); } /// /// prende in carico e stampa la scheda selezionata @@ -314,12 +309,39 @@ public partial class mod_elencoRichieste : ApplicationUserControl /// protected void btnPrendeInCarico_Click(object sender, ImageClickEventArgs e) { - // prende in carico la scheda... -#if false ImageButton imgBtn = (ImageButton)sender; + int idx = Convert.ToInt32(imgBtn.CommandArgument); + // prende in carico la scheda... + try + { + int? newStato = 0; + TA_app.obj.taInterventiMtz.sp_setPresaInCarico(Convert.ToInt32(idx), ref newStato); + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore durante presa in carico: {0}", exc), tipoLog.ERROR); + } // stampo! - reportPrinter.obj.printReport(reportRichiesto.Barcode, memLayer.ML.confReadstring("printerBarcode"), imgBtn.CommandArgument); -#endif + reportPrinter.obj.printReport(reportRichiesto.RichiestaIntervento, memLayer.ML.confReadstring("stampanteRichiesteMtz"), idx.ToString()); + // update del gridView... + grView.DataBind(); + } + /// + /// restituisce true se è una richeista solo inserita e non ancora presa in carico + /// + /// + /// + public bool isPrInCarEnabl(object num) + { + bool answ = false; + try + { + int idxStato = TA_app.obj.taInterventiMtz.getByIdx(Convert.ToInt32(num))[0].idxStato; + if (idxStato == 1) answ = true; + } + catch + { } + return answ; } #endregion diff --git a/WebSites/WebGIM/mod_macchine.ascx.cs b/WebSites/WebGIM/mod_macchine.ascx.cs index 1843078..643b810 100644 --- a/WebSites/WebGIM/mod_macchine.ascx.cs +++ b/WebSites/WebGIM/mod_macchine.ascx.cs @@ -145,6 +145,7 @@ public partial class mod_macchine : ApplicationUserControl protected override void aggiornaControlliDataGL() { base.aggiornaControlliDataGL(); + grViewShort.PageSize = _righeDataGridAnagr; grView.PageSize = _righeDataGridMed; } /// @@ -427,7 +428,7 @@ public partial class mod_macchine : ApplicationUserControl switch (_comando) { case "clonaObj": - TA_app.obj.taMacchine.sp_clonaMacchina(_idx); + TA_app.obj.taMacchine.sp_clonaMacchina(_idx); grView.EditIndex = -1; grView.DataBind(); // blocco update! diff --git a/WebSites/WebGIM/mod_menuBottom.ascx b/WebSites/WebGIM/mod_menuBottom.ascx index 9b66c1f..11df980 100644 --- a/WebSites/WebGIM/mod_menuBottom.ascx +++ b/WebSites/WebGIM/mod_menuBottom.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_menuBottom.ascx.cs" Inherits="mod_menuBottom" %> -25 - +32 - diff --git a/WebSites/WebGIM/test.aspx.cs b/WebSites/WebGIM/test.aspx.cs index 09c359b..606595f 100644 --- a/WebSites/WebGIM/test.aspx.cs +++ b/WebSites/WebGIM/test.aspx.cs @@ -8,12 +8,14 @@ public partial class test : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { +#if false reportExporter re = new reportExporter(); re.popolaPdfStream(reportRichiesto.RichiestaIntervento, "1"); Response.Clear(); Response.ContentType = re.mimeType; Response.AddHeader("content-disposition", "attachment; filename=WebGIM." + re.fileNameExtension); Response.BinaryWrite(re.renderedBytes); - Response.End(); + Response.End(); +#endif } }