Egalware/ETS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vers 1.0.221

Browse Source 
- fix email
- fix varie (redmine)
This commit is contained in:
Samuele Locatelli
2013-09-20 12:53:40 +02:00
parent 32f456ccd6
commit 264e3d6fde
17 changed files with 404 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/ETS_Data.csproj
+1
View File
@@ -157,6 +157,7 @@
<Content Include="SQL\ETS-GPW\ETS_GPW-PROJ_00183.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00180.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00170.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00221.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00216.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00218.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00215.sql" />
ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00221.sql
+265
View File
@@ -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
ETS_Data/bin/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/bin/Release/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+8
View File
@@ -294,6 +294,7 @@
<Content Include="Images\view_s.png" />
<Content Include="Images\WorkInProgress.jpg" />
<Content Include="IntegrazioniCommessa.aspx" />
<Content Include="jumper.aspx" />
<Content Include="Login.aspx" />
<Content Include="Menu.aspx" />
<Content Include="packages.config" />
@@ -475,6 +476,13 @@
<Compile Include="IntegrazioniCommessa.aspx.designer.cs">
<DependentUpon>IntegrazioniCommessa.aspx</DependentUpon>
</Compile>
<Compile Include="jumper.aspx.cs">
<DependentUpon>jumper.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="jumper.aspx.designer.cs">
<DependentUpon>jumper.aspx</DependentUpon>
</Compile>
<Compile Include="Login.aspx.cs">
<DependentUpon>Login.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml
+1 -1
View File
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<MSDeployServiceURL>https://10.74.82.218:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/PROJ-ETS</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>administrator</UserName>
PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/218.pubxml.user
+1 -1
View File
@@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAABv9uHbu3F0CBNoJDBeyEhgAAAAACAAAAAAADZgAAwAAAABAAAACunGgSju3SMihx93pIrGF8AAAAAASAAACgAAAAEAAAAIFYnF7/EF5g/+/J5ZisnWkQAAAAsHXJ1aNJUrviDYKJOQrRvhQAAADFdXCZ/n1lezg0pl2LMal+U9kDpw==</EncryptedPassword>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAeedwGXkKPUOp+YE/vTr2QgAAAAACAAAAAAADZgAAwAAAABAAAAAxFZgpZ21fPe+S+XLG0H8IAAAAAASAAACgAAAAEAAAAPhBLrMV1kxXteNHfs+qGVsQAAAAvumzhE4rh6dblucNyskv/xQAAAAZ323CuCvhw9729vM/6s799qB+gA==</EncryptedPassword>
</PropertyGroup>
</Project>
PROJ-ETS/PROJ-ETS/Web.config
+3 -2
View File
@@ -26,7 +26,7 @@
<add key="appName" value="PROJ-ETS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="218" />
<add key="minRev" value="221" />
<add key="stdEmail" value="info@steamware.net" />
<add key="_safePages" value="Default.aspx#unauthorized.aspx#forceUser.aspx#login.aspx#test.aspx#Test.aspx" />
<!--area gestione auth cookie-->
@@ -69,7 +69,8 @@
<add key="emailCC_subject" value="Notifica assegnazione Commessa Proj-ETS" />
<add key="emailCC_body_CogNome" value="Buongiorno {0} ({1})"/>
<add key="emailCC_body_DatiComm" value="La presente per informarti che sei stato designato CC per la seguente Commessa:"/>
<add key="emailCC_body_Firma" value="PROJ-ETS"/>
<add key="emailCC_body_link" value="QUI potrai completare la pianificazione della commessa con i dati eventualmente mancanti."/>
<add key="emailCC_body_Firma" value="Grazie, La Direzione."/>
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
+8
View File
@@ -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("<a href=\"{1}\">{0}</a><br />", utils.obj.confReadString("emailCC_body_link"), urlDoc);
}
catch
{ }
corpoEmail += "-----------------------------<br/><br/><br/>";
corpoEmail += utils.obj.confReadString("emailCC_body_Firma");
//invio email
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/jumper.aspx
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="jumper.aspx.cs" Inherits="PROJ_ETS.jumper" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
PROJ-ETS/PROJ-ETS/jumper.aspx.cs
+75
View File
@@ -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;
}
}
}
}
PROJ-ETS/PROJ-ETS/jumper.aspx.designer.cs
Generated
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace PROJ_ETS
{
public partial class jumper
{
/// <summary>
/// form1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip
BIN
View File
Binary file not shown.