From 80e7a7c40fc9a96ed6ec6680db224cfa901d0d10 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 09:26:01 +0200 Subject: [PATCH 1/9] Spostamento jenkinsfile in area delete --- 2delete/Jenkinsfile | 325 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 325 insertions(+) create mode 100644 2delete/Jenkinsfile diff --git a/2delete/Jenkinsfile b/2delete/Jenkinsfile new file mode 100644 index 0000000..2f6ab59 --- /dev/null +++ b/2delete/Jenkinsfile @@ -0,0 +1,325 @@ +pipeline { + agent none + environment { + enableIIS02 = 'Y' + enableIIS03 = 'Y' + } + stages { + stage('Checkout') { + agent any + steps { + /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ + script { + withEnv(['NEXT_BUILD_NUMBER=4158']) { + // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + env.APP_NAME = 'GPW' + } + } + script { + currentBuild.displayName = "${env.versionNumber}" + if (env.BRANCH_NAME == "master") { + currentBuild.description = "BUILD ${env.versionNumber}" + } + else { + currentBuild.description = "TEST ${env.versionNumber}" + } + } + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + fixNuget("${WORKSPACE}\\GPW.sln") + } + } + stage('Build') { + agent any + steps { + parallel ( + ALL: { + // ADM + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Admin\\GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // BCODE + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Barcode\\GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // COMMESSE + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Commesse\\GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // HOME + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 HOME\\HOME.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + // SMART + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Smart\\GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" + }, + failFast: false) + } + } + stage('Test') { + steps { + echo 'Testing.. 2 be done...' + } + } + stage('Deploy') { + agent any + steps { + script { + if (env.BRANCH_NAME == "develop") { + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + fixNuget("${WORKSPACE}\\GPW.sln") + parallel ( + ALL: { + //ADMIN: { + // sleep 6 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" + + // }, + // SMART: { + // sleep 4 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" + // }, + // COMM: { + // sleep 2 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" + // }, + // BCODE: { + // sleep 1 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" + // }, + // HOME: { + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" + }, + failFast: false) + } + else if (env.BRANCH_NAME == "master") { + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + fixNuget("${WORKSPACE}\\GPW.sln") + parallel ( + ALL: { + // ADMIN: { + if(env.enableIIS03 == "Y") + { + // sleep 4 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" + } + if(env.enableIIS02 == "Y") + { + // sleep 4 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" + } + // }, + // BCODE: { + if(env.enableIIS02 == "Y") + { + // sleep 8 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" + } + if(env.enableIIS03 == "Y") + { + // sleep 8 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" + } + // }, + // COMM: { + if(env.enableIIS03 == "Y") + { + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" + } + if(env.enableIIS02 == "Y") + { + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" + } + // }, + // HOME: { + if(env.enableIIS02 == "Y") + { + // sleep 6 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" + } + if(env.enableIIS03 == "Y") + { + // sleep 6 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" + } + // }, + // SMART: { + if(env.enableIIS02 == "Y") + { + // sleep 2 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" + } + if(env.enableIIS03 == "Y") + { + // sleep 2 + bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" + } + }, + failFast: false) + } + else { + echo 'Nothing to deploy...' + } + } + } + } + stage('Installers') { + agent any + steps { + script { + /* compilo installers in base al BRANCH del cliente... */ + if (env.BRANCH_NAME == "SPS") { + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + fixNuget("${WORKSPACE}\\GPW.sln") + parallel ( + HOME: { + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/HOME.zip /p:DeployIisAppPath=\"Default Web Site/GPW/HOME\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj" + /*echo 'Copia SPS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\HOME\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\HOME\" " + }, + ADMIN: { + sleep 1 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Admin.zip /p:DeployIisAppPath=\"Default Web Site/GPW/ADMIN\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Admin/GPW_Admin.csproj" + /*echo 'Copia SPS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Admin\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\ADMIN\" " + }, + BCODE: { + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Barcode.zip /p:DeployIisAppPath=\"Default Web Site/GPW/BCODE\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Barcode/GPW_Barcode.csproj" + /*echo 'Copia SPS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Barcode\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\BCODE\" " + }, + COMM: { + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Commesse.zip /p:DeployIisAppPath=\"Default Web Site/GPW/WRKLG\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Commesse/GPW_Commesse.csproj" + /*echo 'Copia SPS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Commesse\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\COMM\" " + }, + SMART: { + sleep 1 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Smart.zip /p:DeployIisAppPath=\"Default Web Site/GPW/SMART\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Smart/GPW_Smart.csproj" + /*echo 'Copia SPS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Smart\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\SMART\" " + }, + failFast: false) + } + else if (env.BRANCH_NAME == "ETS") { + /* CAMBIO numero versione in file sorgente!!! */ + bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + parallel ( + HOME: { + // sleep 4 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/HOME.zip /p:DeployIisAppPath=\"Default Web Site/GPW/HOME\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj" + /*echo 'Copia ETS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\HOME\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\HOME\" " + }, + ADMIN: { + sleep 2 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Admin.zip /p:DeployIisAppPath=\"Default Web Site/GPW/ADMIN\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Admin/GPW_Admin.csproj" + /*echo 'Copia ETS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Admin\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\ADMIN\" " + }, + BCODE: { + // sleep 3 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Barcode.zip /p:DeployIisAppPath=\"Default Web Site/GPW/BCODE\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Barcode/GPW_Barcode.csproj" + /*echo 'Copia ETS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Barcode\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\BCODE\" " + }, + COMM: { + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Commesse.zip /p:DeployIisAppPath=\"Default Web Site/GPW/WRKLG\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Commesse/GPW_Commesse.csproj" + /*echo 'Copia ETS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Commesse\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\COMM\" " + }, + SMART: { + sleep 1 + bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Smart.zip /p:DeployIisAppPath=\"Default Web Site/GPW/SMART\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Smart/GPW_Smart.csproj" + /*echo 'Copia ETS'*/ + bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Smart\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\SMART\" " + }, + failFast: false) + } + else{ + echo 'Questo BRANCH non necessita di installer...' + } + } + } + } + } + post { + success { + sendSlack("Successful", "good") + } + failure { + sendSlack("Failed", "danger") + } + unstable { + sendSlack("Unstable", "warning") + } + } +} + +// Funzione x pubblicazione su server IIS di deploy +def publishToDeployServer(prjPath, iisPath, packName) { + echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName + // inizio copiando files di base da area VersGen... + bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html " + bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png " + bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml " + // manifest.xml: aggiorno versNumber ed URL del branch di update... + bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml 0.0.0.0 ${env.versionNumber} || EXIT /B 0" + bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" + bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{PACKNAME}} " + packName + " || EXIT /B 0" + bat "e:\\fart.exe " + prjPath + "Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0" + writeFile file: prjPath + 'changeLog.log', text: "${getChangeString()}" + powershell '(Get-Content ' + prjPath + 'Resources\\ChangeLog.html) | ForEach-Object { $_ -replace \"{{LAST-CHANGES}}\", \"${getChangeString()}\" } | Set-Content ' + prjPath + 'Resources\\ChangeLog.html' + // copio ed esporto in IIS02 i vari files .xml, .html, .zip + bat "xcopy /y " + prjPath + "Resources\\manifest.xml " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " + bat "xcopy /y " + prjPath + "Resources\\ChangeLog.html " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " + bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " + // salvo copia della versione... + bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\* E:\\Staging\\byProd\\MP\\${env.BRANCH_NAME}\\" + packName + "\\${env.versionNumber}\\ " + // copio x AutoUpdate deploy + bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\" + packName + ".zip " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " +} +@NonCPS +// Funzione x recupero changeLog +def getChangeString() { + MAX_MSG_LEN = 100 + def changeString = "" + + echo "Gathering SCM changes" + def changeLogSets = currentBuild.changeSets + for (int i = 0; i < changeLogSets.size(); i++) { + def entries = changeLogSets[i].items + for (int j = 0; j < entries.length; j++) { + def entry = entries[j] + truncated_msg = entry.msg.take(MAX_MSG_LEN) + changeString += " - ${truncated_msg} [${entry.author}]\n" + } + } + + if (!changeString) { + changeString = " - Nessuna Modifica" + } + return changeString +} + +// Funzione x invio slack +def sendSlack(status, colorCode) { + slackSend ( + color: colorCode, + channel: "#GPW-dev", + failOnError: false, + message: "${env.JOB_NAME} ${env.versionNumber} | " + status + ": Build ${env.BUILD_NUMBER}\n\n" + + "Modifiche:\n " + getChangeString() + "\n\n Verifica build: <${env.BUILD_URL}|Apri>" + "\n" + ) +} +// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy +def fixNuget(solutionFile) { + // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" + // solo la prima volta va aggiunta... + hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C" + if (hasSource == "0") + { + bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + } + else + { + bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" + } + bat "e:\\nuget.exe restore ${solutionFile}" +} \ No newline at end of file From 8acab57cc643f19f3dd3988228bd134502f837b8 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 09:26:16 +0200 Subject: [PATCH 2/9] update css icone home page --- GPW_Admin/Content/Site.css | 24 ++++++++++++------------ GPW_Admin/Content/Site.less | 8 ++++---- GPW_Admin/Content/Site.min.css | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/GPW_Admin/Content/Site.css b/GPW_Admin/Content/Site.css index 4768ba7..83a78d3 100644 --- a/GPW_Admin/Content/Site.css +++ b/GPW_Admin/Content/Site.css @@ -31,10 +31,10 @@ body { text-align: center; } .shortcuts .shortcut { - min-width: 9rem; - min-height: 5rem; + min-width: 9.9rem; + min-height: 5.5rem; display: inline-block; - padding: 0.66666667rem 0; + padding: 0.77rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -47,13 +47,13 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 0.5rem; + border-radius: 0.55rem; } .shortcuts .shortcut-sm { - min-width: 4.5rem; - min-height: 3rem; + min-width: 4.95rem; + min-height: 3.3rem; display: inline-block; - padding: 0.25rem 0; + padding: 0.275rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -66,20 +66,20 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 0.5rem; + border-radius: 1.1rem/2; } .shortcuts .shortcut .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 2rem; + font-size: 2.2rem; color: #333; } .shortcuts .shortcut-sm .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 2rem; + font-size: 2.2rem; color: #333; } .shortcuts .shortcut:hover { @@ -120,8 +120,8 @@ body { } @media (max-width: 992px) { .shortcuts .shortcut { - min-width: 8rem; - min-height: 4rem; + min-width: 8.8rem; + min-height: 4.4rem; } } /* Set widths on the form inputs since otherwise they're 100% wide */ diff --git a/GPW_Admin/Content/Site.less b/GPW_Admin/Content/Site.less index 7bc8b23..5f5d3ef 100644 --- a/GPW_Admin/Content/Site.less +++ b/GPW_Admin/Content/Site.less @@ -33,7 +33,7 @@ body { [ Shortcuts / .shortcuts ] */ -@blSCut: 1rem; +@blSCut: 1.1rem; .shortcuts { text-align: center; @@ -43,7 +43,7 @@ body { min-width: @blSCut * 9; min-height: @blSCut * 5; display: inline-block; - padding: @blSCut*2/3 0; + padding: @blSCut * 0.7 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -56,14 +56,14 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: @blSCut/2; + border-radius: @blSCut * 0.5; } .shortcuts .shortcut-sm { min-width: @blSCut * 4.5; min-height: @blSCut * 3; display: inline-block; - padding: @blSCut/4 0; + padding: @blSCut * 0.25 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; diff --git a/GPW_Admin/Content/Site.min.css b/GPW_Admin/Content/Site.min.css index c5fe75d..64c7c28 100644 --- a/GPW_Admin/Content/Site.min.css +++ b/GPW_Admin/Content/Site.min.css @@ -1 +1 @@ -body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.table-sm th,.table-sm td{padding:.2rem;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file +body{font:'Roboto',sans-serif;}.body-content{font:'Roboto',sans-serif;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.table-sm th,.table-sm td{padding:.2rem;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9.9rem;min-height:5.5rem;display:inline-block;padding:.77rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.55rem;}.shortcuts .shortcut-sm{min-width:4.95rem;min-height:3.3rem;display:inline-block;padding:.275rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1.1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8.8rem;min-height:4.4rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;} \ No newline at end of file From b68e1ed75ff1c3bcee2aee6e805f24790f5a1d5b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 09:26:36 +0200 Subject: [PATCH 3/9] display timb mensili con tags --- .../WebUserControls/mod_reviewTimbrature.ascx | 13 + .../mod_reviewTimbrature.ascx.designer.cs | 106 +++--- Jenkinsfile | 325 ------------------ 3 files changed, 66 insertions(+), 378 deletions(-) delete mode 100644 Jenkinsfile diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx index bb93e51..a0fb4f3 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx @@ -143,6 +143,19 @@ + + +
+ +
+ + +
+ + +
+ + diff --git a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs index 0ab189a..971535d 100644 --- a/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_reviewTimbrature.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace GPW_Admin.WebUserControls @@ -15,146 +15,146 @@ namespace GPW_Admin.WebUserControls { /// - /// Controllo chkshowAll. + /// chkshowAll control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkshowAll; /// - /// Controllo filtroDip. + /// filtroDip control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::mod_filtro filtroDip; /// - /// Controllo odsDip. + /// odsDip control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsDip; /// - /// Controllo cmp_periodoAnalisi. + /// cmp_periodoAnalisi control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi; /// - /// Controllo chkWE. + /// chkWE control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkWE; /// - /// Controllo btnRicalcPeriodo. + /// btnRicalcPeriodo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnRicalcPeriodo; /// - /// Controllo hlExport. + /// hlExport control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlExport; /// - /// Controllo hlExportComm. + /// hlExportComm control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink hlExportComm; /// - /// Controllo grViewExpl. + /// grViewExpl control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grViewExpl; /// - /// Controllo odsExpl. + /// odsExpl control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsExpl; /// - /// Controllo pnlDettagli. + /// pnlDettagli control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Panel pnlDettagli; /// - /// Controllo mod_elencoTimbr1. + /// mod_elencoTimbr1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::GPW_Admin.WebUserControls.mod_elencoTimbr mod_elencoTimbr1; /// - /// Controllo grViewGiust. + /// grViewGiust control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grViewGiust; /// - /// Controllo odsGiust. + /// odsGiust control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsGiust; /// - /// Controllo odsCodGiust. + /// odsCodGiust control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsCodGiust; /// - /// Controllo mod_commAttivitaDesk1. + /// mod_commAttivitaDesk1 control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::GPW_Admin.WebUserControls.mod_commAttivitaDesk mod_commAttivitaDesk1; } diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 2f6ab59..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,325 +0,0 @@ -pipeline { - agent none - environment { - enableIIS02 = 'Y' - enableIIS03 = 'Y' - } - stages { - stage('Checkout') { - agent any - steps { - /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ - script { - withEnv(['NEXT_BUILD_NUMBER=4158']) { - // env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '2.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') - env.APP_NAME = 'GPW' - } - } - script { - currentBuild.displayName = "${env.versionNumber}" - if (env.BRANCH_NAME == "master") { - currentBuild.description = "BUILD ${env.versionNumber}" - } - else { - currentBuild.description = "TEST ${env.versionNumber}" - } - } - /* CAMBIO numero versione in file sorgente!!! */ - bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - fixNuget("${WORKSPACE}\\GPW.sln") - } - } - stage('Build') { - agent any - steps { - parallel ( - ALL: { - // ADM - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Admin\\GPW_Admin.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - // BCODE - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Barcode\\GPW_Barcode.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - // COMMESSE - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Commesse\\GPW_Commesse.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - // HOME - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 HOME\\HOME.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - // SMART - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 GPW_Smart\\GPW_Smart.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m" - }, - failFast: false) - } - } - stage('Test') { - steps { - echo 'Testing.. 2 be done...' - } - } - stage('Deploy') { - agent any - steps { - script { - if (env.BRANCH_NAME == "develop") { - /* CAMBIO numero versione in file sorgente!!! */ - bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - fixNuget("${WORKSPACE}\\GPW.sln") - parallel ( - ALL: { - //ADMIN: { - // sleep 6 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" - - // }, - // SMART: { - // sleep 4 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" - // }, - // COMM: { - // sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" - // }, - // BCODE: { - // sleep 1 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" - // }, - // HOME: { - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" - }, - failFast: false) - } - else if (env.BRANCH_NAME == "master") { - /* CAMBIO numero versione in file sorgente!!! */ - bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - fixNuget("${WORKSPACE}\\GPW.sln") - parallel ( - ALL: { - // ADMIN: { - if(env.enableIIS03 == "Y") - { - // sleep 4 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" - } - if(env.enableIIS02 == "Y") - { - // sleep 4 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Admin/GPW_Admin.csproj" - } - // }, - // BCODE: { - if(env.enableIIS02 == "Y") - { - // sleep 8 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" - } - if(env.enableIIS03 == "Y") - { - // sleep 8 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Barcode/GPW_Barcode.csproj" - } - // }, - // COMM: { - if(env.enableIIS03 == "Y") - { - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" - } - if(env.enableIIS02 == "Y") - { - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Commesse/GPW_Commesse.csproj" - } - // }, - // HOME: { - if(env.enableIIS02 == "Y") - { - // sleep 6 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" - } - if(env.enableIIS03 == "Y") - { - // sleep 6 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ HOME/HOME.csproj" - } - // }, - // SMART: { - if(env.enableIIS02 == "Y") - { - // sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" - } - if(env.enableIIS03 == "Y") - { - // sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ GPW_Smart/GPW_Smart.csproj" - } - }, - failFast: false) - } - else { - echo 'Nothing to deploy...' - } - } - } - } - stage('Installers') { - agent any - steps { - script { - /* compilo installers in base al BRANCH del cliente... */ - if (env.BRANCH_NAME == "SPS") { - /* CAMBIO numero versione in file sorgente!!! */ - bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - fixNuget("${WORKSPACE}\\GPW.sln") - parallel ( - HOME: { - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/HOME.zip /p:DeployIisAppPath=\"Default Web Site/GPW/HOME\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj" - /*echo 'Copia SPS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\HOME\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\HOME\" " - }, - ADMIN: { - sleep 1 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Admin.zip /p:DeployIisAppPath=\"Default Web Site/GPW/ADMIN\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Admin/GPW_Admin.csproj" - /*echo 'Copia SPS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Admin\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\ADMIN\" " - }, - BCODE: { - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Barcode.zip /p:DeployIisAppPath=\"Default Web Site/GPW/BCODE\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Barcode/GPW_Barcode.csproj" - /*echo 'Copia SPS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Barcode\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\BCODE\" " - }, - COMM: { - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Commesse.zip /p:DeployIisAppPath=\"Default Web Site/GPW/WRKLG\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Commesse/GPW_Commesse.csproj" - /*echo 'Copia SPS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Commesse\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\COMM\" " - }, - SMART: { - sleep 1 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/SPS_PROD/${env.versionNumber}/GPW_Smart.zip /p:DeployIisAppPath=\"Default Web Site/GPW/SMART\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=SPS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Smart/GPW_Smart.csproj" - /*echo 'Copia SPS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Smart\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\SPS\\SMART\" " - }, - failFast: false) - } - else if (env.BRANCH_NAME == "ETS") { - /* CAMBIO numero versione in file sorgente!!! */ - bat "e:\\fart.exe VersGen\\GPW.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - parallel ( - HOME: { - // sleep 4 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/HOME.zip /p:DeployIisAppPath=\"Default Web Site/GPW/HOME\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ HOME/HOME.csproj" - /*echo 'Copia ETS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\HOME\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\HOME\" " - }, - ADMIN: { - sleep 2 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Admin.zip /p:DeployIisAppPath=\"Default Web Site/GPW/ADMIN\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Admin/GPW_Admin.csproj" - /*echo 'Copia ETS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Admin\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\ADMIN\" " - }, - BCODE: { - // sleep 3 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Barcode.zip /p:DeployIisAppPath=\"Default Web Site/GPW/BCODE\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Barcode/GPW_Barcode.csproj" - /*echo 'Copia ETS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Barcode\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\BCODE\" " - }, - COMM: { - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Commesse.zip /p:DeployIisAppPath=\"Default Web Site/GPW/WRKLG\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Commesse/GPW_Commesse.csproj" - /*echo 'Copia ETS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Commesse\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\COMM\" " - }, - SMART: { - sleep 1 - bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 /p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=ETS /p:PublishProfile=ETS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/ETS_PROD/${env.versionNumber}/GPW_Smart.zip /p:DeployIisAppPath=\"Default Web Site/GPW/SMART\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /p:TargetConnectionString=\"Data Source=W2012FS\\SQLEXPRESS;Initial Catalog=ETS_GPW;Persist Security Info=True;User ID=sa;Password=steamware\" GPW_Smart/GPW_Smart.csproj" - /*echo 'Copia ETS'*/ - bat "E:\\Jenkins\\exportDropbox.bat \"${WORKSPACE}\\GPW_Smart\\ReleaseClienti\" \"E:\\Staging\\byProd\\GPW\\ETS\\SMART\" " - }, - failFast: false) - } - else{ - echo 'Questo BRANCH non necessita di installer...' - } - } - } - } - } - post { - success { - sendSlack("Successful", "good") - } - failure { - sendSlack("Failed", "danger") - } - unstable { - sendSlack("Unstable", "warning") - } - } -} - -// Funzione x pubblicazione su server IIS di deploy -def publishToDeployServer(prjPath, iisPath, packName) { - echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName - // inizio copiando files di base da area VersGen... - bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html " - bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png " - bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml " - // manifest.xml: aggiorno versNumber ed URL del branch di update... - bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" - bat "e:\\fart.exe " + prjPath + "Resources\\manifest.xml {{PACKNAME}} " + packName + " || EXIT /B 0" - bat "e:\\fart.exe " + prjPath + "Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0" - writeFile file: prjPath + 'changeLog.log', text: "${getChangeString()}" - powershell '(Get-Content ' + prjPath + 'Resources\\ChangeLog.html) | ForEach-Object { $_ -replace \"{{LAST-CHANGES}}\", \"${getChangeString()}\" } | Set-Content ' + prjPath + 'Resources\\ChangeLog.html' - // copio ed esporto in IIS02 i vari files .xml, .html, .zip - bat "xcopy /y " + prjPath + "Resources\\manifest.xml " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " - bat "xcopy /y " + prjPath + "Resources\\ChangeLog.html " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " - bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " - // salvo copia della versione... - bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\* E:\\Staging\\byProd\\MP\\${env.BRANCH_NAME}\\" + packName + "\\${env.versionNumber}\\ " - // copio x AutoUpdate deploy - bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\" + packName + ".zip " + iisPath + packName + "\\${env.BRANCH_NAME}\\ " -} -@NonCPS -// Funzione x recupero changeLog -def getChangeString() { - MAX_MSG_LEN = 100 - def changeString = "" - - echo "Gathering SCM changes" - def changeLogSets = currentBuild.changeSets - for (int i = 0; i < changeLogSets.size(); i++) { - def entries = changeLogSets[i].items - for (int j = 0; j < entries.length; j++) { - def entry = entries[j] - truncated_msg = entry.msg.take(MAX_MSG_LEN) - changeString += " - ${truncated_msg} [${entry.author}]\n" - } - } - - if (!changeString) { - changeString = " - Nessuna Modifica" - } - return changeString -} - -// Funzione x invio slack -def sendSlack(status, colorCode) { - slackSend ( - color: colorCode, - channel: "#GPW-dev", - failOnError: false, - message: "${env.JOB_NAME} ${env.versionNumber} | " + status + ": Build ${env.BUILD_NUMBER}\n\n" + - "Modifiche:\n " + getChangeString() + "\n\n Verifica build: <${env.BUILD_URL}|Apri>" + "\n" - ) -} -// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy -def fixNuget(solutionFile) { - // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" - // solo la prima volta va aggiunta... - hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C" - if (hasSource == "0") - { - bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" - } - else - { - bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" - } - bat "e:\\nuget.exe restore ${solutionFile}" -} \ No newline at end of file From 0b4b99b10418430ea137c883957f9bb7d8911d22 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 09:26:43 +0200 Subject: [PATCH 4/9] aggiunta preliminare pag tag mensili --- GPW_Admin/GPW_Admin.csproj | 16 + GPW_Admin/WebUserControls/mod_tagMensili.ascx | 72 ++ .../WebUserControls/mod_tagMensili.ascx.cs | 274 +++++ .../mod_tagMensili.ascx.designer.cs | 89 ++ GPW_Admin/tagMensili.aspx | 18 + GPW_Admin/tagMensili.aspx.cs | 30 + GPW_Admin/tagMensili.aspx.designer.cs | 35 + GPW_Data/DS_Applicazione.Designer.cs | 1017 +++++++++++++++-- GPW_Data/DS_Applicazione.xsd | 86 +- GPW_Data/DS_Applicazione.xss | 67 +- 10 files changed, 1566 insertions(+), 138 deletions(-) create mode 100644 GPW_Admin/WebUserControls/mod_tagMensili.ascx create mode 100644 GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs create mode 100644 GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs create mode 100644 GPW_Admin/tagMensili.aspx create mode 100644 GPW_Admin/tagMensili.aspx.cs create mode 100644 GPW_Admin/tagMensili.aspx.designer.cs diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 894a224..4c873be 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -636,6 +636,7 @@ + @@ -679,6 +680,7 @@ + @@ -937,6 +939,13 @@ spostaOre.aspx + + tagMensili.aspx + ASPXCodeBehind + + + tagMensili.aspx + Test.aspx ASPXCodeBehind @@ -1262,6 +1271,13 @@ mod_spostaOre.ascx + + mod_tagMensili.ascx + ASPXCodeBehind + + + mod_tagMensili.ascx + mod_timbrMensili.ascx ASPXCodeBehind diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx b/GPW_Admin/WebUserControls/mod_tagMensili.ascx new file mode 100644 index 0000000..b9c429c --- /dev/null +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx @@ -0,0 +1,72 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_tagMensili.ascx.cs" Inherits="GPW_Admin.WebUserControls.mod_tagMensili" %> +<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> +<%@ Register Src="~/WebUserControls/cmp_periodoAnalisi.ascx" TagPrefix="uc1" TagName="cmp_periodoAnalisi" %> + +
+
+ + + + + + +
+
+ +
+
+
+
+ +
+
+ + + + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs new file mode 100644 index 0000000..96539d0 --- /dev/null +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs @@ -0,0 +1,274 @@ +using GPW_data; +using SteamWare; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GPW_Admin.WebUserControls +{ + public partial class mod_tagMensili : BaseUserControl + { + #region Public Events + + public event EventHandler eh_resetSelezione; + + #endregion Public Events + + #region Private Methods + + /// + /// imposto ODS + /// + private void checkFixOds() + { + memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); + grView.DataBind(); + } + + /// + /// seleziono + /// + /// + /// + private void filtroDip_eh_selValore(object sender, EventArgs e) + { + // imposto ods + checkFixOds(); + } + + #endregion Private Methods + + #region Protected Methods + + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + /// + /// elenco colonne del datagrid + /// + /// + protected DataColumnCollection colonneObj() + { + DataColumnCollection colonne = null; + using (DS_Applicazione.TimbMeseExplDataTable tabella = new DS_Applicazione.TimbMeseExplDataTable()) + { + colonne = tabella.Columns; + } + return colonne; + } + + /// + /// traduce gli header delle colonne + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + + /// + /// annulla inserimento nuovo valore da footer + /// + /// + /// + protected void lblCanc_click(object sender, EventArgs e) + { + // annullo inserimento: nascondo footer, bind controlli... + grView.FooterRow.Visible = false; + } + + /// + /// inserisce nuovo valore da footer + /// + /// + /// + protected void lblIns_click(object sender, EventArgs e) + { + // click su inserimento, chiamo il metodo insert dell'ObjectDataSource + ods.Insert(); + } + + /// + /// caricamento + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + grView.PageSize = utils.pageSize; + if (!Page.IsPostBack) + { + filtroDip.ods = odsDip; + memLayer.ML.emptySessionVal("idxDip_sel"); + filtroDip.reselFirst(); + // ricostruisco EVENTUALI date mancanti + DataProxy.DP.taTimbExpl.stp_timbratureExplFillDate(DateTime.Now.AddMonths(-2), DateTime.Now); + } + filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); + } + + /// + /// fix visualizzazione x selezione compensazione richiesta + /// + /// + /// + protected void rblComp_SelectedIndexChanged(object sender, EventArgs e) + { + if (rblComp.SelectedValue == "2") + { + txtMinRedExtra.Visible = true; + } + else + { + txtMinRedExtra.Visible = false; + } + //// salvo in sessione il valore selezionato x passarlo alla stored... + //memLayer.ML.setSessionVal("tipoComp", rblComp.SelectedValue); + grView.DataBind(); + } + + /// + /// recupera i dati di un nuovo record contenuti nel footer di un gridView; + /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...) + /// + /// + /// + protected void recuperaFooter(object sender, ObjectDataSourceMethodEventArgs e) + { + if (e != null) + { + //recupero la riga footer... + DataColumnCollection colonne = colonneObj(); + string nomeCol; + string tipoColonna = ""; + foreach (DataColumn colonna in colonne) + { + nomeCol = colonna.ColumnName; + // cerco un textbox o quello che sia... + if (grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol)) != null) + { + tipoColonna = "textBox"; + } + else if (grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol)) != null) + { + tipoColonna = "dropDownList"; + } + else if (grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol)) != null) + { + tipoColonna = "checkBox"; + } + // in base al tipo salvo negli inputparameters dell'ODS + switch (tipoColonna) + { + case "textBox": + e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; + break; + + case "dropDownList": + e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; + break; + + case "checkBox": + e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; + break; + + default: + break; + } + tipoColonna = ""; + } + } + } + + #endregion Protected Methods + + #region Public Methods + + /// + /// determina se sia visibile il pulsante per la compensazione permessi/strordinari + /// + /// + /// + /// + public bool compPermVisible(object oreStraord, object orePermessi) + { + bool answ = rblComp.SelectedValue == "1"; + // solo se in fase abilitata alla modifica controllo le ore effettive + if (answ) + { + answ = (Convert.ToDouble(oreStraord) > 0) && (Convert.ToDouble(orePermessi) > 0); + } + return answ; + } + + public void doUpdate() + { + grView.PageSize = utils.pageSize; + grView.DataBind(); + } + + /// + /// determina se sia visibile il pulsante per la riduzione degli straordinari per il mese/dipendente + /// + /// + /// + /// + public bool reduceVisible(object oreStraord, object oreAssorb) + { + bool answ = rblComp.SelectedValue == "2"; + // solo se in fase abilitata alla modifica controllo le ore effettive + if (answ) + { + answ = (Convert.ToDouble(oreStraord) >= Convert.ToDouble(oreAssorb)) && (Convert.ToDouble(oreAssorb) > 0); + } + return answ; + } + + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs new file mode 100644 index 0000000..318bf95 --- /dev/null +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs @@ -0,0 +1,89 @@ +//------------------------------------------------------------------------------ +// +// 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 GPW_Admin.WebUserControls +{ + + + public partial class mod_tagMensili + { + + /// + /// filtroDip control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_filtro filtroDip; + + /// + /// odsDip control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsDip; + + /// + /// cmp_periodoAnalisi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi; + + /// + /// txtMinRedExtra control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtMinRedExtra; + + /// + /// rblComp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RadioButtonList rblComp; + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + } +} diff --git a/GPW_Admin/tagMensili.aspx b/GPW_Admin/tagMensili.aspx new file mode 100644 index 0000000..48319f6 --- /dev/null +++ b/GPW_Admin/tagMensili.aspx @@ -0,0 +1,18 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/BMP.Master" AutoEventWireup="true" CodeBehind="tagMensili.aspx.cs" Inherits="GPW_Admin.tagMensili" %> + +<%@ Register Src="~/WebUserControls/mod_pageSize.ascx" TagPrefix="uc1" TagName="mod_pageSize" %> +<%@ Register Src="~/WebUserControls/mod_tagMensili.ascx" TagPrefix="uc1" TagName="mod_tagMensili" %> + + +
+
+ <%: traduci(titolo) %> +
+
+ +
+
+ +
+
+ \ No newline at end of file diff --git a/GPW_Admin/tagMensili.aspx.cs b/GPW_Admin/tagMensili.aspx.cs new file mode 100644 index 0000000..3e4bab7 --- /dev/null +++ b/GPW_Admin/tagMensili.aspx.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GPW_Admin +{ + public partial class tagMensili : BasePage + { + #region Private Methods + + private void Mod_pageSize_eh_nuovaSize(object sender, EventArgs e) + { + mod_tagMensili.doUpdate(); + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + mod_pageSize.eh_nuovaSize += Mod_pageSize_eh_nuovaSize; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/GPW_Admin/tagMensili.aspx.designer.cs b/GPW_Admin/tagMensili.aspx.designer.cs new file mode 100644 index 0000000..b00e220 --- /dev/null +++ b/GPW_Admin/tagMensili.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 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 GPW_Admin +{ + + + public partial class tagMensili + { + + /// + /// mod_tagMensili control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Admin.WebUserControls.mod_tagMensili mod_tagMensili; + + /// + /// mod_pageSize control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Admin.WebUserControls.mod_pageSize mod_pageSize; + } +} diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index a0309cd..1889526 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -72,6 +72,8 @@ namespace GPW_data { private Dipendenti2GruppiDataTable tableDipendenti2Gruppi; + private TagMeseDataTable tableTagMese; + private global::System.Data.DataRelation relationFK_Timbrature_Dipendenti; private global::System.Data.DataRelation relationFK_AnagFasi_AnagProgetti; @@ -188,6 +190,9 @@ namespace GPW_data { if ((ds.Tables["Dipendenti2Gruppi"] != null)) { base.Tables.Add(new Dipendenti2GruppiDataTable(ds.Tables["Dipendenti2Gruppi"])); } + if ((ds.Tables["TagMese"] != null)) { + base.Tables.Add(new TagMeseDataTable(ds.Tables["TagMese"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -446,6 +451,16 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public TagMeseDataTable TagMese { + get { + return this.tableTagMese; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -585,6 +600,9 @@ namespace GPW_data { if ((ds.Tables["Dipendenti2Gruppi"] != null)) { base.Tables.Add(new Dipendenti2GruppiDataTable(ds.Tables["Dipendenti2Gruppi"])); } + if ((ds.Tables["TagMese"] != null)) { + base.Tables.Add(new TagMeseDataTable(ds.Tables["TagMese"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -762,6 +780,12 @@ namespace GPW_data { this.tableDipendenti2Gruppi.InitVars(); } } + this.tableTagMese = ((TagMeseDataTable)(base.Tables["TagMese"])); + if ((initTable == true)) { + if ((this.tableTagMese != null)) { + this.tableTagMese.InitVars(); + } + } this.relationFK_Timbrature_Dipendenti = this.Relations["FK_Timbrature_Dipendenti"]; this.relationFK_AnagFasi_AnagProgetti = this.Relations["FK_AnagFasi_AnagProgetti"]; this.relationFK_RegAttivita_AnagFasi = this.Relations["FK_RegAttivita_AnagFasi"]; @@ -828,6 +852,8 @@ namespace GPW_data { base.Tables.Add(this.tableAnagGruppi); this.tableDipendenti2Gruppi = new Dipendenti2GruppiDataTable(); base.Tables.Add(this.tableDipendenti2Gruppi); + this.tableTagMese = new TagMeseDataTable(); + base.Tables.Add(this.tableTagMese); this.relationFK_Timbrature_Dipendenti = new global::System.Data.DataRelation("FK_Timbrature_Dipendenti", new global::System.Data.DataColumn[] { this.tableDipendenti.idxDipendenteColumn}, new global::System.Data.DataColumn[] { this.tableTimbrature.idxDipendenteColumn}, false); @@ -1006,6 +1032,12 @@ namespace GPW_data { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private bool ShouldSerializeTagMese() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1133,6 +1165,9 @@ namespace GPW_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void Dipendenti2GruppiRowChangeEventHandler(object sender, Dipendenti2GruppiRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void TagMeseRowChangeEventHandler(object sender, TagMeseRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -7812,6 +7847,10 @@ namespace GPW_data { private global::System.Data.DataColumn columntempRil; + private global::System.Data.DataColumn columnTagIsActive; + + private global::System.Data.DataColumn columnCodTag; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public TE_RA_ExplDataTable() { @@ -8133,6 +8172,22 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn TagIsActiveColumn { + get { + return this.columnTagIsActive; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn CodTagColumn { + get { + return this.columnCodTag; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8205,7 +8260,9 @@ namespace GPW_data { int minMpp, int minCassa, int min104, - decimal tempRil) { + decimal tempRil, + bool TagIsActive, + string CodTag) { TE_RA_ExplRow rowTE_RA_ExplRow = ((TE_RA_ExplRow)(this.NewRow())); object[] columnValuesArray = new object[] { dataLav, @@ -8243,7 +8300,9 @@ namespace GPW_data { minMpp, minCassa, min104, - tempRil}; + tempRil, + TagIsActive, + CodTag}; rowTE_RA_ExplRow.ItemArray = columnValuesArray; this.Rows.Add(rowTE_RA_ExplRow); return rowTE_RA_ExplRow; @@ -8310,6 +8369,8 @@ namespace GPW_data { this.columnminCassa = base.Columns["minCassa"]; this.columnmin104 = base.Columns["min104"]; this.columntempRil = base.Columns["tempRil"]; + this.columnTagIsActive = base.Columns["TagIsActive"]; + this.columnCodTag = base.Columns["CodTag"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8387,6 +8448,10 @@ namespace GPW_data { base.Columns.Add(this.columnmin104); this.columntempRil = new global::System.Data.DataColumn("tempRil", typeof(decimal), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columntempRil); + this.columnTagIsActive = new global::System.Data.DataColumn("TagIsActive", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnTagIsActive); + this.columnCodTag = new global::System.Data.DataColumn("CodTag", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodTag); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columndataLav, this.columnidxDipendente}, true)); @@ -8422,6 +8487,9 @@ namespace GPW_data { this.columnminMpp.ReadOnly = true; this.columnminCassa.ReadOnly = true; this.columnmin104.ReadOnly = true; + this.columnTagIsActive.ReadOnly = true; + this.columnCodTag.ReadOnly = true; + this.columnCodTag.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11293,6 +11361,346 @@ namespace GPW_data { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class TagMeseDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnanno; + + private global::System.Data.DataColumn columnmese; + + private global::System.Data.DataColumn columnidxDipendente; + + private global::System.Data.DataColumn columnCognomeNome; + + private global::System.Data.DataColumn columnCodTag; + + private global::System.Data.DataColumn columnNumTag; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseDataTable() { + this.TableName = "TagMese"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal TagMeseDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected TagMeseDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn annoColumn { + get { + return this.columnanno; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn meseColumn { + get { + return this.columnmese; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn idxDipendenteColumn { + get { + return this.columnidxDipendente; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn CognomeNomeColumn { + get { + return this.columnCognomeNome; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn CodTagColumn { + get { + return this.columnCodTag; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn NumTagColumn { + get { + return this.columnNumTag; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRow this[int index] { + get { + return ((TagMeseRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event TagMeseRowChangeEventHandler TagMeseRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event TagMeseRowChangeEventHandler TagMeseRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event TagMeseRowChangeEventHandler TagMeseRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event TagMeseRowChangeEventHandler TagMeseRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddTagMeseRow(TagMeseRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRow AddTagMeseRow(int anno, int mese, int idxDipendente, string CognomeNome, string CodTag, int NumTag) { + TagMeseRow rowTagMeseRow = ((TagMeseRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + anno, + mese, + idxDipendente, + CognomeNome, + CodTag, + NumTag}; + rowTagMeseRow.ItemArray = columnValuesArray; + this.Rows.Add(rowTagMeseRow); + return rowTagMeseRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRow FindByannoidxDipendentemese(int anno, int idxDipendente, int mese) { + return ((TagMeseRow)(this.Rows.Find(new object[] { + anno, + idxDipendente, + mese}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() { + TagMeseDataTable cln = ((TagMeseDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new TagMeseDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() { + this.columnanno = base.Columns["anno"]; + this.columnmese = base.Columns["mese"]; + this.columnidxDipendente = base.Columns["idxDipendente"]; + this.columnCognomeNome = base.Columns["CognomeNome"]; + this.columnCodTag = base.Columns["CodTag"]; + this.columnNumTag = base.Columns["NumTag"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() { + this.columnanno = new global::System.Data.DataColumn("anno", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnanno); + this.columnmese = new global::System.Data.DataColumn("mese", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmese); + this.columnidxDipendente = new global::System.Data.DataColumn("idxDipendente", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxDipendente); + this.columnCognomeNome = new global::System.Data.DataColumn("CognomeNome", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCognomeNome); + this.columnCodTag = new global::System.Data.DataColumn("CodTag", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodTag); + this.columnNumTag = new global::System.Data.DataColumn("NumTag", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumTag); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnanno, + this.columnidxDipendente, + this.columnmese}, true)); + this.columnanno.AllowDBNull = false; + this.columnanno.ReadOnly = true; + this.columnmese.AllowDBNull = false; + this.columnmese.ReadOnly = true; + this.columnidxDipendente.AllowDBNull = false; + this.columnCognomeNome.ReadOnly = true; + this.columnCognomeNome.MaxLength = 101; + this.columnCodTag.AllowDBNull = false; + this.columnCodTag.MaxLength = 50; + this.columnNumTag.ReadOnly = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRow NewTagMeseRow() { + return ((TagMeseRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new TagMeseRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(TagMeseRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.TagMeseRowChanged != null)) { + this.TagMeseRowChanged(this, new TagMeseRowChangeEvent(((TagMeseRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.TagMeseRowChanging != null)) { + this.TagMeseRowChanging(this, new TagMeseRowChangeEvent(((TagMeseRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.TagMeseRowDeleted != null)) { + this.TagMeseRowDeleted(this, new TagMeseRowChangeEvent(((TagMeseRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.TagMeseRowDeleting != null)) { + this.TagMeseRowDeleting(this, new TagMeseRowChangeEvent(((TagMeseRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemoveTagMeseRow(TagMeseRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_Applicazione ds = new DS_Applicazione(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "TagMeseDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -16746,6 +17154,38 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool TagIsActive { + get { + try { + return ((bool)(this[this.tableTE_RA_Expl.TagIsActiveColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'TagIsActive\' in table \'TE_RA_Expl\' is DBNull.", e); + } + } + set { + this[this.tableTE_RA_Expl.TagIsActiveColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string CodTag { + get { + try { + return ((string)(this[this.tableTE_RA_Expl.CodTagColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'CodTag\' in table \'TE_RA_Expl\' is DBNull.", e); + } + } + set { + this[this.tableTE_RA_Expl.CodTagColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsCognomeNomeNull() { @@ -17153,6 +17593,30 @@ namespace GPW_data { public void SettempRilNull() { this[this.tableTE_RA_Expl.tempRilColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsTagIsActiveNull() { + return this.IsNull(this.tableTE_RA_Expl.TagIsActiveColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetTagIsActiveNull() { + this[this.tableTE_RA_Expl.TagIsActiveColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsCodTagNull() { + return this.IsNull(this.tableTE_RA_Expl.CodTagColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetCodTagNull() { + this[this.tableTE_RA_Expl.CodTagColumn] = global::System.Convert.DBNull; + } } /// @@ -18271,6 +18735,121 @@ namespace GPW_data { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class TagMeseRow : global::System.Data.DataRow { + + private TagMeseDataTable tableTagMese; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal TagMeseRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableTagMese = ((TagMeseDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int anno { + get { + return ((int)(this[this.tableTagMese.annoColumn])); + } + set { + this[this.tableTagMese.annoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int mese { + get { + return ((int)(this[this.tableTagMese.meseColumn])); + } + set { + this[this.tableTagMese.meseColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int idxDipendente { + get { + return ((int)(this[this.tableTagMese.idxDipendenteColumn])); + } + set { + this[this.tableTagMese.idxDipendenteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string CognomeNome { + get { + try { + return ((string)(this[this.tableTagMese.CognomeNomeColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'CognomeNome\' in table \'TagMese\' is DBNull.", e); + } + } + set { + this[this.tableTagMese.CognomeNomeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string CodTag { + get { + return ((string)(this[this.tableTagMese.CodTagColumn])); + } + set { + this[this.tableTagMese.CodTagColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int NumTag { + get { + try { + return ((int)(this[this.tableTagMese.NumTagColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumTag\' in table \'TagMese\' is DBNull.", e); + } + } + set { + this[this.tableTagMese.NumTagColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsCognomeNomeNull() { + return this.IsNull(this.tableTagMese.CognomeNomeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetCognomeNomeNull() { + this[this.tableTagMese.CognomeNomeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsNumTagNull() { + return this.IsNull(this.tableTagMese.NumTagColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetNumTagNull() { + this[this.tableTagMese.NumTagColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -19086,6 +19665,40 @@ namespace GPW_data { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class TagMeseRowChangeEvent : global::System.EventArgs { + + private TagMeseRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRowChangeEvent(TagMeseRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace GPW_data.DS_ApplicazioneTableAdapters { @@ -32085,6 +32698,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi tableMapping.ColumnMappings.Add("minCassa", "minCassa"); tableMapping.ColumnMappings.Add("min104", "min104"); tableMapping.ColumnMappings.Add("tempRil", "tempRil"); + tableMapping.ColumnMappings.Add("TagIsActive", "TagIsActive"); + tableMapping.ColumnMappings.Add("CodTag", "CodTag"); this._adapter.TableMappings.Add(tableMapping); } @@ -34945,6 +35560,218 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class TagMeseTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public TagMeseTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "TagMese"; + tableMapping.ColumnMappings.Add("anno", "anno"); + tableMapping.ColumnMappings.Add("mese", "mese"); + tableMapping.ColumnMappings.Add("idxDipendente", "idxDipendente"); + tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome"); + tableMapping.ColumnMappings.Add("CodTag", "CodTag"); + tableMapping.ColumnMappings.Add("NumTag", "NumTag"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::GPW_data.Properties.Settings.Default.GPWConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "dbo.stp_LTDD_ByUserDate"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_Applicazione.TagMeseDataTable dataTable, global::System.Nullable idxDipendente, global::System.Nullable dataFrom, global::System.Nullable dataTo) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((idxDipendente.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((dataFrom.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dataFrom.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((dataTo.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dataTo.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_Applicazione.TagMeseDataTable GetData(global::System.Nullable idxDipendente, global::System.Nullable dataFrom, global::System.Nullable dataTo) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((idxDipendente.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((dataFrom.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dataFrom.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((dataTo.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dataTo.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + DS_Applicazione.TagMeseDataTable dataTable = new DS_Applicazione.TagMeseDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// @@ -35383,15 +36210,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateUpdatedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; - if ((this._anagOrariTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._anagOrariTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._anagGruppiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -35410,6 +36228,15 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } + if ((this._anagOrariTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._anagOrariTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._dipendenti2GruppiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -35419,15 +36246,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } - if ((this._anagFasiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._anagFasiTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._dipendentiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -35437,12 +36255,21 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } - if ((this._anagClientiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._anagFasiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._anagClientiTableAdapter.Update(updatedRows)); + result = (result + this._anagFasiTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } + if ((this._timbratureTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._timbratureTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -35473,15 +36300,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } - if ((this._timbratureExplTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._timbratureExplTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._calendFesteFerieTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.CalendFesteFerie.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -35509,6 +36327,15 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } + if ((this._anagClientiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._anagClientiTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._anagDevicesTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagDevices.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -35518,12 +36345,12 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } - if ((this._timbratureTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + if ((this._timbratureExplTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); if (((updatedRows != null) && (0 < updatedRows.Length))) { - result = (result + this._timbratureTableAdapter.Update(updatedRows)); + result = (result + this._timbratureExplTableAdapter.Update(updatedRows)); allChangedRows.AddRange(updatedRows); } } @@ -35537,14 +36364,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateInsertedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; - if ((this._anagOrariTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._anagOrariTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._anagGruppiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -35561,6 +36380,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } + if ((this._anagOrariTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._anagOrariTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._dipendenti2GruppiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -35569,14 +36396,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } - if ((this._anagFasiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._anagFasiTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._dipendentiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -35585,11 +36404,19 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } - if ((this._anagClientiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._anagFasiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagFasi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._anagClientiTableAdapter.Update(addedRows)); + result = (result + this._anagFasiTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } + if ((this._timbratureTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._timbratureTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -35617,14 +36444,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } - if ((this._timbratureExplTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._timbratureExplTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._calendFesteFerieTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.CalendFesteFerie.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -35649,6 +36468,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } + if ((this._anagClientiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._anagClientiTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._anagDevicesTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagDevices.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -35657,11 +36484,11 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } - if ((this._timbratureTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.Added); + if ((this._timbratureExplTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) && (0 < addedRows.Length))) { - result = (result + this._timbratureTableAdapter.Update(addedRows)); + result = (result + this._timbratureExplTableAdapter.Update(addedRows)); allAddedRows.AddRange(addedRows); } } @@ -35675,11 +36502,11 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateDeletedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._timbratureTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._timbratureExplTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._timbratureTableAdapter.Update(deletedRows)); + result = (result + this._timbratureExplTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -35691,6 +36518,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } + if ((this._anagClientiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._anagClientiTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._dipendenti2RuoliTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti2Ruoli.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -35715,14 +36550,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } - if ((this._timbratureExplTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._timbratureExplTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._giustificativiTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Giustificativi.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -35747,19 +36574,11 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } - if ((this._anagClientiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagClienti.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if ((this._timbratureTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Timbrature.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) && (0 < deletedRows.Length))) { - result = (result + this._anagClientiTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } - if ((this._dipendentiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._dipendentiTableAdapter.Update(deletedRows)); + result = (result + this._timbratureTableAdapter.Update(deletedRows)); allChangedRows.AddRange(deletedRows); } } @@ -35771,6 +36590,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } + if ((this._dipendentiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._dipendentiTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._dipendenti2GruppiTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -35779,6 +36606,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } + if ((this._anagOrariTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._anagOrariTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._anagProgettiTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AnagProgetti.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -35795,14 +36630,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } - if ((this._anagOrariTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._anagOrariTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } return result; } diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index 7ff3250..ac976cb 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -5,7 +5,7 @@ - + @@ -2672,6 +2672,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi + + @@ -3237,6 +3239,32 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + + + dbo.stp_LTDD_ByUserDate + + + + + + + + + + + + + + + + + + + + @@ -3894,7 +3922,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND - + @@ -3954,6 +3982,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + + + + + @@ -4177,6 +4213,30 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + + + + + + + + + + + + + + + + + + + + + @@ -4283,17 +4343,23 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index 8321143..50d379a 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,35 +4,36 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + 391 @@ -44,7 +45,7 @@ - + 1046 @@ -56,7 +57,7 @@ - + 871 @@ -72,7 +73,7 @@ - + 585 @@ -84,7 +85,7 @@ - + 332 @@ -96,7 +97,7 @@ - + 285 @@ -108,7 +109,7 @@ - + 286 @@ -124,7 +125,7 @@ - + 428 From 9ca0480c4c2ce48913ebdb2397755c5fd22a5019 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 10:51:24 +0200 Subject: [PATCH 5/9] Bozza gestione tags --- GPW_Admin/GPW_Admin.csproj | 8 + .../WebUserControls/cmp_tagUserPeriodo.ascx | 21 + .../cmp_tagUserPeriodo.ascx.cs | 61 ++ .../cmp_tagUserPeriodo.ascx.designer.cs | 62 ++ GPW_Admin/WebUserControls/mod_tagMensili.ascx | 111 ++- .../WebUserControls/mod_tagMensili.ascx.cs | 207 +--- .../mod_tagMensili.ascx.designer.cs | 26 +- .../WebUserControls/mod_timbrMensili.ascx | 2 +- GPW_Data/DS_Applicazione.Designer.cs | 930 +++++++++++++++++- GPW_Data/DS_Applicazione.xsd | 112 ++- GPW_Data/DS_Applicazione.xss | 69 +- GPW_Data/DataProxy.cs | 6 + 12 files changed, 1339 insertions(+), 276 deletions(-) create mode 100644 GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx create mode 100644 GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs create mode 100644 GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.designer.cs diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj index 4c873be..39fb7c2 100644 --- a/GPW_Admin/GPW_Admin.csproj +++ b/GPW_Admin/GPW_Admin.csproj @@ -649,6 +649,7 @@ + @@ -1055,6 +1056,13 @@ cmp_righePag.ascx + + cmp_tagUserPeriodo.ascx + ASPXCodeBehind + + + cmp_tagUserPeriodo.ascx + cmp_ticketFreeActiv.ascx ASPXCodeBehind diff --git a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx new file mode 100644 index 0000000..671116e --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx @@ -0,0 +1,21 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_tagUserPeriodo.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_tagUserPeriodo" %> + + + + + + + - + + + + + + + + + + + + + \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs new file mode 100644 index 0000000..86931a1 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GPW_Admin.WebUserControls +{ + public partial class cmp_tagUserPeriodo : BaseUserControl + { + + public event EventHandler eh_reportUpdate; + + protected void Page_Load(object sender, EventArgs e) + { + + } + + public int idxDip + { + set + { + hfIdxDip.Value = $"{value}"; + } + } + + public DateTime inizio + { + set + { + hfInizio.Value = $"{value:yyyy-MM-dd}"; + } + } + public DateTime fine + { + set + { + hfFine.Value = $"{value:yyyy-MM-dd}"; + } + } + + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void reportUpdate() + { + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_reportUpdate != null) + { + eh_reportUpdate(this, new EventArgs()); + } + } + + public void doUpdate() + { + grView.DataBind(); + } + } +} \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.designer.cs new file mode 100644 index 0000000..4f8c256 --- /dev/null +++ b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// 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 GPW_Admin.WebUserControls +{ + + + public partial class cmp_tagUserPeriodo + { + + /// + /// hfIdxDip control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfIdxDip; + + /// + /// hfInizio control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfInizio; + + /// + /// hfFine control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfFine; + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx b/GPW_Admin/WebUserControls/mod_tagMensili.ascx index b9c429c..12c19f3 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx @@ -2,6 +2,8 @@ <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="~/WebUserControls/cmp_periodoAnalisi.ascx" TagPrefix="uc1" TagName="cmp_periodoAnalisi" %> +<%@ Register Src="~/WebUserControls/cmp_tagUserPeriodo.ascx" TagPrefix="uc1" TagName="cmp_tagUserPeriodo" %> +
@@ -17,56 +19,63 @@
-
-
- -
-
- - - - - -
-
+ Ricalcola +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs index 96539d0..18462cb 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs @@ -1,10 +1,7 @@ using GPW_data; using SteamWare; using System; -using System.Collections.Generic; using System.Data; -using System.Linq; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; @@ -18,29 +15,28 @@ namespace GPW_Admin.WebUserControls #endregion Public Events - #region Private Methods + #region Public Methods - /// - /// imposto ODS - /// - private void checkFixOds() + public void doUpdate() { - memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); + grView.PageSize = utils.pageSize; grView.DataBind(); } /// - /// seleziono + /// resetta la selezione dei valori in caso di modifiche su altri controlli /// - /// - /// - private void filtroDip_eh_selValore(object sender, EventArgs e) + public void resetSelezione() { - // imposto ods - checkFixOds(); + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } } - #endregion Private Methods + #endregion Public Methods #region Protected Methods @@ -61,7 +57,7 @@ namespace GPW_Admin.WebUserControls protected DataColumnCollection colonneObj() { DataColumnCollection colonne = null; - using (DS_Applicazione.TimbMeseExplDataTable tabella = new DS_Applicazione.TimbMeseExplDataTable()) + using (DS_Applicazione.TagMeseDataTable tabella = new DS_Applicazione.TagMeseDataTable()) { colonne = tabella.Columns; } @@ -98,27 +94,6 @@ namespace GPW_Admin.WebUserControls } } - /// - /// annulla inserimento nuovo valore da footer - /// - /// - /// - protected void lblCanc_click(object sender, EventArgs e) - { - // annullo inserimento: nascondo footer, bind controlli... - grView.FooterRow.Visible = false; - } - - /// - /// inserisce nuovo valore da footer - /// - /// - /// - protected void lblIns_click(object sender, EventArgs e) - { - // click su inserimento, chiamo il metodo insert dell'ObjectDataSource - ods.Insert(); - } /// /// caricamento @@ -133,142 +108,66 @@ namespace GPW_Admin.WebUserControls filtroDip.ods = odsDip; memLayer.ML.emptySessionVal("idxDip_sel"); filtroDip.reselFirst(); - // ricostruisco EVENTUALI date mancanti - DataProxy.DP.taTimbExpl.stp_timbratureExplFillDate(DateTime.Now.AddMonths(-2), DateTime.Now); } filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); } - /// - /// fix visualizzazione x selezione compensazione richiesta - /// - /// - /// - protected void rblComp_SelectedIndexChanged(object sender, EventArgs e) - { - if (rblComp.SelectedValue == "2") - { - txtMinRedExtra.Visible = true; - } - else - { - txtMinRedExtra.Visible = false; - } - //// salvo in sessione il valore selezionato x passarlo alla stored... - //memLayer.ML.setSessionVal("tipoComp", rblComp.SelectedValue); - grView.DataBind(); - } - - /// - /// recupera i dati di un nuovo record contenuti nel footer di un gridView; - /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...) - /// - /// - /// - protected void recuperaFooter(object sender, ObjectDataSourceMethodEventArgs e) - { - if (e != null) - { - //recupero la riga footer... - DataColumnCollection colonne = colonneObj(); - string nomeCol; - string tipoColonna = ""; - foreach (DataColumn colonna in colonne) - { - nomeCol = colonna.ColumnName; - // cerco un textbox o quello che sia... - if (grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol)) != null) - { - tipoColonna = "textBox"; - } - else if (grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol)) != null) - { - tipoColonna = "dropDownList"; - } - else if (grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol)) != null) - { - tipoColonna = "checkBox"; - } - // in base al tipo salvo negli inputparameters dell'ODS - switch (tipoColonna) - { - case "textBox": - e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; - break; - - case "dropDownList": - e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; - break; - - case "checkBox": - e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; - break; - - default: - break; - } - tipoColonna = ""; - } - } - } - #endregion Protected Methods - #region Public Methods + #region Private Methods /// - /// determina se sia visibile il pulsante per la compensazione permessi/strordinari + /// imposto ODS /// - /// - /// - /// - public bool compPermVisible(object oreStraord, object orePermessi) + private void checkFixOds() { - bool answ = rblComp.SelectedValue == "1"; - // solo se in fase abilitata alla modifica controllo le ore effettive - if (answ) - { - answ = (Convert.ToDouble(oreStraord) > 0) && (Convert.ToDouble(orePermessi) > 0); - } - return answ; - } - - public void doUpdate() - { - grView.PageSize = utils.pageSize; + memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); grView.DataBind(); } /// - /// determina se sia visibile il pulsante per la riduzione degli straordinari per il mese/dipendente + /// seleziono /// - /// - /// - /// - public bool reduceVisible(object oreStraord, object oreAssorb) + /// + /// + private void filtroDip_eh_selValore(object sender, EventArgs e) { - bool answ = rblComp.SelectedValue == "2"; - // solo se in fase abilitata alla modifica controllo le ore effettive - if (answ) - { - answ = (Convert.ToDouble(oreStraord) >= Convert.ToDouble(oreAssorb)) && (Convert.ToDouble(oreAssorb) > 0); - } - return answ; + // imposto ods + checkFixOds(); } - /// - /// resetta la selezione dei valori in caso di modifiche su altri controlli - /// - public void resetSelezione() + #endregion Private Methods + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) { - grView.SelectedIndex = -1; - grView.DataBind(); - if (eh_resetSelezione != null) - { - eh_resetSelezione(this, new EventArgs()); - } + int anno = Convert.ToInt32(grView.SelectedDataKey["anno"].ToString()); + int mese = Convert.ToInt32(grView.SelectedDataKey["mese"].ToString()); + int idxDip = Convert.ToInt32(grView.SelectedDataKey["idxDipendente"].ToString()); + DateTime inizio = new DateTime(anno, mese, 1); + DateTime fine = new DateTime(anno, mese + 1, 1).AddDays(-1); + // imposto nel controlo child + cmp_tagUserPeriodo.idxDip = idxDip; + cmp_tagUserPeriodo.inizio = inizio; + cmp_tagUserPeriodo.fine = fine; + cmp_tagUserPeriodo.doUpdate(); } - #endregion Public Methods + protected void lbtRecalc_Click(object sender, EventArgs e) + { + DateTime fine = DateTime.Today; + DateTime inizio = fine.AddMonths(-3); + // cerco in sessione + if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("_inizio"))) + { + inizio = memLayer.ML.DateTimeSessionObj("_inizio"); + } + if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("_fine"))) + { + fine = memLayer.ML.DateTimeSessionObj("_fine"); + } + // ricostruisco EVENTUALI BP (HARD CODED!!!) + DataProxy.DP.taTagMese.checkCreateByDipDate("BP", filtroDip.valoreInt, inizio, fine, 270); + doUpdate(); + } } } \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs index 318bf95..79e7c48 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.designer.cs @@ -42,22 +42,22 @@ namespace GPW_Admin.WebUserControls protected global::GPW_Admin.WebUserControls.cmp_periodoAnalisi cmp_periodoAnalisi; /// - /// txtMinRedExtra control. + /// lbtRecalc control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox txtMinRedExtra; + protected global::System.Web.UI.WebControls.LinkButton lbtRecalc; /// - /// rblComp control. + /// divMain control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.RadioButtonList rblComp; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMain; /// /// grView control. @@ -85,5 +85,23 @@ namespace GPW_Admin.WebUserControls /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// divDet control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDet; + + /// + /// cmp_tagUserPeriodo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GPW_Admin.WebUserControls.cmp_tagUserPeriodo cmp_tagUserPeriodo; } } diff --git a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx index 90546f6..9973ab8 100644 --- a/GPW_Admin/WebUserControls/mod_timbrMensili.ascx +++ b/GPW_Admin/WebUserControls/mod_timbrMensili.ascx @@ -51,7 +51,7 @@ - + diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index 1889526..986aabf 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -74,6 +74,8 @@ namespace GPW_data { private TagMeseDataTable tableTagMese; + private ListTagDDDataTable tableListTagDD; + private global::System.Data.DataRelation relationFK_Timbrature_Dipendenti; private global::System.Data.DataRelation relationFK_AnagFasi_AnagProgetti; @@ -193,6 +195,9 @@ namespace GPW_data { if ((ds.Tables["TagMese"] != null)) { base.Tables.Add(new TagMeseDataTable(ds.Tables["TagMese"])); } + if ((ds.Tables["ListTagDD"] != null)) { + base.Tables.Add(new ListTagDDDataTable(ds.Tables["ListTagDD"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -461,6 +466,16 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public ListTagDDDataTable ListTagDD { + get { + return this.tableListTagDD; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -603,6 +618,9 @@ namespace GPW_data { if ((ds.Tables["TagMese"] != null)) { base.Tables.Add(new TagMeseDataTable(ds.Tables["TagMese"])); } + if ((ds.Tables["ListTagDD"] != null)) { + base.Tables.Add(new ListTagDDDataTable(ds.Tables["ListTagDD"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -786,6 +804,12 @@ namespace GPW_data { this.tableTagMese.InitVars(); } } + this.tableListTagDD = ((ListTagDDDataTable)(base.Tables["ListTagDD"])); + if ((initTable == true)) { + if ((this.tableListTagDD != null)) { + this.tableListTagDD.InitVars(); + } + } this.relationFK_Timbrature_Dipendenti = this.Relations["FK_Timbrature_Dipendenti"]; this.relationFK_AnagFasi_AnagProgetti = this.Relations["FK_AnagFasi_AnagProgetti"]; this.relationFK_RegAttivita_AnagFasi = this.Relations["FK_RegAttivita_AnagFasi"]; @@ -854,6 +878,8 @@ namespace GPW_data { base.Tables.Add(this.tableDipendenti2Gruppi); this.tableTagMese = new TagMeseDataTable(); base.Tables.Add(this.tableTagMese); + this.tableListTagDD = new ListTagDDDataTable(); + base.Tables.Add(this.tableListTagDD); this.relationFK_Timbrature_Dipendenti = new global::System.Data.DataRelation("FK_Timbrature_Dipendenti", new global::System.Data.DataColumn[] { this.tableDipendenti.idxDipendenteColumn}, new global::System.Data.DataColumn[] { this.tableTimbrature.idxDipendenteColumn}, false); @@ -1038,6 +1064,12 @@ namespace GPW_data { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private bool ShouldSerializeListTagDD() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -1168,6 +1200,9 @@ namespace GPW_data { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public delegate void TagMeseRowChangeEventHandler(object sender, TagMeseRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public delegate void ListTagDDRowChangeEventHandler(object sender, ListTagDDRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -11701,6 +11736,329 @@ namespace GPW_data { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class ListTagDDDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnIdxTagDD; + + private global::System.Data.DataColumn columnidxDipendente; + + private global::System.Data.DataColumn columnDtRif; + + private global::System.Data.DataColumn columnCodTag; + + private global::System.Data.DataColumn columnIsActive; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDDataTable() { + this.TableName = "ListTagDD"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal ListTagDDDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected ListTagDDDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn IdxTagDDColumn { + get { + return this.columnIdxTagDD; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn idxDipendenteColumn { + get { + return this.columnidxDipendente; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn DtRifColumn { + get { + return this.columnDtRif; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn CodTagColumn { + get { + return this.columnCodTag; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn IsActiveColumn { + get { + return this.columnIsActive; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRow this[int index] { + get { + return ((ListTagDDRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ListTagDDRowChangeEventHandler ListTagDDRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ListTagDDRowChangeEventHandler ListTagDDRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ListTagDDRowChangeEventHandler ListTagDDRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public event ListTagDDRowChangeEventHandler ListTagDDRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void AddListTagDDRow(ListTagDDRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRow AddListTagDDRow(int idxDipendente, System.DateTime DtRif, string CodTag, bool IsActive) { + ListTagDDRow rowListTagDDRow = ((ListTagDDRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + null, + idxDipendente, + DtRif, + CodTag, + IsActive}; + rowListTagDDRow.ItemArray = columnValuesArray; + this.Rows.Add(rowListTagDDRow); + return rowListTagDDRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRow FindByIdxTagDD(int IdxTagDD) { + return ((ListTagDDRow)(this.Rows.Find(new object[] { + IdxTagDD}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public override global::System.Data.DataTable Clone() { + ListTagDDDataTable cln = ((ListTagDDDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new ListTagDDDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal void InitVars() { + this.columnIdxTagDD = base.Columns["IdxTagDD"]; + this.columnidxDipendente = base.Columns["idxDipendente"]; + this.columnDtRif = base.Columns["DtRif"]; + this.columnCodTag = base.Columns["CodTag"]; + this.columnIsActive = base.Columns["IsActive"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitClass() { + this.columnIdxTagDD = new global::System.Data.DataColumn("IdxTagDD", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIdxTagDD); + this.columnidxDipendente = new global::System.Data.DataColumn("idxDipendente", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxDipendente); + this.columnDtRif = new global::System.Data.DataColumn("DtRif", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDtRif); + this.columnCodTag = new global::System.Data.DataColumn("CodTag", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnCodTag); + this.columnIsActive = new global::System.Data.DataColumn("IsActive", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIsActive); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columnIdxTagDD}, true)); + this.columnIdxTagDD.AutoIncrement = true; + this.columnIdxTagDD.AutoIncrementSeed = -1; + this.columnIdxTagDD.AutoIncrementStep = -1; + this.columnIdxTagDD.AllowDBNull = false; + this.columnIdxTagDD.ReadOnly = true; + this.columnIdxTagDD.Unique = true; + this.columnidxDipendente.AllowDBNull = false; + this.columnDtRif.AllowDBNull = false; + this.columnCodTag.AllowDBNull = false; + this.columnCodTag.MaxLength = 50; + this.columnIsActive.AllowDBNull = false; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRow NewListTagDDRow() { + return ((ListTagDDRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new ListTagDDRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(ListTagDDRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.ListTagDDRowChanged != null)) { + this.ListTagDDRowChanged(this, new ListTagDDRowChangeEvent(((ListTagDDRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.ListTagDDRowChanging != null)) { + this.ListTagDDRowChanging(this, new ListTagDDRowChangeEvent(((ListTagDDRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.ListTagDDRowDeleted != null)) { + this.ListTagDDRowDeleted(this, new ListTagDDRowChangeEvent(((ListTagDDRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.ListTagDDRowDeleting != null)) { + this.ListTagDDRowDeleting(this, new ListTagDDRowChangeEvent(((ListTagDDRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void RemoveListTagDDRow(ListTagDDRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_Applicazione ds = new DS_Applicazione(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "ListTagDDDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -18850,6 +19208,76 @@ namespace GPW_data { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class ListTagDDRow : global::System.Data.DataRow { + + private ListTagDDDataTable tableListTagDD; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal ListTagDDRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableListTagDD = ((ListTagDDDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int IdxTagDD { + get { + return ((int)(this[this.tableListTagDD.IdxTagDDColumn])); + } + set { + this[this.tableListTagDD.IdxTagDDColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int idxDipendente { + get { + return ((int)(this[this.tableListTagDD.idxDipendenteColumn])); + } + set { + this[this.tableListTagDD.idxDipendenteColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public System.DateTime DtRif { + get { + return ((global::System.DateTime)(this[this.tableListTagDD.DtRifColumn])); + } + set { + this[this.tableListTagDD.DtRifColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public string CodTag { + get { + return ((string)(this[this.tableListTagDD.CodTagColumn])); + } + set { + this[this.tableListTagDD.CodTagColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsActive { + get { + return ((bool)(this[this.tableListTagDD.IsActiveColumn])); + } + set { + this[this.tableListTagDD.IsActiveColumn] = value; + } + } + } + /// ///Row event argument class /// @@ -19699,6 +20127,40 @@ namespace GPW_data { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public class ListTagDDRowChangeEvent : global::System.EventArgs { + + private ListTagDDRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRowChangeEvent(ListTagDDRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace GPW_data.DS_ApplicazioneTableAdapters { @@ -35700,15 +36162,25 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "dbo.stp_LTDD_ByUserDate"; + this._commandCollection[0].CommandText = "dbo.stp_LTM_ByUserDate"; this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_LTDD_checkCreateByDipDate"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTag", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtStart", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEnd", global::System.Data.SqlDbType.Date, 3, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minParam", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -35770,6 +36242,344 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int checkCreateByDipDate(string CodTag, global::System.Nullable idxDipendente, global::System.Nullable DtStart, global::System.Nullable DtEnd, global::System.Nullable minParam) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((CodTag == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodTag)); + } + if ((idxDipendente.HasValue == true)) { + command.Parameters[2].Value = ((int)(idxDipendente.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((DtStart.HasValue == true)) { + command.Parameters[3].Value = ((System.DateTime)(DtStart.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((DtEnd.HasValue == true)) { + command.Parameters[4].Value = ((System.DateTime)(DtEnd.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((minParam.HasValue == true)) { + command.Parameters[5].Value = ((int)(minParam.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class ListTagDDTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public ListTagDDTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "ListTagDD"; + tableMapping.ColumnMappings.Add("IdxTagDD", "IdxTagDD"); + tableMapping.ColumnMappings.Add("idxDipendente", "idxDipendente"); + tableMapping.ColumnMappings.Add("DtRif", "DtRif"); + tableMapping.ColumnMappings.Add("CodTag", "CodTag"); + tableMapping.ColumnMappings.Add("IsActive", "IsActive"); + this._adapter.TableMappings.Add(tableMapping); + this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.DeleteCommand.Connection = this.Connection; + this._adapter.DeleteCommand.CommandText = "DELETE FROM [ListTagDD] WHERE (([IdxTagDD] = @Original_IdxTagDD))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxTagDD", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxTagDD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); + this._adapter.UpdateCommand.Connection = this.Connection; + this._adapter.UpdateCommand.CommandText = "UPDATE [ListTagDD] SET [DtRif] = @DtRif, [IsActive] = @IsActive WHERE (([IdxTagDD" + + "] = @Original_IdxTagDD));\r\nSELECT IdxTagDD, DtRif, IsActive FROM ListTagDD WHERE" + + " (IdxTagDD = @IdxTagDD)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtRif", global::System.Data.SqlDbType.Date, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtRif", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsActive", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IsActive", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxTagDD", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxTagDD", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTagDD", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "IdxTagDD", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::GPW_data.Properties.Settings.Default.GPWConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT * FROM ListTagDD"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[1].Connection = this.Connection; + this._commandCollection[1].CommandText = "dbo.stp_LTDD_ByUserDate"; + this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dataTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_LTDD_toggleActive"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxTagDD", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_Applicazione.ListTagDDDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_Applicazione.ListTagDDDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + DS_Applicazione.ListTagDDDataTable dataTable = new DS_Applicazione.ListTagDDDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Applicazione.ListTagDDDataTable getByUserDate(global::System.Nullable idxDipendente, global::System.Nullable dataFrom, global::System.Nullable dataTo) { + this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((idxDipendente.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxDipendente.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((dataFrom.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(dataFrom.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((dataTo.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((System.DateTime)(dataTo.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + DS_Applicazione.ListTagDDDataTable dataTable = new DS_Applicazione.ListTagDDDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_Applicazione.ListTagDDDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(DS_Applicazione dataSet) { + return this.Adapter.Update(dataSet, "ListTagDD"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int toggleActive(global::System.Nullable IdxTagDD) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((IdxTagDD.HasValue == true)) { + command.Parameters[1].Value = ((int)(IdxTagDD.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// @@ -35816,6 +36626,8 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND private Dipendenti2GruppiTableAdapter _dipendenti2GruppiTableAdapter; + private ListTagDDTableAdapter _listTagDDTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -36055,6 +36867,20 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public ListTagDDTableAdapter ListTagDDTableAdapter { + get { + return this._listTagDDTableAdapter; + } + set { + this._listTagDDTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -36138,6 +36964,10 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND && (this._dipendenti2GruppiTableAdapter.Connection != null))) { return this._dipendenti2GruppiTableAdapter.Connection; } + if (((this._listTagDDTableAdapter != null) + && (this._listTagDDTableAdapter.Connection != null))) { + return this._listTagDDTableAdapter.Connection; + } return null; } set { @@ -36199,6 +37029,9 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND if ((this._dipendenti2GruppiTableAdapter != null)) { count = (count + 1); } + if ((this._listTagDDTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -36210,6 +37043,15 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateUpdatedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allChangedRows, global::System.Collections.Generic.List allAddedRows) { int result = 0; + if ((this._dipendenti2GruppiTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._dipendenti2GruppiTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } if ((this._anagGruppiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -36237,15 +37079,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } - if ((this._dipendenti2GruppiTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._dipendenti2GruppiTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } if ((this._dipendentiTableAdapter != null)) { global::System.Data.DataRow[] updatedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); @@ -36354,6 +37187,15 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(updatedRows); } } + if ((this._listTagDDTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.ListTagDD.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._listTagDDTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -36364,6 +37206,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateInsertedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allAddedRows) { int result = 0; + if ((this._dipendenti2GruppiTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._dipendenti2GruppiTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } if ((this._anagGruppiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.AnagGruppi.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -36388,14 +37238,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } - if ((this._dipendenti2GruppiTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._dipendenti2GruppiTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } if ((this._dipendentiTableAdapter != null)) { global::System.Data.DataRow[] addedRows = dataSet.Dipendenti.Select(null, null, global::System.Data.DataViewRowState.Added); if (((addedRows != null) @@ -36492,6 +37334,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allAddedRows.AddRange(addedRows); } } + if ((this._listTagDDTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.ListTagDD.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._listTagDDTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -36502,6 +37352,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] private int UpdateDeletedRows(DS_Applicazione dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; + if ((this._listTagDDTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.ListTagDD.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._listTagDDTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._timbratureExplTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.TimbratureExpl.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -36598,14 +37456,6 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } - if ((this._dipendenti2GruppiTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._dipendenti2GruppiTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._anagOrariTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AnagOrari.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -36630,6 +37480,14 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND allChangedRows.AddRange(deletedRows); } } + if ((this._dipendenti2GruppiTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.Dipendenti2Gruppi.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._dipendenti2GruppiTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } return result; } @@ -36749,6 +37607,11 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + "tring."); } + if (((this._listTagDDTableAdapter != null) + && (this.MatchTableAdapterConnection(this._listTagDDTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("All TableAdapters managed by a TableAdapterManager must use the same connection s" + + "tring."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + @@ -36925,6 +37788,15 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND adaptersWithAcceptChangesDuringUpdate.Add(this._dipendenti2GruppiTableAdapter.Adapter); } } + if ((this._listTagDDTableAdapter != null)) { + revertConnections.Add(this._listTagDDTableAdapter, this._listTagDDTableAdapter.Connection); + this._listTagDDTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._listTagDDTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._listTagDDTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._listTagDDTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._listTagDDTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -37047,6 +37919,10 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND this._dipendenti2GruppiTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._dipendenti2GruppiTableAdapter])); this._dipendenti2GruppiTableAdapter.Transaction = null; } + if ((this._listTagDDTableAdapter != null)) { + this._listTagDDTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._listTagDDTableAdapter])); + this._listTagDDTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index ac976cb..209a0c1 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -3241,10 +3241,10 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND - + - dbo.stp_LTDD_ByUserDate + dbo.stp_LTM_ByUserDate @@ -3263,7 +3263,88 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND - + + + + + dbo.stp_LTDD_checkCreateByDipDate + + + + + + + + + + + + + + + + + + + DELETE FROM [ListTagDD] WHERE (([IdxTagDD] = @Original_IdxTagDD)) + + + + + + + + SELECT * FROM ListTagDD + + + + + + UPDATE [ListTagDD] SET [DtRif] = @DtRif, [IsActive] = @IsActive WHERE (([IdxTagDD] = @Original_IdxTagDD)); +SELECT IdxTagDD, DtRif, IsActive FROM ListTagDD WHERE (IdxTagDD = @IdxTagDD) + + + + + + + + + + + + + + + + + + + + + + dbo.stp_LTDD_ByUserDate + + + + + + + + + + + + + dbo.stp_LTDD_toggleActive + + + + + + + + @@ -4216,8 +4297,8 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND - - + + @@ -4237,6 +4318,23 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + + + + + + + + + + + + + + @@ -4349,6 +4447,10 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + + + + diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index 50d379a..5a99da2 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,36 +4,37 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + 391 @@ -45,7 +46,7 @@ - + 1046 @@ -57,7 +58,7 @@ - + 871 @@ -73,7 +74,7 @@ - + 585 @@ -85,7 +86,7 @@ - + 332 @@ -97,7 +98,7 @@ - + 285 @@ -109,7 +110,7 @@ - + 286 @@ -125,7 +126,7 @@ - + 428 diff --git a/GPW_Data/DataProxy.cs b/GPW_Data/DataProxy.cs index 4bbdd47..aec3d53 100644 --- a/GPW_Data/DataProxy.cs +++ b/GPW_Data/DataProxy.cs @@ -48,6 +48,8 @@ namespace GPW_data public DS_ApplicazioneTableAdapters.regAttDayExplTableAdapter taRAExpl; public DS_ApplicazioneTableAdapters.RegistroEventiTableAdapter taRE; public DS_ApplicazioneTableAdapters.RilievoTempTableAdapter taRT; + public DS_ApplicazioneTableAdapters.ListTagDDTableAdapter taListTDD; + public DS_ApplicazioneTableAdapters.TagMeseTableAdapter taTagMese; public DS_ApplicazioneTableAdapters.TimbratureTableAdapter taTimb; public DS_ApplicazioneTableAdapters.TimbratureExplTableAdapter taTimbExpl; public DS_ApplicazioneTableAdapters.TE_RA_ExplTableAdapter taTimbRegAtt; @@ -178,6 +180,8 @@ namespace GPW_data private void initTA() { taAnCli = new DS_ApplicazioneTableAdapters.AnagClientiTableAdapter(); + taListTDD = new DS_ApplicazioneTableAdapters.ListTagDDTableAdapter(); + taTagMese = new DS_ApplicazioneTableAdapters.TagMeseTableAdapter(); taTimb = new DS_ApplicazioneTableAdapters.TimbratureTableAdapter(); taTimbExpl = new DS_ApplicazioneTableAdapters.TimbratureExplTableAdapter(); taAnagDev = new DS_ApplicazioneTableAdapters.AnagDevicesTableAdapter(); @@ -215,6 +219,8 @@ namespace GPW_data string connGPW = memLayer.ML.confReadString("GPWConnectionString"); // connections del db taAnCli.Connection.ConnectionString = connGPW; + taListTDD.Connection.ConnectionString = connGPW; + taTagMese.Connection.ConnectionString = connGPW; taTimb.Connection.ConnectionString = connGPW; taTimbExpl.Connection.ConnectionString = connGPW; taAnagDev.Connection.ConnectionString = connGPW; From ad1dc86b3db32b03e628b89b581d3f1bfdd4b03e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 11:27:21 +0200 Subject: [PATCH 6/9] Ok editing tag assegnati --- .../WebUserControls/cmp_tagUserPeriodo.ascx | 19 ++- .../cmp_tagUserPeriodo.ascx.cs | 24 ++-- GPW_Admin/WebUserControls/mod_tagMensili.ascx | 7 +- .../WebUserControls/mod_tagMensili.ascx.cs | 115 ++++++++++-------- 4 files changed, 94 insertions(+), 71 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx index 671116e..02ced2d 100644 --- a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx +++ b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx @@ -4,12 +4,19 @@ - - - + + No Record - - - + + + + + + + <%----%> + + + <%----%> @@ -18,4 +25,4 @@ - \ No newline at end of file + diff --git a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs index 86931a1..3af2c6e 100644 --- a/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs +++ b/GPW_Admin/WebUserControls/cmp_tagUserPeriodo.ascx.cs @@ -1,4 +1,5 @@ -using System; +using GPW_data; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -10,8 +11,6 @@ namespace GPW_Admin.WebUserControls public partial class cmp_tagUserPeriodo : BaseUserControl { - public event EventHandler eh_reportUpdate; - protected void Page_Load(object sender, EventArgs e) { @@ -45,17 +44,24 @@ namespace GPW_Admin.WebUserControls /// public void reportUpdate() { - grView.SelectedIndex = -1; - grView.DataBind(); - if (eh_reportUpdate != null) - { - eh_reportUpdate(this, new EventArgs()); - } + doUpdate(); + raiseEvent(); } public void doUpdate() { + grView.SelectedIndex = -1; grView.DataBind(); } + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // prendo riga selezionata + int idxTagDD = Convert.ToInt32(grView.SelectedDataKey["IdxTagDD"].ToString()); + // eseguo toggle + DataProxy.DP.taListTDD.toggleActive(idxTagDD); + // aggiorno + reportUpdate(); + } } } \ No newline at end of file diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx b/GPW_Admin/WebUserControls/mod_tagMensili.ascx index 12c19f3..46b6875 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx @@ -31,9 +31,12 @@ - + + + + - + diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs index 18462cb..24b2b63 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs @@ -28,6 +28,8 @@ namespace GPW_Admin.WebUserControls /// public void resetSelezione() { + cmp_tagUserPeriodo.idxDip = -1; + cmp_tagUserPeriodo.doUpdate(); grView.SelectedIndex = -1; grView.DataBind(); if (eh_resetSelezione != null) @@ -40,16 +42,6 @@ namespace GPW_Admin.WebUserControls #region Protected Methods - /// - /// reset della selezione - /// - /// - /// - protected void btnReset_Click(object sender, EventArgs e) - { - resetSelezione(); - } - /// /// elenco colonne del datagrid /// @@ -94,50 +86,6 @@ namespace GPW_Admin.WebUserControls } } - - /// - /// caricamento - /// - /// - /// - protected void Page_Load(object sender, EventArgs e) - { - grView.PageSize = utils.pageSize; - if (!Page.IsPostBack) - { - filtroDip.ods = odsDip; - memLayer.ML.emptySessionVal("idxDip_sel"); - filtroDip.reselFirst(); - } - filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); - } - - #endregion Protected Methods - - #region Private Methods - - /// - /// imposto ODS - /// - private void checkFixOds() - { - memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); - grView.DataBind(); - } - - /// - /// seleziono - /// - /// - /// - private void filtroDip_eh_selValore(object sender, EventArgs e) - { - // imposto ods - checkFixOds(); - } - - #endregion Private Methods - protected void grView_SelectedIndexChanged(object sender, EventArgs e) { int anno = Convert.ToInt32(grView.SelectedDataKey["anno"].ToString()); @@ -169,5 +117,64 @@ namespace GPW_Admin.WebUserControls DataProxy.DP.taTagMese.checkCreateByDipDate("BP", filtroDip.valoreInt, inizio, fine, 270); doUpdate(); } + + /// + /// reset della selezione + /// + /// + /// + protected void lbtReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + /// + /// caricamento + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + grView.PageSize = utils.pageSize; + if (!Page.IsPostBack) + { + filtroDip.ods = odsDip; + memLayer.ML.emptySessionVal("idxDip_sel"); + filtroDip.reselFirst(); + } + filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); + cmp_tagUserPeriodo.eh_doRefresh += Cmp_tagUserPeriodo_eh_doRefresh; + } + + #endregion Protected Methods + + #region Private Methods + + /// + /// imposto ODS + /// + private void checkFixOds() + { + memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); + grView.DataBind(); + } + + private void Cmp_tagUserPeriodo_eh_doRefresh(object sender, EventArgs e) + { + doUpdate(); + } + + /// + /// seleziono + /// + /// + /// + private void filtroDip_eh_selValore(object sender, EventArgs e) + { + // imposto ods + checkFixOds(); + } + + #endregion Private Methods } } \ No newline at end of file From d48328f0e62bc564233bb21a1f467e94fc3dbc5a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 11:46:24 +0200 Subject: [PATCH 7/9] ADM: - vari fix grafici x gestione tag - aggiunta num tag disabilitati --- GPW_Admin/WebUserControls/cmp_footer.ascx | 3 +- GPW_Admin/WebUserControls/mod_tagMensili.ascx | 5 ++ .../WebUserControls/mod_tagMensili.ascx.cs | 13 ++++- GPW_Data/DS_Applicazione.Designer.cs | 48 ++++++++++++++++++- GPW_Data/DS_Applicazione.xsd | 4 +- 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_footer.ascx b/GPW_Admin/WebUserControls/cmp_footer.ascx index b78fb07..44af9f0 100644 --- a/GPW_Admin/WebUserControls/cmp_footer.ascx +++ b/GPW_Admin/WebUserControls/cmp_footer.ascx @@ -14,7 +14,8 @@
- + +
diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx b/GPW_Admin/WebUserControls/mod_tagMensili.ascx index 46b6875..cd38803 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx @@ -64,6 +64,11 @@ + + + + + diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs index 24b2b63..2bbc688 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx.cs @@ -28,8 +28,7 @@ namespace GPW_Admin.WebUserControls /// public void resetSelezione() { - cmp_tagUserPeriodo.idxDip = -1; - cmp_tagUserPeriodo.doUpdate(); + resetDetail(); grView.SelectedIndex = -1; grView.DataBind(); if (eh_resetSelezione != null) @@ -116,6 +115,7 @@ namespace GPW_Admin.WebUserControls // ricostruisco EVENTUALI BP (HARD CODED!!!) DataProxy.DP.taTagMese.checkCreateByDipDate("BP", filtroDip.valoreInt, inizio, fine, 270); doUpdate(); + resetDetail(); } /// @@ -141,6 +141,7 @@ namespace GPW_Admin.WebUserControls filtroDip.ods = odsDip; memLayer.ML.emptySessionVal("idxDip_sel"); filtroDip.reselFirst(); + resetDetail(); } filtroDip.eh_selValore += new EventHandler(filtroDip_eh_selValore); cmp_tagUserPeriodo.eh_doRefresh += Cmp_tagUserPeriodo_eh_doRefresh; @@ -157,6 +158,7 @@ namespace GPW_Admin.WebUserControls { memLayer.ML.setSessionVal("idxDip_sel", filtroDip.valoreInt); grView.DataBind(); + resetDetail(); } private void Cmp_tagUserPeriodo_eh_doRefresh(object sender, EventArgs e) @@ -172,9 +174,16 @@ namespace GPW_Admin.WebUserControls private void filtroDip_eh_selValore(object sender, EventArgs e) { // imposto ods + grView.SelectedIndex = -1; checkFixOds(); } + private void resetDetail() + { + cmp_tagUserPeriodo.idxDip = -1; + cmp_tagUserPeriodo.doUpdate(); + } + #endregion Private Methods } } \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index 986aabf..e03bf12 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -11415,6 +11415,8 @@ namespace GPW_data { private global::System.Data.DataColumn columnNumTag; + private global::System.Data.DataColumn columnNumDis; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public TagMeseDataTable() { @@ -11496,6 +11498,14 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn NumDisColumn { + get { + return this.columnNumDis; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -11533,7 +11543,7 @@ namespace GPW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public TagMeseRow AddTagMeseRow(int anno, int mese, int idxDipendente, string CognomeNome, string CodTag, int NumTag) { + public TagMeseRow AddTagMeseRow(int anno, int mese, int idxDipendente, string CognomeNome, string CodTag, int NumTag, int NumDis) { TagMeseRow rowTagMeseRow = ((TagMeseRow)(this.NewRow())); object[] columnValuesArray = new object[] { anno, @@ -11541,7 +11551,8 @@ namespace GPW_data { idxDipendente, CognomeNome, CodTag, - NumTag}; + NumTag, + NumDis}; rowTagMeseRow.ItemArray = columnValuesArray; this.Rows.Add(rowTagMeseRow); return rowTagMeseRow; @@ -11579,6 +11590,7 @@ namespace GPW_data { this.columnCognomeNome = base.Columns["CognomeNome"]; this.columnCodTag = base.Columns["CodTag"]; this.columnNumTag = base.Columns["NumTag"]; + this.columnNumDis = base.Columns["NumDis"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11596,6 +11608,8 @@ namespace GPW_data { base.Columns.Add(this.columnCodTag); this.columnNumTag = new global::System.Data.DataColumn("NumTag", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNumTag); + this.columnNumDis = new global::System.Data.DataColumn("NumDis", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnNumDis); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnanno, this.columnidxDipendente, @@ -11610,6 +11624,7 @@ namespace GPW_data { this.columnCodTag.AllowDBNull = false; this.columnCodTag.MaxLength = 50; this.columnNumTag.ReadOnly = true; + this.columnNumDis.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -19183,6 +19198,22 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public int NumDis { + get { + try { + return ((int)(this[this.tableTagMese.NumDisColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'NumDis\' in table \'TagMese\' is DBNull.", e); + } + } + set { + this[this.tableTagMese.NumDisColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsCognomeNomeNull() { @@ -19206,6 +19237,18 @@ namespace GPW_data { public void SetNumTagNull() { this[this.tableTagMese.NumTagColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsNumDisNull() { + return this.IsNull(this.tableTagMese.NumDisColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetNumDisNull() { + this[this.tableTagMese.NumDisColumn] = global::System.Convert.DBNull; + } } /// @@ -36149,6 +36192,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome"); tableMapping.ColumnMappings.Add("CodTag", "CodTag"); tableMapping.ColumnMappings.Add("NumTag", "NumTag"); + tableMapping.ColumnMappings.Add("NumDis", "NumDis"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index 209a0c1..a8dbdfe 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -5,7 +5,7 @@ - + @@ -3262,6 +3262,7 @@ SELECT idxDipendente, gruppo FROM Dipendenti2Gruppi WHERE (gruppo = @gruppo) AND + @@ -4315,6 +4316,7 @@ SELECT IdxTagDD, DtRif, IsActive FROM ListTagDD WHERE (IdxTagDD = @IdxTagDD) + From b6111d1cfdaad3450d5e171f71775200ff85ea61 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 4 Aug 2022 11:57:20 +0200 Subject: [PATCH 8/9] Fix display update periodo --- .../WebUserControls/cmp_periodoAnalisi.ascx | 6 +-- .../cmp_periodoAnalisi.ascx.designer.cs | 40 +++++++++---------- GPW_Admin/WebUserControls/mod_tagMensili.ascx | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx b/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx index 085bc1f..d2de5f6 100644 --- a/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx +++ b/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx @@ -8,7 +8,7 @@ // If not native HTML5 support, fallback to jQuery datePicker $('input[type=date]').datepicker({ // Consistent format with the HTML5 picker - dateFormat: 'yy-mm-dd' + dateFormat: 'yyyy-MM-dd' } //// Localization //,$.datepicker.regional['it'] @@ -43,8 +43,8 @@ - - + +
diff --git a/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx.designer.cs index acb6949..c873714 100644 --- a/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx.designer.cs +++ b/GPW_Admin/WebUserControls/cmp_periodoAnalisi.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace GPW_Admin.WebUserControls @@ -15,47 +15,47 @@ namespace GPW_Admin.WebUserControls { /// - /// Controllo ddlSelPeriodo. + /// ddlSelPeriodo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlSelPeriodo; /// - /// Controllo ods_ddlSelPeriodo. + /// ods_ddlSelPeriodo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods_ddlSelPeriodo; /// - /// Controllo txtInizio. + /// txtInizio control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtInizio; /// - /// Controllo txtFine. + /// txtFine control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtFine; /// - /// Controllo btnUpdate. + /// btnUpdate control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnUpdate; } diff --git a/GPW_Admin/WebUserControls/mod_tagMensili.ascx b/GPW_Admin/WebUserControls/mod_tagMensili.ascx index cd38803..12760c8 100644 --- a/GPW_Admin/WebUserControls/mod_tagMensili.ascx +++ b/GPW_Admin/WebUserControls/mod_tagMensili.ascx @@ -16,7 +16,7 @@
- +
Ricalcola From 1b5ba617156e43748cfcb6caccaabf9b32afb7c2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 12 Sep 2022 19:54:25 +0200 Subject: [PATCH 9/9] Fix generazione URL encoded --- GPW_Admin/WebUserControls/cmp_userCard.ascx.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs index 0265136..0b4fcd7 100644 --- a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs +++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using SteamWare; using System; +using System.Web; namespace GPW_Admin.WebUserControls { @@ -76,13 +77,18 @@ namespace GPW_Admin.WebUserControls string urlName = showExt ? "smartBaseUrlExt" : "smartBaseUrlInt"; string[] valori = new string[2]; valori[0] = $"{idxDip}"; - valori[1] = $"{UserAuthkey}"; + valori[1] = HttpUtility.UrlEncode($"{UserAuthkey}"); + + string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/{memLayer.ML.CRS("UrlQuery")}"; + //string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/JSON_ENC?val="; + string urlEncoded = memLayer.ML.CRS(urlName) + HttpUtility.UrlEncode("jumper?idxDipendente={0}&UserAuthkey={1}"); + + //string rawUrl = memLayer.ML.CRS(urlName) + "jumper?idxDipendente={0}&UserAuthkey={1}"; + //string urlEncoded = HttpUtility.UrlEncode(rawUrl); - string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/JSON?val="; qrPayload currPayload = new qrPayload() { - // NB: & --> %26 - baseUrl = memLayer.ML.CRS(urlName) + "jumper?idxDipendente={0}%26UserAuthkey={1}", + baseUrl = urlEncoded, parameters = valori }; string payload = JsonConvert.SerializeObject(currPayload);