diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index 749783e..20eae1c 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Release/SteamWare.dll b/CMS-SC-Data/bin/Release/SteamWare.dll index 759de9d..bad78fa 100644 Binary files a/CMS-SC-Data/bin/Release/SteamWare.dll and b/CMS-SC-Data/bin/Release/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index 749783e..20eae1c 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 41ab99e..0e1cccb 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index 00b92e6..6e223df 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -22,43 +22,43 @@
-
+
- - <%: traduci("btnShowReportFull") %> - + <%: traduci("btnShowReportFull") %>
- - <%: traduci("btnShowReportComp") %> - + <%: traduci("btnShowReportComp") %>
- - <%: traduci("btnShowReportCli") %> - + <%: traduci("btnShowReportCli") %>
-
- -
-
+
+
+ +
+
+
-
- +
+ +
-
- -
-
+
-
- +
+
+ +
+
+ +
+
diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index 34b7ef0..033ac8e 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -9,7 +9,7 @@ using System.Web.UI.WebControls; namespace CMS_SC { - public partial class ElencoSchede : System.Web.UI.Page + public partial class ElencoSchede : SteamWare.UserPage { /// /// caricamento pagina diff --git a/CMS_SC/ElencoSchede.aspx.designer.cs b/CMS_SC/ElencoSchede.aspx.designer.cs index 44717f8..e710449 100644 --- a/CMS_SC/ElencoSchede.aspx.designer.cs +++ b/CMS_SC/ElencoSchede.aspx.designer.cs @@ -93,15 +93,6 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.Button btnAddFromFam; - /// - /// btnInsMisFasi control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button btnInsMisFasi; - /// /// ddlSelScheda control. /// @@ -120,6 +111,15 @@ namespace CMS_SC { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsScheda; + /// + /// btnInsMisFasi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnInsMisFasi; + /// /// btnAddFromScheda control. /// diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt index 8aa5d5a..ccd0bd7 100644 --- a/CMS_SC/ToDo.txt +++ b/CMS_SC/ToDo.txt @@ -4,12 +4,7 @@ - TODO's ---------------------------------------------------------------------------------------------------------------- -- show/hide pannello storico schede -- Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file - - -- in generale F1 = help del significato delle varie Icone. --> TOOLTIP ---------------------------------------------------------------------------------------------------------------- @@ -70,6 +65,7 @@ Gestione FILES - gestione allegati tipo FILE (blob? in scheda o "generale"?) - allegati FILE (su DB come link?) - fix nuova scheda x file upload/download +- show/hide pannello storico schede ................................................................................................................ @@ -82,4 +78,9 @@ Gestione FILES - selezione multipla delle schede ( es. cancellazione dal dossier ) --> inserire selezione con checkbox? NO x ora, provare versione con nuove gestioni... - export excel "in bianco" (da compilare) da verificare - se funzionano reports è già così, sennò... è un qualcosa da portare avanti con futura release... +- Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file + + +- in generale F1 = help del significato delle varie Icone. --> TOOLTIP + ................................................................................................................ diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx index 9246a24..8ba85f6 100644 --- a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx @@ -10,7 +10,7 @@   - + @@ -18,16 +18,16 @@ - + - + - + diff --git a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs index 06c6578..de91ba1 100644 --- a/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs +++ b/CMS_SC/WebUserControls/mod_elencoSchedeDossier.ascx.cs @@ -9,7 +9,7 @@ using SteamWare; namespace CMS_SC.WebUserControls { - public partial class mod_elencoSchedeDossier : System.Web.UI.UserControl + public partial class mod_elencoSchedeDossier : SteamWare.UserControl { /// /// selezione valore in DettScheda diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index 55ff7fe..20eae1c 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 8515d45..8aea49d 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 a3ce86e..bad78fa 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 4a65876..737d1a9 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.074.349")] -[assembly: AssemblyFileVersion("1.8.074.349")] +[assembly: AssemblyVersion("1.8.075.350")] +[assembly: AssemblyFileVersion("1.8.075.350")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index ed59aa7..f9eda29 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.074.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.8.074.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.075.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.075.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 024948d..5e4f942 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ