diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj
index deef345..a1a40ce 100644
--- a/ETS_Data/ETS_Data.csproj
+++ b/ETS_Data/ETS_Data.csproj
@@ -157,6 +157,7 @@
+
diff --git a/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00221.sql b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00221.sql
new file mode 100644
index 0000000..844afee
--- /dev/null
+++ b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00221.sql
@@ -0,0 +1,265 @@
+set xact_abort on;
+go
+
+begin transaction;
+go
+
+set ANSI_NULLS on;
+go
+
+alter VIEW v_selCC
+AS
+SELECT UT.Nome + ' ' + UT.Cognome AS label, UT.Nome + ' ' + UT.Cognome AS value
+FROM ETS_Anagrafica.dbo.Utenti AS UT INNER JOIN
+ ETS_Anagrafica.dbo.Diritti AS d ON UT.UtenteAD = d .UtenteAD
+/*WHERE (d .codFunzione = 'CC') -- modifica 30-07-2013 */ UNION
+SELECT '-' AS value, '-' AS label
+UNION
+SELECT DISTINCT CapoCommessa AS value, CapoCommessa AS label
+FROM dbo.DatiCommessa
+go
+
+exec sp_updateextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00]
+Begin DesignProperties =
+ Begin PaneConfigurations =
+ Begin PaneConfiguration = 0
+ NumPanes = 4
+ Configuration = "(H (1[37] 4[20] 2[17] 3) )"
+ End
+ Begin PaneConfiguration = 1
+ NumPanes = 3
+ Configuration = "(H (1 [50] 4 [25] 3))"
+ End
+ Begin PaneConfiguration = 2
+ NumPanes = 3
+ Configuration = "(H (1 [50] 2 [25] 3))"
+ End
+ Begin PaneConfiguration = 3
+ NumPanes = 3
+ Configuration = "(H (4 [30] 2 [40] 3))"
+ End
+ Begin PaneConfiguration = 4
+ NumPanes = 2
+ Configuration = "(H (1 [56] 3))"
+ End
+ Begin PaneConfiguration = 5
+ NumPanes = 2
+ Configuration = "(H (2 [66] 3))"
+ End
+ Begin PaneConfiguration = 6
+ NumPanes = 2
+ Configuration = "(H (4 [50] 3))"
+ End
+ Begin PaneConfiguration = 7
+ NumPanes = 1
+ Configuration = "(V (3))"
+ End
+ Begin PaneConfiguration = 8
+ NumPanes = 3
+ Configuration = "(H (1[56] 4[18] 2) )"
+ End
+ Begin PaneConfiguration = 9
+ NumPanes = 2
+ Configuration = "(H (1 [75] 4))"
+ End
+ Begin PaneConfiguration = 10
+ NumPanes = 2
+ Configuration = "(H (1[66] 2) )"
+ End
+ Begin PaneConfiguration = 11
+ NumPanes = 2
+ Configuration = "(H (4 [60] 2))"
+ End
+ Begin PaneConfiguration = 12
+ NumPanes = 1
+ Configuration = "(H (1) )"
+ End
+ Begin PaneConfiguration = 13
+ NumPanes = 1
+ Configuration = "(V (4))"
+ End
+ Begin PaneConfiguration = 14
+ NumPanes = 1
+ Configuration = "(V (2))"
+ End
+ ActivePaneConfig = 0
+ End
+ Begin DiagramPane =
+ Begin Origin =
+ Top = 0
+ Left = 0
+ End
+ Begin Tables =
+ End
+ End
+ Begin SQLPane =
+ End
+ Begin DataPane =
+ Begin ParameterDefaults = ""
+ End
+ Begin ColumnWidths = 9
+ Width = 284
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ End
+ End
+ Begin CriteriaPane =
+ Begin ColumnWidths = 11
+ Column = 1440
+ Alias = 900
+ Table = 1170
+ Output = 720
+ Append = 1400
+ NewValue = 1170
+ SortType = 1350
+ SortOrder = 1410
+ GroupBy = 1350
+ Filter = 1350
+ Or = 1350
+ Or = 1350
+ Or = 1350
+ End
+ End
+End
+', 'SCHEMA', 'dbo', 'VIEW', 'v_selCC';
+go
+
+exec sp_updateextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00]
+Begin DesignProperties =
+ Begin PaneConfigurations =
+ Begin PaneConfiguration = 0
+ NumPanes = 4
+ Configuration = "(H (1[35] 4[25] 2[20] 3) )"
+ End
+ Begin PaneConfiguration = 1
+ NumPanes = 3
+ Configuration = "(H (1 [50] 4 [25] 3))"
+ End
+ Begin PaneConfiguration = 2
+ NumPanes = 3
+ Configuration = "(H (1 [50] 2 [25] 3))"
+ End
+ Begin PaneConfiguration = 3
+ NumPanes = 3
+ Configuration = "(H (4 [30] 2 [40] 3))"
+ End
+ Begin PaneConfiguration = 4
+ NumPanes = 2
+ Configuration = "(H (1 [56] 3))"
+ End
+ Begin PaneConfiguration = 5
+ NumPanes = 2
+ Configuration = "(H (2 [66] 3))"
+ End
+ Begin PaneConfiguration = 6
+ NumPanes = 2
+ Configuration = "(H (4 [50] 3))"
+ End
+ Begin PaneConfiguration = 7
+ NumPanes = 1
+ Configuration = "(V (3))"
+ End
+ Begin PaneConfiguration = 8
+ NumPanes = 3
+ Configuration = "(H (1[56] 4[18] 2) )"
+ End
+ Begin PaneConfiguration = 9
+ NumPanes = 2
+ Configuration = "(H (1 [75] 4))"
+ End
+ Begin PaneConfiguration = 10
+ NumPanes = 2
+ Configuration = "(H (1[66] 2) )"
+ End
+ Begin PaneConfiguration = 11
+ NumPanes = 2
+ Configuration = "(H (4 [60] 2))"
+ End
+ Begin PaneConfiguration = 12
+ NumPanes = 1
+ Configuration = "(H (1) )"
+ End
+ Begin PaneConfiguration = 13
+ NumPanes = 1
+ Configuration = "(V (4))"
+ End
+ Begin PaneConfiguration = 14
+ NumPanes = 1
+ Configuration = "(V (2))"
+ End
+ ActivePaneConfig = 0
+ End
+ Begin DiagramPane =
+ Begin Origin =
+ Top = 0
+ Left = 0
+ End
+ Begin Tables =
+ Begin Table = "DatiCommessa"
+ Begin Extent =
+ Top = 6
+ Left = 38
+ Bottom = 223
+ Right = 230
+ End
+ DisplayFlags = 280
+ TopColumn = 0
+ End
+ End
+ End
+ Begin SQLPane =
+ End
+ Begin DataPane =
+ Begin ParameterDefaults = ""
+ End
+ Begin ColumnWidths = 9
+ Width = 284
+ Width = 1755
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ Width = 1500
+ End
+ End
+ Begin CriteriaPane =
+ Begin ColumnWidths = 11
+ Column = 1440
+ Alias = 900
+ Table = 1170
+ Output = 720
+ Append = 1400
+ NewValue = 1170
+ SortType = 1350
+ SortOrder = 1410
+ GroupBy = 1350
+ Filter = 1350
+ Or = 1350
+ Or = 1350
+ Or = 1350
+ End
+ End
+End
+', 'SCHEMA', 'dbo', 'VIEW', 'v_selCC_all';
+go
+
+commit;
+go
+
+
+
+
+
+-- registro versione...
+INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(221, GETDATE())
+GO
+SELECT TOP 10 * FROM LogUpdateDb ORDER BY Versione DESC
+GO
diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll
index b3e8def..cc16123 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/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll
index 4de357a..adbfd3a 100644
Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ
diff --git a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
index aaa3c2d..dc87cbd 100644
Binary files a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll
index b3e8def..cc16123 100644
Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
index 64f19b9..d3c3f8e 100644
--- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
@@ -294,6 +294,7 @@
+
@@ -475,6 +476,13 @@
IntegrazioniCommessa.aspx
+
+ jumper.aspx
+ ASPXCodeBehind
+
+
+ jumper.aspx
+
Login.aspx
ASPXCodeBehind
diff --git a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml
index 91eadc6..8ed5bf3 100644
--- a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml
+++ b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
https://10.74.82.218:8172/MsDeploy.axd
Default Web Site/PROJ-ETS
- True
+ False
WMSVC
True
administrator
diff --git a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml.user b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml.user
index 2f51a94..b20693a 100644
--- a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml.user
+++ b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml.user
@@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
- AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAABv9uHbu3F0CBNoJDBeyEhgAAAAACAAAAAAADZgAAwAAAABAAAACunGgSju3SMihx93pIrGF8AAAAAASAAACgAAAAEAAAAIFYnF7/EF5g/+/J5ZisnWkQAAAAsHXJ1aNJUrviDYKJOQrRvhQAAADFdXCZ/n1lezg0pl2LMal+U9kDpw==
+ AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAeedwGXkKPUOp+YE/vTr2QgAAAAACAAAAAAADZgAAwAAAABAAAAAxFZgpZ21fPe+S+XLG0H8IAAAAAASAAACgAAAAEAAAAPhBLrMV1kxXteNHfs+qGVsQAAAAvumzhE4rh6dblucNyskv/xQAAAAZ323CuCvhw9729vM/6s799qB+gA==
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config
index 5688027..9565903 100644
--- a/PROJ-ETS/PROJ-ETS/Web.config
+++ b/PROJ-ETS/PROJ-ETS/Web.config
@@ -26,7 +26,7 @@
-
+
@@ -69,7 +69,8 @@
-
+
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
index 3dd718a..79707da 100644
--- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
+++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
@@ -256,6 +256,7 @@ namespace PROJ_ETS.WebUserControls
protected void btnEmailCC_Click(object sender, EventArgs e)
{
// dati x url documento
+ string baseUrl = utils.obj.confReadString("baseUrl");
string urlEtsDip = utils.obj.confReadString("urlEtsDip");
string urlPage = utils.obj.confReadString("urlPage");
string param = utils.obj.confReadString("param");
@@ -311,6 +312,13 @@ namespace PROJ_ETS.WebUserControls
}
catch
{ }
+ try
+ {
+ urlDoc = string.Format(@"{0}/jumper?tipoJump=DettComm&idxFase={1}", baseUrl, rigaComm.idxFase);
+ corpoEmail += string.Format("{0}
", utils.obj.confReadString("emailCC_body_link"), urlDoc);
+ }
+ catch
+ { }
corpoEmail += "-----------------------------
";
corpoEmail += utils.obj.confReadString("emailCC_body_Firma");
//invio email
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
index 33c7a67..cc16123 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
index da2fd38..842d182 100644
Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ
diff --git a/PROJ-ETS/PROJ-ETS/jumper.aspx b/PROJ-ETS/PROJ-ETS/jumper.aspx
new file mode 100644
index 0000000..01a6b17
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/jumper.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="PROJ_ETS.jumper" %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PROJ-ETS/PROJ-ETS/jumper.aspx.cs b/PROJ-ETS/PROJ-ETS/jumper.aspx.cs
new file mode 100644
index 0000000..20f5782
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/jumper.aspx.cs
@@ -0,0 +1,75 @@
+using ETS_Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace PROJ_ETS
+{
+ public partial class jumper : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ string tipoJump = "";
+ try
+ {
+ tipoJump = Request["tipoJump"];
+ }
+ catch
+ { }
+ // in base al tipo jump leggo variabili diverse e formatto!
+ switch(tipoJump)
+ {
+ case "DettComm":
+ int idxFase = 0;
+ int idxProj = 0;
+ int idxCli = 0;
+ string nomeCli = "";
+ try
+ {
+ idxFase = Convert.ToInt32(Request["idxFase"]);
+ }
+ catch
+ { }
+ if (idxFase > 0)
+ {
+ try
+ {
+ idxProj = DataProxy_ProjEts.DP.taAF.getByIdx(idxFase)[0].idxProgetto;
+ }
+ catch
+ { }
+ // salvo idxCli...
+ try
+ {
+ idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(idxProj)[0].idxCliente;
+ }
+ catch
+ { }
+ // cerco di recuperare nome cliente...
+ try
+ {
+ nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label;
+ }
+ catch
+ { }
+ utils.obj.setSessionVal("idxProgetto_sel", idxProj);
+ utils.obj.setSessionVal("idxCli_sel", idxCli);
+ utils.obj.setSessionVal("nomeCli_sel", nomeCli);
+ // redirect
+ Response.Redirect("DatiCommessa");
+ }
+ else
+ {
+ Response.Redirect("Unauthorized");
+ }
+ break;
+ default:
+ break;
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/PROJ-ETS/PROJ-ETS/jumper.aspx.designer.cs b/PROJ-ETS/PROJ-ETS/jumper.aspx.designer.cs
new file mode 100644
index 0000000..0a6d429
--- /dev/null
+++ b/PROJ-ETS/PROJ-ETS/jumper.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace PROJ_ETS
+{
+
+
+ public partial class jumper
+ {
+
+ ///
+ /// form1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
index f4fb942..beb884b 100644
Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ