diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index d93a105..2e3443a 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -156,6 +156,7 @@ + diff --git a/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00202.sql b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00202.sql new file mode 100644 index 0000000..b163a48 --- /dev/null +++ b/ETS_Data/SQL/ETS_PROJ/ETS_PROJ_00202.sql @@ -0,0 +1,225 @@ +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/********************************************************** +* STORED stp_IR_getFullSettPareto +* +* recupera riga tabella PIENA x anno, settimana x dipendente FINTO ordinando commesse in logica pareto ore tot settimana +* PER LE SOLE COMMESSE SCHEDULATE in bazaar +* +* mod: S.E.L. 2013.09.12 +* +**********************************************************/ +create PROCEDURE stp_IR_getBazSettPareto +( + @Anno INT = 0, + @Settimana INT = 0 +) +AS + +SELECT Anno, Sett, 0 as idxDipendente, idxFase, SUM(OreTot) as OreTot +FROM ImpiegoRisorse +WHERE Anno = @Anno AND Sett = @Settimana + AND idxFase IN (SELECT DISTINCT idxFase FROM BazaarRisorse WHERE Anno = @Anno AND Sett = @Settimana) +GROUP BY Anno, Sett, idxFase +ORDER BY SUM(OreTot) + +RETURN +go + +drop procedure stp_IR_getFullSettByDip +go + +/********************************************************** +* STORED stp_IR_getFullSettPareto +* +* recupera riga tabella PIENA x anno, settimana x DIPENDENTE FINTO (=0) ordinando commesse in logica pareto ore tot settimana +* +* mod: S.E.L. 2013.09.12 +* +**********************************************************/ +create PROCEDURE stp_IR_getFullSettPareto +( + @Anno INT = 0, + @Settimana INT = 0 +) +AS + +SELECT Anno, Sett, 0 as idxDipendente, idxFase, SUM(OreTot) as OreTot +FROM ImpiegoRisorse +WHERE Anno = @Anno AND Sett = @Settimana +GROUP BY Anno, Sett, idxFase +ORDER BY SUM(OreTot) + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/********************************************************** +* STORED stp_IR_getFullSettimana +* +* genera tabella PIENA x anno e settimana selezionate (eventualemnte record a zero ove non presenti) +* +* mod: S.E.L. 2013.09.06 +* +**********************************************************/ +alter PROCEDURE stp_IR_getFullSettimana +( + @Anno INT = 0, + @Settimana INT = 0 +) +AS + +SELECT @anno AS Anno, @settimana AS Sett, tf.idxDipendente, tf.idxFase, ISNULL(ir.OreTot, 0) as OreTot +FROM +( + SELECT DISTINCT @Anno as Anno, @Settimana as Sett, d2a.idxDipendente, ir.idxFase + FROM Dip2ATR d2a CROSS JOIN ImpiegoRisorse ir + WHERE ISNULL(d2a.Gruppo,'') <>'' + AND ir.Anno = @Anno AND ir.Sett = @Settimana +) as tf LEFT OUTER JOIN ImpiegoRisorse ir ON tf.idxDipendente = ir.idxDipendente AND tf.idxFase = ir.idxFase AND ir.Anno=tf.Anno AND ir.Sett=tf.Sett + +RETURN +go + +/********************************************************** +* STORED stp_IR_importSettimana +* +* importa i dati di registro attività x anno e settimana selezionate +* +* mod: S.E.L. 2013.09.04 +* +**********************************************************/ +alter PROCEDURE stp_IR_importSettimana +( + @Anno INT = 0, + @Settimana INT = 0 +) +AS + +DECLARE @InizioAnno AS DATETIME; +DECLARE @SettInizioAnno AS INT; +DECLARE @InizioSettimana AS DATETIME; +DECLARE @FineSettimana AS DATETIME; + +-- CALCOLO DIFFERENZA SETTIMANA DA GIORNO 0 A INIZIO ANNO +SET @InizioAnno = CONVERT( DATETIME, CONVERT(CHAR(4), @anno ) + '0101' ); +SET @SettInizioAnno = datediff(week, 0, @InizioAnno); + +-- Calcolo il giorno di inizio settimana richiesta e il primo gg della settimana successiva +SET @InizioSettimana = dateadd(week, @SettInizioAnno + @Settimana -1 , 0 ); +SET @FineSettimana = dateadd(week, @SettInizioAnno + @Settimana , 0 ); + +-- con merge ( query corretta ) +WITH cte AS -- calcolo totale ore lavorate x dipendente / fase x la settimana richiesta +( SELECT @Anno AS Anno, @Settimana AS Sett, ra.idxDipendente + , CASE WHEN af.idxFaseAncest = 0 THEN af.idxFase ELSE af.idxFaseAncest END AS idxFaseAncest + , SUM(oreTot) AS OreTot + FROM dbo.RegAttivita AS ra + INNER JOIN dbo.AnagFasi AS af ON ra.idxFAse=af.idxFase + INNER JOIN dbo.Dip2ATR AS d2a ON d2a.idxDipendente=ra.idxDipendente + WHERE inizio >= @InizioSettimana AND inizio < @FineSettimana + AND ISNULL(d2a.Gruppo,'') <> '' -- tolgo i dipendenti senza un gruppo assegnato + GROUP BY CASE WHEN af.idxFaseAncest = 0 THEN af.idxFase ELSE af.idxFaseAncest END, ra.idxDipendente +) +MERGE dbo.ImpiegoRisorse AS target +USING cte AS source + ON target.Anno = source.Anno + AND target.Sett = source.Sett + AND target.idxDipendente = source.idxDipendente + AND target.idxFase = source.idxFaseAncest + +WHEN MATCHED THEN -- se esiste riga aggiorno + UPDATE SET target.OreTot = source.OreTot +WHEN NOT MATCHED BY TARGET THEN -- se non esiste in destinazione inserisco record + INSERT (Anno,Sett,idxDipendente,idxFase , OreTot) + VALUES (source.Anno,source.Sett,source.idxDipendente,source.idxFaseAncest , source.OreTot) + +WHEN NOT MATCHED BY SOURCE + AND target.Anno = @Anno AND target.Sett = @Settimana THEN -- se esiste in destinazione ma non nella sorgente cancello + DELETE; +-- OUTPUT $action, inserted.*, deleted.*; -- da usare x test e vedere i dati modificati + + +/* +-- con merge +WITH cte AS -- calcolo totale ore lavorate x dipendente / fase x la settimana richiesta +( SELECT @Anno AS Anno, @Settimana AS Sett, ra.idxDipendente + , CASE WHEN af.idxFaseAncest = 0 THEN af.idxFase ELSE af.idxFaseAncest END AS idxFaseAncest + , SUM(oreTot) AS OreTot + FROM dbo.RegAttivita AS ra + INNER JOIN dbo.AnagFasi AS af ON ra.idxFAse=af.idxFase + INNER JOIN dbo.Dip2ATR AS d2a ON d2a.idxDipendente=ra.idxDipendente + WHERE DATEPART(wk, inizio) = @Settimana AND YEAR(inizio) = @Anno + AND ISNULL(d2a.Gruppo,'') <> '' -- tolgo i dipendenti senza un gruppo assegnato + GROUP BY CASE WHEN af.idxFaseAncest = 0 THEN af.idxFase ELSE af.idxFaseAncest END, ra.idxDipendente +) +MERGE dbo.ImpiegoRisorse AS target +USING cte AS source + ON target.Anno = source.Anno + AND target.Sett = source.Sett + AND target.idxDipendente = source.idxDipendente + AND target.idxFase = source.idxFaseAncest + +WHEN MATCHED THEN -- se esiste riga aggiorno + UPDATE SET target.OreTot = source.OreTot +WHEN NOT MATCHED BY TARGET THEN -- se non esiste in destinazione inserisco record + INSERT (Anno,Sett,idxDipendente,idxFase , OreTot) + VALUES (source.Anno,source.Sett,source.idxDipendente,source.idxFaseAncest , source.OreTot) +WHEN NOT MATCHED BY SOURCE THEN -- se esiste in destinazione ma non nella sorgente cancello + DELETE; +-- OUTPUT $action, inserted.*, deleted.*; -- da usare x test e vedere i dati modificati + + +-- **** questa è quella schifosa di SAM +-- svuoto eventuali record precedenti... +DELETE +FROM ImpiegoRisorse +WHERE Anno = @Anno + AND Sett = @Settimana + +-- creo record... +INSERT INTO ImpiegoRisorse(Anno,Sett,idxDipendente,idxFase,OreTot) +SELECT @Anno, @Settimana, idxDipendente, af.idxFaseAncest, SUM(oreTot) AS OreTot +FROM RegAttivita ra INNER JOIN AnagFasi af on ra.idxFAse=af.idxFase +WHERE DATEPART(wk, inizio) = @Settimana AND YEAR(inizio) = @Anno +GROUP BY af.idxFaseAncest, idxDipendente +*/ + + +RETURN +go + +commit +go + + + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(202, 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 d5d30f6..ea95e12 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/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index a1a9e76..6999eb1 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.csproj.FileListAbsolute.txt b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt index 7c6aa28..083d41c 100644 --- a/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/ETS/ETS_Data.csproj.FileListAbsolute.txt @@ -18,3 +18,13 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.pdb C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\NLog.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.dll.config +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\ETS_Data.pdb +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\DocumentFormat.OpenXml.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\NLog.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\bin\ETS\NLog.xml +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.csprojResolveAssemblyReference.cache +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.dll +C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\ETS_Data\obj\ETS\ETS_Data.pdb diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index d5d30f6..ea95e12 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_ProjEts1.Designer.cs.dll b/ETS_Data/obj/ETS/TempPE/Ds_ProjEts1.Designer.cs.dll index e89676e..631c008 100644 Binary files a/ETS_Data/obj/ETS/TempPE/Ds_ProjEts1.Designer.cs.dll and b/ETS_Data/obj/ETS/TempPE/Ds_ProjEts1.Designer.cs.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/ETS.pubxml b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/ETS.pubxml index 68afb00..28dcf36 100644 --- a/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/ETS.pubxml +++ b/PROJ-ETS/PROJ-ETS/Properties/PublishProfiles/ETS.pubxml @@ -10,7 +10,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\PROJ-ETS\ReleaseClienti\ETS\PROJ-ETS.zip + C:\Users\samuele\Documents\Visual Studio 2012\Projects\ETS\PROJ-ETS\ReleaseClienti\ETS\PROJ-ETS.zip true Default Web Site/PROJ-ETS diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs index 5a6cf38..b94ee86 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs @@ -113,7 +113,6 @@ namespace PROJ_ETS.WebUserControls /// protected void imgGoProj_Click(object sender, ImageClickEventArgs e) { - //utils.obj.setSessionVal("nextObjCommand", "goProj"); // carico parametri int idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(utils.obj.IntSessionObj("idxProgetto_sel"))[0].idxCliente; string nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label; diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 3769652..ea95e12 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 affd05b..266d479 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/ReleaseClienti/ETS/PROJ-ETS.SourceManifest.xml b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.SourceManifest.xml index 3d1de0e..4228602 100644 --- a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.SourceManifest.xml +++ b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.SourceManifest.xml @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.deploy.cmd b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.deploy.cmd index 0be264a..f6729d8 100644 --- a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.deploy.cmd +++ b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.deploy.cmd @@ -177,9 +177,9 @@ call :CheckParameterFile echo. Start executing msdeploy.exe echo ------------------------------------------------------- if not exist "%_DeploySetParametersFile%" ( -set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%PROJ-ETS.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\ETS\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/PROJ-ETS\\App_Data$' +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%PROJ-ETS.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\ETS\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default Web Site/PROJ-ETS\\App_Data$' ) else ( -set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%PROJ-ETS.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\ETS\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default\ Web\ Site/PROJ-ETS\\App_Data$' -setParamFile:"%_DeploySetParametersFile%" +set _MSDeployCommandline="%MSDeployPath%msdeploy.exe" -source:package='%RootPath%PROJ-ETS.zip' -dest:%_Destination% -verb:sync -disableLink:AppPoolExtension -disableLink:ContentExtension -disableLink:CertificateExtension -skip:objectname='dirPath',absolutepath='obj\\ETS\\Package\\PackageTmp\\App_Data$' -skip:objectname='dirPath',absolutepath='Default Web Site/PROJ-ETS\\App_Data$' -setParamFile:"%_DeploySetParametersFile%" ) if "%_HaveArgMSDeployAdditonalFlags%" == "" ( diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip index 99eea51..19673c6 100644 Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ