diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index b0ddc91..b316953 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -206,6 +206,9 @@ + + + diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index a7f929b..fd972dc 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -30,7 +30,7 @@ - + @@ -48,11 +48,11 @@ - + - + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs index e8f47f4..2d31586 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs @@ -169,7 +169,7 @@ namespace ETS_WS.WebUserControls int lastChar = Convert.ToInt32(_lastChar); if (answ.Length > maxChar) { - answ = answ.Substring(0, 30) + "[...]" + answ.Substring(answ.Length - lastChar); + answ = answ.Substring(0, maxChar) + "[...]" + answ.Substring(answ.Length - lastChar); } return answ; } diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index e79cb56..71c1271 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -31,15 +31,15 @@
- - + + - +
@@ -70,7 +70,14 @@
-
+
+
+ +
+
+ +
+
@@ -94,7 +101,7 @@

-   +  
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs index 6c54979..ec840b3 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.cs @@ -359,5 +359,15 @@ namespace ETS_WS.WebUserControls cblTags.Focus(); } + protected void imgNoLink_Click(object sender, ImageClickEventArgs e) + { + // inserisco commessa "empty" dell'anno + string commessa = string.Format("0000-{0}", DateTime.Now.Year); + tacCommesse.valore = commessa; + tacCommesse.label = commessa; + // aggiorno visualizzazione! + updateVisual(); + } + } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs index fccb67f..18b7dea 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs @@ -165,6 +165,15 @@ namespace ETS_WS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblCommessa; + /// + /// imgNoLink control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton imgNoLink; + /// /// tacCommesse control. /// diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index e0f88ed..ee28c15 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 1aafa8b..94df39d 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/images/Logo_ETS.png b/ETS-WS/ETS-WS/images/Logo_ETS.png deleted file mode 100644 index 3faf447..0000000 Binary files a/ETS-WS/ETS-WS/images/Logo_ETS.png and /dev/null differ diff --git a/ETS-WS/ETS-WS/images/arrow_d.png b/ETS-WS/ETS-WS/images/arrow_d.png deleted file mode 100644 index 5a2e53b..0000000 Binary files a/ETS-WS/ETS-WS/images/arrow_d.png and /dev/null differ diff --git a/ETS-WS/ETS-WS/images/arrow_d_h.png b/ETS-WS/ETS-WS/images/arrow_d_h.png deleted file mode 100644 index c345a1f..0000000 Binary files a/ETS-WS/ETS-WS/images/arrow_d_h.png and /dev/null differ diff --git a/ETS-WS/ETS-WS/images/arrow_r.png b/ETS-WS/ETS-WS/images/arrow_r.png deleted file mode 100644 index 9da4ae5..0000000 Binary files a/ETS-WS/ETS-WS/images/arrow_r.png and /dev/null differ diff --git a/ETS-WS/ETS-WS/images/arrow_r_h.png b/ETS-WS/ETS-WS/images/arrow_r_h.png deleted file mode 100644 index dd86cc9..0000000 Binary files a/ETS-WS/ETS-WS/images/arrow_r_h.png and /dev/null differ diff --git a/ETS-WS/ETS-WS/images/link-break_l.png b/ETS-WS/ETS-WS/images/link-break_l.png new file mode 100644 index 0000000..5080d0e Binary files /dev/null and b/ETS-WS/ETS-WS/images/link-break_l.png differ diff --git a/ETS-WS/ETS-WS/images/link-break_m.png b/ETS-WS/ETS-WS/images/link-break_m.png new file mode 100644 index 0000000..38bb197 Binary files /dev/null and b/ETS-WS/ETS-WS/images/link-break_m.png differ diff --git a/ETS-WS/ETS-WS/images/link-break_s.png b/ETS-WS/ETS-WS/images/link-break_s.png new file mode 100644 index 0000000..57bafcf Binary files /dev/null and b/ETS-WS/ETS-WS/images/link-break_s.png differ diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index bdfc69e..2320cd8 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -30,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index e695180..135df2b 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -30,7 +30,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index 6fbf3ae..2218279 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS-WS/ETS-WS/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index 6145708..810c783 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index e0f88ed..ee28c15 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index ea36641..bcde462 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index e2706d6..2da2b8f 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -30,7 +30,7 @@ - + @@ -48,11 +48,11 @@ - + - + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index bdfc69e..2320cd8 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -30,7 +30,7 @@ - + diff --git a/ETS_Data/Properties/Settings.Designer.cs b/ETS_Data/Properties/Settings.Designer.cs index f9a6c51..ad36a99 100644 --- a/ETS_Data/Properties/Settings.Designer.cs +++ b/ETS_Data/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17626 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -26,8 +26,8 @@ namespace ETS_Data.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=T" + - "rue;User ID=sa;Password=keyhammer")] + [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=ETS_WS-prod;Persist Security I" + + "nfo=True;User ID=sa;Password=keyhammer")] public string ETS_WSConnectionString { get { return ((string)(this["ETS_WSConnectionString"])); diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index 1aafa8b..94df39d 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 17d18cc..26e3a58 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/TempPE/DS_Anagrafica.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/DS_Anagrafica.Designer.cs.dll index 377abc4..975a9e9 100644 Binary files a/ETS_Data/obj/Debug/TempPE/DS_Anagrafica.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/DS_Anagrafica.Designer.cs.dll differ diff --git a/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll index f474de5..ea75240 100644 Binary files a/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/DS_WebScip.Designer.cs.dll differ diff --git a/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll b/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll index e7c1fb8..4833f3e 100644 Binary files a/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll and b/ETS_Data/obj/Debug/TempPE/DS_utils.Designer.cs.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index 1aafa8b..94df39d 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/TempPE/DS_Anagrafica.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/DS_Anagrafica.Designer.cs.dll index e223a9a..4c874f1 100644 Binary files a/ETS_Data/obj/ETS/TempPE/DS_Anagrafica.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/DS_Anagrafica.Designer.cs.dll differ diff --git a/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll index 311c95f..db146e4 100644 Binary files a/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/DS_WebScip.Designer.cs.dll differ diff --git a/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll index 7d83933..cda7360 100644 Binary files a/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/DS_utils.Designer.cs.dll differ