<%# contaAllegati(Eval("ValoreMis")) %>
@@ -62,10 +62,10 @@
-
+
-
+
@@ -73,50 +73,38 @@
-
+
- <%--
-
-
-
-
-
-
-
-
-
-
- --%>
-
+
-
-
+
+
-
-
-
+
+
+
diff --git a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
index 5b93b19..74778eb 100644
--- a/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_collaudi.ascx.cs
@@ -279,10 +279,20 @@ namespace CMS_SC.WebUserControls
///
protected void btnSave_Click(object sender, EventArgs e)
{
- // salvo
- grView.UpdateRow(grView.EditIndex, false);
- grView.EditIndex = -1;
- grView.DataBind();
+ //// salvo
+ //int idxEdit = grView.EditIndex;
+ //grView.UpdateRow(grView.EditIndex, false);
+ //grView.EditIndex = -1;
+ //grView.DataBind();
+
+ // verifico SE sia in editing...
+ if (grView.EditIndex >= 0)
+ {
+ // salvo
+ grView.UpdateRow(grView.EditIndex, false);
+ grView.EditIndex = -1;
+ grView.DataBind();
+ }
}
diff --git a/CMS_SC/WebUserControls/mod_validVal.ascx b/CMS_SC/WebUserControls/mod_validVal.ascx
index d8b264f..9f768fc 100644
--- a/CMS_SC/WebUserControls/mod_validVal.ascx
+++ b/CMS_SC/WebUserControls/mod_validVal.ascx
@@ -1,6 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_validVal.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_validVal" %>
+
-
+
diff --git a/CMS_SC/WebUserControls/mod_validVal.ascx.cs b/CMS_SC/WebUserControls/mod_validVal.ascx.cs
index 8c69832..fed6b98 100644
--- a/CMS_SC/WebUserControls/mod_validVal.ascx.cs
+++ b/CMS_SC/WebUserControls/mod_validVal.ascx.cs
@@ -151,5 +151,26 @@ namespace CMS_SC.WebUserControls
return answ;
}
}
+ ///
+ /// save del record
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ trySaveEdit();
+ }
+
+ public void trySaveEdit()
+ {
+ // verifico SE sia in editing...
+ if (grView.EditIndex >= 0)
+ {
+ // salvo
+ grView.UpdateRow(grView.EditIndex, false);
+ grView.EditIndex = -1;
+ grView.DataBind();
+ }
+ }
}
}
\ 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 86344cd..882524a 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 46a2a46..ed6a50c 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 6901807..fbc144c 100644
--- a/CMS_SC/bin/CMS_SC.dll.config
+++ b/CMS_SC/bin/CMS_SC.dll.config
@@ -178,6 +178,8 @@
+
+
diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll
index fb581d6..fd6e819 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 ca69180..2f062b2 100644
--- a/CMS_SC/bin/SteamWare.xml
+++ b/CMS_SC/bin/SteamWare.xml
@@ -602,7 +602,7 @@
- effettua setup dei connection strings da web.config delal singola applicazione
+ effettua setup dei connection strings da web.config della singola applicazione
@@ -4667,5 +4667,24 @@
+
+
+ gestione helper tempi ciclo
+
+
+
+
+ formatta in minuti/sec partendo da min.cent
+
+
+
+
+
+
+ conversione da tempo minuti centesimali a minuti/secondi
+
+
+
+
diff --git a/Release Clienti/CMS_SC.zip b/Release Clienti/CMS_SC.zip
index 221fb7f..5f5df41 100644
Binary files a/Release Clienti/CMS_SC.zip and b/Release Clienti/CMS_SC.zip differ
diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs
index fd6d039..0af30de 100644
--- a/VersGen/CMS_SC.cs
+++ b/VersGen/CMS_SC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.9.100.354")]
-[assembly: AssemblyFileVersion("1.9.100.354")]
+[assembly: AssemblyVersion("1.9.103.355")]
+[assembly: AssemblyFileVersion("1.9.103.355")]
[assembly: AssemblyCopyright("Steamware © 2009-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt
index 834ed32..28e2e78 100644
--- a/VersGen/CMS_SC.tt
+++ b/VersGen/CMS_SC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.9.100.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.9.100.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.9.103.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.9.103.<#= 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 7372c90..a7a87ae 100644
Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ
diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll
index 7b83279..ee50dbb 100644
Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ
diff --git a/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg b/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg
new file mode 100644
index 0000000..d6b9f38
Binary files /dev/null and b/packages/AjaxControlToolkit.15.1.3.0/AjaxControlToolkit.15.1.3.0.nupkg differ
diff --git a/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform b/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform
new file mode 100644
index 0000000..5b1b95d
--- /dev/null
+++ b/packages/AjaxControlToolkit.15.1.3.0/Content/Web.config.transform
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll b/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll
new file mode 100644
index 0000000..378c0f2
Binary files /dev/null and b/packages/AjaxControlToolkit.15.1.3.0/lib/net40/AjaxControlToolkit.dll differ
diff --git a/packages/AjaxControlToolkit.15.1.3.0/readme.txt b/packages/AjaxControlToolkit.15.1.3.0/readme.txt
new file mode 100644
index 0000000..a1156d2
--- /dev/null
+++ b/packages/AjaxControlToolkit.15.1.3.0/readme.txt
@@ -0,0 +1,23 @@
+You have downloaded the ASP.NET AJAX Control Toolkit v15.1.3 nuget package.
+
+To learn more about this release, please read this post:
+https://community.devexpress.com/blogs/aspnet/archive/2015/05/21/asp-net-ajax-control-toolkit-v15-1-2-nuget-bug-fixes-and-more.aspx
+
+
+Getting Started
+---------------
+Please see https://www.devexpress.com/go/AjaxControlToolkit_Nuget_TextFile_CodePlex.aspx for more information on using AjaxControlToolkit.
+
+
+Upgrading from earlier version
+------------------------------
+Please see https://ajaxcontroltoolkit.codeplex.com/wikipage?title=Upgrade%20your%20project%20to%20AjaxControlToolkit%20v15.1 for more information on how to
+upgrade to version 15.1
+
+
+Maintained by DevExpress
+------------------------
+
+The ASP.NET AJAX Control Toolkit is now maintained by DevExpress.
+
+Visit http://devexpress.com/ms-act for more information.
diff --git a/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg b/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg
new file mode 100644
index 0000000..0e22af9
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/AjaxMin.5.14.5506.26202.nupkg differ
diff --git a/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll b/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll
new file mode 100644
index 0000000..7a7975a
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/lib/net20/AjaxMin.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll b/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll
new file mode 100644
index 0000000..cada03b
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/lib/net35/AjaxMin.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll b/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll
new file mode 100644
index 0000000..9c15262
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/lib/net40/AjaxMin.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll
new file mode 100644
index 0000000..cada03b
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets
new file mode 100644
index 0000000..ac26647
--- /dev/null
+++ b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMin.targets
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)Content\
+ $(ProjectDir)
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll
new file mode 100644
index 0000000..835aaff
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/tools/net35/AjaxMinTask.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll
new file mode 100644
index 0000000..9c15262
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.dll differ
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets
new file mode 100644
index 0000000..ac26647
--- /dev/null
+++ b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMin.targets
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDir)Content\
+ $(ProjectDir)
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll
new file mode 100644
index 0000000..6f33e70
Binary files /dev/null and b/packages/AjaxMin.5.14.5506.26202/tools/net40/AjaxMinTask.dll differ