diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index 1c41cc9..c284d46 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 6905096..b1829d5 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 1c41cc9..c284d46 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/Collaudi.aspx b/CMS_SC/Collaudi.aspx index 2672219..4f6e00a 100644 --- a/CMS_SC/Collaudi.aspx +++ b/CMS_SC/Collaudi.aspx @@ -22,39 +22,31 @@
-
- - - - - - - +
+ + +
-
+
- +
- - - - - - - -
-
- <%-- - - --%> - - - +
+ + + + + + +
+
+ +
diff --git a/CMS_SC/Collaudi.aspx.cs b/CMS_SC/Collaudi.aspx.cs index 77d1e93..a59dc5e 100644 --- a/CMS_SC/Collaudi.aspx.cs +++ b/CMS_SC/Collaudi.aspx.cs @@ -18,6 +18,9 @@ namespace CMS_SC ((Bootstrap)this.Master).showSearch = true; mod_righePag.numRowPag = 20; mod_collaudi.pageSize = mod_righePag.numRowPag; + ddlFase.DataBind(); + ddlDossier.DataBind(); + ddlSelScheda.DataBind(); fixControls(); } mod_righePag.eh_newNum += mod_righePag_eh_newNum; @@ -110,12 +113,14 @@ namespace CMS_SC return answ; } } +#if false protected void ddlStato_SelectedIndexChanged(object sender, EventArgs e) { ddlDossier.DataBind(); ddlSelScheda.DataBind(); fixControls(); - } + } +#endif protected void ddlDossier_SelectedIndexChanged(object sender, EventArgs e) { ddlSelScheda.DataBind(); @@ -127,6 +132,8 @@ namespace CMS_SC } protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e) { + ddlDossier.DataBind(); + ddlSelScheda.DataBind(); fixControls(); } /// diff --git a/CMS_SC/Collaudi.aspx.designer.cs b/CMS_SC/Collaudi.aspx.designer.cs index f09be9c..ddd5657 100644 --- a/CMS_SC/Collaudi.aspx.designer.cs +++ b/CMS_SC/Collaudi.aspx.designer.cs @@ -22,22 +22,22 @@ namespace CMS_SC { protected global::System.Web.UI.WebControls.Button btnAddNewSetMis; /// - /// ddlStato control. + /// ddlFase control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList ddlStato; + protected global::System.Web.UI.WebControls.DropDownList ddlFase; /// - /// odsStato control. + /// odsFase control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsStato; + protected global::System.Web.UI.WebControls.ObjectDataSource odsFase; /// /// ddlDossier control. @@ -84,24 +84,6 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.HyperLink hlDoc; - /// - /// ddlFase control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlFase; - - /// - /// odsFase control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsFase; - /// /// mod_collaudi control. /// diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 1c41cc9..c284d46 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 1f9736a..c2883d7 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 6905096..b1829d5 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs index d60a32d..f82f930 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.063.349")] -[assembly: AssemblyFileVersion("1.8.063.349")] +[assembly: AssemblyVersion("1.8.065.349")] +[assembly: AssemblyFileVersion("1.8.065.349")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index 591a33a..57801af 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.063.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.8.063.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.065.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.065.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 7658381..8ccffd9 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ