diff --git a/Projects/WebGIM/GIM_site/GIM_site.csproj b/Projects/WebGIM/GIM_site/GIM_site.csproj
index a32c454..0a3fd17 100644
--- a/Projects/WebGIM/GIM_site/GIM_site.csproj
+++ b/Projects/WebGIM/GIM_site/GIM_site.csproj
@@ -1360,16 +1360,24 @@
-
+
+ Designer
+
-
+
+ Designer
+
-
+
+ Designer
+
-
+
+ Designer
+
10.0
diff --git a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc
index 4c17d0a..979ad39 100644
--- a/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc
+++ b/Projects/WebGIM/GIM_site/Reports/EN/MacchineReparti.rdlc
@@ -29,7 +29,7 @@
2pt
true
- Elenco Reparti e Macchine
+ Plant and Machines List
0.61309cm
@@ -111,7 +111,7 @@
true
0.12566cm
0.91429cm
- Elenco Macchine Reparti
+ Plant and Machines List
WebGim
@@ -624,7 +624,7 @@
29
true
- Reparto
+ Plant
@@ -645,7 +645,7 @@
28
true
- Macchina
+ Machine
@@ -666,7 +666,7 @@
27
true
- cod Macchina
+ Cod
@@ -687,7 +687,7 @@
26
true
- matricola
+ S.Num.
@@ -708,7 +708,7 @@
25
true
- modello
+ Model
@@ -730,7 +730,7 @@
24
true
- anno
+ Year
@@ -751,7 +751,7 @@
23
true
- Peso
+ Weight
@@ -772,7 +772,7 @@
22
true
- Cons.
+ Power
@@ -831,7 +831,7 @@
3
true
5.70238cm
- Somaschini SPA - SteamWare © 2006-2011
+ Somaschini SPA - SteamWare © 2006-2014
0.05754cm
@@ -877,7 +877,7 @@
2pt
true
- = " data " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
+ = " date " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
0.53373cm
diff --git a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc
index 0cb4dd0..33c8079 100644
--- a/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc
+++ b/Projects/WebGIM/GIM_site/Reports/EN/Report_MTBF_MTTR.rdlc
@@ -118,7 +118,7 @@
true
10.25cm
0.5cm
- riferito al tempo di fermata complessiva della macchina (impianto)
+ referred to the total stop time for the machine/plant
3cm
@@ -134,8 +134,7 @@
true
0.25cm
0.5cm
- riferito al tempo di pura riparazione della macchina (impianto)
-
+ referred to the time spent for the actual manutenance of the machine/plant
1.75cm
@@ -151,8 +150,7 @@
true
10.25cm
0.75cm
- (Tempo medio di riparazione) Durata media di un intervento di riparazione alla macchina (impianto)
-
+ Mean time to repair the machine/plant
1.75cm
@@ -168,8 +166,7 @@
true
0.25cm
0.75cm
- (Tempo medio di guasto) Ore che intercorrono mediamente tra due guasti alla macchina (impianto)
-
+ Mean time between subsequent failures
2.5cm
@@ -219,7 +216,7 @@
true
0.25cm
0.5cm
- MTBF (Mean Time Before Failure)
+ MTBF (Mean Time Between Failure)
textbox1
@@ -960,7 +957,7 @@
true
0.28373cm
0.4762cm
- = " data " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
+ = " date " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
0.75cm
diff --git a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc
index 4c17d0a..a195901 100644
--- a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc
+++ b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc
@@ -687,7 +687,7 @@
26
true
- matricola
+ Matricola
@@ -708,7 +708,7 @@
25
true
- modello
+ Modello
@@ -730,7 +730,7 @@
24
true
- anno
+ Anno
@@ -831,7 +831,7 @@
3
true
5.70238cm
- Somaschini SPA - SteamWare © 2006-2011
+ Somaschini SPA - SteamWare © 2006-2014
0.05754cm
diff --git a/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc.bak b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc.bak
new file mode 100644
index 0000000..1dfaa5c
--- /dev/null
+++ b/Projects/WebGIM/GIM_site/Reports/IT/MacchineReparti.rdlc.bak
@@ -0,0 +1,888 @@
+
+
+
+
+ 4ff050af-b9d5-4fd6-8b1e-1dfa4459442c
+ WebGim
+
+
+ 11in
+ true
+ 8.5in
+ 0.25cm
+ false
+ 0.2cm
+ 0.2cm
+
+ true
+
+
+ 0.05754cm
+ 28.55489cm
+
+ true
+ Elenco Reparti e Macchine
+
+
+ 0.61309cm
+ true
+
+ 0.2cm
+ d6433c86-fc2e-4a5c-b604-aa1d171ded77
+ 29.7cm
+
+
+
+
+ codImpianto
+ System.String
+
+
+ nomeImpianto
+ System.String
+
+
+ tipoImpianto
+ System.String
+
+
+ codMacchina
+ System.String
+
+
+ nomeMacchina
+ System.String
+
+
+ modello
+ System.String
+
+
+ matricola
+ System.String
+
+
+ anno
+ System.Int32
+
+
+ kgPeso
+ System.Double
+
+
+ kwConsumo
+ System.Double
+
+
+
+ WebGim
+ select * from v_elencoImpiantiMacchine
+ true
+
+
+
+
+ 28.75cm
+
+ 1cm
+
+
+ textbox1
+ 28.31085cm
+
+ 1
+ true
+ 0.12566cm
+ 0.91429cm
+ Elenco Macchine Reparti
+
+
+ WebGim
+ 1.35317cm
+
+
+
+
+ =Fields!nomeImpianto.Value
+
+
+
+
+ =Fields!nomeImpianto.Value
+ Ascending
+
+
+
+
+
+
+
+ 3
+
+
+ nomeImpianto
+
+ 21
+ true
+ =(Fields!nomeImpianto.Value)&" "&(Fields!codImpianto.Value)&"/"&(Fields!tipoImpianto.Value)
+
+
+
+
+
+
+ textbox7
+
+ 20
+ true
+
+
+
+
+
+
+
+ textbox20
+
+ 19
+ true
+
+
+
+
+
+
+
+ textbox11
+
+ 18
+ true
+
+
+
+
+
+
+
+ textbox13
+
+ 17
+ true
+
+
+
+
+
+
+
+ textbox15
+
+ 16
+ true
+
+
+
+
+
+ 0.53333cm
+
+
+ true
+
+
+
+
+ 28.53572cm
+
+
+
+
+
+
+
+ textbox3
+
+ 7
+ true
+
+
+
+
+
+
+
+
+ nomeMacchina
+
+ 6
+ true
+ =Fields!nomeMacchina.Value
+
+
+
+
+
+
+ codMacchina
+
+ 5
+ true
+ =Fields!codMacchina.Value
+
+
+
+
+
+
+ matricola
+
+ 4
+ true
+ =Fields!matricola.Value
+
+
+
+
+
+
+ modello
+
+ 3
+ true
+ =Fields!modello.Value
+
+
+
+
+
+
+ anno
+
+ 2
+ true
+ =Fields!anno.Value
+
+
+
+
+
+
+ kgPeso
+
+ 1
+ true
+ =Fields!kgPeso.Value
+
+
+
+
+
+
+ kwConsumo
+
+ true
+ =Fields!kwConsumo.Value
+
+
+
+
+ 0.53333cm
+
+
+
+
+
+
+
+
+
+
+ textbox2
+
+ 29
+ true
+ Reparto
+
+
+
+
+
+
+ textbox4
+
+ 28
+ true
+ Macchina
+
+
+
+
+
+
+ textbox6
+
+ 27
+ true
+ cod Macchina
+
+
+
+
+
+
+ textbox8
+
+ 26
+ true
+ Matricola
+
+
+
+
+
+
+ textbox10
+
+ 25
+ true
+ Modello
+
+
+
+
+
+
+ textbox12
+
+ 24
+ true
+ Anno
+
+
+
+
+
+
+ textbox14
+
+ 23
+ true
+ Peso
+
+
+
+
+
+
+ textbox16
+
+ 22
+ true
+ Cons.
+
+
+
+
+ 0.5cm
+
+
+ true
+
+
+
+ 2.5cm
+
+
+ 11.0582cm
+
+
+ 3.30291cm
+
+
+ 2.25cm
+
+
+ 4.77646cm
+
+
+ 1.5cm
+
+
+ 1.45503cm
+
+
+ 1.69312cm
+
+
+
+
+ 3.55475cm
+
+ en-US
+
+ true
+
+
+ 0.05754cm
+ 17.67196cm
+
+ 3
+ true
+ 5.70238cm
+ Somaschini SPA - SteamWare © 2006-2011
+
+
+ 0.05754cm
+ 1.75cm
+
+ 2
+ true
+ 24cm
+ Pagina
+
+
+ 0.05754cm
+ 2.5cm
+
+ 1
+ true
+ 25.5cm
+ =Globals.PageNumber & " di " & Globals.TotalPages
+
+
+ 0.05754cm
+ 5.25cm
+
+ true
+ = " data " & Format(Globals.ExecutionTime, "yyyy-MM-dd, HH:mm")
+
+
+ 0.53373cm
+ true
+
+ 0.2cm
+ 21cm
+
\ No newline at end of file
diff --git a/Projects/WebGIM/GIM_site/Web.config b/Projects/WebGIM/GIM_site/Web.config
index fdf97cd..ef38491 100644
--- a/Projects/WebGIM/GIM_site/Web.config
+++ b/Projects/WebGIM/GIM_site/Web.config
@@ -104,7 +104,7 @@
-
+
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index d186414..1bf3a08 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/images/logo_sw.png b/Projects/WebGIM/GIM_site/images/logo_sw.png
index 68342bb..bc356c5 100644
Binary files a/Projects/WebGIM/GIM_site/images/logo_sw.png and b/Projects/WebGIM/GIM_site/images/logo_sw.png differ
diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll
index d186414..1bf3a08 100644
Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache
index 21fbe67..24a269b 100644
Binary files a/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache and b/Projects/WebGIM/GIM_site/obj/SomaschiniUSA/RdlCompile.cache differ