diff --git a/GIM_data/reportExporter.cs b/GIM_data/reportExporter.cs
index 0352ae6..05fbbba 100644
--- a/GIM_data/reportExporter.cs
+++ b/GIM_data/reportExporter.cs
@@ -128,7 +128,7 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
- report.ReportPath = string.Format(@".\Reports\{0}\MacchineReparti.rdlc", user_std.UtSn.lingua);
+ report.ReportPath = string.Format(@".\{0}\{1}\MacchineReparti.rdlc", memLayer.ML.CRS("ReportBasePath"), user_std.UtSn.lingua);
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport)));
deviceInfo = new devInfoParam("PDF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
@@ -151,7 +151,7 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.RichiestaIntervento:
- report.ReportPath = string.Format(@".\Reports\{0}\RichiestaIntervento.rdlc", user_std.UtSn.lingua);
+ report.ReportPath = string.Format(@".\{0}\{1}\RichiestaIntervento.rdlc", memLayer.ML.CRS("ReportBasePath"), user_std.UtSn.lingua);
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro))); // OCCHIO!!! va messa sorgente dati CORRETTA
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
@@ -176,12 +176,12 @@ public class reportExporter
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
- report.ReportPath = string.Format(@".\Reports\{0}\ReportInterventi.rdlc", user_std.UtSn.lingua);
+ report.ReportPath = string.Format(@".\{0}\{1}\ReportInterventi.rdlc", memLayer.ML.CRS("ReportBasePath"), user_std.UtSn.lingua);
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username, soloMacchinaFerma, includiMtzPrev)));
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.MTBF_MTTR:
- report.ReportPath = string.Format(@".\Reports\{0}\Report_MTBF_MTTR.rdlc", user_std.UtSn.lingua);
+ report.ReportPath = string.Format(@".\{0}\{1}\Report_MTBF_MTTR.rdlc", memLayer.ML.CRS("ReportBasePath"), user_std.UtSn.lingua);
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username, soloMacchinaFerma, includiMtzPrev)));
deviceInfo = new devInfoParam("PDF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
// calcolo le ore totali equivalenti...
diff --git a/GIM_data/reportPrinter.cs b/GIM_data/reportPrinter.cs
index 56e212d..0efe77b 100644
--- a/GIM_data/reportPrinter.cs
+++ b/GIM_data/reportPrinter.cs
@@ -149,12 +149,12 @@ public class reportPrinter
switch (tipoReport)
{
case reportRichiesto.ElencoMacchine:
- report.ReportPath = @".\Reports\MacchineReparti.rdlc";
+ report.ReportPath = string.Format(@".\{0}\MacchineReparti.rdlc",, memLayer.ML.CRS("ReportBasePath"));
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = new devInfoParam("EMF", "21cm", "29.7cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.RichiestaIntervento:
- report.ReportPath = @".\Reports\RichiestaIntervento.rdlc";
+ report.ReportPath = string.Format(@".\{0}\RichiestaIntervento.rdlc", memLayer.ML.CRS("ReportBasePath"));
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, parametro)));
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
@@ -176,12 +176,12 @@ public class reportPrinter
switch (tipoReport)
{
case reportRichiesto.ElencoInterventi:
- report.ReportPath = @".\Reports\ReportInterventi.rdlc";
+ report.ReportPath = string.Format(@".\{0}\ReportInterventi.rdlc", memLayer.ML.CRS("ReportBasePath"));
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
break;
case reportRichiesto.MTBF_MTTR:
- report.ReportPath = @".\Reports\Report_MTBF_MTTR.rdlc";
+ report.ReportPath = string.Format(@".\{0}\Report_MTBF_MTTR.rdlc", memLayer.ML.CRS("ReportBasePath"));
report.DataSources.Add(new ReportDataSource("WebGim", caricaDati(tipoReport, periodoAnalizzato, username)));
deviceInfo = new devInfoParam("EMF", "29.7cm", "21cm", "0.2cm", "0.2cm", "0.2cm", "0.2cm");
// calcolo le ore totali equivalenti...
diff --git a/GIM_site/GIM_site.csproj b/GIM_site/GIM_site.csproj
index 3932c18..a6c6a0e 100644
--- a/GIM_site/GIM_site.csproj
+++ b/GIM_site/GIM_site.csproj
@@ -757,7 +757,9 @@
-
+
+ Always
+
@@ -1771,18 +1773,22 @@
-
+
Designer
-
-
+ Always
+
+
Designer
-
-
+ Always
+
+
Designer
-
-
+ Always
+
+
Designer
-
+ Always
+
@@ -1819,102 +1825,106 @@
-
+
Designer
-
+ Always
+
-
+
Designer
-
+ Always
+
-
+
Designer
-
+ Always
+
-
+
Designer
-
+ Always
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
+
-
+
Designer
-
-
+
+
Designer
-
-
+
+
Designer
-
-
+
+
Designer
-
-
-
-
-
-
+
+
+
+
+
+
Designer
-
-
+
+
Designer
-
-
+
+
Designer
-
-
+
+
Designer
-
-
-
+
+
+
Designer
-
-
+
+
Designer
-
-
+
+
10.0
diff --git a/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup (2).rdlc b/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup (2).rdlc
deleted file mode 100644
index 080eafd..0000000
--- a/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup (2).rdlc
+++ /dev/null
@@ -1,981 +0,0 @@
-
-
-
-
- a89e8338-493e-433b-b479-316efbad0009
- WebGim
-
-
- 11in
-
-
- Float
- true
- OreTotali
-
-
- String
-
-
- Alumat SRL
-
-
- true
- true
-
-
- true
- 8.5in
- 0.25cm
- true
- 0.2cm
- 0.2cm
-
- true
-
-
- 20.25cm
-
- true
- Report MTBF MTTR
-
-
- 0.4762cm
- true
-
- 0.2cm
- 0aad9ce8-d201-4dde-aa78-0d9db3569b39
- 21cm
-
-
-
-
- numInterventi
- System.Int32
-
-
- totOreMtz
- System.Double
-
-
- totOreOfficina
- System.Double
-
-
- codImpianto
- System.String
-
-
- codMacchina
- System.String
-
-
- nomeImpianto
- System.String
-
-
- nomeMacchina
- System.String
-
-
-
- WebGim
- select * from v_datiMTBFMTTR
- true
-
-
-
-
- 1
- WebGim
- 4cm
-
-
-
-
- =Fields!nomeImpianto.Value
-
-
-
-
- =Fields!nomeImpianto.Value
- Ascending
-
-
-
-
-
-
-
- 4
-
-
- nomeImpianto
-
- 26
- true
- =(Fields!nomeImpianto.Value)&" "&(Fields!codImpianto.Value)
-
-
-
-
-
-
- textbox15
-
- 25
- true
- Num. Int.
-
-
-
-
-
-
-
- 24
- true
- MTBF
-
-
-
-
-
-
-
- 23
- true
- MTTR_man
-
-
-
-
-
-
-
- 22
- true
- MTTR_off
-
-
-
-
- 0.5cm
-
-
-
-
-
-
- 20.05716cm
-
-
-
-
-
- 3
-
-
-
- 5
- true
- =(Fields!nomeMacchina.Value)&" "&(Fields!codMacchina.Value)
-
-
-
-
-
-
-
- 4
- true
-
-
-
-
-
-
-
-
- 3
- true
- =Fields!numInterventi.Value
-
-
-
-
-
-
-
- 2
- true
- =(Parameters!OreTotali.Value)/Fields!numInterventi.Value
-
-
-
-
-
-
-
- 1
- true
- =(Fields!totOreMtz.Value)/(Fields!numInterventi.Value)
-
-
-
-
-
-
-
- true
- =(Fields!totOreOfficina.Value)/(Fields!numInterventi.Value)
-
-
-
-
- 0.55588cm
-
-
-
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 1.25cm
-
-
- 2.25cm
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 2.77031cm
-
-
- 2.32572cm
-
-
- 0.25cm
- 1.25cm
- 19.7619cm
-
- 2.5cm
-
-
- 6.82572cm
-
- en-US
-
- true
-
-
- 0.1369cm
- 10.54762cm
-
- 3
- true
- 5.03373cm
- 0.4762cm
- =Parameters!nomeSoc.Value & " - SteamWare © 2006-" & Format(Globals.ExecutionTime, "yyyy")
-
-
- 0.1369cm
- 1.75cm
-
- 2
- true
- 16.03373cm
- 0.4762cm
- Pagina
-
-
- 0.1369cm
- 2.5cm
-
- 1
- true
- 17.53373cm
- 0.4762cm
- =Globals.PageNumber & " di " & Globals.TotalPages
-
-
- 0.1369cm
- 4.5cm
-
- true
- 0.28373cm
- 0.4762cm
- = " data " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
-
-
- 0.75cm
- true
-
- 0.2cm
- 29.7cm
-
\ No newline at end of file
diff --git a/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup.rdlc b/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup.rdlc
deleted file mode 100644
index 080eafd..0000000
--- a/GIM_site/Reports/ZZ_STEAM/IT/Report_MTBF_MTTR - Backup.rdlc
+++ /dev/null
@@ -1,981 +0,0 @@
-
-
-
-
- a89e8338-493e-433b-b479-316efbad0009
- WebGim
-
-
- 11in
-
-
- Float
- true
- OreTotali
-
-
- String
-
-
- Alumat SRL
-
-
- true
- true
-
-
- true
- 8.5in
- 0.25cm
- true
- 0.2cm
- 0.2cm
-
- true
-
-
- 20.25cm
-
- true
- Report MTBF MTTR
-
-
- 0.4762cm
- true
-
- 0.2cm
- 0aad9ce8-d201-4dde-aa78-0d9db3569b39
- 21cm
-
-
-
-
- numInterventi
- System.Int32
-
-
- totOreMtz
- System.Double
-
-
- totOreOfficina
- System.Double
-
-
- codImpianto
- System.String
-
-
- codMacchina
- System.String
-
-
- nomeImpianto
- System.String
-
-
- nomeMacchina
- System.String
-
-
-
- WebGim
- select * from v_datiMTBFMTTR
- true
-
-
-
-
- 1
- WebGim
- 4cm
-
-
-
-
- =Fields!nomeImpianto.Value
-
-
-
-
- =Fields!nomeImpianto.Value
- Ascending
-
-
-
-
-
-
-
- 4
-
-
- nomeImpianto
-
- 26
- true
- =(Fields!nomeImpianto.Value)&" "&(Fields!codImpianto.Value)
-
-
-
-
-
-
- textbox15
-
- 25
- true
- Num. Int.
-
-
-
-
-
-
-
- 24
- true
- MTBF
-
-
-
-
-
-
-
- 23
- true
- MTTR_man
-
-
-
-
-
-
-
- 22
- true
- MTTR_off
-
-
-
-
- 0.5cm
-
-
-
-
-
-
- 20.05716cm
-
-
-
-
-
- 3
-
-
-
- 5
- true
- =(Fields!nomeMacchina.Value)&" "&(Fields!codMacchina.Value)
-
-
-
-
-
-
-
- 4
- true
-
-
-
-
-
-
-
-
- 3
- true
- =Fields!numInterventi.Value
-
-
-
-
-
-
-
- 2
- true
- =(Parameters!OreTotali.Value)/Fields!numInterventi.Value
-
-
-
-
-
-
-
- 1
- true
- =(Fields!totOreMtz.Value)/(Fields!numInterventi.Value)
-
-
-
-
-
-
-
- true
- =(Fields!totOreOfficina.Value)/(Fields!numInterventi.Value)
-
-
-
-
- 0.55588cm
-
-
-
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 1.25cm
-
-
- 2.25cm
-
-
- 2.75737cm
-
-
- 2.75737cm
-
-
- 2.77031cm
-
-
- 2.32572cm
-
-
- 0.25cm
- 1.25cm
- 19.7619cm
-
- 2.5cm
-
-
- 6.82572cm
-
- en-US
-
- true
-
-
- 0.1369cm
- 10.54762cm
-
- 3
- true
- 5.03373cm
- 0.4762cm
- =Parameters!nomeSoc.Value & " - SteamWare © 2006-" & Format(Globals.ExecutionTime, "yyyy")
-
-
- 0.1369cm
- 1.75cm
-
- 2
- true
- 16.03373cm
- 0.4762cm
- Pagina
-
-
- 0.1369cm
- 2.5cm
-
- 1
- true
- 17.53373cm
- 0.4762cm
- =Globals.PageNumber & " di " & Globals.TotalPages
-
-
- 0.1369cm
- 4.5cm
-
- true
- 0.28373cm
- 0.4762cm
- = " data " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
-
-
- 0.75cm
- true
-
- 0.2cm
- 29.7cm
-
\ No newline at end of file
diff --git a/GIM_site/Web.config b/GIM_site/Web.config
index 1b5b1d1..a352e6f 100644
--- a/GIM_site/Web.config
+++ b/GIM_site/Web.config
@@ -130,6 +130,8 @@
+
+
diff --git a/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6845c43..ae6ed57 100644
Binary files a/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GIM_site/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ