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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele Locatelli
2013-09-03 16:53:38 +02:00
parent 0776a0f03c 286ccd8bba
commit 8c4a6666ec
24 changed files with 741 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS-WS/ETS-WS/Web.config
+1 -1
View File
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="137" />
<add key="minRev" value="138" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+4
View File
@@ -88,6 +88,10 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="NrProt." SortExpression="Numero" ItemStyle-Wrap="false" ItemStyle-CssClass="padSxDx">
<EditItemTemplate>
<asp:Label ID="lblProto" runat="server" Text='<%# nrProtoAnno(Eval("Numero"),Eval("Anno")) %>' ToolTip='<%# Eval("NrProtocollo") %>'
ForeColor="#CDCDCD" />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblProto" runat="server" Text='<%# nrProtoAnno(Eval("Numero"),Eval("Anno")) %>' ToolTip='<%# Eval("NrProtocollo") %>'
ForeColor="#777777" />
ETS-WS/ETS-WS/bin/ETS-DIP.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS-WS/ReleaseClienti/ETS-WS.zip
BIN
View File
Binary file not shown.
ETS_Data/ETS_Data.csproj
+1
View File
@@ -154,6 +154,7 @@
<Content Include="SQL\ETS-DIP\ETS_WS_00137.sql" />
<Content Include="SQL\ETS-GPW\ETS_GPW-PROJ_00183.sql" />
<Content Include="SQL\ETS_anagrafica\ETS_ANAG_00170.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00187.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00183.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00172.sql" />
<Content Include="SQL\ETS_PROJ\ETS_PROJ_00170.sql" />
ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00187.sql
+659
View File
@@ -0,0 +1,659 @@
create table Dip2ATR(
idxDipendente int not null,
CodTipoRisorsa nvarchar(50) not null,
constraint PK_Dip2ATR primary key(idxDipendente,CodTipoRisorsa)
);
go
set xact_abort on
go
begin transaction
go
INSERT INTO dbo.Dip2ATR
VALUES (1, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (2, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (3, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (4, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (5, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (6, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (7, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (8, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (9, N'SEN')
INSERT INTO dbo.Dip2ATR
VALUES (10, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (11, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (12, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (13, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (14, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (15, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (16, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (17, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (18, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (19, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (20, N'JUN')
INSERT INTO dbo.Dip2ATR
VALUES (21, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (22, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (23, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (24, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (25, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (26, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (27, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (28, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (29, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (30, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (31, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (32, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (33, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (34, N'DIS')
INSERT INTO dbo.Dip2ATR
VALUES (35, N'DIS')
go
commit transaction
go
set xact_abort on;
go
begin transaction;
go
set ANSI_NULLS on;
go
/*************************************************************
* Trigger su delete
* Aggiorna tempo budget sulle fasi PROJ-ETS
*
* ultima modifica: S.E. Locatelli - 2013.04.29
**************************************************************/
create TRIGGER trg_BRF_delBdgtOre
ON BdgtRisorseFasi
FOR DELETE
AS
SET XACT_ABORT ON
--IF UPDATE(BCWS)
BEGIN TRAN
-- controllo se è stato aggiornato valore BCWS della commessa, in tal caso RICALCOLA a livello di (sotto)FASI il budget di tempo (ore) previsto
UPDATE af
SET budgetTime = ISNULL(brf.totOre,0)
,budgetMoney = ISNULL(brf.totMoney,0)
FROM deleted d
INNER JOIN AnagFasi af ON af.idxFase = d.idxFase
LEFT OUTER JOIN
(
SELECT SUM(ISNULL(OreBdgt,0)) as totOre, SUM(ISNULL(OreBdgt,0)*ISNULL(CostoBdgt,0)) as totMoney, idxFase
FROM BdgtRisorseFasi
GROUP BY idxFase
) as brf ON d.idxFase = brf.idxFase
COMMIT TRAN
go
commit;
go
set xact_abort on;
go
begin transaction;
go
set ANSI_NULLS on;
go
create VIEW RegAttByFase
AS
SELECT dbo.RegAttivita.idxFase, SUM(dbo.RegAttivita.oreTot) AS oreTot, SUM(dbo.RegAttivita.oreTot * dbo.AnagTipoRisorse.costoOrario) AS costoTot
FROM dbo.AnagTipoRisorse INNER JOIN
dbo.Dip2ATR ON dbo.AnagTipoRisorse.CodTipoRisorsa = dbo.Dip2ATR.CodTipoRisorsa RIGHT OUTER JOIN
dbo.RegAttivita ON dbo.Dip2ATR.idxDipendente = dbo.RegAttivita.idxDipendente
GROUP BY dbo.RegAttivita.idxFase
go
exec sp_addextendedproperty 'MS_DiagramPane1', '[0E232FF0-B466-11cf-A24F-00AA00A3EFFF, 1.00]
Begin DesignProperties =
Begin PaneConfigurations =
Begin PaneConfiguration = 0
NumPanes = 4
Configuration = "(H (1[40] 4[20] 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 = "RegAttivita"
Begin Extent =
Top = 24
Left = 345
Bottom = 304
Right = 515
End
DisplayFlags = 280
TopColumn = 0
End
Begin Table = "Dip2ATR"
Begin Extent =
Top = 28
Left = 626
Bottom = 124
Right = 814
End
DisplayFlags = 280
TopColumn = 0
End
Begin Table = "AnagTipoRisorse"
Begin Extent =
Top = 70
Left = 905
Bottom = 183
Right = 1100
End
DisplayFlags = 280
TopColumn = 0
End
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 = 12
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', 'RegAttByFase';
go
exec sp_addextendedproperty 'MS_DiagramPaneCount', 1, 'SCHEMA', 'dbo', 'VIEW', 'RegAttByFase';
go
commit;
go
set xact_abort on;
go
begin transaction;
go
set ANSI_NULLS on;
go
alter VIEW ElencoFasiExpl
AS
SELECT af.idxFase, af.idxProgetto, af.codFase, af.idxFaseAncest, af.nomeFase, af.descrizioneFase, af.enableTime, af.enableMoney, af.Attivo, ISNULL(af.budgetTime,
0) AS BCWS_time, ISNULL(af.budgetMoney, 0) AS BCWS_money, ISNULL(df.DataScad, '9999-12-31') AS DataScad, ISNULL(df.ScadFixed, 0) AS ScadFixed,
ISNULL(df.Note, '') AS Note, ISNULL(raf.oreTot, 0) AS ACWP_time, ISNULL(raf.costoTot, 0) AS ACWP_money, ISNULL(raf.oreTot, 0)
/ CASE WHEN ISNULL(af.budgetTime, 0) > 0 THEN af.budgetTime ELSE ISNULL(raf.oreTot, 1) END AS percUtil_time, ISNULL(raf.costoTot, 0)
/ CASE WHEN ISNULL(af.budgetMoney, 0) > 0 THEN af.budgetMoney ELSE ISNULL(raf.costoTot, 1) END AS percUtil_money
FROM dbo.AnagFasi AS af LEFT OUTER JOIN
dbo.RegAttByFase AS raf ON af.idxFase = raf.idxFase LEFT OUTER JOIN
dbo.DatiFase AS df ON af.idxFase = df.idxFase
WHERE (af.idxFaseAncest > 0)
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[40] 4[20] 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 = "af"
Begin Extent =
Top = 29
Left = 733
Bottom = 288
Right = 904
End
DisplayFlags = 280
TopColumn = 0
End
Begin Table = "df"
Begin Extent =
Top = 58
Left = 407
Bottom = 213
Right = 577
End
DisplayFlags = 280
TopColumn = 0
End
Begin Table = "raf"
Begin Extent =
Top = 42
Left = 1110
Bottom = 157
Right = 1280
End
DisplayFlags = 280
TopColumn = 0
End
End
End
Begin SQLPane =
End
Begin DataPane =
Begin ParameterDefaults = ""
End
Begin ColumnWidths = 20
Width = 284
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
Width = 1500
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', 'ElencoFasiExpl';
go
commit;
go
set xact_abort on;
go
begin transaction;
go
set ANSI_NULLS on;
go
/**********************************************************
* STORED stp_ATR_getUnusedByFase
*
* recupera elenco risorse a budget x fasi
*
* mod: S.E.L. 2013.07.26
*
**********************************************************/
create PROCEDURE stp_ATR_getUnusedByFase
(
@idxFase INT = 0
)
AS
SELECT CodTipoRisorsa, DescrTipoRisorsa, costoOrario
FROM dbo.AnagTipoRisorse
WHERE CodTipoRisorsa NOT IN
(
SELECT CodTipoRisorsa
FROM BdgtRisorseFasi
WHERE idxFase = @idxFase
)
ORDER BY costoOrario
RETURN
go
/**********************************************************
* STORED stp_BRF_DeleteQuery
*
* elimina risorsa a budget x fasi
*
* mod: S.E.L. 2013.08.30
*
**********************************************************/
create PROCEDURE stp_BRF_DeleteQuery
(
@Original_idxFase INT,
@Original_CodTipoRisorsa NVARCHAR(50)
)
AS
SET NOCOUNT OFF;
DELETE FROM BdgtRisorseFasi WHERE (idxFase = @Original_idxFase) AND CodTipoRisorsa = @Original_CodTipoRisorsa
go
/**********************************************************
* STORED stp_BRF_InsertQuery
*
* inserisce nuova risorsa a budget x fasi (con costo budget corrente)
*
* mod: S.E.L. 2013.08.30
*
**********************************************************/
create PROCEDURE stp_BRF_InsertQuery
(
@idxFase int,
@CodTipoRisorsa nvarchar(50),
@OreBdgt decimal(18, 2)
)
AS
SET NOCOUNT OFF;
-- calcolo costo std della risorsa
DECLARE @CostoBdgt numeric(18, 2)
SELECT @CostoBdgt = ISNULL(costoOrario, 0) FROM AnagTipoRisorse WHERE CodTipoRisorsa = @CodTipoRisorsa
-- insert!
INSERT INTO BdgtRisorseFasi (idxFase, CodTipoRisorsa, OreBdgt, CostoBdgt, DataRif)
VALUES (@idxFase, @CodTipoRisorsa, @OreBdgt, @CostoBdgt, GETDATE())
go
/**********************************************************
* STORED stp_BRF_InsertQuery
*
* aggiorna risorsa a budget x fasi (con costo budget corrente)
*
* mod: S.E.L. 2013.07.26
*
**********************************************************/
create PROCEDURE stp_BRF_UpdateQuery
(
@CodTipoRisorsa NVARCHAR(50),
@OreBdgt DECIMAL(18, 2),
@Original_idxFase INT,
@Original_CodTipoRisorsa NVARCHAR(50)
)
AS
SET NOCOUNT OFF;
-- calcolo costo std della risorsa
DECLARE @CostoBdgt numeric(18, 2)
SELECT @CostoBdgt = ISNULL(costoOrario, 0) FROM AnagTipoRisorse WHERE CodTipoRisorsa = @CodTipoRisorsa
UPDATE dbo.BdgtRisorseFasi
SET CodTipoRisorsa = @CodTipoRisorsa, OreBdgt = @OreBdgt, CostoBdgt = @CostoBdgt, DataRif = GETDATE()
WHERE (idxFase = @Original_idxFase) AND CodTipoRisorsa = @Original_CodTipoRisorsa
go
commit;
go
set xact_abort on;
go
begin transaction;
go
set ANSI_NULLS on;
go
/**********************************************************
* STORED stp_DFE_updateQuery
*
* aggiorna dati fasi
*
* mod: S.E.L. 2013.08.30
*
**********************************************************/
create PROCEDURE stp_DFE_updateQuery
(
@Original_idxFase INT = 0,
@DataScad DATETIME,
@ScadFixed BIT,
@Note NVARCHAR(250)
)
AS
DECLARE @trovati INT = 0
SELECT @trovati = COUNT(*)
FROM DatiFase
WHERE idxfase = @Original_idxFase
IF(@trovati = 0)
BEGIN
-- se non c'è record creo...
INSERT INTO DatiFase
VALUES (@Original_idxFase, @DataScad, @ScadFixed, @Note)
END
ELSE
BEGIN
-- altrimenti udpate
UPDATE DatiFase
SET DataScad = @DataScad
,ScadFixed = @ScadFixed
,Note = @Note
WHERE idxfase = @Original_idxFase
END
RETURN
go
commit;
go
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(187, 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.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/ETS_Data.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/DS_utilsProjEts.Designer.cs.dll
BIN
View File
Binary file not shown.
ETS_Data/obj/ETS/TempPE/Ds_ProjEts.Designer.cs.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/Content/Style.css
+3
View File
@@ -1085,3 +1085,6 @@ div > ul > li > a.selected.menuNav {
vertical-align: middle;
}
/*#endregion */
.lblErrore {
color: #ff0000;
}
PROJ-ETS/PROJ-ETS/Content/Style.less
+3
View File
@@ -1210,3 +1210,6 @@ div > ul > li > a.selected.menuNav {
/*#endregion */
.lblErrore {
color: @rossoStart;
}
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
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="0.7"/>
<add key="minRev" value="187"/>
<add key="minRev" value="188"/>
<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-->
@@ -39,6 +39,7 @@
<!--gestione caricamento doc da ETS-DIP-->
<add key="urlEtsDip" value="http://iis01/DIP" />
<add key="urlPage" value="getDocByProto.aspx" />
<add key="urlPageArch" value="GestioneDocumenti.aspx" />
<add key="param" value="nrProto" />
<!--update pagina-->
<add key="intUpdatePagina_ms" value="120000"/>
@@ -46,7 +47,7 @@
<add key ="idxProgettoTemplate" value="2480"/>
<!--valori default x risorse-->
<add key ="codTipoRisorsaStd" value="DIS"/>
<add key ="oreBdgtStd" value="8"/>
<add key ="oreBdgtStd" value="1"/>
<!--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
+10 -8
View File
@@ -108,7 +108,7 @@
<asp:Label ID="lblhlOfferta" runat="server" Text="Offerta" AssociatedControlID="hlOfferta" />
</div>
<div class="divDx" style="width: 180px; text-align: right;">
<asp:HyperLink runat="server" ID="hlOfferta" NavigateUrl='<%# getUrlDoc(Eval("urlOfferta")) %>' ToolTip="Vai al documento dell'offerta" Text='<%# Eval("rifOfferta") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" />
<asp:HyperLink runat="server" ID="hlOfferta" NavigateUrl='<%# getUrlDoc(Eval("urlOfferta")) %>' ToolTip="Vai al documento dell'offerta" Text='<%# Eval("rifOfferta") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" Visible='<%# urlOk(Eval("urlOfferta")) %>'/>
</div>
</div>
<div class="clearDiv padStd" style="height: 1.1em;">
@@ -116,7 +116,7 @@
<asp:Label ID="Label1" runat="server" Text="Ordine" AssociatedControlID="hlOrdine" />
</div>
<div class="divDx" style="width: 180px; text-align: right;">
<asp:HyperLink runat="server" ID="hlOrdine" NavigateUrl='<%# getUrlDoc(Eval("urlOrdine")) %>' ToolTip="Vai al documento dell'ordine" Text='<%# Eval("rifOrdine") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" />
<asp:HyperLink runat="server" ID="hlOrdine" NavigateUrl='<%# getUrlDoc(Eval("urlOrdine")) %>' ToolTip="Vai al documento dell'ordine" Text='<%# Eval("rifOrdine") %>' Font-Size="0.8em" CssClass="divDx docIcon" Target="_blank" Visible='<%# urlOk(Eval("urlOrdine")) %>' />
</div>
</div>
</div>
@@ -231,12 +231,13 @@
</div>
</div>
<div class="clearDiv padStd" style="border-top: 1px dotted #CDCDCD;">
<div class="clearDiv padStd" style="height: 1.1em; font-size:0.8em;">
<div class="clearDiv padStd" style="height: 1.1em; font-size: 0.8em;">
<div class="divSx">
<asp:HyperLink runat="server" ID="hlOfferta" Target="_blank" NavigateUrl='<%# getUrlArchivioDocs %>' Text="Offerta nr." ToolTip="Vai su archivio documenti" Font-Size="8pt" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.6em;">
<asp:TextBox runat="server" ID="txtUrlOfferta" Text='<%# Bind("urlOfferta") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" />
<asp:TextBox runat="server" ID="txtUrlOfferta" Text='<%# Bind("urlOfferta") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" TextMode="Search" />
<asp:RegularExpressionValidator ID="revOfferta" runat="server" ErrorMessage="!!!" ControlToValidate="txtUrlOfferta" ValidationExpression="\d{1,5}-\d{2,4}" CssClass="lblErrore" ToolTip="Numero-Anno" Font-Size="7pt" />
</div>
<div class="clearDiv divSx">
<asp:Label ID="lblRifOfferta" runat="server" Text="Descr Offerta" AssociatedControlID="txtRifOfferta" />
@@ -245,15 +246,16 @@
<asp:TextBox runat="server" ID="txtRifOfferta" Text='<%# Bind("rifOfferta") %>' TextMode="MultiLine" Height="3em" Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="Descrizione (es Offerta num-anno del gg/mm/anno)" />
</div>
</div>
<div class="clearDiv padStd" style="height: 1.1em; font-size:0.8em;">
<div class="clearDiv padStd" style="height: 1.1em; font-size: 0.8em;">
<div class="divSx">
<asp:HyperLink runat="server" ID="hlOrdine" Target="_blank" NavigateUrl='<%# getUrlArchivioDocs %>' Text="Ordine nr." ToolTip="Vai su archivio documenti" Font-Size="8pt" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.6em;">
<asp:TextBox runat="server" ID="txtUrlOrdine" Text='<%# Bind("urlOrdine") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" />
<asp:TextBox runat="server" ID="txtUrlOrdine" Text='<%# Bind("urlOrdine") %>' Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="inserire protocollo formato num-anno" TextMode="Search" />
<asp:RegularExpressionValidator ID="revOrdine" runat="server" ErrorMessage="!!!" ControlToValidate="txtUrlOrdine" ValidationExpression="\d{1,5}-\d{2,4}" CssClass="lblErrore" ToolTip="Numero-Anno" Font-Size="7pt" />
</div>
<div class="clearDiv divSx">
<asp:Label ID="lblRifOrdine" runat="server" Text="Ordine" AssociatedControlID="txtRifOrdine" />
<asp:Label ID="lblRifOrdine" runat="server" Text="Descr Ordine" AssociatedControlID="txtRifOrdine" />
</div>
<div class="divDx" style="width: 180px; text-align: right; font-size: 0.5em;">
<asp:TextBox runat="server" ID="txtRifOrdine" Text='<%# Bind("rifOrdine") %>' TextMode="MultiLine" Height="3em" Width="11em" BorderWidth="1px" CssClass="divDx bordoAzzurro" ToolTip="Descrizione (es Offerta num-anno del gg/mm/anno)" />
@@ -274,7 +276,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter" UpdateMethod="Update">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="ETS_Data.Ds_ProjEtsTableAdapters.DatiCommessaTableAdapter" UpdateMethod="Update" OnUpdating="ods_Updating">
<SelectParameters>
<asp:SessionParameter Name="idxFase" Type="Int32" SessionField="idxFase_sel" />
</SelectParameters>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs
+50 -6
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using ETS_Data;
namespace PROJ_ETS.WebUserControls
{
@@ -31,9 +32,9 @@ namespace PROJ_ETS.WebUserControls
string answ = "";
try
{
string urlEtsDip = "http://iis01/DIP";
string urlPage = "getDocByProto.aspx";
string param = "nrProto";
string urlEtsDip = utils.obj.confReadString("urlEtsDip");
string urlPage = utils.obj.confReadString("urlPage");
string param = utils.obj.confReadString("param");
answ = string.Format(@"{0}/{1}?{2}={3}", urlEtsDip, urlPage, param, urlDoc);
}
catch
@@ -53,14 +54,57 @@ namespace PROJ_ETS.WebUserControls
string answ = "";
try
{
string urlEtsDip = "http://iis01/DIP";
string urlPage = "GestioneDocumenti.aspx";
answ = string.Format(@"{0}/{1}", urlEtsDip, urlPage);
string urlEtsDip = utils.obj.confReadString("urlEtsDip");
string urlPageArch = utils.obj.confReadString("urlPageArch");
answ = string.Format(@"{0}/{1}", urlEtsDip, urlPageArch);
}
catch
{ }
return answ;
}
}
/// <summary>
/// in fase di update...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
{
// controllo: se mancano descrizioni x offerta/ordine prendo numero protocollo
if (e.InputParameters["rifOfferta"] == null)
{
e.InputParameters["rifOfferta"] = e.InputParameters["urlOfferta"];
}
if (e.InputParameters["rifOrdine"] == null)
{
e.InputParameters["rifOrdine"] = e.InputParameters["urlOrdine"];
}
// se vuoto num protocollo cancello testo...
if (e.InputParameters["urlOfferta"] == null)
{
e.InputParameters["rifOfferta"] = "";
}
if (e.InputParameters["urlOrdine"] == null)
{
e.InputParameters["rifOrdine"] = "";
}
}
/// <summary>
/// definisce visibilità da URL (se presente è ok)
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public bool urlOk(object url)
{
bool answ = false;
try
{
answ = url.ToString() != "";
}
catch
{ }
return answ;
}
}
}
PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs
+6 -2
View File
@@ -96,7 +96,11 @@ namespace PROJ_ETS.WebUserControls
/// <param name="e"></param>
protected void btnNewBdgtEmpty_Click(object sender, EventArgs e)
{
insertNewOne();
int idxFase = utils.obj.IntSessionObj("idxFaseDet_sel");
while (codTipoRisorsaFree(idxFase) != "")
{
insertNewOne();
}
}
/// <summary>
/// inserisce nuovo record e fa refresh
@@ -122,7 +126,7 @@ namespace PROJ_ETS.WebUserControls
}
catch
{
answ = utils.obj.confReadString("codTipoRisorsaStd");
//answ = utils.obj.confReadString("codTipoRisorsaStd");
}
return answ;
}
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/ReleaseClienti/ETS/PROJ-ETS.zip
BIN
View File
Binary file not shown.