friday
This commit is contained in:
Luc Vandenbroucke
parent
9c5be9f801
commit
6611fc90b4
13 changed files with 722 additions and 705 deletions
|
|
@ -1,197 +1,196 @@
|
|||
|
||||
$cert = get-childitem -path cert:\CurrentUser\My\857150b64ef7d3e679c8cbde425d2a0b5e58ffaa
|
||||
Export-Certificate -Force -FilePath "\\sqlsrv7\c$\soft\eDos\signertrust.cer" -Cert $cert
|
||||
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\Upgrader.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie2.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
|
||||
|
||||
compress-archive -force -Path "D:\l\src\cs\eDosStation\syncEdosLocal\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosSync.zip"
|
||||
compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosStation.zip"
|
||||
Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\UpdateLocal.sql" -Destination "\\sqlsrv7\c$\soft\eDos\UpdateLocal.sql"
|
||||
Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\Updates.sql" -Destination "\\sqlsrv7\c$\soft\eDos\Updates.sql"
|
||||
Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe"
|
||||
Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe.config" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe.config"
|
||||
|
||||
|
||||
exit
|
||||
|
||||
# SIG # Begin signature block
|
||||
# MIIgzwYJKoZIhvcNAQcCoIIgwDCCILwCAQExDzANBglghkgBZQMEAgEFADB5Bgor
|
||||
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
|
||||
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCA+fDmHhnog4UGM
|
||||
# e3vgoZTowQzXcGEXO0O2Dfo82QdpQKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
|
||||
# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
|
||||
# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
|
||||
# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
|
||||
# WjBPMSEwHwYDVQQDExhWYW5kZW5icm91Y2tlIEx1YyBDUzIwMjExKjAoBgkqhkiG
|
||||
# 9w0BCQEWG2x1Yy52YW5kZW5icm91Y2tlQHNja2Nlbi5iZTCCASIwDQYJKoZIhvcN
|
||||
# AQEBBQADggEPADCCAQoCggEBAPRbMPSAdMsURs6M9TChuXZWe1LSQlVXYVHPGRln
|
||||
# QeF719tgHS1Ern70aW0PuvCECkzUTbGHw3o+bF+vj1UZWw82oOEZGannAoTyG1CI
|
||||
# xdOMc85Mdmy+Kb++9Ivxa6i4ahfpNDHE0F58TomaNyDY0dtRUDEMZw/A0AMkFmdg
|
||||
# 9BOnqrYeeLB0O/86ZkzUklRifi/Wa3ti1LV4U7fR6S4bMm7dZBh46IU2G3/oBdlN
|
||||
# YAtC3DNol+bnrcBvF+ccGwG5kVxEZg8TtpEMj00hnI+rNPjI4Ar6mE83XKak1X5/
|
||||
# xddZppx9ldJaiVujyOqy0cONhiN/vsWPdZU37LQbG1OydGUCAwEAAaOCAYowggGG
|
||||
# MAkGA1UdEwQCMAAwHQYDVR0OBBYEFN+1bIhLi6eWlLbzynleh97QuIFlMB8GA1Ud
|
||||
# IwQYMBaAFPApFPVqIRSSVlQTpD3VrfAhOsV4MAsGA1UdDwQEAwIHgDAfBgNVHSUE
|
||||
# GDAWBggrBgEFBQcDAwYKKwYBBAGCNwIBFTA6BgNVHREEMzAxgRtsdWMudmFuZGVu
|
||||
# YnJvdWNrZUBzY2tjZW4uYmWBEmx2YW5kZW5iQHNja2Nlbi5iZTA1BgNVHRIELjAs
|
||||
# hipodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBJQ1QlMjBDQS5jcnQwOwYD
|
||||
# VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU
|
||||
# JTIwQ0EuY3JsMD4GCSsGAQQBgjcVBwQxMC8GJysGAQQBgjcVCISMvCGCyP13gqGT
|
||||
# IoSXlEaExpIugQGC1IQhgfrIaQIBZAIBCDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsG
|
||||
# AQUFBwMDMA0GCSqGSIb3DQEBCwUAA4ICAQBGH87fu9sNbcCPVQCdJ9jP4jT59WTZ
|
||||
# m6s5BquO10UL9i7UAEmdd0yfCHW3myNUigR6O+Oc6Wa74HbUhAk+nEimHxzP5KcN
|
||||
# nKE6lwqsIOf49J5G+2HRmTgW9tewsr39ZiB3NE5s04fHEA0I45zs8wsgyp4Mlr5v
|
||||
# 3AfzYB7gxh0Hxdm+ion7PXvbKhAyI3F7pQTYauilmLAkHnoXD6T+Osp04wR9m1+H
|
||||
# NGqLMKYyVOSdu0UnmGuqHBxpMD7hAJ8LCi5yR6t6s4BNCczwhzUpo6ZgrtLmKCac
|
||||
# DmZ6SJMqsGFwan/GxnLSvw5QpVXUVJidDfTflMeJrfWhDOEt7jx9oQWQ249uzxlq
|
||||
# JMVfBt1YZDq4gr76yjK6VY7F6540ECog4auPte4NoiT5UPdE3QHSD/82/cdLoVuh
|
||||
# ELR4p4bfJ7PONT7x8iZzI8BoASh9SKJBh06mcmyJosOkc77Wv3ykqal7R+/LQi9g
|
||||
# eJwku6Ti0XIy9UFGBbUD4m18e5cKdqDzyIHwAne0JR0ZEILPzITWviFuSXKqGP0b
|
||||
# kSbGgpl+LuaCHcKAv+1FQBc2oWW0yPdxCUYpwo9QfTTh0qYXABQAbibOw7VKTnRL
|
||||
# sS92m9pb6wn9tYyNfMu6r7EXCuxJNDbYpKbxeadfY0arCzlOT6mpC6lzBqfgKyN+
|
||||
# VWoy9rmdzhjEjjCCBnIwggRaoAMCAQICEzgAAAACbukOrXYB5dcAAAAAAAIwDQYJ
|
||||
# KoZIhvcNAQELBQAwZzELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEM
|
||||
# MAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEXMBUG
|
||||
# A1UEAxMOU0NLQ0VOIFJvb3QgQ0EwHhcNMTcwNjIzMTEzOTM0WhcNMzIwNjIzMTE0
|
||||
# OTM0WjBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJQW50d2VycGVuMQwwCgYDVQQH
|
||||
# EwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UECxMDSUNUMRYwFAYDVQQDEw1T
|
||||
# Q0tDRU4gSUNUIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsW1u
|
||||
# J8gCKQwjdhAhr6eJJNXw+wffi5p2RB48uzTaQh2Y89P+75NFhk7qeOW0tVwacxYk
|
||||
# ubMvgNqasA9RslymREsxLfloMCidRPSQj8o0KE2cfLYojYre1TChFxc0PZobibZ7
|
||||
# BTsU2v75GQjnsEEMmxzwJLAjSU2mFVKJKjrKs4Xt/q6j3w0fdrRz0ba8zSMbTHO2
|
||||
# K8Cd1Rq3GQDLPythJyDxzo6YRE7TFOFcXGrIpFXvmy1XPc/ItiHwTocOmQ1msF+4
|
||||
# 6W0gfWtbFLt8bC/CnuE2ZQPnAmpq3lOUu8cOq/2eqhihAeAli5McYepaK+qr1JtL
|
||||
# NfgTSkkFFw27c5cPXwFCCE0ryJdN+qN4Xdk3J2iz0hayEJ4sGaimdJTXv/OTmSxx
|
||||
# KGMnPYV+BTvk/PDJnGjWQqOryf0PWgmwVQ1KAowaPjBAXJOEotzNnzW0/FKtvgJY
|
||||
# Lk3xFs3sJJ6EG6D02wB2RNszNGM66tyqqx/Z3651xwzgkYYR1ETdmddcqL6/3a+H
|
||||
# ifS5K99N+q7rX/Rp31AUlNsb53xhh43NWUAg5Tzrb9J54mBR6Z/MafmTVHcK2nK6
|
||||
# RRYaUfxs/WuE2+OzX7MdG/URi1lVuOu7hp7AKnSjcLnOcBG7lkSK1Q1pCuACYMkv
|
||||
# Cl+7keio376akUfumX3HqEVgK8ttZiRgiVHR7Q0CAwEAAaOCARYwggESMBAGCSsG
|
||||
# AQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTwKRT1aiEUklZUE6Q91a3wITrFeDAZBgkr
|
||||
# BgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
|
||||
# AwEB/zAfBgNVHSMEGDAWgBRSvxsquCggUTGvI6e+I5TG0fkUMDA8BgNVHR8ENTAz
|
||||
# MDGgL6AthitodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBSb290JTIwQ0Eu
|
||||
# Y3JsMEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAoYraHR0cDovL2NybC5zY2tj
|
||||
# ZW4uYmUvU0NLQ0VOJTIwUm9vdCUyMENBLmNydDANBgkqhkiG9w0BAQsFAAOCAgEA
|
||||
# hsQ1eNAeFzKKGY9KW0VMGrLUbtccjHoeKlGdVn+yhS9xhSaIFgm00IPVO5zh9jKt
|
||||
# gCA3o81TqY0w1WoRK1U8t89On5RZYVy39pDyu+oBlHgul9KOuJbIKLgh0VgEPvY3
|
||||
# vM0h0bLdxIrnlIxchVxgs5y/h/wLKmXLjsg+AuYzsJ4+9GAD5SsdFGp2jiKPf9aw
|
||||
# 6zG67an2yTqtvPfeoRpkMWO+Mx39CWWwfU3MaQySlAx0/JzZcqWzk6QFgN1h89wS
|
||||
# BHD0mMFdnahEth5y9QhPkLydPniibF5VZ59gbUVlpFFz8VddmBtx9xfe5aIYEjkj
|
||||
# 35HmEW/FN7qwnJP3dCljzFiqSueKqiFIN3punjHbMUoAxJnibx11Xz4pFm5mdk8v
|
||||
# 95r+sncH8SFK/P5nUjjEYIBRInZiovl7C8KfI1RD9lXJDPdw5yVfkCpkCr/rYNNM
|
||||
# BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO
|
||||
# kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs
|
||||
# Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a
|
||||
# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxghPvMIIT6wIBATBrMGYx
|
||||
# CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP
|
||||
# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
|
||||
# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
|
||||
# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
|
||||
# MSIEIOModi0HjAdP5qGJaeVHmXSQ1s4i6mPKQ6tMGNl+2MmzMEQGCisGAQQBgjcC
|
||||
# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
|
||||
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQDbA2yTpPzA7GiMtyxLN88SUvdG
|
||||
# 3IU1XzQRGYhrEm3T08z4L730AwCkMOAv9cH9D/qg0CeiImaVfgPiMc4WfPWonR9/
|
||||
# E0EVULGG6wiYO76wGiGRU9txyJajuU9SONmo9TQn00RSqBul1SHS0HBeypNkqidD
|
||||
# jdWjD1VWG/JkZqb4kONUw4gY4KkyrLnXhg5LCVGNdZNG0ooR8qxPrgJKOoJQGUtj
|
||||
# 2hUAOqWajI+onea4O8uq5+bmvW7reYv8fWjF1oC54HnC7lJe5mk8XzLVPCeGeIpk
|
||||
# XX6puuRzgq2n7aCSDUSWymg0eO+YxmSVi0OLQQus2o3zj7QzZASDpUMiuHHAoYIR
|
||||
# ojCCEZ4GCisGAQQBgjcDAwExghGOMIIRigYJKoZIhvcNAQcCoIIRezCCEXcCAQMx
|
||||
# DzANBglghkgBZQMEAgEFADBnBgsqhkiG9w0BCRABBKBYBFYwVAIBAQYJYIZIAYb9
|
||||
# bAcBMCEwCQYFKw4DAhoFAAQUxKkLyeoejdIzULU1OHnooTi9XoUCEGzvu/VcoYtl
|
||||
# rPEkzBh8wRAYDzIwMjIwNDEyMDgzODIwWqCCDXwwggbGMIIErqADAgECAhAKekqI
|
||||
# nsmZQpAGYzhNhpedMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNVBAYTAlVTMRcwFQYD
|
||||
# VQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBH
|
||||
# NCBSU0E0MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0EwHhcNMjIwMzI5MDAwMDAw
|
||||
# WhcNMzMwMzE0MjM1OTU5WjBMMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNl
|
||||
# cnQsIEluYy4xJDAiBgNVBAMTG0RpZ2lDZXJ0IFRpbWVzdGFtcCAyMDIyIC0gMjCC
|
||||
# AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALkqliOmXLxf1knwFYIY9DPu
|
||||
# zFxs4+AlLtIx5DxArvurxON4XX5cNur1JY1Do4HrOGP5PIhp3jzSMFENMQe6Rm7p
|
||||
# o0tI6IlBfw2y1vmE8Zg+C78KhBJxbKFiJgHTzsNs/aw7ftwqHKm9MMYW2Nq867Lx
|
||||
# g9GfzQnFuUFqRUIjQVr4YNNlLD5+Xr2Wp/D8sfT0KM9CeR87x5MHaGjlRDRSXw9Q
|
||||
# 3tRZLER0wDJHGVvimC6P0Mo//8ZnzzyTlU6E6XYYmJkRFMUrDKAz200kheiClOEv
|
||||
# A+5/hQLJhuHVGBS3BEXz4Di9or16cZjsFef9LuzSmwCKrB2NO4Bo/tBZmCbO4O2u
|
||||
# fyguwp7gC0vICNEyu4P6IzzZ/9KMu/dDI9/nw1oFYn5wLOUrsj1j6siugSBrQ4nI
|
||||
# fl+wGt0ZvZ90QQqvuY4J03ShL7BUdsGQT5TshmH/2xEvkgMwzjC3iw9dRLNDHSNQ
|
||||
# zZHXL537/M2xwafEDsTvQD4ZOgLUMalpoEn5deGb6GjkagyP6+SxIXuGZ1h+fx/o
|
||||
# K+QUshbWgaHK2jCQa+5vdcCwNiayCDv/vb5/bBMY38ZtpHlJrYt/YYcFaPfUcONC
|
||||
# leieu5tLsuK2QT3nr6caKMmtYbCgQRgZTu1Hm2GV7T4LYVrqPnqYklHNP8lE54CL
|
||||
# KUJy93my3YTqJ+7+fXprAgMBAAGjggGLMIIBhzAOBgNVHQ8BAf8EBAMCB4AwDAYD
|
||||
# VR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAgBgNVHSAEGTAXMAgG
|
||||
# BmeBDAEEAjALBglghkgBhv1sBwEwHwYDVR0jBBgwFoAUuhbZbU2FL3MpdpovdYxq
|
||||
# II+eyG8wHQYDVR0OBBYEFI1kt4kh/lZYRIRhp+pvHDaP3a8NMFoGA1UdHwRTMFEw
|
||||
# T6BNoEuGSWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRH
|
||||
# NFJTQTQwOTZTSEEyNTZUaW1lU3RhbXBpbmdDQS5jcmwwgZAGCCsGAQUFBwEBBIGD
|
||||
# MIGAMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wWAYIKwYB
|
||||
# BQUHMAKGTGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0
|
||||
# ZWRHNFJTQTQwOTZTSEEyNTZUaW1lU3RhbXBpbmdDQS5jcnQwDQYJKoZIhvcNAQEL
|
||||
# BQADggIBAA0tI3Sm0fX46kuZPwHk9gzkrxad2bOMl4IpnENvAS2rOLVwEb+EGYs/
|
||||
# XeWGT76TOt4qOVo5TtiEWaW8G5iq6Gzv0UhpGThbz4k5HXBw2U7fIyJs1d/2Wcuh
|
||||
# wupMdsqh3KErlribVakaa33R9QIJT4LWpXOIxJiA3+5JlbezzMWn7g7h7x44ip/v
|
||||
# EckxSli23zh8y/pc9+RTv24KfH7X3pjVKWWJD6KcwGX0ASJlx+pedKZbNZJQfPQX
|
||||
# podkTz5GiRZjIGvL8nvQNeNKcEiptucdYL0EIhUlcAZyqUQ7aUcR0+7px6A+TxC5
|
||||
# MDbk86ppCaiLfmSiZZQR+24y8fW7OK3NwJMR1TJ4Sks3KkzzXNy2hcC7cDBVeNaY
|
||||
# /lRtf3GpSBp43UZ3Lht6wDOK+EoojBKoc88t+dMj8p4Z4A2UKKDr2xpRoJWCjihr
|
||||
# pM6ddt6pc6pIallDrl/q+A8GQp3fBmiW/iqgdFtjZt5rLLh4qk1wbfAs8QcVfjW0
|
||||
# 5rUMopml1xVrNQ6F1uAszOAMJLh8UgsemXzvyMjFjFhpr6s94c/MfRWuFL+Kcd/K
|
||||
# l7HYR+ocheBFThIcFClYzG/Tf8u+wQ5KbyCcrtlzMlkI5y2SoRoR/jKYpl0rl+CL
|
||||
# 05zMbbUNrkdjOEcXW28T2moQbh9Jt0RbtAgKh1pZBHYRoad3AhMcMIIGrjCCBJag
|
||||
# AwIBAgIQBzY3tyRUfNhHrP0oZipeWzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQG
|
||||
# EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
|
||||
# cnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMjIw
|
||||
# MzIzMDAwMDAwWhcNMzcwMzIyMjM1OTU5WjBjMQswCQYDVQQGEwJVUzEXMBUGA1UE
|
||||
# ChMORGlnaUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQgRzQg
|
||||
# UlNBNDA5NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMIICIjANBgkqhkiG9w0BAQEF
|
||||
# AAOCAg8AMIICCgKCAgEAxoY1BkmzwT1ySVFVxyUDxPKRN6mXUaHW0oPRnkyibaCw
|
||||
# zIP5WvYRoUQVQl+kiPNo+n3znIkLf50fng8zH1ATCyZzlm34V6gCff1DtITaEfFz
|
||||
# sbPuK4CEiiIY3+vaPcQXf6sZKz5C3GeO6lE98NZW1OcoLevTsbV15x8GZY2UKdPZ
|
||||
# 7Gnf2ZCHRgB720RBidx8ald68Dd5n12sy+iEZLRS8nZH92GDGd1ftFQLIWhuNyG7
|
||||
# QKxfst5Kfc71ORJn7w6lY2zkpsUdzTYNXNXmG6jBZHRAp8ByxbpOH7G1WE15/teP
|
||||
# c5OsLDnipUjW8LAxE6lXKZYnLvWHpo9OdhVVJnCYJn+gGkcgQ+NDY4B7dW4nJZCY
|
||||
# OjgRs/b2nuY7W+yB3iIU2YIqx5K/oN7jPqJz+ucfWmyU8lKVEStYdEAoq3NDzt9K
|
||||
# oRxrOMUp88qqlnNCaJ+2RrOdOqPVA+C/8KI8ykLcGEh/FDTP0kyr75s9/g64ZCr6
|
||||
# dSgkQe1CvwWcZklSUPRR8zZJTYsg0ixXNXkrqPNFYLwjjVj33GHek/45wPmyMKVM
|
||||
# 1+mYSlg+0wOI/rOP015LdhJRk8mMDDtbiiKowSYI+RQQEgN9XyO7ZONj4KbhPvbC
|
||||
# dLI/Hgl27KtdRnXiYKNYCQEoAA6EVO7O6V3IXjASvUaetdN2udIOa5kM0jO0zbEC
|
||||
# AwEAAaOCAV0wggFZMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFLoW2W1N
|
||||
# hS9zKXaaL3WMaiCPnshvMB8GA1UdIwQYMBaAFOzX44LScV1kTN8uZz/nupiuHA9P
|
||||
# MA4GA1UdDwEB/wQEAwIBhjATBgNVHSUEDDAKBggrBgEFBQcDCDB3BggrBgEFBQcB
|
||||
# AQRrMGkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBBBggr
|
||||
# BgEFBQcwAoY1aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VHJ1
|
||||
# c3RlZFJvb3RHNC5jcnQwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybDMuZGln
|
||||
# aWNlcnQuY29tL0RpZ2lDZXJ0VHJ1c3RlZFJvb3RHNC5jcmwwIAYDVR0gBBkwFzAI
|
||||
# BgZngQwBBAIwCwYJYIZIAYb9bAcBMA0GCSqGSIb3DQEBCwUAA4ICAQB9WY7Ak7Zv
|
||||
# mKlEIgF+ZtbYIULhsBguEE0TzzBTzr8Y+8dQXeJLKftwig2qKWn8acHPHQfpPmDI
|
||||
# 2AvlXFvXbYf6hCAlNDFnzbYSlm/EUExiHQwIgqgWvalWzxVzjQEiJc6VaT9Hd/ty
|
||||
# dBTX/6tPiix6q4XNQ1/tYLaqT5Fmniye4Iqs5f2MvGQmh2ySvZ180HAKfO+ovHVP
|
||||
# ulr3qRCyXen/KFSJ8NWKcXZl2szwcqMj+sAngkSumScbqyQeJsG33irr9p6xeZmB
|
||||
# o1aGqwpFyd/EjaDnmPv7pp1yr8THwcFqcdnGE4AJxLafzYeHJLtPo0m5d2aR8XKc
|
||||
# 6UsCUqc3fpNTrDsdCEkPlM05et3/JWOZJyw9P2un8WbDQc1PtkCbISFA0LcTJM3c
|
||||
# HXg65J6t5TRxktcma+Q4c6umAU+9Pzt4rUyt+8SVe+0KXzM5h0F4ejjpnOHdI/0d
|
||||
# KNPH+ejxmF/7K9h+8kaddSweJywm228Vex4Ziza4k9Tm8heZWcpw8De/mADfIBZP
|
||||
# J/tgZxahZrrdVcA6KYawmKAr7ZVBtzrVFZgxtGIJDwq9gdkT/r+k0fNX2bwE+oLe
|
||||
# Mt8EifAAzV3C+dAjfwAL5HYCJtnwZXZCpimHCUcr5n8apIUP/JiW9lVUKx+A+sDy
|
||||
# Divl1vupL0QVSucTDh3bNzgaoSv27dZ8/DGCA3YwggNyAgEBMHcwYzELMAkGA1UE
|
||||
# BhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2Vy
|
||||
# dCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQQIQCnpK
|
||||
# iJ7JmUKQBmM4TYaXnTANBglghkgBZQMEAgEFAKCB0TAaBgkqhkiG9w0BCQMxDQYL
|
||||
# KoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDQxMjA4MzgyMFowKwYLKoZI
|
||||
# hvcNAQkQAgwxHDAaMBgwFgQUhQjzhlFcs9MHfba0t8B/G0peQd4wLwYJKoZIhvcN
|
||||
# AQkEMSIEIFC6eLQ1GrWoCY9H7Ix/i43Z0BbYY09ijHymqmF89rjgMDcGCyqGSIb3
|
||||
# DQEJEAIvMSgwJjAkMCIEIJ2mkBXDScbBiXhFujWCrXDIj6QpO9tqvpwr0lOSeeY7
|
||||
# MA0GCSqGSIb3DQEBAQUABIICAKecGErSiuFMa3UwWHj55qcdmPCcRyIhUV8gRdpk
|
||||
# TMmkSb72WbQ2if5qmqMXZ4purIPa73gFwMoNS+QW7OL8r+ROP/qDKX5EqVPQcNfj
|
||||
# A/k1KffMrUGtMbq464zufkWTHBBbGNhvZpb9o/q1mWAbo51iNkhOAdVhPrFMlnWL
|
||||
# HWKqoY4xp4+b3I+H7mPAAcTnIRuEVUHSdeZjecKNQZGvY6PHJuui4XSpYAnrmNI5
|
||||
# Ep5cd63noDvS0QDw+5JrbHRN+pl4OQrwGFo2NUnKuilJDpekxB/qzAE6UFjElqfk
|
||||
# c15xdjuFjPEgp45EvEVeGsnJBHhi2jsTHnwCTHH4NEk8Qr1UgYx4MR9HQcx6jfml
|
||||
# /H4eOetwrdFjK5cPnJ45LWYMVblX8Xnsjo6fIh3ABLdnjo8FDjqyHXOb5LvzcIJN
|
||||
# 5B7zaw7KLwFAGX/gRj1excOYrX6seHhov9OdOqPhM4KX0MiSco7DJmbLgwtouoat
|
||||
# wRA++Bu3uMPrKK6N+lzimIfvmkOUyUTUvqYZEjzzfIwz9+tid5NvUxybN686YqWt
|
||||
# 9kPhAd+UjTNiBypcV+WkrjlV1HM2B5V/XQmrfKXtE/ftmzre0nlazynXeYDka898
|
||||
# QlqGxh9/81WhIc9AweB9zIR5DGXQUF+tt7ePQ08BVs2U1mbSPoi/9gzP3h7NvnWh
|
||||
# scq4
|
||||
# SIG # End signature block
|
||||
|
||||
$cert = get-childitem -path cert:\CurrentUser\My\857150b64ef7d3e679c8cbde425d2a0b5e58ffaa
|
||||
Export-Certificate -Force -FilePath "\\sqlsrv7\c$\soft\eDos\signertrust.cer" -Cert $cert
|
||||
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\Upgrader.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie2.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
|
||||
|
||||
compress-archive -force -Path "D:\l\src\cs\eDosStation\syncEdosLocal\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosSync.zip"
|
||||
compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosStation.zip"
|
||||
Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\UpdateLocal.sql" -Destination "\\sqlsrv7\c$\soft\eDos\UpdateLocal.sql"
|
||||
Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\Updates.sql" -Destination "\\sqlsrv7\c$\soft\eDos\Updates.sql"
|
||||
Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe"
|
||||
Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe.config" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe.config"
|
||||
Copy-Item -Path "D:\Soft\OpenSSH\OpenSSH89Signed.zip" -Destination "\\sqlsrv7\c$\soft\eDos\"
|
||||
exit
|
||||
|
||||
# SIG # Begin signature block
|
||||
# MIIg0AYJKoZIhvcNAQcCoIIgwTCCIL0CAQExDzANBglghkgBZQMEAgEFADB5Bgor
|
||||
# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
|
||||
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDvqWEQvrYc4spT
|
||||
# Iv/8me6SIgRMcZgeLQ4kSdX714sdsaCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
|
||||
# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
|
||||
# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
|
||||
# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
|
||||
# WjBPMSEwHwYDVQQDExhWYW5kZW5icm91Y2tlIEx1YyBDUzIwMjExKjAoBgkqhkiG
|
||||
# 9w0BCQEWG2x1Yy52YW5kZW5icm91Y2tlQHNja2Nlbi5iZTCCASIwDQYJKoZIhvcN
|
||||
# AQEBBQADggEPADCCAQoCggEBAPRbMPSAdMsURs6M9TChuXZWe1LSQlVXYVHPGRln
|
||||
# QeF719tgHS1Ern70aW0PuvCECkzUTbGHw3o+bF+vj1UZWw82oOEZGannAoTyG1CI
|
||||
# xdOMc85Mdmy+Kb++9Ivxa6i4ahfpNDHE0F58TomaNyDY0dtRUDEMZw/A0AMkFmdg
|
||||
# 9BOnqrYeeLB0O/86ZkzUklRifi/Wa3ti1LV4U7fR6S4bMm7dZBh46IU2G3/oBdlN
|
||||
# YAtC3DNol+bnrcBvF+ccGwG5kVxEZg8TtpEMj00hnI+rNPjI4Ar6mE83XKak1X5/
|
||||
# xddZppx9ldJaiVujyOqy0cONhiN/vsWPdZU37LQbG1OydGUCAwEAAaOCAYowggGG
|
||||
# MAkGA1UdEwQCMAAwHQYDVR0OBBYEFN+1bIhLi6eWlLbzynleh97QuIFlMB8GA1Ud
|
||||
# IwQYMBaAFPApFPVqIRSSVlQTpD3VrfAhOsV4MAsGA1UdDwQEAwIHgDAfBgNVHSUE
|
||||
# GDAWBggrBgEFBQcDAwYKKwYBBAGCNwIBFTA6BgNVHREEMzAxgRtsdWMudmFuZGVu
|
||||
# YnJvdWNrZUBzY2tjZW4uYmWBEmx2YW5kZW5iQHNja2Nlbi5iZTA1BgNVHRIELjAs
|
||||
# hipodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBJQ1QlMjBDQS5jcnQwOwYD
|
||||
# VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU
|
||||
# JTIwQ0EuY3JsMD4GCSsGAQQBgjcVBwQxMC8GJysGAQQBgjcVCISMvCGCyP13gqGT
|
||||
# IoSXlEaExpIugQGC1IQhgfrIaQIBZAIBCDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsG
|
||||
# AQUFBwMDMA0GCSqGSIb3DQEBCwUAA4ICAQBGH87fu9sNbcCPVQCdJ9jP4jT59WTZ
|
||||
# m6s5BquO10UL9i7UAEmdd0yfCHW3myNUigR6O+Oc6Wa74HbUhAk+nEimHxzP5KcN
|
||||
# nKE6lwqsIOf49J5G+2HRmTgW9tewsr39ZiB3NE5s04fHEA0I45zs8wsgyp4Mlr5v
|
||||
# 3AfzYB7gxh0Hxdm+ion7PXvbKhAyI3F7pQTYauilmLAkHnoXD6T+Osp04wR9m1+H
|
||||
# NGqLMKYyVOSdu0UnmGuqHBxpMD7hAJ8LCi5yR6t6s4BNCczwhzUpo6ZgrtLmKCac
|
||||
# DmZ6SJMqsGFwan/GxnLSvw5QpVXUVJidDfTflMeJrfWhDOEt7jx9oQWQ249uzxlq
|
||||
# JMVfBt1YZDq4gr76yjK6VY7F6540ECog4auPte4NoiT5UPdE3QHSD/82/cdLoVuh
|
||||
# ELR4p4bfJ7PONT7x8iZzI8BoASh9SKJBh06mcmyJosOkc77Wv3ykqal7R+/LQi9g
|
||||
# eJwku6Ti0XIy9UFGBbUD4m18e5cKdqDzyIHwAne0JR0ZEILPzITWviFuSXKqGP0b
|
||||
# kSbGgpl+LuaCHcKAv+1FQBc2oWW0yPdxCUYpwo9QfTTh0qYXABQAbibOw7VKTnRL
|
||||
# sS92m9pb6wn9tYyNfMu6r7EXCuxJNDbYpKbxeadfY0arCzlOT6mpC6lzBqfgKyN+
|
||||
# VWoy9rmdzhjEjjCCBnIwggRaoAMCAQICEzgAAAACbukOrXYB5dcAAAAAAAIwDQYJ
|
||||
# KoZIhvcNAQELBQAwZzELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEM
|
||||
# MAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEXMBUG
|
||||
# A1UEAxMOU0NLQ0VOIFJvb3QgQ0EwHhcNMTcwNjIzMTEzOTM0WhcNMzIwNjIzMTE0
|
||||
# OTM0WjBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJQW50d2VycGVuMQwwCgYDVQQH
|
||||
# EwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UECxMDSUNUMRYwFAYDVQQDEw1T
|
||||
# Q0tDRU4gSUNUIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsW1u
|
||||
# J8gCKQwjdhAhr6eJJNXw+wffi5p2RB48uzTaQh2Y89P+75NFhk7qeOW0tVwacxYk
|
||||
# ubMvgNqasA9RslymREsxLfloMCidRPSQj8o0KE2cfLYojYre1TChFxc0PZobibZ7
|
||||
# BTsU2v75GQjnsEEMmxzwJLAjSU2mFVKJKjrKs4Xt/q6j3w0fdrRz0ba8zSMbTHO2
|
||||
# K8Cd1Rq3GQDLPythJyDxzo6YRE7TFOFcXGrIpFXvmy1XPc/ItiHwTocOmQ1msF+4
|
||||
# 6W0gfWtbFLt8bC/CnuE2ZQPnAmpq3lOUu8cOq/2eqhihAeAli5McYepaK+qr1JtL
|
||||
# NfgTSkkFFw27c5cPXwFCCE0ryJdN+qN4Xdk3J2iz0hayEJ4sGaimdJTXv/OTmSxx
|
||||
# KGMnPYV+BTvk/PDJnGjWQqOryf0PWgmwVQ1KAowaPjBAXJOEotzNnzW0/FKtvgJY
|
||||
# Lk3xFs3sJJ6EG6D02wB2RNszNGM66tyqqx/Z3651xwzgkYYR1ETdmddcqL6/3a+H
|
||||
# ifS5K99N+q7rX/Rp31AUlNsb53xhh43NWUAg5Tzrb9J54mBR6Z/MafmTVHcK2nK6
|
||||
# RRYaUfxs/WuE2+OzX7MdG/URi1lVuOu7hp7AKnSjcLnOcBG7lkSK1Q1pCuACYMkv
|
||||
# Cl+7keio376akUfumX3HqEVgK8ttZiRgiVHR7Q0CAwEAAaOCARYwggESMBAGCSsG
|
||||
# AQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTwKRT1aiEUklZUE6Q91a3wITrFeDAZBgkr
|
||||
# BgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
|
||||
# AwEB/zAfBgNVHSMEGDAWgBRSvxsquCggUTGvI6e+I5TG0fkUMDA8BgNVHR8ENTAz
|
||||
# MDGgL6AthitodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBSb290JTIwQ0Eu
|
||||
# Y3JsMEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAoYraHR0cDovL2NybC5zY2tj
|
||||
# ZW4uYmUvU0NLQ0VOJTIwUm9vdCUyMENBLmNydDANBgkqhkiG9w0BAQsFAAOCAgEA
|
||||
# hsQ1eNAeFzKKGY9KW0VMGrLUbtccjHoeKlGdVn+yhS9xhSaIFgm00IPVO5zh9jKt
|
||||
# gCA3o81TqY0w1WoRK1U8t89On5RZYVy39pDyu+oBlHgul9KOuJbIKLgh0VgEPvY3
|
||||
# vM0h0bLdxIrnlIxchVxgs5y/h/wLKmXLjsg+AuYzsJ4+9GAD5SsdFGp2jiKPf9aw
|
||||
# 6zG67an2yTqtvPfeoRpkMWO+Mx39CWWwfU3MaQySlAx0/JzZcqWzk6QFgN1h89wS
|
||||
# BHD0mMFdnahEth5y9QhPkLydPniibF5VZ59gbUVlpFFz8VddmBtx9xfe5aIYEjkj
|
||||
# 35HmEW/FN7qwnJP3dCljzFiqSueKqiFIN3punjHbMUoAxJnibx11Xz4pFm5mdk8v
|
||||
# 95r+sncH8SFK/P5nUjjEYIBRInZiovl7C8KfI1RD9lXJDPdw5yVfkCpkCr/rYNNM
|
||||
# BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO
|
||||
# kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs
|
||||
# Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a
|
||||
# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxghPwMIIT7AIBATBrMGYx
|
||||
# CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP
|
||||
# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
|
||||
# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
|
||||
# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
|
||||
# MSIEIHZO4cBWHlFC072jipwLWrLy3AXXaPWRBd0pzT1DBdP8MEQGCisGAQQBgjcC
|
||||
# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
|
||||
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCaW3lR9DEmyI5QWAlaFBjb6qsW
|
||||
# 8TP0B61s3l5WB9jsbj50mmLc/Hvy6II54utyk0hN/T17553Y9YkV0puqDr/1Sfx0
|
||||
# FnC1vmytYzEwuHUx4BMNftm2FRV7J0jnvlzSImbZPg4pbpFPrQkX47usruxtsCiZ
|
||||
# aSILqODvn4Q8a9Q8iWlILB0dozzvGzEWK3FMo4tCsUkNHBdq3OxQH6qnX+4Tz9eG
|
||||
# pvJZTqITAvNAM/TldLAZL+G1OzFokvXYQNa1bFtQ8++a+HKYJJro2HFKcCfqqBMF
|
||||
# Gi+acG3haGLVDW3xjrcplXsSTpnBLtmR+DuekUQi5jHFqGxdSoN9hlOE9MFuoYIR
|
||||
# ozCCEZ8GCisGAQQBgjcDAwExghGPMIIRiwYJKoZIhvcNAQcCoIIRfDCCEXgCAQMx
|
||||
# DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9
|
||||
# bAcBMCEwCQYFKw4DAhoFAAQU4UCjxpmRnRkTKCQAe/zR8Hr+k+gCEQCiV5scaFyY
|
||||
# 9u2mRA10D2ikGA8yMDIyMDQyMjEwMjk0M1qggg18MIIGxjCCBK6gAwIBAgIQCnpK
|
||||
# iJ7JmUKQBmM4TYaXnTANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEXMBUG
|
||||
# A1UEChMORGlnaUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQg
|
||||
# RzQgUlNBNDA5NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMB4XDTIyMDMyOTAwMDAw
|
||||
# MFoXDTMzMDMxNDIzNTk1OVowTDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lD
|
||||
# ZXJ0LCBJbmMuMSQwIgYDVQQDExtEaWdpQ2VydCBUaW1lc3RhbXAgMjAyMiAtIDIw
|
||||
# ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5KpYjply8X9ZJ8BWCGPQz
|
||||
# 7sxcbOPgJS7SMeQ8QK77q8TjeF1+XDbq9SWNQ6OB6zhj+TyIad480jBRDTEHukZu
|
||||
# 6aNLSOiJQX8Nstb5hPGYPgu/CoQScWyhYiYB087DbP2sO37cKhypvTDGFtjavOuy
|
||||
# 8YPRn80JxblBakVCI0Fa+GDTZSw+fl69lqfw/LH09CjPQnkfO8eTB2ho5UQ0Ul8P
|
||||
# UN7UWSxEdMAyRxlb4pguj9DKP//GZ888k5VOhOl2GJiZERTFKwygM9tNJIXogpTh
|
||||
# LwPuf4UCyYbh1RgUtwRF8+A4vaK9enGY7BXn/S7s0psAiqwdjTuAaP7QWZgmzuDt
|
||||
# rn8oLsKe4AtLyAjRMruD+iM82f/SjLv3QyPf58NaBWJ+cCzlK7I9Y+rIroEga0OJ
|
||||
# yH5fsBrdGb2fdEEKr7mOCdN0oS+wVHbBkE+U7IZh/9sRL5IDMM4wt4sPXUSzQx0j
|
||||
# UM2R1y+d+/zNscGnxA7E70A+GToC1DGpaaBJ+XXhm+ho5GoMj+vksSF7hmdYfn8f
|
||||
# 6CvkFLIW1oGhytowkGvub3XAsDYmsgg7/72+f2wTGN/GbaR5Sa2Lf2GHBWj31HDj
|
||||
# QpXonrubS7LitkE956+nGijJrWGwoEEYGU7tR5thle0+C2Fa6j56mJJRzT/JROeA
|
||||
# iylCcvd5st2E6ifu/n16awIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwG
|
||||
# A1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAI
|
||||
# BgZngQwBBAIwCwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WM
|
||||
# aiCPnshvMB0GA1UdDgQWBBSNZLeJIf5WWESEYafqbxw2j92vDTBaBgNVHR8EUzBR
|
||||
# ME+gTaBLhklodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVk
|
||||
# RzRSU0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSB
|
||||
# gzCBgDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsG
|
||||
# AQUFBzAChkxodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVz
|
||||
# dGVkRzRSU0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEB
|
||||
# CwUAA4ICAQANLSN0ptH1+OpLmT8B5PYM5K8WndmzjJeCKZxDbwEtqzi1cBG/hBmL
|
||||
# P13lhk++kzreKjlaOU7YhFmlvBuYquhs79FIaRk4W8+JOR1wcNlO3yMibNXf9lnL
|
||||
# ocLqTHbKodyhK5a4m1WpGmt90fUCCU+C1qVziMSYgN/uSZW3s8zFp+4O4e8eOIqf
|
||||
# 7xHJMUpYtt84fMv6XPfkU79uCnx+196Y1SlliQ+inMBl9AEiZcfqXnSmWzWSUHz0
|
||||
# F6aHZE8+RokWYyBry/J70DXjSnBIqbbnHWC9BCIVJXAGcqlEO2lHEdPu6cegPk8Q
|
||||
# uTA25POqaQmoi35komWUEftuMvH1uzitzcCTEdUyeEpLNypM81zctoXAu3AwVXjW
|
||||
# mP5UbX9xqUgaeN1Gdy4besAzivhKKIwSqHPPLfnTI/KeGeANlCig69saUaCVgo4o
|
||||
# a6TOnXbeqXOqSGpZQ65f6vgPBkKd3wZolv4qoHRbY2beayy4eKpNcG3wLPEHFX41
|
||||
# tOa1DKKZpdcVazUOhdbgLMzgDCS4fFILHpl878jIxYxYaa+rPeHPzH0VrhS/inHf
|
||||
# ypex2EfqHIXgRU4SHBQpWMxv03/LvsEOSm8gnK7ZczJZCOctkqEaEf4ymKZdK5fg
|
||||
# i9OczG21Da5HYzhHF1tvE9pqEG4fSbdEW7QICodaWQR2EaGndwITHDCCBq4wggSW
|
||||
# oAMCAQICEAc2N7ckVHzYR6z9KGYqXlswDQYJKoZIhvcNAQELBQAwYjELMAkGA1UE
|
||||
# BhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3LmRpZ2lj
|
||||
# ZXJ0LmNvbTEhMB8GA1UEAxMYRGlnaUNlcnQgVHJ1c3RlZCBSb290IEc0MB4XDTIy
|
||||
# MDMyMzAwMDAwMFoXDTM3MDMyMjIzNTk1OVowYzELMAkGA1UEBhMCVVMxFzAVBgNV
|
||||
# BAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVkIEc0
|
||||
# IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTCCAiIwDQYJKoZIhvcNAQEB
|
||||
# BQADggIPADCCAgoCggIBAMaGNQZJs8E9cklRVcclA8TykTepl1Gh1tKD0Z5Mom2g
|
||||
# sMyD+Vr2EaFEFUJfpIjzaPp985yJC3+dH54PMx9QEwsmc5Zt+FeoAn39Q7SE2hHx
|
||||
# c7Gz7iuAhIoiGN/r2j3EF3+rGSs+QtxnjupRPfDWVtTnKC3r07G1decfBmWNlCnT
|
||||
# 2exp39mQh0YAe9tEQYncfGpXevA3eZ9drMvohGS0UvJ2R/dhgxndX7RUCyFobjch
|
||||
# u0CsX7LeSn3O9TkSZ+8OpWNs5KbFHc02DVzV5huowWR0QKfAcsW6Th+xtVhNef7X
|
||||
# j3OTrCw54qVI1vCwMROpVymWJy71h6aPTnYVVSZwmCZ/oBpHIEPjQ2OAe3VuJyWQ
|
||||
# mDo4EbP29p7mO1vsgd4iFNmCKseSv6De4z6ic/rnH1pslPJSlRErWHRAKKtzQ87f
|
||||
# SqEcazjFKfPKqpZzQmiftkaznTqj1QPgv/CiPMpC3BhIfxQ0z9JMq++bPf4OuGQq
|
||||
# +nUoJEHtQr8FnGZJUlD0UfM2SU2LINIsVzV5K6jzRWC8I41Y99xh3pP+OcD5sjCl
|
||||
# TNfpmEpYPtMDiP6zj9NeS3YSUZPJjAw7W4oiqMEmCPkUEBIDfV8ju2TjY+Cm4T72
|
||||
# wnSyPx4JduyrXUZ14mCjWAkBKAAOhFTuzuldyF4wEr1GnrXTdrnSDmuZDNIztM2x
|
||||
# AgMBAAGjggFdMIIBWTASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS6Ftlt
|
||||
# TYUvcyl2mi91jGogj57IbzAfBgNVHSMEGDAWgBTs1+OC0nFdZEzfLmc/57qYrhwP
|
||||
# TzAOBgNVHQ8BAf8EBAMCAYYwEwYDVR0lBAwwCgYIKwYBBQUHAwgwdwYIKwYBBQUH
|
||||
# AQEEazBpMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQQYI
|
||||
# KwYBBQUHMAKGNWh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRy
|
||||
# dXN0ZWRSb290RzQuY3J0MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwzLmRp
|
||||
# Z2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRSb290RzQuY3JsMCAGA1UdIAQZMBcw
|
||||
# CAYGZ4EMAQQCMAsGCWCGSAGG/WwHATANBgkqhkiG9w0BAQsFAAOCAgEAfVmOwJO2
|
||||
# b5ipRCIBfmbW2CFC4bAYLhBNE88wU86/GPvHUF3iSyn7cIoNqilp/GnBzx0H6T5g
|
||||
# yNgL5Vxb122H+oQgJTQxZ822EpZvxFBMYh0MCIKoFr2pVs8Vc40BIiXOlWk/R3f7
|
||||
# cnQU1/+rT4osequFzUNf7WC2qk+RZp4snuCKrOX9jLxkJodskr2dfNBwCnzvqLx1
|
||||
# T7pa96kQsl3p/yhUifDVinF2ZdrM8HKjI/rAJ4JErpknG6skHibBt94q6/aesXmZ
|
||||
# gaNWhqsKRcnfxI2g55j7+6adcq/Ex8HBanHZxhOACcS2n82HhyS7T6NJuXdmkfFy
|
||||
# nOlLAlKnN36TU6w7HQhJD5TNOXrd/yVjmScsPT9rp/Fmw0HNT7ZAmyEhQNC3EyTN
|
||||
# 3B14OuSereU0cZLXJmvkOHOrpgFPvT87eK1MrfvElXvtCl8zOYdBeHo46Zzh3SP9
|
||||
# HSjTx/no8Zhf+yvYfvJGnXUsHicsJttvFXseGYs2uJPU5vIXmVnKcPA3v5gA3yAW
|
||||
# Tyf7YGcWoWa63VXAOimGsJigK+2VQbc61RWYMbRiCQ8KvYHZE/6/pNHzV9m8BPqC
|
||||
# 3jLfBInwAM1dwvnQI38AC+R2AibZ8GV2QqYphwlHK+Z/GqSFD/yYlvZVVCsfgPrA
|
||||
# 8g4r5db7qS9EFUrnEw4d2zc4GqEr9u3WfPwxggN2MIIDcgIBATB3MGMxCzAJBgNV
|
||||
# BAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNl
|
||||
# cnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAp6
|
||||
# SoieyZlCkAZjOE2Gl50wDQYJYIZIAWUDBAIBBQCggdEwGgYJKoZIhvcNAQkDMQ0G
|
||||
# CyqGSIb3DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0yMjA0MjIxMDI5NDNaMCsGCyqG
|
||||
# SIb3DQEJEAIMMRwwGjAYMBYEFIUI84ZRXLPTB322tLfAfxtKXkHeMC8GCSqGSIb3
|
||||
# DQEJBDEiBCBnVOMCXFKfkz+AbeeWej7r/qsYJVoSpjNpQfJR56KRRjA3BgsqhkiG
|
||||
# 9w0BCRACLzEoMCYwJDAiBCCdppAVw0nGwYl4Rbo1gq1wyI+kKTvbar6cK9JTknnm
|
||||
# OzANBgkqhkiG9w0BAQEFAASCAgBqDGrhXkwMgq8OjsxUQVTPzrpZKgA+yQ0u5b9X
|
||||
# fg6xPrm1Duwywy+J8JrMYWoMfTw/Yn/72lOR++u/6rP+dDKwAvguGDTM/V8jUIWj
|
||||
# 5KwcETKIcwc2PnaQzyD8P52sUWE3i54/IQ7Kgdkv7pH5jY9xALyDh5hyQ3tnHvXk
|
||||
# Xs1mGcTcNLkJo1FZLlAgu60k8b0BGbmN6hxi5dKFNrbwxnGLkfzPOAec7XmwL9yW
|
||||
# 9TibdAWMmun/zHGNsQDSoKBotTnIuDLXYnWNSdCI0qWki64Jfe98PjAYg2ToJm5j
|
||||
# wPFUBzldTB9vl9LcJtbtJf9lpt8DTK5tohnslPgEvsqJbdsZRsiv17W0A0kE309H
|
||||
# 451NsydrOuao5MeLM5PWiikpYwOKELPrK6tbWrptYgWqKqIRxTb2jXHCC6iWXMAZ
|
||||
# xbHNRRyDN4U32QGsAGdVUsmJizDfC9ce/v4WLGdl5rzCIhM6np2+56iyY26I+uJl
|
||||
# 5mgKTbCNis8+4cU8T9drvtv1e1u8t9at7plfMiR9b/pFTEZhKRTgMpYvTCCOzXvD
|
||||
# WV7F/wCL8fEwhzjNp3ElzpsKpJIzHGy9vDLa9PSYo4SXYX2MIPhfDlo88le+n7w4
|
||||
# Z2ZHZnbDSnGuis09PWDaDYeK4PnQjicxLv+nP7eeA5CED11gj98tZ7hfmyfbGlf6
|
||||
# jcPJwQ==
|
||||
# SIG # End signature block
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ AS BEGIN
|
|||
[a].[Deleted],
|
||||
[ReasonNoAccess] = CASE WHEN @AllowMultipleEPD = 1
|
||||
AND [a].[hasEPD] = 1 THEN 'EPD not returned'
|
||||
WHEN [VisitIDLocked] IS NOT NULL THEN 'Locked because of alarm' ELSE [a].[ReasonNoAccess] END,
|
||||
WHEN ISNULL([VisitIDLocked], 0) > 0 THEN 'Locked because of alarm' ELSE [a].[ReasonNoAccess] END,
|
||||
[a].[Dose_52W_microSv],
|
||||
[a].[hasEPD],
|
||||
[activeStation] = @lid_station,
|
||||
|
|
@ -97,6 +97,7 @@ AS BEGIN
|
|||
WHERE [p].[PersID] = @PersID) [a];
|
||||
END;
|
||||
|
||||
|
||||
go
|
||||
|
||||
---- Luc 2022-03-25
|
||||
|
|
|
|||
|
|
@ -1,88 +1,90 @@
|
|||
<Window x:Class="eDosStation.About"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
mc:Ignorable="d"
|
||||
Title="About" Height="658.389" Width="800" FontFamily="Segoe UI"
|
||||
WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" WindowState="Normal" >
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<FlowDocumentScrollViewer Grid.Row="1" ScrollViewer.CanContentScroll="False" ScrollViewer.VerticalScrollBarVisibility="Auto">
|
||||
<FlowDocument>
|
||||
|
||||
<Paragraph FontSize="30" >
|
||||
<Image Source="/Images/EPD-MK3.png" VerticalAlignment="Center" Stretch="None" />
|
||||
<Run BaselineAlignment="Center">eDos EPD station</Run>
|
||||
</Paragraph>
|
||||
<Paragraph>2021-2022 Version
|
||||
<TextBlock Name="aVersion" Text="1.1" />
|
||||
</Paragraph>
|
||||
<Table BorderBrush="#FF1E8CED" BorderThickness="1" >
|
||||
<Table.Columns>
|
||||
<TableColumn Width="200" ></TableColumn>
|
||||
<TableColumn Width="auto" ></TableColumn>
|
||||
</Table.Columns>
|
||||
<TableRowGroup >
|
||||
<TableRow>
|
||||
<TableCell ><Paragraph TextAlignment="Right" Margin="0,5,20,0">Station ID</Paragraph></TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" Name="stationID" Text="99" />
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Remote sql alias</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="remoteSql" Text="sql"/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Local sql alias</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="localSql" Text="sql"/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Check users quiz</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="checkUser" Text=""/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableRowGroup>
|
||||
</Table>
|
||||
|
||||
<Paragraph Margin="50,10,0,10" FontStyle="Italic">
|
||||
<Run>Architecture and testing by Isabelle Majkowski, Luc Praet, Raf Aarts, Eric Boogers, Kris Bruns</Run>
|
||||
<LineBreak />
|
||||
<Run>Developed by Luc Vandenbroucke</Run>
|
||||
<LineBreak />
|
||||
<Run>Technical info by Thermo</Run>
|
||||
<LineBreak/>
|
||||
<Run>and lots of research ...</Run>
|
||||
</Paragraph>
|
||||
</FlowDocument>
|
||||
</FlowDocumentScrollViewer>
|
||||
|
||||
<telerik:RadButton Grid.Row="2" Content="OK" Width="200" HorizontalAlignment="Center" Click="RadButton_Click" Style="{DynamicResource OkCancelButton}" />
|
||||
</Grid>
|
||||
</Window>
|
||||
<Window x:Class="eDosStation.About"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
mc:Ignorable="d"
|
||||
Title="About" Height="658.389" Width="800" FontFamily="Segoe UI"
|
||||
WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" WindowState="Normal" >
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<FlowDocumentScrollViewer Grid.Row="1" ScrollViewer.CanContentScroll="False" ScrollViewer.VerticalScrollBarVisibility="Auto">
|
||||
<FlowDocument>
|
||||
|
||||
<Paragraph FontSize="30" >
|
||||
<Image Source="/Images/EPD-MK3.png" VerticalAlignment="Center" Stretch="None" />
|
||||
<Run BaselineAlignment="Center">eDos EPD station</Run>
|
||||
</Paragraph>
|
||||
<Paragraph>2021-2022 Version
|
||||
<TextBlock Name="aVersion" Text="1.1" />
|
||||
</Paragraph>
|
||||
<Table BorderBrush="#FF1E8CED" BorderThickness="1" >
|
||||
<Table.Columns>
|
||||
<TableColumn Width="200" ></TableColumn>
|
||||
<TableColumn Width="auto" ></TableColumn>
|
||||
</Table.Columns>
|
||||
<TableRowGroup >
|
||||
<TableRow>
|
||||
<TableCell ><Paragraph TextAlignment="Right" Margin="0,5,20,0">Station ID</Paragraph></TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" Name="stationID" Text="99" />
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Remote sql alias</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="remoteSql" Text="sql"/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Local sql alias</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="localSql" Text="sql"/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Check users quiz</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="checkUser" Text=""/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableRowGroup>
|
||||
</Table>
|
||||
|
||||
<Paragraph Margin="50,10,0,10" FontStyle="Italic">
|
||||
<Run>Architecture and testing by Isabelle Majkowski, Luc Praet, Raf Aarts, Eric Boogers, Kris Bruns</Run>
|
||||
<LineBreak />
|
||||
<Run>Feedback by Cools Job, Thijs Bart, Mutert Peter, Smets Gunter</Run>
|
||||
<LineBreak />
|
||||
<Run>Developed by Luc Vandenbroucke</Run>
|
||||
<LineBreak />
|
||||
<Run>Technical info by Thermo</Run>
|
||||
<LineBreak/>
|
||||
<Run>and lots of research ...</Run>
|
||||
</Paragraph>
|
||||
</FlowDocument>
|
||||
</FlowDocumentScrollViewer>
|
||||
|
||||
<telerik:RadButton Grid.Row="2" Content="OK" Width="200" HorizontalAlignment="Center" Click="RadButton_Click" Style="{DynamicResource OkCancelButton}" />
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
|||
|
|
@ -372,6 +372,8 @@ namespace eDosStation
|
|||
splunkLog?.WriteException(moduleName, taskName, ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public User GetUser(string CSN, string Code, bool isEntry)
|
||||
{
|
||||
const string taskName = "GetUser";
|
||||
|
|
@ -413,17 +415,7 @@ namespace eDosStation
|
|||
else
|
||||
{
|
||||
// Not found
|
||||
u.PersID = 0;
|
||||
u.LastName = "Not Found";
|
||||
u.FirstName = "Not Found";
|
||||
//u.conCode = "A1";
|
||||
u.Language = "N";
|
||||
u.AccessAllow = false;
|
||||
u.Margin = 0;
|
||||
u.VisitIDLocked = 0;
|
||||
u.ReasonNoAccess = "Not found";
|
||||
u.UserComment = string.Empty;
|
||||
u.hasEPD = false;
|
||||
u.SetNotFound();
|
||||
u.AllOk = !CheckUser || (u.AccessAllow == true && u.VisitIDLocked == 0);
|
||||
}
|
||||
rs.Close();
|
||||
|
|
|
|||
|
|
@ -1,388 +1,389 @@
|
|||
<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
x:Class="eDosStation.EntryBadge"
|
||||
mc:Ignorable="d"
|
||||
Title="EntryBadge"
|
||||
Height="980" Width="1820" ResizeMode="NoResize" FontFamily="Segoe UI" FontSize="36"
|
||||
Loaded="Window_Loaded"
|
||||
WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing"
|
||||
>
|
||||
<Window.Resources>
|
||||
<local:DataSet1 x:Key="dataSet1"/>
|
||||
<CollectionViewSource x:Key="getTaskListViewSource" Source="{Binding GetTaskInfo, Source={StaticResource dataSet1}}" />
|
||||
<Style x:Key="tblIssuedLabel" TargetType="TextBlock">
|
||||
<Setter Property="Background" Value="{StaticResource sckbLB}" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
<Setter Property="TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
<Style x:Key="tblIssuedValue" TargetType="TextBlock">
|
||||
<Setter Property="TextAlignment" Value="Right" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
</Style>
|
||||
<Style x:Key="tblIssuedValueTitle" TargetType="TextBlock">
|
||||
<Setter Property="TextAlignment" Value="Right" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
<Setter Property="FontWeight" Value="Bold"/>
|
||||
</Style>
|
||||
|
||||
|
||||
</Window.Resources>
|
||||
<DockPanel VerticalAlignment="Top">
|
||||
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left">
|
||||
<Image Source="/Images/logoh120.png" Height="60"/>
|
||||
</StackPanel>
|
||||
<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Center">
|
||||
<!--<StaticResource ResourceKey="tbFooter" />-->
|
||||
</StackPanel>
|
||||
<TabControl Name="tb" TabStripPlacement="Top" VerticalAlignment="Center" >
|
||||
<TabItem Name="tbEntry" VerticalAlignment="Center" >
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,100,10,10" >
|
||||
<Border Background="{Binding Mode=OneWay, Source={StaticResource sckbLB}}" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" CornerRadius="10" BorderThickness="2" BorderBrush="Blue" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock TextAlignment="Center" Padding="10,10,10,10" >
|
||||
<LineBreak/>
|
||||
<Image Source="/Images/Mannetjet.png" Width="60" Margin="0,0,50,0"/>
|
||||
|
||||
<Run Foreground="{Binding Mode=OneWay, Source={StaticResource sckbP}}" FontSize="28" FontWeight="Bold">Welcome to eDOS</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run Background="LightGreen">Entry Process is ready</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run>Please scan your badge on the badge reader</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<StackPanel VerticalAlignment="Center">
|
||||
<telerik:RadButton Name="LeesCancel" Content="Cancel" Click="LeesCancel_Click" Margin="20,20,0,0" Style="{DynamicResource OkCancelButton}" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock x:Name="CSN" />
|
||||
<TextBlock x:Name="Site" />
|
||||
<TextBlock x:Name="Code" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,50,0,0" Name="pTestButtons" Visibility="Collapsed" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="tbUser" VerticalAlignment="Center" >
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical" Margin="50,50,50,50">
|
||||
<Border Background="AliceBlue" TextBlock.FontSize="20" Padding="20,20,20,20" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock Name="Username" Text="" TextAlignment="Center" Margin="0,20,0,20" HorizontalAlignment="Stretch"/>
|
||||
<TextBlock Name="UserAccess" Text="Welcome to eDOS" TextAlignment="Center" MaxWidth="600" TextWrapping="Wrap" HorizontalAlignment="Stretch" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Name="boxComment" Background="AliceBlue" TextBlock.FontSize="15" Padding="20,20,20,20" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock Text="Comment" />
|
||||
<TextBlock x:Name="UserComment" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<ProgressBar x:Name="pUserSeconds" Background="Blue" Value="5" Maximum="10" Tag="AA" >
|
||||
<ProgressBar.Effect>
|
||||
<DropShadowEffect/>
|
||||
</ProgressBar.Effect>
|
||||
</ProgressBar>
|
||||
<TextBlock x:Name="tUserSeconds" Text="10" TextAlignment="Center" HorizontalAlignment="Stretch" />
|
||||
<telerik:RadButton Content="OK" Name="bUserRead" Click="BUserRead_Click" Style="{DynamicResource OkCancelButton}" Margin="50,50,50,50"/>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="tbTask" VerticalAlignment="Top">
|
||||
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="80" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.ColumnSpan="3" Text="Naam" Name="Naam" HorizontalAlignment="Stretch" TextAlignment="Center" FontWeight="Bold" Background="Azure" FontSize="15" />
|
||||
<Border Grid.Row="1" Grid.ColumnSpan="3" Background="{StaticResource sckbLB}" HorizontalAlignment="Stretch" CornerRadius="10" VerticalAlignment="Top" >
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Orientation="Horizontal" Grid.Column="0">
|
||||
<telerik:RadToggleButton Name="cbNormal" HorizontalAlignment="Left" Width="150" Content="Normal" TextBlock.FontSize="24" Click="CbNormal_Click" IsChecked="True" CornerRadius="15" />
|
||||
<telerik:RadToggleButton Name="cbAlara" HorizontalAlignment="Left" Width="150" Content="Alara" TextBlock.FontSize="24" Click="CbAlara_Click" IsChecked="False" CornerRadius="15" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Column="1" FontSize="36" TextAlignment="Center" Text="Choose a task" />
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="3">
|
||||
<telerik:RadToggleButton Name="cbInst1" HorizontalAlignment="Left" Width="150" Content="Inst1" TextBlock.FontSize="24" Click="CbInst1_Click" IsChecked="True" CornerRadius="15" />
|
||||
<telerik:RadToggleButton Name="cbInst2" HorizontalAlignment="Left" Width="150" Content="Inst2" TextBlock.FontSize="24" Click="CbInst2_Click" IsChecked="false" Visibility="Collapsed" CornerRadius="15" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Stretch" >
|
||||
<Border MaxHeight="700" HorizontalAlignment="Left" VerticalAlignment="Top">
|
||||
<ScrollViewer VerticalScrollBarVisibility="Visible" Name="scrollTask" Visibility="Visible" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
|
||||
<ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" ScrollViewer.CanContentScroll="False" Name="LB1" >
|
||||
<ListBox.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type ListBoxItem}">
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
</Style>
|
||||
</ListBox.ItemContainerStyle>
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<telerik:RadUniformGrid Columns="3" IsItemsHost="True" HorizontalAlignment="Left" VerticalAlignment="Center" />
|
||||
</ItemsPanelTemplate>
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<TextBlock Text="{Binding TaskType_CODE}" Width="60" TextWrapping="NoWrap" FontSize="18" HorizontalAlignment="Left" >
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Background" Value="LightGray"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Background" Value="Black"></Setter>
|
||||
<Setter Property="Foreground" Value="White"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
<TextBlock Text="{Binding Task_Name}" Width="410" FontSize="17" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="10,0,0,0" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch" >
|
||||
<telerik:RadMultiColumnComboBox.ItemsSourceProvider>
|
||||
<telerik:GridViewItemsSourceProvider ItemsSource="{Binding}" />
|
||||
</telerik:RadMultiColumnComboBox.ItemsSourceProvider>
|
||||
</telerik:RadMultiColumnComboBox>-->
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
<Grid Name="numPanel" Width="600" Height="300" Visibility="Collapsed" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.Row="0" Grid.ColumnSpan="3" BorderBrush="Black" BorderThickness="1" Padding="20,10,20,10">
|
||||
<TextBlock Text="0" TextAlignment="Right" Background="AliceBlue" Name="numPanelDisplay" />
|
||||
</Border>
|
||||
<TextBlock Grid.Row="0" Grid.Column="3" Text="Task" TextAlignment="Center" />
|
||||
|
||||
<Button Content="7" Grid.Row="1" Grid.Column="0" Name="numPanel7" Tag="7" Click="numPanel_Click" />
|
||||
<Button Content="8" Grid.Row="1" Grid.Column="1" Name="numPanel8" Tag="8" Click="numPanel_Click" />
|
||||
<Button Content="9" Grid.Row="1" Grid.Column="2" Name="numPanel9" Tag="9" Click="numPanel_Click" />
|
||||
<Button Content="Clear" Grid.Row="1" Grid.Column="4" Name="numPanelClear" Tag="C" Click="numPanel_Click" />
|
||||
|
||||
<Button Content="4" Grid.Row="2" Grid.Column="0" Name="numPanel4" Tag="4" Click="numPanel_Click" />
|
||||
<Button Content="5" Grid.Row="2" Grid.Column="1" Name="numPanel5" Tag="5" Click="numPanel_Click" />
|
||||
<Button Content="6" Grid.Row="2" Grid.Column="2" Name="numPanel6" Tag="6" Click="numPanel_Click" />
|
||||
|
||||
<Button Content="1" Grid.Row="3" Grid.Column="0" Name="numPanel1" Tag="1" Click="numPanel_Click" />
|
||||
<Button Content="2" Grid.Row="3" Grid.Column="1" Name="numPanel2" Tag="2" Click="numPanel_Click" />
|
||||
<Button Content="3" Grid.Row="3" Grid.Column="2" Name="numPanel3" Tag="3" Click="numPanel_Click" />
|
||||
<Button Content="0" Grid.Row="4" Grid.Column="0" Name="numPanel0" Tag="0" Click="numPanel_Click" />
|
||||
<Button Content="<X" Grid.Row="4" Grid.Column="2" Name="numPanelDel" Tag="B" Click="numPanel_Click" />
|
||||
<Button Content="ENTER" Grid.Row="4" Grid.Column="3" Name="numPanelEnter" Tag="E" Click="numPanel_Click" />
|
||||
</Grid>
|
||||
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="10,10,10,10" TextBlock.FontSize="12" TextBlock.LineHeight="12" Name="gridTaskSummary" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Grid.Row="0" Grid.RowSpan="5" Height="60" VerticalAlignment="Center" Margin="5,10,50,5" >
|
||||
<Image.Style>
|
||||
<Style TargetType="{x:Type Image}">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Source" Value="{StaticResource iBG}"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Source" Value="{StaticResource iNG}"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Image.Style>
|
||||
</Image>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Task: "/>
|
||||
<Run Text="{Binding TaskType_CODE,Mode=OneWay}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Hp07Dose: "/>
|
||||
<Run Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00} µSv}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="3" >
|
||||
<Run FontWeight="Bold" Text="Hp10Dose L: "/>
|
||||
<Run Text="{Binding Hp10Dose1,StringFormat={}{0:0.00} µSv}" />
|
||||
<Run FontWeight="Bold" Text="H: "/>
|
||||
<Run Text="{Binding Hp10Dose2,StringFormat={}{0:0.00} µSv}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Hp07Rate Off: "/>
|
||||
<Run Text="{Binding HP07RateOFF,StringFormat={}{0:0.00} µSv/h}" />
|
||||
<Run FontWeight="Bold" Text=" On: "/>
|
||||
<Run Text="{Binding HP07RateON,StringFormat={}{0:0.00} µSv/h}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Hp10Rate Off: "/>
|
||||
<Run Text="{Binding HP10Rate1OFF,StringFormat={}{0:0.00} µSv/h}" />
|
||||
<Run FontWeight="Bold" Text=" On: "/>
|
||||
<Run Text="{Binding HP10Rate1ON,StringFormat={}{0:0.00} µSv/h}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Type : "/>
|
||||
<Run Text="{Binding EPDRad}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Gain : "/>
|
||||
<Run Text="{Binding FNGain_ANGainValue,StringFormat={}{0:0.00}}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="3" >
|
||||
<Run FontWeight="Bold" Text="Dose margin : "/>
|
||||
<Run Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" />
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<StackPanel Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="TaskCancel" Content="Cancel" Click="TaskCancel_Click" Width="300" Style="{DynamicResource OkCancelButton}" Margin="20,0,0,0" />
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="ShowNumpad" Content="Code" Width="300" Style="{DynamicResource OkCancelButton}" Margin="20,0,0,0" Click="ShowNumpad_Click" />
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="TaskOK" Content="OK" Width="300" Click="TaskOK_Click" Style="{DynamicResource OkCancelButton}" IsEnabled="False" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="tbEPD" FontSize="25" >
|
||||
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Grid.Row="0" Name="panelWait" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Images/Mannetjet.png" Width="87" HorizontalAlignment="Left"/>
|
||||
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" FontWeight="Bold" >
|
||||
<TextBlock.Foreground>
|
||||
<SolidColorBrush Color="{DynamicResource sckcP}"/>
|
||||
</TextBlock.Foreground>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
<Image Source="/Images/Mk2OnReader.jpg" Width="300" Margin="10,10,10,50"/>
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="1" Name="panelDone" HorizontalAlignment="Center" >
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="Task" Style="{StaticResource tblIssuedLabel}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2">
|
||||
<Run Text="{Binding Task_Name,Mode=OneWay}" />
|
||||
<Run Text=" (" />
|
||||
<Run Text="{Binding ID_Task,Mode=OneWay}" />
|
||||
<Run Text=")" />
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="Margin" Style="{StaticResource tblIssuedLabel}" TextAlignment="Right"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Name="lbHP07" Text="HP07" Style="{DynamicResource sIssuedSubHeader}" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" Name="lbHP10" Text="HP10" Style="{DynamicResource sIssuedSubHeader}" />
|
||||
|
||||
<TextBlock Grid.Row="3" Grid.ColumnSpan="2" Grid.Column="1" Text="Doses (µSv)" Style="{DynamicResource sIssuedSubHeader}" TextAlignment="Center"/>
|
||||
|
||||
<TextBlock Grid.Row="4" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="4" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="5" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
<TextBlock Grid.Row="5" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
|
||||
<TextBlock Grid.Row="6" Grid.ColumnSpan="2" Text="Rates (µSv/h)" Style="{DynamicResource sIssuedSubHeader}" Grid.Column="1" />
|
||||
<TextBlock Grid.Row="7" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="7" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="8" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="8" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
<TextBlock Grid.Row="8" Grid.Column="2" Text="{Binding HP10Rate2ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<telerik:RadButton Name="bEpdCancel" Content="Cancel" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,9.6" Height="Auto" />
|
||||
<!--<telerik:RadButton Name="bEpdDone" Background="LawnGreen" Content="OK" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,10" />-->
|
||||
</StackPanel>
|
||||
<telerik:RadProgressBar Grid.Row="3" x:Name="pWaitEpd" Style="{StaticResource styleTTOProgessBar}" />
|
||||
<TextBlock Grid.Row="4" FontSize="25" Name="statusEPD" Text="waiting" HorizontalAlignment="Center" TextAlignment="Center" />
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="tbNotAllowed">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="300" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="100" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" >
|
||||
<Run Text="No Access" />
|
||||
<Run Name="tReasonNoAccess" Text="" />
|
||||
<LineBreak/>
|
||||
|
||||
</TextBlock>
|
||||
<telerik:RadButton Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bNoAccessDone" Click="bClose_Click" Style="{DynamicResource OkCancelButton}">
|
||||
</telerik:RadButton>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</DockPanel>
|
||||
</Window>
|
||||
|
||||
<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
x:Class="eDosStation.EntryBadge"
|
||||
mc:Ignorable="d"
|
||||
Title="EntryBadge"
|
||||
Height="980" Width="1820" ResizeMode="NoResize" FontFamily="Segoe UI" FontSize="36"
|
||||
Loaded="Window_Loaded"
|
||||
WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing"
|
||||
>
|
||||
<Window.Resources>
|
||||
<local:DataSet1 x:Key="dataSet1"/>
|
||||
<CollectionViewSource x:Key="getTaskListViewSource" Source="{Binding GetTaskInfo, Source={StaticResource dataSet1}}" />
|
||||
<Style x:Key="tblIssuedLabel" TargetType="TextBlock">
|
||||
<Setter Property="Background" Value="{StaticResource sckbLB}" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
<Setter Property="TextAlignment" Value="Right"/>
|
||||
</Style>
|
||||
<Style x:Key="tblIssuedValue" TargetType="TextBlock">
|
||||
<Setter Property="TextAlignment" Value="Right" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
</Style>
|
||||
<Style x:Key="tblIssuedValueTitle" TargetType="TextBlock">
|
||||
<Setter Property="TextAlignment" Value="Right" />
|
||||
<Setter Property="Padding" Value="20,0,20,0" />
|
||||
<Setter Property="FontWeight" Value="Bold"/>
|
||||
</Style>
|
||||
|
||||
|
||||
</Window.Resources>
|
||||
<DockPanel VerticalAlignment="Top">
|
||||
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left">
|
||||
<Image Source="/Images/logoh120.png" Height="60"/>
|
||||
</StackPanel>
|
||||
<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Center">
|
||||
<!--<StaticResource ResourceKey="tbFooter" />-->
|
||||
</StackPanel>
|
||||
|
||||
<TabControl Name="tb" TabStripPlacement="Top" VerticalAlignment="Center" Padding="-1" >
|
||||
<TabItem Name="tbEntry" VerticalAlignment="Center" >
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,100,10,10" >
|
||||
<Border Background="{Binding Mode=OneWay, Source={StaticResource sckbLB}}" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" CornerRadius="10" BorderThickness="2" BorderBrush="Blue" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock TextAlignment="Center" Padding="10,10,10,10" >
|
||||
<LineBreak/>
|
||||
<Image Source="/Images/Mannetjet.png" Width="60" Margin="0,0,50,0"/>
|
||||
|
||||
<Run Foreground="{Binding Mode=OneWay, Source={StaticResource sckbP}}" FontSize="28" FontWeight="Bold">Welcome to eDOS</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run Background="LightGreen">Entry Process is ready</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run>Please scan your badge on the badge reader</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<StackPanel VerticalAlignment="Center">
|
||||
<telerik:RadButton Name="LeesCancel" Content="Cancel" Click="LeesCancel_Click" Margin="20,20,0,0" Style="{DynamicResource OkCancelButton}" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock x:Name="CSN" />
|
||||
<TextBlock x:Name="Site" />
|
||||
<TextBlock x:Name="Code" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,50,0,0" Name="pTestButtons" Visibility="Collapsed" />
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="tbUser" VerticalAlignment="Center" >
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Vertical" Margin="50,50,50,50">
|
||||
<Border Background="AliceBlue" TextBlock.FontSize="20" Padding="20,20,20,20" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock Name="Username" Text="" TextAlignment="Center" Margin="0,20,0,20" HorizontalAlignment="Stretch"/>
|
||||
<TextBlock Name="UserAccess" Text="Welcome to eDOS" TextAlignment="Center" MaxWidth="600" TextWrapping="Wrap" HorizontalAlignment="Stretch" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Name="boxComment" Background="AliceBlue" TextBlock.FontSize="15" Padding="20,20,20,20" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock Text="Comment" />
|
||||
<TextBlock x:Name="UserComment" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<ProgressBar x:Name="pUserSeconds" Background="Blue" Value="5" Maximum="10" Tag="AA" >
|
||||
<ProgressBar.Effect>
|
||||
<DropShadowEffect/>
|
||||
</ProgressBar.Effect>
|
||||
</ProgressBar>
|
||||
<TextBlock x:Name="tUserSeconds" Text="10" TextAlignment="Center" HorizontalAlignment="Stretch" />
|
||||
<telerik:RadButton Content="OK" Name="bUserRead" Click="BUserRead_Click" Style="{DynamicResource OkCancelButton}" Margin="50,50,50,50"/>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="tbTask" VerticalAlignment="Top">
|
||||
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="80" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.ColumnSpan="3" Text="Naam" Name="Naam" HorizontalAlignment="Stretch" TextAlignment="Center" FontWeight="Bold" Background="Azure" FontSize="15" />
|
||||
<Border Grid.Row="1" Grid.ColumnSpan="3" Background="{StaticResource sckbLB}" HorizontalAlignment="Stretch" CornerRadius="10" VerticalAlignment="Top" >
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Orientation="Horizontal" Grid.Column="0">
|
||||
<telerik:RadToggleButton Name="cbNormal" HorizontalAlignment="Left" Width="150" Content="Normal" TextBlock.FontSize="24" Click="CbNormal_Click" IsChecked="True" CornerRadius="15" />
|
||||
<telerik:RadToggleButton Name="cbAlara" HorizontalAlignment="Left" Width="150" Content="Alara" TextBlock.FontSize="24" Click="CbAlara_Click" IsChecked="False" CornerRadius="15" />
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Column="1" FontSize="36" TextAlignment="Center" Text="Choose a task" />
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="3">
|
||||
<telerik:RadToggleButton Name="cbInst1" HorizontalAlignment="Left" Width="150" Content="Inst1" TextBlock.FontSize="24" Click="CbInst1_Click" IsChecked="True" CornerRadius="15" />
|
||||
<telerik:RadToggleButton Name="cbInst2" HorizontalAlignment="Left" Width="150" Content="Inst2" TextBlock.FontSize="24" Click="CbInst2_Click" IsChecked="false" Visibility="Collapsed" CornerRadius="15" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Stretch" >
|
||||
<Border MaxHeight="700" HorizontalAlignment="Left" VerticalAlignment="Top">
|
||||
<ScrollViewer VerticalScrollBarVisibility="Visible" Name="scrollTask" Visibility="Visible" HorizontalAlignment="Stretch" VerticalAlignment="Top" >
|
||||
<ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" ScrollViewer.CanContentScroll="False" Name="LB1" >
|
||||
<ListBox.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type ListBoxItem}">
|
||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
||||
<Setter Property="VerticalContentAlignment" Value="Center"/>
|
||||
</Style>
|
||||
</ListBox.ItemContainerStyle>
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<telerik:RadUniformGrid Columns="3" IsItemsHost="True" HorizontalAlignment="Left" VerticalAlignment="Center" />
|
||||
</ItemsPanelTemplate>
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" Height="20" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<TextBlock Text="{Binding TaskType_CODE}" Width="60" TextWrapping="NoWrap" FontSize="18" HorizontalAlignment="Left" >
|
||||
<TextBlock.Style>
|
||||
<Style TargetType="TextBlock">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Background" Value="LightGray"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Background" Value="Black"></Setter>
|
||||
<Setter Property="Foreground" Value="White"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</TextBlock.Style>
|
||||
</TextBlock>
|
||||
<TextBlock Text="{Binding Task_Name}" Width="410" FontSize="17" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="10,0,0,0" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
<!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch" >
|
||||
<telerik:RadMultiColumnComboBox.ItemsSourceProvider>
|
||||
<telerik:GridViewItemsSourceProvider ItemsSource="{Binding}" />
|
||||
</telerik:RadMultiColumnComboBox.ItemsSourceProvider>
|
||||
</telerik:RadMultiColumnComboBox>-->
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
<Grid Name="numPanel" Width="600" Height="300" Visibility="Collapsed" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.Row="0" Grid.ColumnSpan="3" BorderBrush="Black" BorderThickness="1" Padding="20,10,20,10">
|
||||
<TextBlock Text="0" TextAlignment="Right" Background="AliceBlue" Name="numPanelDisplay" />
|
||||
</Border>
|
||||
<TextBlock Grid.Row="0" Grid.Column="3" Text="Task" TextAlignment="Center" />
|
||||
|
||||
<Button Content="7" Grid.Row="1" Grid.Column="0" Name="numPanel7" Tag="7" Click="numPanel_Click" />
|
||||
<Button Content="8" Grid.Row="1" Grid.Column="1" Name="numPanel8" Tag="8" Click="numPanel_Click" />
|
||||
<Button Content="9" Grid.Row="1" Grid.Column="2" Name="numPanel9" Tag="9" Click="numPanel_Click" />
|
||||
<Button Content="Clear" Grid.Row="1" Grid.Column="4" Name="numPanelClear" Tag="C" Click="numPanel_Click" />
|
||||
|
||||
<Button Content="4" Grid.Row="2" Grid.Column="0" Name="numPanel4" Tag="4" Click="numPanel_Click" />
|
||||
<Button Content="5" Grid.Row="2" Grid.Column="1" Name="numPanel5" Tag="5" Click="numPanel_Click" />
|
||||
<Button Content="6" Grid.Row="2" Grid.Column="2" Name="numPanel6" Tag="6" Click="numPanel_Click" />
|
||||
|
||||
<Button Content="1" Grid.Row="3" Grid.Column="0" Name="numPanel1" Tag="1" Click="numPanel_Click" />
|
||||
<Button Content="2" Grid.Row="3" Grid.Column="1" Name="numPanel2" Tag="2" Click="numPanel_Click" />
|
||||
<Button Content="3" Grid.Row="3" Grid.Column="2" Name="numPanel3" Tag="3" Click="numPanel_Click" />
|
||||
<Button Content="0" Grid.Row="4" Grid.Column="0" Name="numPanel0" Tag="0" Click="numPanel_Click" />
|
||||
<Button Content="<X" Grid.Row="4" Grid.Column="2" Name="numPanelDel" Tag="B" Click="numPanel_Click" />
|
||||
<Button Content="ENTER" Grid.Row="4" Grid.Column="3" Name="numPanelEnter" Tag="E" Click="numPanel_Click" />
|
||||
</Grid>
|
||||
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="10,10,10,10" TextBlock.FontSize="12" TextBlock.LineHeight="12" Name="gridTaskSummary" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Grid.Row="0" Grid.RowSpan="5" Height="60" VerticalAlignment="Center" Margin="5,10,50,5" >
|
||||
<Image.Style>
|
||||
<Style TargetType="{x:Type Image}">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Source" Value="{StaticResource iBG}"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Source" Value="{StaticResource iNG}"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Image.Style>
|
||||
</Image>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Task: "/>
|
||||
<Run Text="{Binding TaskType_CODE,Mode=OneWay}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Hp07Dose: "/>
|
||||
<Run Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00} µSv}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="3" >
|
||||
<Run FontWeight="Bold" Text="Hp10Dose L: "/>
|
||||
<Run Text="{Binding Hp10Dose1,StringFormat={}{0:0.00} µSv}" />
|
||||
<Run FontWeight="Bold" Text="H: "/>
|
||||
<Run Text="{Binding Hp10Dose2,StringFormat={}{0:0.00} µSv}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Hp07Rate Off: "/>
|
||||
<Run Text="{Binding HP07RateOFF,StringFormat={}{0:0.00} µSv/h}" />
|
||||
<Run FontWeight="Bold" Text=" On: "/>
|
||||
<Run Text="{Binding HP07RateON,StringFormat={}{0:0.00} µSv/h}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Hp10Rate Off: "/>
|
||||
<Run Text="{Binding HP10Rate1OFF,StringFormat={}{0:0.00} µSv/h}" />
|
||||
<Run FontWeight="Bold" Text=" On: "/>
|
||||
<Run Text="{Binding HP10Rate1ON,StringFormat={}{0:0.00} µSv/h}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="1" >
|
||||
<Run FontWeight="Bold" Text="Type : "/>
|
||||
<Run Text="{Binding EPDRad}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="2" >
|
||||
<Run FontWeight="Bold" Text="Gain : "/>
|
||||
<Run Text="{Binding FNGain_ANGainValue,StringFormat={}{0:0.00}}" />
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="3" Grid.Column="3" >
|
||||
<Run FontWeight="Bold" Text="Dose margin : "/>
|
||||
<Run Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" />
|
||||
</TextBlock>
|
||||
</Grid>
|
||||
<StackPanel Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="TaskCancel" Content="Cancel" Click="TaskCancel_Click" Width="300" Style="{DynamicResource OkCancelButton}" Margin="20,0,0,0" />
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="ShowNumpad" Content="Code" Width="300" Style="{DynamicResource OkCancelButton}" Margin="20,0,0,0" Click="ShowNumpad_Click" />
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Center" >
|
||||
<telerik:RadButton Name="TaskOK" Content="OK" Width="300" Click="TaskOK_Click" Style="{DynamicResource OkCancelButton}" IsEnabled="False" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="tbEPD" FontSize="25" >
|
||||
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<StackPanel Grid.Row="0" Name="panelWait" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Image Source="/Images/Mannetjet.png" Width="87" HorizontalAlignment="Left"/>
|
||||
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" FontWeight="Bold" >
|
||||
<TextBlock.Foreground>
|
||||
<SolidColorBrush Color="{DynamicResource sckcP}"/>
|
||||
</TextBlock.Foreground>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
<Image Source="/Images/Mk2OnReader.jpg" Width="300" Margin="10,10,10,50"/>
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="1" Name="panelDone" HorizontalAlignment="Center" >
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="Task" Style="{StaticResource tblIssuedLabel}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2">
|
||||
<Run Text="{Binding Task_Name,Mode=OneWay}" />
|
||||
<Run Text=" (" />
|
||||
<Run Text="{Binding ID_Task,Mode=OneWay}" />
|
||||
<Run Text=")" />
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="Margin" Style="{StaticResource tblIssuedLabel}" TextAlignment="Right"/>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Name="lbHP07" Text="HP07" Style="{DynamicResource sIssuedSubHeader}" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" Name="lbHP10" Text="HP10" Style="{DynamicResource sIssuedSubHeader}" />
|
||||
|
||||
<TextBlock Grid.Row="3" Grid.ColumnSpan="2" Grid.Column="1" Text="Doses (µSv)" Style="{DynamicResource sIssuedSubHeader}" TextAlignment="Center"/>
|
||||
|
||||
<TextBlock Grid.Row="4" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="4" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="5" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
<TextBlock Grid.Row="5" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
|
||||
<TextBlock Grid.Row="6" Grid.ColumnSpan="2" Text="Rates (µSv/h)" Style="{DynamicResource sIssuedSubHeader}" Grid.Column="1" />
|
||||
<TextBlock Grid.Row="7" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="7" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
|
||||
|
||||
<TextBlock Grid.Row="8" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
|
||||
<TextBlock Grid.Row="8" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
<TextBlock Grid.Row="8" Grid.Column="2" Text="{Binding HP10Rate2ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
|
||||
|
||||
|
||||
</Grid>
|
||||
</Grid>
|
||||
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center">
|
||||
<telerik:RadButton Name="bEpdCancel" Content="Cancel" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,9.6" Height="Auto" />
|
||||
<!--<telerik:RadButton Name="bEpdDone" Background="LawnGreen" Content="OK" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" Margin="100,10,200,10" />-->
|
||||
</StackPanel>
|
||||
<telerik:RadProgressBar Grid.Row="3" x:Name="pWaitEpd" Style="{StaticResource styleTTOProgessBar}" />
|
||||
<TextBlock Grid.Row="4" FontSize="25" Name="statusEPD" Text="waiting" HorizontalAlignment="Center" TextAlignment="Center" />
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Name="tbNotAllowed">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="300" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="100" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" >
|
||||
<Run Text="No Access" />
|
||||
<Run Name="tReasonNoAccess" Text="" />
|
||||
<LineBreak/>
|
||||
|
||||
</TextBlock>
|
||||
<telerik:RadButton Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bNoAccessDone" Click="bClose_Click" Style="{DynamicResource OkCancelButton}">
|
||||
</telerik:RadButton>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
</DockPanel>
|
||||
</Window>
|
||||
|
||||
|
|
|
|||
|
|
@ -689,11 +689,15 @@ namespace eDosStation
|
|||
{
|
||||
b = new Button();
|
||||
b.Click += BTestPerson_Click;
|
||||
if (i > 1)
|
||||
id = i.ToString();
|
||||
else id = "P12103";
|
||||
switch (i)
|
||||
{
|
||||
case 1: id = "P12103"; break;
|
||||
case 2: id = "P24643"; break;
|
||||
default: id = i.ToString(); break;
|
||||
}
|
||||
b.Tag = id;
|
||||
b.Content = $"{id}";
|
||||
b.FontSize = 10;
|
||||
b.Height = 40; b.Width = 50;
|
||||
b.Margin = m;
|
||||
sp.Children.Add(b);
|
||||
|
|
|
|||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("2.7.3.0")]
|
||||
[assembly: AssemblyFileVersion("2.7.3.0")]
|
||||
[assembly: AssemblyVersion("2.7.5.0")]
|
||||
[assembly: AssemblyFileVersion("2.7.5.0")]
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ namespace eDosStation
|
|||
public bool HasMessage ()
|
||||
{
|
||||
return AccessAllow != true || !string.IsNullOrEmpty(UserComment) || !string.IsNullOrEmpty(ReasonNoAccess);
|
||||
|
||||
}
|
||||
|
||||
public bool AllowShowTask()
|
||||
|
|
@ -46,8 +45,27 @@ namespace eDosStation
|
|||
|
||||
public User()
|
||||
{
|
||||
LastName = FirstName = conCode = Language = string.Empty;
|
||||
AccessAllow = null;
|
||||
SetNotFound();
|
||||
Error = 0;
|
||||
}
|
||||
|
||||
public void SetNotFound()
|
||||
{
|
||||
Error = 0;
|
||||
PersID = 0;
|
||||
LastName = "Not Found";
|
||||
FirstName = "Not Found";
|
||||
conCode = "A1";
|
||||
Language = "N";
|
||||
AccessAllow = false;
|
||||
activeVisit = null;
|
||||
Margin = 0;
|
||||
VisitIDLocked = 0;
|
||||
ReasonNoAccess = "Not found";
|
||||
UserComment = string.Empty;
|
||||
hasEPD = false;
|
||||
AllOk = false;
|
||||
isAgent = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\LSWLib.3.0.9\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.0.9\build\LSWLib.props')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.14\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.0.14\build\LSWLib.props')" />
|
||||
<Import Project="..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
|
|
@ -336,13 +336,13 @@
|
|||
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.props'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.9\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.9\build\LSWLib.props'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.9\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.9\build\LSWLib.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.14\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.14\build\LSWLib.props'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.14\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.14\build\LSWLib.targets'))" />
|
||||
</Target>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /sha1 857150b64ef7d3e679c8cbde425d2a0b5e58ffaa /fd sha256 /d "Integrity & Authenticity" /tr "http://timestamp.digicert.com" $(TargetPath)</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
|
||||
<Import Project="..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.9\build\LSWDesfirePublic.targets')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.9\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.0.9\build\LSWLib.targets')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.14\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.0.14\build\LSWLib.targets')" />
|
||||
</Project>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="LSWDesfirePublic" version="1.3.9" targetFramework="net48" />
|
||||
<package id="LSWLib" version="3.0.9" targetFramework="net48" />
|
||||
<package id="LSWLib" version="3.0.14" targetFramework="net48" />
|
||||
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.8" targetFramework="net48" developmentDependency="true" />
|
||||
<package id="SharpDX" version="4.2.0" targetFramework="net48" />
|
||||
<package id="SharpDX.D3DCompiler" version="4.2.0" targetFramework="net48" />
|
||||
|
|
|
|||
|
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.6.2.0")]
|
||||
[assembly: AssemblyFileVersion("1.6.2.0")]
|
||||
[assembly: AssemblyVersion("1.6.3.0")]
|
||||
[assembly: AssemblyFileVersion("1.6.3.0")]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="LSWLib" version="3.0.9" targetFramework="net48" />
|
||||
<package id="LSWLib" version="3.0.14" targetFramework="net48" />
|
||||
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.8" targetFramework="net48" developmentDependency="true" />
|
||||
</packages>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\LSWLib.3.0.9\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.0.9\build\LSWLib.props')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.14\build\LSWLib.props" Condition="Exists('..\packages\LSWLib.3.0.14\build\LSWLib.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
|
|
@ -106,9 +106,9 @@
|
|||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.9\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.9\build\LSWLib.props'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.9\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.9\build\LSWLib.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.14\build\LSWLib.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.14\build\LSWLib.props'))" />
|
||||
<Error Condition="!Exists('..\packages\LSWLib.3.0.14\build\LSWLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWLib.3.0.14\build\LSWLib.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.8\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.9\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.0.9\build\LSWLib.targets')" />
|
||||
<Import Project="..\packages\LSWLib.3.0.14\build\LSWLib.targets" Condition="Exists('..\packages\LSWLib.3.0.14\build\LSWLib.targets')" />
|
||||
</Project>
|
||||
Loading…
Add table
Reference in a new issue