diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
index b2efbfc..e461cdc 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 1cccdc5..a987589 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/bin/Debug/SteamWare.xml b/CMS-SC-Data/bin/Debug/SteamWare.xml
index 731a8b6..ca69180 100644
--- a/CMS-SC-Data/bin/Debug/SteamWare.xml
+++ b/CMS-SC-Data/bin/Debug/SteamWare.xml
@@ -4667,19 +4667,5 @@
-
-
- evento standard agganciabile da grView x aggiunta doppio click e singolo click (x edit e select)
-
-
-
-
-
-
- effettua traduzione del lemma
-
-
-
-
diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll
index e840e7c..c454a84 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 b40df9d..11fcd1a 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/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
index b2efbfc..e461cdc 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/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll
index e840e7c..c454a84 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 0e1cccb..160a6eb 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/Collaudi.aspx b/CMS_SC/Collaudi.aspx
index bc699ff..bd4478e 100644
--- a/CMS_SC/Collaudi.aspx
+++ b/CMS_SC/Collaudi.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Collaudi.aspx.cs" Inherits="CMS_SC.Collaudi" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Collaudi.aspx.cs" Inherits="CMS_SC.Collaudi" EnableEventValidation="false" %>
<%@ Register Src="~/WebUserControls/mod_collaudi.ascx" TagPrefix="uc1" TagName="mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %>
@@ -18,14 +18,15 @@
<%: traduci("CollaudiAttivi") %>
+
diff --git a/CMS_SC/Collaudi.aspx.designer.cs b/CMS_SC/Collaudi.aspx.designer.cs
index 6209fd3..f31a4ef 100644
--- a/CMS_SC/Collaudi.aspx.designer.cs
+++ b/CMS_SC/Collaudi.aspx.designer.cs
@@ -21,6 +21,15 @@ namespace CMS_SC {
///
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain;
+ ///
+ /// btnEmpty control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnEmpty;
+
///
/// btnAddNewSetMis control.
///
diff --git a/CMS_SC/SchemaCollMacc.aspx.cs b/CMS_SC/SchemaCollMacc.aspx.cs
index d891a4a..d5133cb 100644
--- a/CMS_SC/SchemaCollMacc.aspx.cs
+++ b/CMS_SC/SchemaCollMacc.aspx.cs
@@ -24,7 +24,7 @@ namespace CMS_SC
///
public string serviceUrl(string method)
{
- return string.Format("/{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method);
+ return string.Format("{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method);
}
///
/// wrapper traduzione
diff --git a/CMS_SC/Web.CMS.config b/CMS_SC/Web.CMS.config
index 2ce7566..3423876 100644
--- a/CMS_SC/Web.CMS.config
+++ b/CMS_SC/Web.CMS.config
@@ -18,6 +18,7 @@
+
diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config
index f926000..70fa24e 100644
--- a/CMS_SC/Web.config
+++ b/CMS_SC/Web.config
@@ -41,7 +41,7 @@
-
+
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx b/CMS_SC/WebUserControls/mod_collaudi.ascx
index 9b261aa..c9b2615 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx
@@ -1,8 +1,26 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_collaudi.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
+
+<%--
+--%>
+
-
+
@@ -22,7 +40,7 @@
<%# contaAllegati(Eval("ValoreMis")) %>
@@ -44,7 +62,7 @@
-
+
@@ -55,7 +73,7 @@
-
+
@@ -70,7 +88,7 @@
-
+
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
index df12e21..5b93b19 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
namespace CMS_SC.WebUserControls
{
- public partial class mod_collaudi : System.Web.UI.UserControl
+ public partial class mod_collaudi : SteamWare.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -208,15 +208,6 @@ namespace CMS_SC.WebUserControls
}
}
- ///
- /// wrapper traduzione
- ///
- ///
- ///
- public string traduci(string lemma)
- {
- return user_std.UtSn.Traduci(lemma);
- }
///
/// formatta URL x mostrare i file associati al record
///
@@ -247,6 +238,53 @@ namespace CMS_SC.WebUserControls
{ }
return answ;
}
+#if false
+ ///
+ /// save + edit del record precedente (se possibile)
+ ///
+ ///
+ ///
+ protected void btnUp_Click(object sender, EventArgs e)
+ {
+ if (grView.EditIndex > 0)
+ {
+ // salvo
+ grView.UpdateRow(grView.EditIndex, false);
+ // seleziono nuovo record x edit
+ grView.EditIndex = grView.EditIndex - 1;
+ //grView.FindControl("txtValoreMis").Focus();
+ }
+ }
+ ///
+ /// save + edit del record successivo (se possibile)
+ ///
+ ///
+ ///
+ protected void btnDown_Click(object sender, EventArgs e)
+ {
+ if (grView.EditIndex < pageSize - 1)
+ {
+ // salvo
+ grView.UpdateRow(grView.EditIndex, false);
+ // seleziono nuovo record x edit
+ grView.EditIndex = grView.EditIndex + 1;
+ //grView.FindControl("txtValoreMis").Focus();
+ }
+ }
+#endif
+ ///
+ /// save del record
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ // salvo
+ grView.UpdateRow(grView.EditIndex, false);
+ grView.EditIndex = -1;
+ grView.DataBind();
+ }
+
#if false
protected void lbFileMan_DataBinding(object sender, EventArgs e)
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.designer.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.designer.cs
index 38cda70..fd4c6cc 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx.designer.cs
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.designer.cs
@@ -12,6 +12,15 @@ namespace CMS_SC.WebUserControls {
public partial class mod_collaudi {
+ ///
+ /// btnSave control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnSave;
+
///
/// grView control.
///
diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll
index b2efbfc..e461cdc 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 dbce1af..74078b9 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/CMS_SC.dll.config b/CMS_SC/bin/CMS_SC.dll.config
index f926000..4c200d7 100644
--- a/CMS_SC/bin/CMS_SC.dll.config
+++ b/CMS_SC/bin/CMS_SC.dll.config
@@ -41,7 +41,7 @@
-
+
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index 1cccdc5..a987589 100644
Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ
diff --git a/CMS_SC/bin/SteamWare.xml b/CMS_SC/bin/SteamWare.xml
index 731a8b6..ca69180 100644
--- a/CMS_SC/bin/SteamWare.xml
+++ b/CMS_SC/bin/SteamWare.xml
@@ -4667,19 +4667,5 @@
-
-
- evento standard agganciabile da grView x aggiunta doppio click e singolo click (x edit e select)
-
-
-
-
-
-
- effettua traduzione del lemma
-
-
-
-
diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs
index fe872d3..f9a8288 100644
--- a/VersGen/CMS_SC.cs
+++ b/VersGen/CMS_SC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.8.093.354")]
-[assembly: AssemblyFileVersion("1.8.093.354")]
+[assembly: AssemblyVersion("1.8.095.354")]
+[assembly: AssemblyFileVersion("1.8.095.354")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt
index 49a003d..9229f0c 100644
--- a/VersGen/CMS_SC.tt
+++ b/VersGen/CMS_SC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.8.093.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.8.093.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.8.095.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.8.095.<#= 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 c3b3c8a..022d3a9 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ