Compare commits

..

43 Commits

Author SHA1 Message Date
Samuele Locatelli daa520e61d Iinstaller su master + approvazione manuale 2021-09-22 11:40:06 +02:00
Samuele Locatelli c609678322 modifica x test pubblicazione nexus 2021-09-22 11:34:45 +02:00
Samuele Locatelli de63ffbf7d completato test riscrittura aprametrica zip 2021-09-22 11:25:12 +02:00
Samuele Locatelli f823469724 test parametrizzazione zipName 2021-09-22 11:24:08 +02:00
Samuele Locatelli 7c0d79fd0a update fino a staging 2021-09-22 11:16:16 +02:00
Samuele Locatelli 26bf24ebf7 Inizio fix yaml ci/cd 2021-09-22 11:14:23 +02:00
Marco Salvi 9f2a08c80f Update .gitlab-ci.yml file 2021-09-17 11:15:56 +00:00
marco.salvi 753e2132ec Suddivisione build 2021-09-17 13:13:45 +02:00
Marco Salvi 6459fa9c65 Update .gitlab-ci.yml file 2021-09-17 10:20:23 +00:00
marco.salvi bd69ea0777 Test per scrittura nexus 2021-09-17 11:54:01 +02:00
Marco Salvi 39e8120cfc Update .gitlab-ci.yml file 2021-09-17 07:17:56 +00:00
Marco Salvi 4b256fee30 Update .gitlab-ci.yml file 2021-09-14 16:08:28 +00:00
Marco Salvi 5fd0bf1909 Update .gitlab-ci.yml file 2021-09-14 15:56:27 +00:00
marco.salvi 4527f6b911 Test new target hashBuild 2021-09-14 17:43:32 +02:00
marco.salvi 43604e4377 Disabilito temporaneamente deploy su iis01 2021-09-14 16:56:49 +02:00
marco.salvi 9ebdd50a68 Fix IIS01 2021-09-14 16:30:29 +02:00
marco.salvi 8b056efd9b Test variabile locale per APP_NAME 2021-09-14 15:46:35 +02:00
Samuele Locatelli 7009be0871 Merge branch 'develop' 2021-09-13 11:29:04 +02:00
Samuele Locatelli b4220a1261 Merge tag 'FixCookieSessionTImeouts' into develop
Fix timeout sessione
2021-09-13 11:27:02 +02:00
Samuele Locatelli 4eec0d3bb1 Rimesso in web.config timeout sessione TAB esplicito 2021-09-13 11:25:42 +02:00
Samuele Locatelli a5bb3f7285 Inizio gestione fix gitlab 2021-09-10 18:17:07 +02:00
Samuele Locatelli 1d6788c89d Release iniziale file yaml gitlab x CICD 2021-09-10 17:55:06 +02:00
Samuele Locatelli 41c2b3aa18 Merge branch 'release/FixCookieSessionTImeouts' 2021-09-10 15:24:15 +02:00
Samuele Locatelli 42def6d4a2 Fix timeout: gestito da IIS e non da web.config 2021-09-10 15:23:42 +02:00
Samuele Locatelli a9529a8427 Fix gestione cookie expyre in frazioni di giorno 2021-09-10 15:04:39 +02:00
Samuele Locatelli 5f84fc1aab correizone nexus https in jenkinsfile 2021-09-09 16:45:36 +02:00
Samuele Locatelli 0f621f56bf Merge tag 'TabReviewCookieExpiry' into develop
Expiry in giorni decimali
2021-09-09 16:09:27 +02:00
Samuele Locatelli 2c8d649577 Merge branch 'release/TabReviewCookieExpiry' 2021-09-09 16:09:16 +02:00
Samuele Locatelli 1040582f65 Update expiry date decimale (er aintero) x TAB 2021-09-09 16:08:11 +02:00
Samuele Locatelli 10a050ee09 Merge tag 'FixMagOdlSearch' into develop
Fix search/cancel x articolo ODL
2021-09-01 14:51:48 +02:00
Samuele Locatelli 8d21f655c1 Merge branch 'release/FixMagOdlSearch' 2021-09-01 14:51:39 +02:00
Samuele Locatelli 41bca8823f MAG: Update con btn search + reset x articolo ODL 2021-09-01 14:51:12 +02:00
Samuele Locatelli a96fe723b2 Fix git spread (eslude master) 2021-09-01 10:22:20 +02:00
Samuele Locatelli ced24cb340 Merge tag 'AddMagOdlPrintArtSearch' into develop
FIx ricerca articolo x ristampa ODL
2021-09-01 10:22:11 +02:00
Samuele Locatelli bea5804f8f Merge branch 'release/AddMagOdlPrintArtSearch' 2021-09-01 10:21:15 +02:00
Samuele Locatelli bd1d80fbdb Aggiunta funzionalità ricerca x articolo x ristampa ODL MAG 2021-09-01 10:20:41 +02:00
Samuele Locatelli df8dbbfd0c Merge tag 'FixDerogaCheck' into develop
Fix gestioen deroca (ciclo su ttute le richieste)
2021-08-31 09:31:30 +02:00
Samuele Locatelli 41e41157f7 Merge branch 'release/FixDerogaCheck' 2021-08-31 09:31:19 +02:00
Samuele Locatelli 59fb6a2166 Fix controllo deroghe e abilitazione force 2021-08-31 09:29:11 +02:00
Samuele Locatelli d5614138ec Update con registrazione forzata/non forzata scheda tecnica (check) 2021-08-02 12:42:46 +02:00
Samuele Locatelli a70e22c95c Merge branch 'develop' into beta 2021-07-30 17:30:47 +02:00
Samuele Locatelli 70aa4d31da Fix errore elencolotti vuoto 2021-07-30 17:29:45 +02:00
Samuele Locatelli 6443424455 fix fontawesome e font woff 2021-07-30 17:28:45 +02:00
41 changed files with 997 additions and 369 deletions
+471
View File
@@ -0,0 +1,471 @@
variables:
NUGET_PATH: 'C:\Tools\nuget.exe'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\MoonPro\Release'
DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds'
VERS_MAIN: '6.14'
NEW_REL: ''
NEXUS_PATH: 'MP-XXXX'
APP_NAME: 'MP.Xxxx'
ZIP_NAME: ''
# helper x fix pacchetti nuget da repo locale nexus.steamware.net
.nuget-fix: &nuget-fix
- |
$hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
if ($hasSource -eq 0) {
C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
} else {
C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
}
echo $hasSource
# helper creazione hash files x IIS
.hashBuild: &hashBuild
# $Target = $env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:NEW_REL + "\" + $env:ZIP_NAME + ".zip"
- |
$Target = $env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:ZIP_NAME + ".zip"
$MD5 = Get-FileHash $Target -Algorithm MD5
$SHA1 = Get-FileHash $Target -Algorithm SHA1
New-Item $Target".md5"
New-Item $Target".sha1"
$MD5.Hash | Set-Content -Path $Target".md5"
$SHA1.Hash | Set-Content -Path $Target".sha1"
echo "Created HASH files for $Target"
# helper x send su NEXUS x pack
.nexusUpload: &nexusUpload
# $File2Send = Get-ChildItem($env:APP_NAME + "\ReleaseClienti\MAPO_PROD\" + $env:NEW_REL + "\*")
- |
Set-Alias mCurl C:\Windows\system32\curl.exe
$currentDate = get-date -format yyMM;
$currentTime = get-date -format ddHH;
$VersNumb = $env:NEW_REL
echo "Curr Version: $VersNumb"
if($CI_COMMIT_BRANCH -eq "master")
{
$version = "stable"
}
else
{
$version = "unstable"
}
$File2Send = Get-ChildItem($env:APP_NAME + "\ReleaseClienti\MAPO_PROD\*")
ForEach ($File in $File2Send) {
$FileName = Split-Path $File -leaf
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName
}
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "VersGen\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "VersGen\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
# helper x fix version number
.version-fix: &version-fix
- |
$env:NEW_REL = $env:VERS_MAIN+"."+(get-date format yyMM)+"."+(get-date format dHH)
echo "Set vers: $env:NEW_REL"
$contenuto = Get-Content -path 'VersGen\MoonPro.cs' -Raw
$newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
$newContenuto | Set-Content -Path 'VersGen\MoonPro.cs'
stages:
- build
- staging
- deploy
- installer
ADM:build:
stage: build
variables:
CURR_PRJ: "MP-ADM"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
IO:build:
stage: build
variables:
CURR_PRJ: "MP-IO"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
SITE:build:
stage: build
variables:
CURR_PRJ: "MP-SITE"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
MON:build:
stage: build
variables:
CURR_PRJ: "MP-MON"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
TAB:build:
stage: build
variables:
CURR_PRJ: "MP-TAB"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
MAG:build:
stage: build
variables:
CURR_PRJ: "MP-MAG"
tags:
- win
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln' # path alla solution corrente
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-MAG/MP-MAG.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
# test_job:
# stage: test
# only:
# - tags
# script:
# - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests
# artifacts:
# when: always # save test results even when the task fails
# expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on
# paths:
# - '.\TestResult.xml' # saving NUnit results to copy to deploy folder
# dependencies:
# - build_job
ADM:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
needs: ["ADM:build"]
IO:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-IO/MP-IO.csproj'
needs: ["IO:build"]
SITE:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
MON:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-MON/MP-MON.csproj'
needs: ["MON:build"]
TAB:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
needs: ["TAB:build"]
MAG:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
needs: ["MAG:build"]
ADM:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
needs: ["ADM:build"]
IO:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-IO/MP-IO.csproj'
needs: ["IO:build"]
SITE:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
MON:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-MON/MP-MON.csproj'
needs: ["MON:build"]
TAB:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
needs: ["TAB:build"]
MAG:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /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/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
needs: ["MAG:build"]
ADM:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-ADM
NEXUS_PATH: MP-ADM
ZIP_NAME: ADM
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["ADM:build"]
IO:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-IO
NEXUS_PATH: MP-IO
ZIP_NAME: IO
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["IO:build"]
SITE:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-SITE
NEXUS_PATH: MP-SITE
ZIP_NAME: SITE
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["SITE:build"]
MON:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-MON
NEXUS_PATH: MP-MON
ZIP_NAME: MON
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["MON:build"]
TAB:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-TAB
NEXUS_PATH: MP-TAB
ZIP_NAME: TAB
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["TAB:build"]
MAG:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
variables:
APP_NAME: MP-MAG
NEXUS_PATH: MP-MAG
ZIP_NAME: MAG
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore MAPO.sln'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=8 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=SPS /p:PublishProfile=SPS.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/MAPO_PROD/$env:ZIP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-$env:ZIP_NAME/MP-$env:ZIP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["MAG:build"]
Vendored
+6 -6
View File
@@ -13,7 +13,7 @@ pipeline {
steps { steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */ /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script { script {
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "dHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO' env.APP_NAME = 'MAPO'
} }
script { script {
@@ -158,8 +158,8 @@ pipeline {
// lancio upload con nuget! // lancio upload con nuget!
echo 'Start upload with nuget push' echo 'Start upload with nuget push'
bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted" bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted"
bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted" bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted"
} }
else if ( env.singleProj.contains(env.BRANCH_NAME) ) { else if ( env.singleProj.contains(env.BRANCH_NAME) ) {
parallel ( parallel (
@@ -374,16 +374,16 @@ def sendSlack(status, colorCode) {
} }
// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy // funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy
def fixNuget(solutionFile) { def fixNuget(solutionFile) {
// bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group" // bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-group"
// solo la prima volta va aggiunta... // solo la prima volta va aggiunta...
hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C" hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C"
if (hasSource == "0") if (hasSource == "0")
{ {
bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
} }
else else
{ {
bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\"" bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source https://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
} }
bat "e:\\nuget.exe restore ${solutionFile}" bat "e:\\nuget.exe restore ${solutionFile}"
} }
+2 -2
View File
@@ -322,9 +322,9 @@
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
-6
View File
@@ -269,8 +269,6 @@
<Content Include="images\macchine\Transfer_Tecnotransfer.jpg" /> <Content Include="images\macchine\Transfer_Tecnotransfer.jpg" />
<Content Include="inputIOB.aspx" /> <Content Include="inputIOB.aspx" />
<Content Include="lastUpdate.aspx" /> <Content Include="lastUpdate.aspx" />
<Content Include="libzstd.dll" />
<Content Include="mongocrypt.dll" />
<Content Include="PingPage.htm" /> <Content Include="PingPage.htm" />
<Content Include="Properties\PublishProfiles\IIS01.pubxml.user" /> <Content Include="Properties\PublishProfiles\IIS01.pubxml.user" />
<Content Include="Properties\PublishProfiles\IIS02.pubxml.user" /> <Content Include="Properties\PublishProfiles\IIS02.pubxml.user" />
@@ -285,8 +283,6 @@
</Content> </Content>
<Content Include="sendReboot.aspx" /> <Content Include="sendReboot.aspx" />
<Content Include="sigLogEnabled.aspx" /> <Content Include="sigLogEnabled.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="status.aspx" /> <Content Include="status.aspx" />
<Content Include="Web.config"> <Content Include="Web.config">
<SubType>Designer</SubType> <SubType>Designer</SubType>
@@ -368,8 +364,6 @@
<Content Include="NLog.config"> <Content Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="libmongocrypt.so" />
<Content Include="libmongocrypt.dylib" />
<None Include="NLog.xsd"> <None Include="NLog.xsd">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
+2 -2
View File
@@ -335,9 +335,9 @@
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -337,8 +337,8 @@
<clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="365.00:00:00" /> <clientCache cacheControlCustom="public" cacheControlMode="UseMaxAge" cacheControlMaxAge="365.00:00:00" />
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
</staticContent> </staticContent>
<modules> <modules>
<remove name="Session" /> <remove name="Session" />
-3
View File
@@ -799,7 +799,6 @@
<Content Include="images\LogoSteamware.png" /> <Content Include="images\LogoSteamware.png" />
<Content Include="images\SteamwareLogo.png" /> <Content Include="images\SteamwareLogo.png" />
<Content Include="jumper.aspx" /> <Content Include="jumper.aspx" />
<Content Include="mongocrypt.dll" />
<Content Include="Resources\ChangeLog.html"> <Content Include="Resources\ChangeLog.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
@@ -847,8 +846,6 @@
</Content> </Content>
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" /> <Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" /> <Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="libmongocrypt.so" />
<Content Include="libmongocrypt.dylib" />
<Content Include="Scripts\bootstrap.min.js.map" /> <Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" /> <Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" /> <Content Include="Scripts\bootstrap.bundle.min.js.map" />
+4
View File
@@ -22,6 +22,10 @@
<i class="fa-2x fas fa-print"></i> <i class="fa-2x fas fa-print"></i>
<span class="shortcut-label">SEMILAVORATI</span> <span class="shortcut-label">SEMILAVORATI</span>
</a>--%> </a>--%>
<a href="printCartOdl" class="shortcut">
<i class="fa-2x text-dark fas fa-print"></i>
<span class="shortcut-label">Stampa ODL</span>
</a>
<a href="packList" class="shortcut"> <a href="packList" class="shortcut">
<i class="fa-2x text-dark fas fa-shipping-fast"></i> <i class="fa-2x text-dark fas fa-shipping-fast"></i>
<span class="shortcut-label">Richiesta PackList</span> <span class="shortcut-label">Richiesta PackList</span>
+8 -8
View File
@@ -1,17 +1,17 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <generato automaticamente> // <auto-generated>
// 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 // Changes to this file may cause incorrect behavior and will be lost if
// il codice viene rigenerato. // the code is regenerated.
// </generato automaticamente> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MP_MAG.SMART namespace MP_MAG.SMART
{ {
public partial class menu public partial class menu
{ {
} }
} }
+2 -1
View File
@@ -27,7 +27,8 @@
<webopt:BundleReference runat="server" Path="~/Content/css" /> <webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="~/Content/fontawesome-all.min.css" rel="stylesheet" /> <link href="~/Content/all.min.css" rel="stylesheet" />
<%--<link href="~/Content/fontawesome.css" rel="stylesheet" />--%>
</head> </head>
<body class="pt-0"> <body class="pt-0">
<form runat="server"> <form runat="server">
+2 -2
View File
@@ -87,9 +87,9 @@
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
+1 -1
View File
@@ -7,7 +7,7 @@ using System.Web.UI.WebControls;
namespace MP_MAG.WebUserControls namespace MP_MAG.WebUserControls
{ {
public partial class cmp_dettLotti : System.Web.UI.UserControl public partial class cmp_dettLotti : BaseUserControl
{ {
#region Public Events #region Public Events
+37 -7
View File
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_listODL.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_listODL" %> <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_listODL.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_listODL" %>
<%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %>
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
@@ -7,9 +7,27 @@
<div class="col-4"> <div class="col-4">
<h5>Ultimi ODL</h5> <h5>Ultimi ODL</h5>
</div> </div>
<div class="col-8"> <div class="col-4">
<asp:DropDownList runat="server" ID="ddlMacchina" DataSourceID="odsMacchina" DataTextField="label" DataValueField="value" CssClass="form-input" AutoPostBack="true"></asp:DropDownList> <div class="input-group">
<asp:ObjectDataSource runat="server" ID="odsMacchina" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MagData.DS_UtilityTableAdapters.selMacchineTableAdapter"></asp:ObjectDataSource> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-industry" aria-hidden="true"></i></span>
</div>
<asp:DropDownList runat="server" ID="ddlMacchina" DataSourceID="odsMacchina" DataTextField="label" DataValueField="value" CssClass="form-control" AutoPostBack="true"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsMacchina" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MagData.DS_UtilityTableAdapters.selMacchineTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="col-4">
<div class="input-group">
<div class="input-group-prepend">
<asp:LinkButton runat="server" ID="lbtSearch" CssClass="btn btn-secondary" OnClick="lbtSearch_Click">
<i class="fa fa-search" aria-hidden="true"></i>
</asp:LinkButton>
</div>
<asp:TextBox runat="server" ID="txtSearch" class="form-control" placeholder="Ricerca Articolo" AutoPostBack="true" />
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtResetSearch" CssClass="btn btn-secondary" OnClick="lbtResetSearch_Click"><i class="fa fa-window-close" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -25,8 +43,8 @@
<Columns> <Columns>
<asp:TemplateField ShowHeader="False"> <asp:TemplateField ShowHeader="False">
<HeaderTemplate> <HeaderTemplate>
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fas fa-sync"></i></asp:LinkButton> <asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fas fa-sync"></i></asp:LinkButton>
</HeaderTemplate> </HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton> <asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate> </ItemTemplate>
@@ -52,10 +70,22 @@
<asp:BoundField DataField="CodCli" HeaderText="CodCli" SortExpression="CodCli" /> <asp:BoundField DataField="CodCli" HeaderText="CodCli" SortExpression="CodCli" />
</Columns> </Columns>
</asp:GridView> </asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getLastByMacc" TypeName="MagData.DS_MagTableAdapters.ODLTableAdapter"> <asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getLastByMacc" TypeName="MagData.DS_MagTableAdapters.ODLTableAdapter" FilterExpression=" CodArticolo LIKE '%{0}%'">
<SelectParameters> <SelectParameters>
<asp:ControlParameter ControlID="ddlMacchina" DefaultValue="#" Name="IdxMacchina" PropertyName="SelectedValue" Type="String" /> <asp:ControlParameter ControlID="ddlMacchina" DefaultValue="#" Name="IdxMacchina" PropertyName="SelectedValue" Type="String" />
</SelectParameters> </SelectParameters>
<FilterParameters>
<asp:ControlParameter ControlID="txtSearch" DefaultValue="" Type="String" />
</FilterParameters>
</asp:ObjectDataSource> </asp:ObjectDataSource>
</div> </div>
<div class="card-footer">
<div class="row">
<div class="col-8">
</div>
<div class="col-4 text-right">
<uc1:cmp_numRow runat="server" ID="cmp_numRow" />
</div>
</div>
</div>
</div> </div>
+24 -1
View File
@@ -12,6 +12,11 @@ namespace MP_MAG.WebUserControls
{ {
#region Private Methods #region Private Methods
private void Cmp_numRow_eh_doRefresh(object sender, EventArgs e)
{
grView.PageSize = cmp_numRow.numRow;
}
private void resetSelezione() private void resetSelezione()
{ {
grView.SelectedIndex = -1; grView.SelectedIndex = -1;
@@ -97,12 +102,25 @@ namespace MP_MAG.WebUserControls
resetSelezione(); resetSelezione();
} }
protected void lbtResetSearch_Click(object sender, EventArgs e)
{
// reset ricerca!
txtSearch.Text = "";
}
protected void lbtSearch_Click(object sender, EventArgs e)
{
// ricerca senza fare nulla
}
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
if (!Page.IsPostBack) if (!Page.IsPostBack)
{ {
grView.PageSize = 5; cmp_numRow.numRow = 10;
grView.PageSize = cmp_numRow.numRow;
} }
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
} }
protected int QtaUdcByOdl(int idxOdl) protected int QtaUdcByOdl(int idxOdl)
@@ -124,6 +142,11 @@ namespace MP_MAG.WebUserControls
return answ; return answ;
} }
protected void txtSearch_TextChanged(object sender, EventArgs e)
{
// esegue update senza fare nulla
}
#endregion Protected Methods #endregion Protected Methods
} }
} }
+53 -17
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <generato automaticamente> // <auto-generated>
// 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 // Changes to this file may cause incorrect behavior and will be lost if
// il codice viene rigenerato. // the code is regenerated.
// </generato automaticamente> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MP_MAG.WebUserControls namespace MP_MAG.WebUserControls
@@ -15,39 +15,75 @@ namespace MP_MAG.WebUserControls
{ {
/// <summary> /// <summary>
/// Controllo ddlMacchina. /// ddlMacchina control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlMacchina; protected global::System.Web.UI.WebControls.DropDownList ddlMacchina;
/// <summary> /// <summary>
/// Controllo odsMacchina. /// odsMacchina control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchina; protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchina;
/// <summary> /// <summary>
/// Controllo grView. /// lbtSearch control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtSearch;
/// <summary>
/// txtSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// lbtResetSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtResetSearch;
/// <summary>
/// grView control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.GridView grView; protected global::System.Web.UI.WebControls.GridView grView;
/// <summary> /// <summary>
/// Controllo ods. /// ods control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods; protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// cmp_numRow control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_numRow cmp_numRow;
} }
} }
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2 -2
View File
@@ -355,10 +355,10 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" /> <add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah" preCondition="managedHandler" />
</modules> </modules>
<staticContent> <staticContent>
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="font/woff2" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
+2 -2
View File
@@ -349,9 +349,9 @@
<system.webServer> <system.webServer>
<staticContent> <staticContent>
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
+3 -3
View File
@@ -30,7 +30,7 @@
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" /> <add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls> </controls>
</pages> </pages>
<sessionState mode="Custom" customProvider="MySessionStateStore"> <sessionState mode="Custom" customProvider="MySessionStateStore" timeout="1">
<providers> <providers>
<!-- For more details check https://github.com/Azure/aspnet-redis-providers/wiki --> <!-- For more details check https://github.com/Azure/aspnet-redis-providers/wiki -->
<add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false" applicationName="MP_TAB" databaseId="1" /> <add name="MySessionStateStore" type="Microsoft.Web.Redis.RedisSessionStateProvider" host="127.0.0.1" accessKey="" ssl="false" applicationName="MP_TAB" databaseId="1" />
@@ -351,9 +351,9 @@
</modules> </modules>
<staticContent> <staticContent>
<remove fileExtension=".woff" /> <remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff" mimeType="font/woff" />
<remove fileExtension=".woff2" /> <remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" /> <mimeMap fileExtension=".woff2" mimeType="font/woff2" />
<remove fileExtension=".svg" /> <remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" /> <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent> </staticContent>
+1 -1
View File
@@ -64,7 +64,7 @@
</ContentTemplate> </ContentTemplate>
</asp:UpdatePanel> </asp:UpdatePanel>
<!-- /.container --> <!-- /.container -->
<asp:UpdatePanel ID="uppFooter" runat="server"> <asp:UpdatePanel ID="uppFooter" runat="server" RenderMode="Block" UpdateMode="Conditional">
<ContentTemplate> <ContentTemplate>
<uc1:mod_footer runat="server" ID="mod_footer" /> <uc1:mod_footer runat="server" ID="mod_footer" />
</ContentTemplate> </ContentTemplate>
+45 -43
View File
@@ -1,122 +1,124 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <generato automaticamente> // <auto-generated>
// 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 // Changes to this file may cause incorrect behavior and will be lost if
// il codice viene rigenerato. // the code is regenerated.
// </generato automaticamente> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace WebMasterPages { namespace WebMasterPages
{
public partial class Bootstrap { public partial class Bootstrap
{
/// <summary> /// <summary>
/// Controllo PlaceHolder1. /// PlaceHolder1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary> /// <summary>
/// Controllo BundleReference1. /// BundleReference1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary> /// <summary>
/// Controllo BundleReference2. /// BundleReference2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary> /// <summary>
/// Controllo HeadContent. /// HeadContent control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
/// <summary> /// <summary>
/// Controllo form1. /// form1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// Controllo ScriptManager1. /// ScriptManager1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager1; protected global::System.Web.UI.ScriptManager ScriptManager1;
/// <summary> /// <summary>
/// Controllo mod_title. /// mod_title control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::MoonProTablet.WebUserControls.mod_title mod_title; protected global::MoonProTablet.WebUserControls.mod_title mod_title;
/// <summary> /// <summary>
/// Controllo uppContainer. /// uppContainer control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.UpdatePanel uppContainer; protected global::System.Web.UI.UpdatePanel uppContainer;
/// <summary> /// <summary>
/// Controllo MainContent. /// MainContent control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
/// <summary> /// <summary>
/// Controllo uppFooter. /// uppFooter control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.UpdatePanel uppFooter; protected global::System.Web.UI.UpdatePanel uppFooter;
/// <summary> /// <summary>
/// Controllo mod_footer. /// mod_footer control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::MoonProTablet.WebUserControls.mod_footer mod_footer; protected global::MoonProTablet.WebUserControls.mod_footer mod_footer;
/// <summary> /// <summary>
/// Controllo PlaceHolder2. /// PlaceHolder2 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2; protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder2;
} }
+31 -23
View File
@@ -72,18 +72,6 @@ namespace MoonProTablet.WebUserControls
#region Private Methods #region Private Methods
public void checkInputData()
{
bool showInput = false;
try
{
showInput = DataLayerObj.taSTAR.getPendingByOdl(idxOdl).Count > 0;
}
catch
{ }
divCheckData.Visible = showInput;
}
/// <summary> /// <summary>
/// procedura pricipale decodifica Barcode /// procedura pricipale decodifica Barcode
/// </summary> /// </summary>
@@ -110,7 +98,7 @@ namespace MoonProTablet.WebUserControls
lblMessage.Text = $"Parametro acquisito: {BCodeVal}"; lblMessage.Text = $"Parametro acquisito: {BCodeVal}";
lblMessage.CssClass = "text-success"; lblMessage.CssClass = "text-success";
// upsert controllo // upsert controllo
DataLayerObj.taSTChk.upsertQuery(idxOdl, datiEqCheck.IdxST, datiEqCheck.Oggetto, datiEqCheck.Num, BCodeVal, BCodeVal, true, user_std.UtSn.utente); DataLayerObj.taSTChk.upsertQuery(idxOdl, datiEqCheck.IdxST, datiEqCheck.Oggetto, datiEqCheck.Num, BCodeVal, BCodeVal, true, user_std.UtSn.utente, false);
} }
// se non trovato // se non trovato
@@ -130,7 +118,7 @@ namespace MoonProTablet.WebUserControls
// registro trovato // registro trovato
found = true; found = true;
// upsert controllo // upsert controllo
DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente); DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente, false);
// conto quanti check ci sono dopo, se calati --> ok altrimenti errore // conto quanti check ci sono dopo, se calati --> ok altrimenti errore
var tabRichiestePost = DataLayerObj.taSTAR.getPendingByOdl(idxOdl); var tabRichiestePost = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
if (tabRichiestePost.Count < tabRichieste.Count) if (tabRichiestePost.Count < tabRichieste.Count)
@@ -149,17 +137,21 @@ namespace MoonProTablet.WebUserControls
if (!batchOk) if (!batchOk)
{ {
// verifico EVENTUALI deroghe
var currDeroga = DataLayerObj.getDerogaSt(tabRichieste[0].IdxST); var currDeroga = DataLayerObj.getDerogaSt(tabRichieste[0].IdxST);
// se è deroga x gruppo/tipo/num corretto... // ciclo tra TUTTE le richeiste attive
if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num && tabRichieste[0].Oggetto == currDeroga.Oggetto) foreach (var item in tabRichieste)
{ {
// ... forzo accettazione deroga // verifico EVENTUALI deroghe
DataLayerObj.taSTChk.upsertQuery(idxOdl, tabRichieste[0].IdxST, tabRichieste[0].Oggetto, tabRichieste[0].Num, BCodeVal, tabRichieste[0].Value, true, user_std.UtSn.utente); // se è deroga x gruppo/tipo/num corretto...
lblMessage.Text = $"Lotto/articolo non valido: {BCodeVal} --> Forzato a valido per articolo {tabRichieste[0].Value}"; if (currDeroga.CanForce && item.CodGruppo == currDeroga.CodGruppo && item.CodTipo == currDeroga.CodTipo && item.Num == currDeroga.Num && item.Oggetto == currDeroga.Oggetto)
lblMessage.CssClass = "text-warning"; {
DataLayerObj.setDerogaSt(new MapoSDK.StCheckOverride() { IdxST = tabRichieste[0].IdxST, CanForce = false }); // ... forzo accettazione deroga
batchOk = true; DataLayerObj.taSTChk.upsertQuery(idxOdl, item.IdxST, item.Oggetto, item.Num, BCodeVal, item.Value, true, user_std.UtSn.utente, true);
lblMessage.Text = $"Lotto/articolo non valido: {BCodeVal} --> Forzato a valido per articolo {item.Value}";
lblMessage.CssClass = "text-warning";
DataLayerObj.setDerogaSt(new MapoSDK.StCheckOverride() { IdxST = item.IdxST, CanForce = false });
batchOk = true;
}
} }
} }
} }
@@ -218,5 +210,21 @@ namespace MoonProTablet.WebUserControls
} }
#endregion Protected Methods #endregion Protected Methods
#region Public Methods
public void checkInputData()
{
bool showInput = false;
try
{
showInput = DataLayerObj.taSTAR.getPendingByOdl(idxOdl).Count > 0;
}
catch
{ }
divCheckData.Visible = showInput;
}
#endregion Public Methods
} }
} }
+81 -75
View File
@@ -13,6 +13,38 @@ namespace MoonProTablet.WebUserControls
{ {
public partial class cmp_ST_objView : BaseUserControl public partial class cmp_ST_objView : BaseUserControl
{ {
#region Protected Properties
protected bool enableForceParamSchedaTecnica
{
get
{
return memLayer.ML.cdvb("enableForceParamSchedaTecnica");
}
}
protected bool hasDeroga
{
get
{
bool answ = false;
try
{
var currDeroga = DataLayerObj.getDerogaSt(idxST);
answ = (currDeroga != null);
if (answ)
{
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto);
}
}
catch
{ }
return answ;
}
}
#endregion Protected Properties
#region Public Properties #region Public Properties
public string dataCss public string dataCss
@@ -35,30 +67,6 @@ namespace MoonProTablet.WebUserControls
} }
} }
public string dataLabel
{
get
{
return hfLabel.Value.Trim();
}
set
{
hfLabel.Value = value.Trim();
}
}
public string dataType
{
get
{
return hfType.Value.Trim();
}
set
{
hfType.Value = value.Trim();
fixDisplay();
}
}
public string dataGroup public string dataGroup
{ {
get get
@@ -71,6 +79,18 @@ namespace MoonProTablet.WebUserControls
} }
} }
public string dataLabel
{
get
{
return hfLabel.Value.Trim();
}
set
{
hfLabel.Value = value.Trim();
}
}
public int dataNum public int dataNum
{ {
get get
@@ -99,17 +119,16 @@ namespace MoonProTablet.WebUserControls
} }
} }
public int idxST public string dataType
{ {
get get
{ {
int answ = 0; return hfType.Value.Trim();
int.TryParse(hfIdxST.Value, out answ);
return answ;
} }
set set
{ {
hfIdxST.Value = $"{value}"; hfType.Value = value.Trim();
fixDisplay();
} }
} }
@@ -138,6 +157,16 @@ namespace MoonProTablet.WebUserControls
} }
} }
public string derogaCss
{
get
{
string answ = enableForceParamSchedaTecnica && hasDeroga ? " bg-warning" : "";
return answ;
}
}
public string extCode public string extCode
{ {
get get
@@ -151,6 +180,20 @@ namespace MoonProTablet.WebUserControls
} }
} }
public int idxST
{
get
{
int answ = 0;
int.TryParse(hfIdxST.Value, out answ);
return answ;
}
set
{
hfIdxST.Value = $"{value}";
}
}
/// <summary> /// <summary>
/// Url immagine SE richiesta /// Url immagine SE richiesta
/// </summary> /// </summary>
@@ -222,44 +265,6 @@ namespace MoonProTablet.WebUserControls
} }
} }
protected bool enableForceParamSchedaTecnica
{
get
{
return memLayer.ML.cdvb("enableForceParamSchedaTecnica");
}
}
public string derogaCss
{
get
{
string answ = enableForceParamSchedaTecnica && hasDeroga ? " bg-warning" : "";
return answ;
}
}
protected bool hasDeroga
{
get
{
bool answ = false;
try
{
var currDeroga = DataLayerObj.getDerogaSt(idxST);
answ = (currDeroga != null);
if (answ)
{
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto);
}
}
catch
{ }
return answ;
}
}
#endregion Public Properties #endregion Public Properties
#region Private Methods #region Private Methods
@@ -282,20 +287,15 @@ namespace MoonProTablet.WebUserControls
bool doShow = showMissingData; bool doShow = showMissingData;
lblError.Visible = doShow; lblError.Visible = doShow;
lblChecked.Visible = doShow; lblChecked.Visible = doShow;
lbtForce.Visible = doShow && enableForceParamSchedaTecnica && !hasDeroga; bool checkDeroga = hasDeroga;
lblDeroga.Visible = doShow && enableForceParamSchedaTecnica && hasDeroga; lbtForce.Visible = doShow && enableForceParamSchedaTecnica && !checkDeroga;
lblDeroga.Visible = doShow && enableForceParamSchedaTecnica && checkDeroga;
} }
#endregion Private Methods #endregion Private Methods
#region Protected Methods #region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
protected void lbtForce_Click(object sender, EventArgs e) protected void lbtForce_Click(object sender, EventArgs e)
{ {
// registro abilitazione forzatura parametro per un periodo limitato // registro abilitazione forzatura parametro per un periodo limitato
@@ -312,5 +312,11 @@ namespace MoonProTablet.WebUserControls
DataLayerObj.setDerogaSt(newDeroga); DataLayerObj.setDerogaSt(newDeroga);
Response.Redirect(Request.RawUrl); Response.Redirect(Request.RawUrl);
} }
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
} }
} }
+8 -6
View File
@@ -1,9 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %> <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
<footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black " style="font-size: 1em; height: 1.5em;"> <footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black " style="font-size: 1em; height: 1.5em;">
<div class="d-flex justify-content-start pl-1 text-left align-self-center small"> <div class="d-flex justify-content-start pl-1 text-left align-self-center small">
<strong><%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %></strong> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] <strong><%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %></strong> - v.<%: currVersion.ToString() %> [ <%: videoSize %> ] | <%: DateTime.Now %>
</div> </div>
<div class="d-flex justify-content-end pr-1 text-right align-self-center small"> <div class="d-flex justify-content-end pr-1 text-right align-self-center small">
<img src="./images/logoSteamware.png" height="20" /> Steamware&nbsp;&copy; <%: DateTime.Now.Year %> <img src="./images/logoSteamware.png" height="20" />
</div> Steamware&nbsp;&copy; <%: DateTime.Now.Year %>
</div>
</footer> </footer>
+25 -10
View File
@@ -4,13 +4,8 @@ namespace MoonProTablet.WebUserControls
{ {
public partial class mod_footer : BaseUserControl public partial class mod_footer : BaseUserControl
{ {
protected void Page_Load(object sender, EventArgs e) #region Public Properties
{
if (!Page.IsPostBack)
{
updateLabels();
}
}
/// <summary> /// <summary>
/// Versione corrente sw /// Versione corrente sw
/// </summary> /// </summary>
@@ -21,9 +16,7 @@ namespace MoonProTablet.WebUserControls
return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
} }
} }
private void updateLabels()
{
}
/// <summary> /// <summary>
/// Dimensione schermata video attuale /// Dimensione schermata video attuale
/// </summary> /// </summary>
@@ -39,5 +32,27 @@ namespace MoonProTablet.WebUserControls
return answ; return answ;
} }
} }
#endregion Public Properties
#region Private Methods
private void updateLabels()
{
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
updateLabels();
}
}
#endregion Protected Methods
} }
} }
+9 -7
View File
@@ -1,15 +1,17 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <generato automaticamente> // <auto-generated>
// 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 // Changes to this file may cause incorrect behavior and will be lost if
// il codice viene rigenerato. // the code is regenerated.
// </generato automaticamente> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls { namespace MoonProTablet.WebUserControls
{
public partial class mod_footer { public partial class mod_footer
{
} }
} }
+1 -1
View File
@@ -75,7 +75,7 @@
</SelectParameters> </SelectParameters>
</asp:ObjectDataSource> </asp:ObjectDataSource>
</div> </div>
<!-- timer refresh dei blocchi in mappa stato: 2 sec, 2'000 ms --> <!-- timer refresh dei blocchi in mappa stato: 5 sec, 5'000 ms -->
<asp:Timer ID="Timer1" runat="server" Interval="5000" OnTick="Timer1_Tick"> <asp:Timer ID="Timer1" runat="server" Interval="5000" OnTick="Timer1_Tick">
</asp:Timer> </asp:Timer>
</ContentTemplate> </ContentTemplate>
+19 -18
View File
@@ -1,51 +1,52 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <generato automaticamente> // <auto-generated>
// 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 // Changes to this file may cause incorrect behavior and will be lost if
// il codice viene rigenerato. // the code is regenerated.
// </generato automaticamente> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MoonProTablet.WebUserControls namespace MoonProTablet.WebUserControls
{ {
public partial class mod_mappaStato { public partial class mod_mappaStato
{
/// <summary> /// <summary>
/// Controllo UpdatePanel1. /// UpdatePanel1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1; protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary> /// <summary>
/// Controllo repLI. /// repLI control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Repeater repLI; protected global::System.Web.UI.WebControls.Repeater repLI;
/// <summary> /// <summary>
/// Controllo ods. /// ods control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods; protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary> /// <summary>
/// Controllo Timer1. /// Timer1 control.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// Campo generato automaticamente. /// Auto-generated field.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// To modify move field declaration from designer file to code-behind file.
/// </remarks> /// </remarks>
protected global::System.Web.UI.Timer Timer1; protected global::System.Web.UI.Timer Timer1;
} }
+54 -17
View File
@@ -1420,6 +1420,8 @@ namespace MapoDb {
private global::System.Data.DataColumn columnUserMod; private global::System.Data.DataColumn columnUserMod;
private global::System.Data.DataColumn columnForced;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ST_CheckDataTable() { public ST_CheckDataTable() {
@@ -1533,6 +1535,14 @@ namespace MapoDb {
} }
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn ForcedColumn {
get {
return this.columnForced;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)] [global::System.ComponentModel.Browsable(false)]
@@ -1570,7 +1580,7 @@ namespace MapoDb {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public ST_CheckRow AddST_CheckRow(System.DateTime DtEvent, int IdxODL, int IdxST, short Oggetto, int Num, string ValueRead, string ExtCode, bool CheckOk, string DtMod, string UserMod) { public ST_CheckRow AddST_CheckRow(System.DateTime DtEvent, int IdxODL, int IdxST, short Oggetto, int Num, string ValueRead, string ExtCode, bool CheckOk, System.DateTime DtMod, string UserMod, bool Forced) {
ST_CheckRow rowST_CheckRow = ((ST_CheckRow)(this.NewRow())); ST_CheckRow rowST_CheckRow = ((ST_CheckRow)(this.NewRow()));
object[] columnValuesArray = new object[] { object[] columnValuesArray = new object[] {
DtEvent, DtEvent,
@@ -1582,7 +1592,8 @@ namespace MapoDb {
ExtCode, ExtCode,
CheckOk, CheckOk,
DtMod, DtMod,
UserMod}; UserMod,
Forced};
rowST_CheckRow.ItemArray = columnValuesArray; rowST_CheckRow.ItemArray = columnValuesArray;
this.Rows.Add(rowST_CheckRow); this.Rows.Add(rowST_CheckRow);
return rowST_CheckRow; return rowST_CheckRow;
@@ -1626,6 +1637,7 @@ namespace MapoDb {
this.columnCheckOk = base.Columns["CheckOk"]; this.columnCheckOk = base.Columns["CheckOk"];
this.columnDtMod = base.Columns["DtMod"]; this.columnDtMod = base.Columns["DtMod"];
this.columnUserMod = base.Columns["UserMod"]; this.columnUserMod = base.Columns["UserMod"];
this.columnForced = base.Columns["Forced"];
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1647,10 +1659,12 @@ namespace MapoDb {
base.Columns.Add(this.columnExtCode); base.Columns.Add(this.columnExtCode);
this.columnCheckOk = new global::System.Data.DataColumn("CheckOk", typeof(bool), null, global::System.Data.MappingType.Element); this.columnCheckOk = new global::System.Data.DataColumn("CheckOk", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnCheckOk); base.Columns.Add(this.columnCheckOk);
this.columnDtMod = new global::System.Data.DataColumn("DtMod", typeof(string), null, global::System.Data.MappingType.Element); this.columnDtMod = new global::System.Data.DataColumn("DtMod", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDtMod); base.Columns.Add(this.columnDtMod);
this.columnUserMod = new global::System.Data.DataColumn("UserMod", typeof(string), null, global::System.Data.MappingType.Element); this.columnUserMod = new global::System.Data.DataColumn("UserMod", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserMod); base.Columns.Add(this.columnUserMod);
this.columnForced = new global::System.Data.DataColumn("Forced", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnForced);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnNum, this.columnNum,
this.columnOggetto, this.columnOggetto,
@@ -1668,9 +1682,9 @@ namespace MapoDb {
this.columnExtCode.MaxLength = 2147483647; this.columnExtCode.MaxLength = 2147483647;
this.columnCheckOk.AllowDBNull = false; this.columnCheckOk.AllowDBNull = false;
this.columnDtMod.AllowDBNull = false; this.columnDtMod.AllowDBNull = false;
this.columnDtMod.MaxLength = 250;
this.columnUserMod.AllowDBNull = false; this.columnUserMod.AllowDBNull = false;
this.columnUserMod.MaxLength = 250; this.columnUserMod.MaxLength = 250;
this.columnForced.AllowDBNull = false;
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3530,9 +3544,9 @@ namespace MapoDb {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string DtMod { public System.DateTime DtMod {
get { get {
return ((string)(this[this.tableST_Check.DtModColumn])); return ((global::System.DateTime)(this[this.tableST_Check.DtModColumn]));
} }
set { set {
this[this.tableST_Check.DtModColumn] = value; this[this.tableST_Check.DtModColumn] = value;
@@ -3549,6 +3563,17 @@ namespace MapoDb {
this[this.tableST_Check.UserModColumn] = value; this[this.tableST_Check.UserModColumn] = value;
} }
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Forced {
get {
return ((bool)(this[this.tableST_Check.ForcedColumn]));
}
set {
this[this.tableST_Check.ForcedColumn] = value;
}
}
} }
/// <summary> /// <summary>
@@ -5495,10 +5520,11 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
tableMapping.ColumnMappings.Add("CheckOk", "CheckOk"); tableMapping.ColumnMappings.Add("CheckOk", "CheckOk");
tableMapping.ColumnMappings.Add("DtMod", "DtMod"); tableMapping.ColumnMappings.Add("DtMod", "DtMod");
tableMapping.ColumnMappings.Add("UserMod", "UserMod"); tableMapping.ColumnMappings.Add("UserMod", "UserMod");
tableMapping.ColumnMappings.Add("Forced", "Forced");
this._adapter.TableMappings.Add(tableMapping); this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection; this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ST_Check] WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod))"; this._adapter.DeleteCommand.CommandText = @"DELETE FROM [ST_Check] WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod) AND ([Forced] = @Original_Forced))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -5507,12 +5533,13 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Num", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Num", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Num", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Num", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Forced", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Forced", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [ST_Check] ([DtEvent], [IdxODL], [IdxST], [Oggetto], [Num], [ValueRead], [ExtCode], [CheckOk], [DtMod], [UserMod]) VALUES (@DtEvent, @IdxODL, @IdxST, @Oggetto, @Num, @ValueRead, @ExtCode, @CheckOk, @DtMod, @UserMod); this._adapter.InsertCommand.CommandText = @"INSERT INTO [ST_Check] ([DtEvent], [IdxODL], [IdxST], [Oggetto], [Num], [ValueRead], [ExtCode], [CheckOk], [DtMod], [UserMod], [Forced]) VALUES (@DtEvent, @IdxODL, @IdxST, @Oggetto, @Num, @ValueRead, @ExtCode, @CheckOk, @DtMod, @UserMod, @Forced);
SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)"; SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod, Forced FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -5522,12 +5549,13 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Forced", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Forced", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [ST_Check] SET [DtEvent] = @DtEvent, [IdxODL] = @IdxODL, [IdxST] = @IdxST, [Oggetto] = @Oggetto, [Num] = @Num, [ValueRead] = @ValueRead, [ExtCode] = @ExtCode, [CheckOk] = @CheckOk, [DtMod] = @DtMod, [UserMod] = @UserMod WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod)); this._adapter.UpdateCommand.CommandText = @"UPDATE [ST_Check] SET [DtEvent] = @DtEvent, [IdxODL] = @IdxODL, [IdxST] = @IdxST, [Oggetto] = @Oggetto, [Num] = @Num, [ValueRead] = @ValueRead, [ExtCode] = @ExtCode, [CheckOk] = @CheckOk, [DtMod] = @DtMod, [UserMod] = @UserMod, [Forced] = @Forced WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod) AND ([Forced] = @Original_Forced));
SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)"; SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod, Forced FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -5537,8 +5565,9 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ExtCode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DtMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Forced", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Forced", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtEvent", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtEvent", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxST", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxST", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxST", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxST", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -5546,8 +5575,9 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Num", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Num", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Num", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Num", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValueRead", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ValueRead", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CheckOk", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CheckOk", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DtMod", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DtMod", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UserMod", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UserMod", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Forced", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Forced", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5563,7 +5593,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM ST_Check"; this._commandCollection[0].CommandText = "SELECT *\r\n FROM ST_Check";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].Connection = this.Connection;
@@ -5590,6 +5620,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ExtCode", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CheckOk", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Forced", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5693,7 +5724,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int upsertQuery(global::System.Nullable<int> IdxOdl, global::System.Nullable<int> IdxST, global::System.Nullable<int> Oggetto, global::System.Nullable<int> Num, string ValueRead, string ExtCode, global::System.Nullable<bool> CheckOk, string UserMod) { public virtual int upsertQuery(global::System.Nullable<int> IdxOdl, global::System.Nullable<int> IdxST, global::System.Nullable<int> Oggetto, global::System.Nullable<int> Num, string ValueRead, string ExtCode, global::System.Nullable<bool> CheckOk, string UserMod, global::System.Nullable<bool> Forced) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
if ((IdxOdl.HasValue == true)) { if ((IdxOdl.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxOdl.Value)); command.Parameters[1].Value = ((int)(IdxOdl.Value));
@@ -5743,6 +5774,12 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
else { else {
command.Parameters[8].Value = ((string)(UserMod)); command.Parameters[8].Value = ((string)(UserMod));
} }
if ((Forced.HasValue == true)) {
command.Parameters[9].Value = ((bool)(Forced.Value));
}
else {
command.Parameters[9].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State; global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open) if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) { != global::System.Data.ConnectionState.Open)) {
+30 -29
View File
@@ -305,7 +305,7 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
<DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.ST_Check" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill"> <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.ST_Check" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand> <DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false"> <DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [ST_Check] WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod))</CommandText> <CommandText>DELETE FROM [ST_Check] WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod) AND ([Forced] = @Original_Forced))</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -314,15 +314,16 @@ SELECT IdxST, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Require
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Num" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Num" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Num" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Num" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Forced" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Forced" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</DeleteCommand> </DeleteCommand>
<InsertCommand> <InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false"> <DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [ST_Check] ([DtEvent], [IdxODL], [IdxST], [Oggetto], [Num], [ValueRead], [ExtCode], [CheckOk], [DtMod], [UserMod]) VALUES (@DtEvent, @IdxODL, @IdxST, @Oggetto, @Num, @ValueRead, @ExtCode, @CheckOk, @DtMod, @UserMod); <CommandText>INSERT INTO [ST_Check] ([DtEvent], [IdxODL], [IdxST], [Oggetto], [Num], [ValueRead], [ExtCode], [CheckOk], [DtMod], [UserMod], [Forced]) VALUES (@DtEvent, @IdxODL, @IdxST, @Oggetto, @Num, @ValueRead, @ExtCode, @CheckOk, @DtMod, @UserMod, @Forced);
SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)</CommandText> SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod, Forced FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -332,22 +333,23 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ExtCode" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ExtCode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Forced" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Forced" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</InsertCommand> </InsertCommand>
<SelectCommand> <SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true"> <DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT * <CommandText>SELECT *
FROM ST_Check</CommandText> FROM ST_Check</CommandText>
<Parameters /> <Parameters />
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
<UpdateCommand> <UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false"> <DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [ST_Check] SET [DtEvent] = @DtEvent, [IdxODL] = @IdxODL, [IdxST] = @IdxST, [Oggetto] = @Oggetto, [Num] = @Num, [ValueRead] = @ValueRead, [ExtCode] = @ExtCode, [CheckOk] = @CheckOk, [DtMod] = @DtMod, [UserMod] = @UserMod WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod)); <CommandText>UPDATE [ST_Check] SET [DtEvent] = @DtEvent, [IdxODL] = @IdxODL, [IdxST] = @IdxST, [Oggetto] = @Oggetto, [Num] = @Num, [ValueRead] = @ValueRead, [ExtCode] = @ExtCode, [CheckOk] = @CheckOk, [DtMod] = @DtMod, [UserMod] = @UserMod, [Forced] = @Forced WHERE (([DtEvent] = @Original_DtEvent) AND ([IdxODL] = @Original_IdxODL) AND ([IdxST] = @Original_IdxST) AND ([Oggetto] = @Original_Oggetto) AND ([Num] = @Original_Num) AND ([ValueRead] = @Original_ValueRead) AND ([CheckOk] = @Original_CheckOk) AND ([DtMod] = @Original_DtMod) AND ([UserMod] = @Original_UserMod) AND ([Forced] = @Original_Forced));
SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)</CommandText> SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod, UserMod, Forced FROM ST_Check WHERE (DtEvent = @DtEvent) AND (IdxODL = @IdxODL) AND (IdxST = @IdxST) AND (Num = @Num) AND (Oggetto = @Oggetto)</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -357,8 +359,9 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ExtCode" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ExtCode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Forced" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Forced" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtEvent" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtEvent" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxODL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxODL" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxST" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxST" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IdxST" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IdxST" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -366,8 +369,9 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Num" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Num" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_Num" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="Num" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_ValueRead" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="ValueRead" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_CheckOk" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="CheckOk" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_DtMod" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="DtMod" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Original" /> <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="UserMod" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_Forced" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="Forced" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</UpdateCommand> </UpdateCommand>
@@ -384,6 +388,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
<Mapping SourceColumn="CheckOk" DataSetColumn="CheckOk" /> <Mapping SourceColumn="CheckOk" DataSetColumn="CheckOk" />
<Mapping SourceColumn="DtMod" DataSetColumn="DtMod" /> <Mapping SourceColumn="DtMod" DataSetColumn="DtMod" />
<Mapping SourceColumn="UserMod" DataSetColumn="UserMod" /> <Mapping SourceColumn="UserMod" DataSetColumn="UserMod" />
<Mapping SourceColumn="Forced" DataSetColumn="Forced" />
</Mappings> </Mappings>
<Sources> <Sources>
<DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ST_CHK_cleanByOdl" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="cleanByOdl" Modifier="Public" Name="cleanByOdl" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cleanByOdl"> <DbSource ConnectionRef="MoonProConnectionString (Settings)" DbObjectName="MoonPro.dbo.stp_ST_CHK_cleanByOdl" DbObjectType="StoredProcedure" GenerateShortCommands="true" GeneratorSourceName="cleanByOdl" Modifier="Public" Name="cleanByOdl" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cleanByOdl">
@@ -422,6 +427,7 @@ SELECT DtEvent, IdxODL, IdxST, Oggetto, Num, ValueRead, ExtCode, CheckOk, DtMod,
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@ExtCode" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@CheckOk" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@UserMod" Precision="0" ProviderType="NVarChar" Scale="0" Size="250" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Forced" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
@@ -680,7 +686,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
<xs:element name="DS_SheetTech" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_SheetTech" msprop:Generator_UserDSName="DS_SheetTech"> <xs:element name="DS_SheetTech" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_SheetTech" msprop:Generator_UserDSName="DS_SheetTech">
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="ST_Actual" msprop:Generator_TableClassName="ST_ActualDataTable" msprop:Generator_TableVarName="tableST_Actual" msprop:Generator_RowChangedName="ST_ActualRowChanged" msprop:Generator_TablePropName="ST_Actual" msprop:Generator_RowDeletingName="ST_ActualRowDeleting" msprop:Generator_RowChangingName="ST_ActualRowChanging" msprop:Generator_RowEvHandlerName="ST_ActualRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_ActualRowDeleted" msprop:Generator_RowClassName="ST_ActualRow" msprop:Generator_UserTableName="ST_Actual" msprop:Generator_RowEvArgName="ST_ActualRowChangeEvent"> <xs:element name="ST_Actual" msprop:Generator_TableClassName="ST_ActualDataTable" msprop:Generator_TableVarName="tableST_Actual" msprop:Generator_TablePropName="ST_Actual" msprop:Generator_RowDeletingName="ST_ActualRowDeleting" msprop:Generator_RowChangingName="ST_ActualRowChanging" msprop:Generator_RowEvHandlerName="ST_ActualRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_ActualRowDeleted" msprop:Generator_UserTableName="ST_Actual" msprop:Generator_RowChangedName="ST_ActualRowChanged" msprop:Generator_RowEvArgName="ST_ActualRowChangeEvent" msprop:Generator_RowClassName="ST_ActualRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="IdxST" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxST" msprop:Generator_ColumnPropNameInRow="IdxST" msprop:Generator_ColumnPropNameInTable="IdxSTColumn" msprop:Generator_UserColumnName="IdxST" type="xs:int" /> <xs:element name="IdxST" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIdxST" msprop:Generator_ColumnPropNameInRow="IdxST" msprop:Generator_ColumnPropNameInTable="IdxSTColumn" msprop:Generator_UserColumnName="IdxST" type="xs:int" />
@@ -726,7 +732,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_ActualRow" msprop:Generator_TableClassName="ST_ActualRowDataTable" msprop:Generator_TableVarName="tableST_ActualRow" msprop:Generator_RowChangedName="ST_ActualRowRowChanged" msprop:Generator_TablePropName="_ST_ActualRow" msprop:Generator_RowDeletingName="ST_ActualRowRowDeleting" msprop:Generator_RowChangingName="ST_ActualRowRowChanging" msprop:Generator_RowEvHandlerName="ST_ActualRowRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_ActualRowRowDeleted" msprop:Generator_RowClassName="ST_ActualRowRow" msprop:Generator_UserTableName="ST_ActualRow" msprop:Generator_RowEvArgName="ST_ActualRowRowChangeEvent"> <xs:element name="ST_ActualRow" msprop:Generator_TableClassName="ST_ActualRowDataTable" msprop:Generator_TableVarName="tableST_ActualRow" msprop:Generator_TablePropName="_ST_ActualRow" msprop:Generator_RowDeletingName="ST_ActualRowRowDeleting" msprop:Generator_RowChangingName="ST_ActualRowRowChanging" msprop:Generator_RowEvHandlerName="ST_ActualRowRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_ActualRowRowDeleted" msprop:Generator_UserTableName="ST_ActualRow" msprop:Generator_RowChangedName="ST_ActualRowRowChanged" msprop:Generator_RowEvArgName="ST_ActualRowRowChangeEvent" msprop:Generator_RowClassName="ST_ActualRowRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="IdxST" msprop:Generator_ColumnVarNameInTable="columnIdxST" msprop:Generator_ColumnPropNameInRow="IdxST" msprop:Generator_ColumnPropNameInTable="IdxSTColumn" msprop:Generator_UserColumnName="IdxST" type="xs:int" /> <xs:element name="IdxST" msprop:Generator_ColumnVarNameInTable="columnIdxST" msprop:Generator_ColumnPropNameInRow="IdxST" msprop:Generator_ColumnPropNameInTable="IdxSTColumn" msprop:Generator_UserColumnName="IdxST" type="xs:int" />
@@ -806,7 +812,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_Check" msprop:Generator_TableClassName="ST_CheckDataTable" msprop:Generator_TableVarName="tableST_Check" msprop:Generator_RowChangedName="ST_CheckRowChanged" msprop:Generator_TablePropName="ST_Check" msprop:Generator_RowDeletingName="ST_CheckRowDeleting" msprop:Generator_RowChangingName="ST_CheckRowChanging" msprop:Generator_RowEvHandlerName="ST_CheckRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_CheckRowDeleted" msprop:Generator_RowClassName="ST_CheckRow" msprop:Generator_UserTableName="ST_Check" msprop:Generator_RowEvArgName="ST_CheckRowChangeEvent"> <xs:element name="ST_Check" msprop:Generator_TableClassName="ST_CheckDataTable" msprop:Generator_TableVarName="tableST_Check" msprop:Generator_TablePropName="ST_Check" msprop:Generator_RowDeletingName="ST_CheckRowDeleting" msprop:Generator_RowChangingName="ST_CheckRowChanging" msprop:Generator_RowEvHandlerName="ST_CheckRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_CheckRowDeleted" msprop:Generator_UserTableName="ST_Check" msprop:Generator_RowChangedName="ST_CheckRowChanged" msprop:Generator_RowEvArgName="ST_CheckRowChangeEvent" msprop:Generator_RowClassName="ST_CheckRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="DtEvent" msprop:Generator_ColumnVarNameInTable="columnDtEvent" msprop:Generator_ColumnPropNameInRow="DtEvent" msprop:Generator_ColumnPropNameInTable="DtEventColumn" msprop:Generator_UserColumnName="DtEvent" type="xs:dateTime" /> <xs:element name="DtEvent" msprop:Generator_ColumnVarNameInTable="columnDtEvent" msprop:Generator_ColumnPropNameInRow="DtEvent" msprop:Generator_ColumnPropNameInTable="DtEventColumn" msprop:Generator_UserColumnName="DtEvent" type="xs:dateTime" />
@@ -829,13 +835,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="CheckOk" msprop:Generator_ColumnVarNameInTable="columnCheckOk" msprop:Generator_ColumnPropNameInRow="CheckOk" msprop:Generator_ColumnPropNameInTable="CheckOkColumn" msprop:Generator_UserColumnName="CheckOk" type="xs:boolean" /> <xs:element name="CheckOk" msprop:Generator_ColumnVarNameInTable="columnCheckOk" msprop:Generator_ColumnPropNameInRow="CheckOk" msprop:Generator_ColumnPropNameInTable="CheckOkColumn" msprop:Generator_UserColumnName="CheckOk" type="xs:boolean" />
<xs:element name="DtMod" msprop:Generator_ColumnVarNameInTable="columnDtMod" msprop:Generator_ColumnPropNameInRow="DtMod" msprop:Generator_ColumnPropNameInTable="DtModColumn" msprop:Generator_UserColumnName="DtMod"> <xs:element name="DtMod" msprop:Generator_ColumnVarNameInTable="columnDtMod" msprop:Generator_ColumnPropNameInRow="DtMod" msprop:Generator_ColumnPropNameInTable="DtModColumn" msprop:Generator_UserColumnName="DtMod" type="xs:dateTime" />
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="250" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="UserMod" msprop:Generator_ColumnVarNameInTable="columnUserMod" msprop:Generator_ColumnPropNameInRow="UserMod" msprop:Generator_ColumnPropNameInTable="UserModColumn" msprop:Generator_UserColumnName="UserMod"> <xs:element name="UserMod" msprop:Generator_ColumnVarNameInTable="columnUserMod" msprop:Generator_ColumnPropNameInRow="UserMod" msprop:Generator_ColumnPropNameInTable="UserModColumn" msprop:Generator_UserColumnName="UserMod">
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
@@ -843,10 +843,11 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="Forced" msprop:Generator_ColumnVarNameInTable="columnForced" msprop:Generator_ColumnPropNameInRow="Forced" msprop:Generator_ColumnPropNameInTable="ForcedColumn" msprop:Generator_UserColumnName="Forced" type="xs:boolean" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_AnagGruppi" msprop:Generator_TableClassName="ST_AnagGruppiDataTable" msprop:Generator_TableVarName="tableST_AnagGruppi" msprop:Generator_RowChangedName="ST_AnagGruppiRowChanged" msprop:Generator_TablePropName="ST_AnagGruppi" msprop:Generator_RowDeletingName="ST_AnagGruppiRowDeleting" msprop:Generator_RowChangingName="ST_AnagGruppiRowChanging" msprop:Generator_RowEvHandlerName="ST_AnagGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_AnagGruppiRowDeleted" msprop:Generator_RowClassName="ST_AnagGruppiRow" msprop:Generator_UserTableName="ST_AnagGruppi" msprop:Generator_RowEvArgName="ST_AnagGruppiRowChangeEvent"> <xs:element name="ST_AnagGruppi" msprop:Generator_TableClassName="ST_AnagGruppiDataTable" msprop:Generator_TableVarName="tableST_AnagGruppi" msprop:Generator_TablePropName="ST_AnagGruppi" msprop:Generator_RowDeletingName="ST_AnagGruppiRowDeleting" msprop:Generator_RowChangingName="ST_AnagGruppiRowChanging" msprop:Generator_RowEvHandlerName="ST_AnagGruppiRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_AnagGruppiRowDeleted" msprop:Generator_UserTableName="ST_AnagGruppi" msprop:Generator_RowChangedName="ST_AnagGruppiRowChanged" msprop:Generator_RowEvArgName="ST_AnagGruppiRowChangeEvent" msprop:Generator_RowClassName="ST_AnagGruppiRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="CodGruppo" msprop:Generator_ColumnVarNameInTable="columnCodGruppo" msprop:Generator_ColumnPropNameInRow="CodGruppo" msprop:Generator_ColumnPropNameInTable="CodGruppoColumn" msprop:Generator_UserColumnName="CodGruppo"> <xs:element name="CodGruppo" msprop:Generator_ColumnVarNameInTable="columnCodGruppo" msprop:Generator_ColumnPropNameInRow="CodGruppo" msprop:Generator_ColumnPropNameInTable="CodGruppoColumn" msprop:Generator_UserColumnName="CodGruppo">
@@ -874,7 +875,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_AnagTipi" msprop:Generator_TableClassName="ST_AnagTipiDataTable" msprop:Generator_TableVarName="tableST_AnagTipi" msprop:Generator_RowChangedName="ST_AnagTipiRowChanged" msprop:Generator_TablePropName="ST_AnagTipi" msprop:Generator_RowDeletingName="ST_AnagTipiRowDeleting" msprop:Generator_RowChangingName="ST_AnagTipiRowChanging" msprop:Generator_RowEvHandlerName="ST_AnagTipiRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_AnagTipiRowDeleted" msprop:Generator_RowClassName="ST_AnagTipiRow" msprop:Generator_UserTableName="ST_AnagTipi" msprop:Generator_RowEvArgName="ST_AnagTipiRowChangeEvent"> <xs:element name="ST_AnagTipi" msprop:Generator_TableClassName="ST_AnagTipiDataTable" msprop:Generator_TableVarName="tableST_AnagTipi" msprop:Generator_TablePropName="ST_AnagTipi" msprop:Generator_RowDeletingName="ST_AnagTipiRowDeleting" msprop:Generator_RowChangingName="ST_AnagTipiRowChanging" msprop:Generator_RowEvHandlerName="ST_AnagTipiRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_AnagTipiRowDeleted" msprop:Generator_UserTableName="ST_AnagTipi" msprop:Generator_RowChangedName="ST_AnagTipiRowChanged" msprop:Generator_RowEvArgName="ST_AnagTipiRowChangeEvent" msprop:Generator_RowClassName="ST_AnagTipiRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="CodTipo" msprop:Generator_ColumnVarNameInTable="columnCodTipo" msprop:Generator_ColumnPropNameInRow="CodTipo" msprop:Generator_ColumnPropNameInTable="CodTipoColumn" msprop:Generator_UserColumnName="CodTipo"> <xs:element name="CodTipo" msprop:Generator_ColumnVarNameInTable="columnCodTipo" msprop:Generator_ColumnPropNameInRow="CodTipo" msprop:Generator_ColumnPropNameInTable="CodTipoColumn" msprop:Generator_UserColumnName="CodTipo">
@@ -894,7 +895,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_Template" msprop:Generator_TableClassName="ST_TemplateDataTable" msprop:Generator_TableVarName="tableST_Template" msprop:Generator_RowChangedName="ST_TemplateRowChanged" msprop:Generator_TablePropName="ST_Template" msprop:Generator_RowDeletingName="ST_TemplateRowDeleting" msprop:Generator_RowChangingName="ST_TemplateRowChanging" msprop:Generator_RowEvHandlerName="ST_TemplateRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_TemplateRowDeleted" msprop:Generator_RowClassName="ST_TemplateRow" msprop:Generator_UserTableName="ST_Template" msprop:Generator_RowEvArgName="ST_TemplateRowChangeEvent"> <xs:element name="ST_Template" msprop:Generator_TableClassName="ST_TemplateDataTable" msprop:Generator_TableVarName="tableST_Template" msprop:Generator_TablePropName="ST_Template" msprop:Generator_RowDeletingName="ST_TemplateRowDeleting" msprop:Generator_RowChangingName="ST_TemplateRowChanging" msprop:Generator_RowEvHandlerName="ST_TemplateRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_TemplateRowDeleted" msprop:Generator_UserTableName="ST_Template" msprop:Generator_RowChangedName="ST_TemplateRowChanged" msprop:Generator_RowEvArgName="ST_TemplateRowChangeEvent" msprop:Generator_RowClassName="ST_TemplateRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="CodTempl" msprop:Generator_ColumnVarNameInTable="columnCodTempl" msprop:Generator_ColumnPropNameInRow="CodTempl" msprop:Generator_ColumnPropNameInTable="CodTemplColumn" msprop:Generator_UserColumnName="CodTempl"> <xs:element name="CodTempl" msprop:Generator_ColumnVarNameInTable="columnCodTempl" msprop:Generator_ColumnPropNameInRow="CodTempl" msprop:Generator_ColumnPropNameInTable="CodTemplColumn" msprop:Generator_UserColumnName="CodTempl">
@@ -914,7 +915,7 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ST_TemplateRows" msprop:Generator_TableClassName="ST_TemplateRowsDataTable" msprop:Generator_TableVarName="tableST_TemplateRows" msprop:Generator_RowChangedName="ST_TemplateRowsRowChanged" msprop:Generator_TablePropName="ST_TemplateRows" msprop:Generator_RowDeletingName="ST_TemplateRowsRowDeleting" msprop:Generator_RowChangingName="ST_TemplateRowsRowChanging" msprop:Generator_RowEvHandlerName="ST_TemplateRowsRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_TemplateRowsRowDeleted" msprop:Generator_RowClassName="ST_TemplateRowsRow" msprop:Generator_UserTableName="ST_TemplateRows" msprop:Generator_RowEvArgName="ST_TemplateRowsRowChangeEvent"> <xs:element name="ST_TemplateRows" msprop:Generator_TableClassName="ST_TemplateRowsDataTable" msprop:Generator_TableVarName="tableST_TemplateRows" msprop:Generator_TablePropName="ST_TemplateRows" msprop:Generator_RowDeletingName="ST_TemplateRowsRowDeleting" msprop:Generator_RowChangingName="ST_TemplateRowsRowChanging" msprop:Generator_RowEvHandlerName="ST_TemplateRowsRowChangeEventHandler" msprop:Generator_RowDeletedName="ST_TemplateRowsRowDeleted" msprop:Generator_UserTableName="ST_TemplateRows" msprop:Generator_RowChangedName="ST_TemplateRowsRowChanged" msprop:Generator_RowEvArgName="ST_TemplateRowsRowChangeEvent" msprop:Generator_RowClassName="ST_TemplateRowsRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="CodTempl" msprop:Generator_ColumnVarNameInTable="columnCodTempl" msprop:Generator_ColumnPropNameInRow="CodTempl" msprop:Generator_ColumnPropNameInTable="CodTemplColumn" msprop:Generator_UserColumnName="CodTempl"> <xs:element name="CodTempl" msprop:Generator_ColumnVarNameInTable="columnCodTempl" msprop:Generator_ColumnPropNameInRow="CodTempl" msprop:Generator_ColumnPropNameInTable="CodTemplColumn" msprop:Generator_UserColumnName="CodTempl">
@@ -1013,11 +1014,11 @@ SELECT CodTempl, Label, Oggetto, Num, CodGruppo, CodTipo, Value, CheckType, Requ
</xs:element> </xs:element>
<xs:annotation> <xs:annotation>
<xs:appinfo> <xs:appinfo>
<msdata:Relationship name="FK_ST_ActualRows_ST_Actual" msdata:parent="ST_Actual" msdata:child="ST_ActualRow" msdata:parentkey="IdxST" msdata:childkey="IdxST" msprop:Generator_UserChildTable="ST_ActualRow" msprop:Generator_ChildPropName="GetST_ActualRowRows" msprop:Generator_UserRelationName="FK_ST_ActualRows_ST_Actual" msprop:Generator_RelationVarName="relationFK_ST_ActualRows_ST_Actual" msprop:Generator_UserParentTable="ST_Actual" msprop:Generator_ParentPropName="ST_ActualRow" /> <msdata:Relationship name="FK_ST_ActualRows_ST_Actual" msdata:parent="ST_Actual" msdata:child="ST_ActualRow" msdata:parentkey="IdxST" msdata:childkey="IdxST" msprop:Generator_UserChildTable="ST_ActualRow" msprop:Generator_ChildPropName="GetST_ActualRowRows" msprop:Generator_UserRelationName="FK_ST_ActualRows_ST_Actual" msprop:Generator_ParentPropName="ST_ActualRow" msprop:Generator_RelationVarName="relationFK_ST_ActualRows_ST_Actual" msprop:Generator_UserParentTable="ST_Actual" />
<msdata:Relationship name="FK_ST_TemplateRows_ST_AnagGruppi" msdata:parent="ST_AnagGruppi" msdata:child="ST_TemplateRows" msdata:parentkey="CodGruppo" msdata:childkey="CodGruppo" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_AnagGruppi" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_AnagGruppi" msprop:Generator_UserParentTable="ST_AnagGruppi" msprop:Generator_ParentPropName="ST_AnagGruppiRow" /> <msdata:Relationship name="FK_ST_TemplateRows_ST_AnagGruppi" msdata:parent="ST_AnagGruppi" msdata:child="ST_TemplateRows" msdata:parentkey="CodGruppo" msdata:childkey="CodGruppo" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_AnagGruppi" msprop:Generator_ParentPropName="ST_AnagGruppiRow" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_AnagGruppi" msprop:Generator_UserParentTable="ST_AnagGruppi" />
<msdata:Relationship name="FK_ST_TemplateRows_ST_AnagTipi1" msdata:parent="ST_AnagTipi" msdata:child="ST_TemplateRows" msdata:parentkey="CodTipo" msdata:childkey="CodTipo" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_AnagTipi1" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_AnagTipi1" msprop:Generator_UserParentTable="ST_AnagTipi" msprop:Generator_ParentPropName="ST_AnagTipiRow" /> <msdata:Relationship name="FK_ST_TemplateRows_ST_AnagTipi1" msdata:parent="ST_AnagTipi" msdata:child="ST_TemplateRows" msdata:parentkey="CodTipo" msdata:childkey="CodTipo" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_AnagTipi1" msprop:Generator_ParentPropName="ST_AnagTipiRow" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_AnagTipi1" msprop:Generator_UserParentTable="ST_AnagTipi" />
<msdata:Relationship name="FK_ST_TemplateRows_ST_Template" msdata:parent="ST_Template" msdata:child="ST_TemplateRows" msdata:parentkey="CodTempl" msdata:childkey="CodTempl" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_Template" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_Template" msprop:Generator_UserParentTable="ST_Template" msprop:Generator_ParentPropName="ST_TemplateRow" /> <msdata:Relationship name="FK_ST_TemplateRows_ST_Template" msdata:parent="ST_Template" msdata:child="ST_TemplateRows" msdata:parentkey="CodTempl" msdata:childkey="CodTempl" msprop:Generator_UserChildTable="ST_TemplateRows" msprop:Generator_ChildPropName="GetST_TemplateRowsRows" msprop:Generator_UserRelationName="FK_ST_TemplateRows_ST_Template" msprop:Generator_ParentPropName="ST_TemplateRow" msprop:Generator_RelationVarName="relationFK_ST_TemplateRows_ST_Template" msprop:Generator_UserParentTable="ST_Template" />
<msdata:Relationship name="ST_Template_ST_Actual" msdata:parent="ST_Template" msdata:child="ST_Actual" msdata:parentkey="CodTempl" msdata:childkey="CodTempl" msprop:Generator_UserChildTable="ST_Actual" msprop:Generator_ChildPropName="GetST_ActualRows" msprop:Generator_UserRelationName="ST_Template_ST_Actual" msprop:Generator_ParentPropName="ST_TemplateRow" msprop:Generator_RelationVarName="relationST_Template_ST_Actual" msprop:Generator_UserParentTable="ST_Template" /> <msdata:Relationship name="ST_Template_ST_Actual" msdata:parent="ST_Template" msdata:child="ST_Actual" msdata:parentkey="CodTempl" msdata:childkey="CodTempl" msprop:Generator_UserChildTable="ST_Actual" msprop:Generator_ChildPropName="GetST_ActualRows" msprop:Generator_UserRelationName="ST_Template_ST_Actual" msprop:Generator_RelationVarName="relationST_Template_ST_Actual" msprop:Generator_UserParentTable="ST_Template" msprop:Generator_ParentPropName="ST_TemplateRow" />
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
</xs:schema> </xs:schema>
+7 -7
View File
@@ -4,15 +4,15 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="84" ViewPortY="-18" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:ST_Actual" ZOrder="7" X="161" Y="201" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" /> <Shape ID="DesignTable:ST_Actual" ZOrder="7" X="161" Y="201" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:ST_ActualRow" ZOrder="1" X="176" Y="608" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:ST_ActualRow" ZOrder="2" X="176" Y="608" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ST_Check" ZOrder="6" X="584" Y="585" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" /> <Shape ID="DesignTable:ST_Check" ZOrder="1" X="584" Y="585" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:ST_AnagGruppi" ZOrder="5" X="945" Y="2" Height="153" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" /> <Shape ID="DesignTable:ST_AnagGruppi" ZOrder="6" X="945" Y="2" Height="153" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ST_AnagTipi" ZOrder="4" X="642" Y="23" Height="115" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:ST_AnagTipi" ZOrder="5" X="642" Y="23" Height="115" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ST_Template" ZOrder="3" X="535" Y="318" Height="115" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" /> <Shape ID="DesignTable:ST_Template" ZOrder="4" X="535" Y="318" Height="115" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:ST_TemplateRows" ZOrder="2" X="807" Y="229" Height="267" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" /> <Shape ID="DesignTable:ST_TemplateRows" ZOrder="3" X="807" Y="229" Height="267" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
</Shapes> </Shapes>
<Connectors> <Connectors>
<Connector ID="DesignRelation:FK_ST_ActualRows_ST_Actual" ZOrder="12" LineWidth="11"> <Connector ID="DesignRelation:FK_ST_ActualRows_ST_Actual" ZOrder="12" LineWidth="11">
+43 -37
View File
@@ -162,42 +162,6 @@ namespace MapoDb
} }
} }
/// <summary>
/// Dati deroga SchedaTecnica serializzati in REDIS (get/set)
/// </summary>
public StCheckOverride getDerogaSt(int idxST)
{
StCheckOverride answ = new StCheckOverride() { IdxST = idxST };
string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{idxST:000}");
string rawData = memLayer.ML.getRSV(keyDerogaST);
if (!string.IsNullOrEmpty(rawData))
{
try
{
answ = JsonConvert.DeserializeObject<StCheckOverride>(rawData);
}
catch
{ }
}
return answ;
}
public bool setDerogaSt(StCheckOverride deroga)
{
bool fatto = false;
try
{
string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{deroga.IdxST:000}");
string rawData = JsonConvert.SerializeObject(deroga);
memLayer.ML.setRSV(keyDerogaST, rawData, 60*2);
fatto = true;
}
catch
{ }
return fatto;
}
/// <summary> /// <summary>
/// MatrOpr in sessione /// MatrOpr in sessione
/// </summary> /// </summary>
@@ -1707,7 +1671,14 @@ namespace MapoDb
UsrName = memLayer.ML.CRS("user"); UsrName = memLayer.ML.CRS("user");
} }
string cookieName = memLayer.ML.CRS("cookieName"); string cookieName = memLayer.ML.CRS("cookieName");
DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire")); //DateTime expDate = DateTime.Now.AddDays(memLayer.ML.CRI("cookieDayExpire"));
string cookieDayExpire = memLayer.ML.CRS("cookieDayExpire").Replace(".", ",");
double dayExp = 1;
NumberStyles style = NumberStyles.AllowDecimalPoint | NumberStyles.AllowThousands;
CultureInfo culture = CultureInfo.CreateSpecificCulture("it-IT");
double.TryParse(cookieDayExpire, style, culture, out dayExp);
DateTime expDate = DateTime.Now.AddDays(dayExp);
string Secret = authProxy.getSecret(Dominio, UsrName, matricola, DeviceName, adesso); string Secret = authProxy.getSecret(Dominio, UsrName, matricola, DeviceName, adesso);
string devSecret = SteamCrypto.EncryptString(Secret, cookieName); string devSecret = SteamCrypto.EncryptString(Secret, cookieName);
try try
@@ -1817,6 +1788,26 @@ namespace MapoDb
return answ; return answ;
} }
/// <summary>
/// Dati deroga SchedaTecnica serializzati in REDIS (get/set)
/// </summary>
public StCheckOverride getDerogaSt(int idxST)
{
StCheckOverride answ = new StCheckOverride() { IdxST = idxST };
string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{idxST:000}");
string rawData = memLayer.ML.getRSV(keyDerogaST);
if (!string.IsNullOrEmpty(rawData))
{
try
{
answ = JsonConvert.DeserializeObject<StCheckOverride>(rawData);
}
catch
{ }
}
return answ;
}
/// <summary> /// <summary>
/// restituisce una tabella con tutte le transizioni degli ingressi per una data macchina /// restituisce una tabella con tutte le transizioni degli ingressi per una data macchina
/// </summary> /// </summary>
@@ -3515,6 +3506,21 @@ namespace MapoDb
return answ; return answ;
} }
public bool setDerogaSt(StCheckOverride deroga)
{
bool fatto = false;
try
{
string keyDerogaST = memLayer.ML.redHash($"DerogaSt:{user_std.UtSn.utente}:{deroga.IdxST:000}");
string rawData = JsonConvert.SerializeObject(deroga);
memLayer.ML.setRSV(keyDerogaST, rawData, 60 * 2);
fatto = true;
}
catch
{ }
return fatto;
}
/// <summary> /// <summary>
/// Salvataggio su della mappa di memoria dell'IOB x ulteriori impieghi /// Salvataggio su della mappa di memoria dell'IOB x ulteriori impieghi
/// </summary> /// </summary>
-8
View File
@@ -17,20 +17,12 @@ REM Faccio push remoto condizionale
if %pushRemote% GTR 0 ( git push . %baseBranch%:beta ) if %pushRemote% GTR 0 ( git push . %baseBranch%:beta )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop ) if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
@REM if %pushRemote% GTR 1 ( git push . %baseBranch%:ADM )
@REM if %pushRemote% GTR 1 ( git push . %baseBranch%:MAG )
@REM if %pushRemote% GTR 1 ( git push . %baseBranch%:TAB )
if %pushRemote% GTR 1 ( git push . %baseBranch%:SDK ) if %pushRemote% GTR 1 ( git push . %baseBranch%:SDK )
if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:beta ) if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:beta )
if %pushRemote% GTR 2 ( git push . %baseBranch%:master )
if %pushRemote% GTR 2 ( git push . %baseBranch%:stable ) if %pushRemote% GTR 2 ( git push . %baseBranch%:stable )
@REM if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:ADM )
@REM if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:MAG )
@REM if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:TAB )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:SDK ) if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:SDK )
if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:master )
if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:stable ) if %pushRemote% GTR 3 ( git push gitlab.steamware %baseBranch%:stable )
ECHO on ECHO on