diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss
index 598bbc3..4bdc86a 100644
--- a/CMS-SC-Data/DS_Applicazione.xss
+++ b/CMS-SC-Data/DS_Applicazione.xss
@@ -15,7 +15,7 @@
-
+
@@ -118,23 +118,23 @@
1100
- 592
+ 578
- 1048
- 592
+ 1026
+ 578
- 779
+ 860
497
- 779
- 565
+ 860
+ 551
diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
index 9acd4b6..cb07a83 100644
Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ
diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll
index 0da3199..37d613c 100644
Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ
diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
index 9acd4b6..cb07a83 100644
Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ
diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index dc7ba4f..5330c1e 100644
Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/CMS_SC/Collaudi.aspx.cs b/CMS_SC/Collaudi.aspx.cs
index 5f68bf6..d2319e4 100644
--- a/CMS_SC/Collaudi.aspx.cs
+++ b/CMS_SC/Collaudi.aspx.cs
@@ -61,7 +61,7 @@ namespace CMS_SC
{
get
{
- string answ = "";
+ string answ = "-";
try
{
answ = ddlSelScheda.SelectedValue;
@@ -75,7 +75,7 @@ namespace CMS_SC
{
get
{
- string answ = "";
+ string answ = "-";
try
{
answ = ddlFase.SelectedValue;
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx
index 404676a..9be7e31 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx
@@ -54,6 +54,6 @@
-
+
\ No newline at end of file
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
index 40aa3cd..f16c3c0 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -83,7 +84,14 @@ namespace CMS_SC.WebUserControls
}
public void doUpdate()
{
- grView.DataBind();
+ try
+ {
+ grView.DataBind();
+ }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog(string.Format("Eccezione in databind, valori filtro{0}Dossier: [{1}]{0}CodScheda: [{2}]{0}Fase: [{3}]{0}Eccezione:{0}{4}", Environment.NewLine, IdxDossier, CodSchedaVers, Fase, exc));
+ }
}
}
}
\ No newline at end of file
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index 9acd4b6..cb07a83 100644
Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ
diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll
index 3e61226..6deb119 100644
Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index 0da3199..37d613c 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ