From b2fab73efdbb4823a3b17c6610f0afd4e8cbf4fd Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Fri, 13 Sep 2024 15:31:27 +0200 Subject: [PATCH] mk2 setissued = 1 anders geen registratie --- EpdBase/EpdBase.cpp | 2 ++ eDosStation/EntryBadge.xaml.cs | 2 +- eDosStation/Properties/AssemblyInfo.cs | 4 ++-- eDosStation/Resources/BuildDate.txt | 2 +- scripts/Upgrader.ps1 | 26 +++++++++++++------------- scripts/installatie.ps1 | 26 +++++++++++++------------- scripts/installatie2.ps1 | 26 +++++++++++++------------- 7 files changed, 45 insertions(+), 43 deletions(-) diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp index 501d682..db1478e 100644 --- a/EpdBase/EpdBase.cpp +++ b/EpdBase/EpdBase.cpp @@ -557,6 +557,8 @@ WORD EpdBase::Epd2U::Issue() Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData); rv = 1; } + else + EPDIssued = 1; ClearFailFlag(); // all actions have been completed diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs index 28f9af9..409bb69 100644 --- a/eDosStation/EntryBadge.xaml.cs +++ b/eDosStation/EntryBadge.xaml.cs @@ -333,7 +333,7 @@ namespace eDosStation lbHP07.Text = ep.Hp07Name; lbHP10.Text = ep.Hp10Name; - if (ep.EPDIssued) + if (ep.EPDIssued || !ep.isMK3) { using (var l = new SqlLog()) { diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs index b3e2f2f..3bff275 100644 --- a/eDosStation/Properties/AssemblyInfo.cs +++ b/eDosStation/Properties/AssemblyInfo.cs @@ -62,5 +62,5 @@ using System.Windows; //2.30 check reset voor OF na EPD verbinding //2.31 extra disconnect/connect //2.32 VS2022 -[assembly: AssemblyVersion("2.32.0.0")] -[assembly: AssemblyFileVersion("2.32.0.0")] +[assembly: AssemblyVersion("2.33.0.0")] +[assembly: AssemblyFileVersion("2.33.0.0")] diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt index 16684ef..3d10df5 100644 --- a/eDosStation/Resources/BuildDate.txt +++ b/eDosStation/Resources/BuildDate.txt @@ -1 +1 @@ -Thu 09/12/2024 14:59:12.36 +Fri 09/13/2024 15:19:32.68 diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1 index 9024086..6bb7755 100644 --- a/scripts/Upgrader.ps1 +++ b/scripts/Upgrader.ps1 @@ -213,17 +213,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA5MTIxMjU5MTVaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz -# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgBIB0WRd/Mq -# Vyw5HWPUxxwacrl+A5MAhyDDZLJVb7bgdpxDuEs+KHsfePE4FiBwmgJNR72vBpai -# NnKI6t++fqLYCRlrafuBtN630Yh1KoazRPvseLkh8JsK0jed0JFbN3vZAKOQnWMc -# za0uwJOlOAFgUgJoVzW5jKIMfVUWYk/M4RZ8Qm2ratJfYEtmxOf0aw4h9/3n/MUZ -# PsJZqjiCKWDRgEztcomKD+cxkgKZ0KDzNvXTM0XqzLLP3pHiSTJpgMTuxj1fwLgw -# vqRLtFaoJlGhFfKcLA9ScBjljfMEEvwFjypOGKX3dXoTDt8sHdHTt41Ee7WAghXB -# POjfG/c/6GwMoufKYlScqNqw4+BhrbqKegrKTrZfv8MTHRtp34RRldi9toy4/TE3 -# w/yrnmZqDp7omnehaOfMKQOw90wZCWoYXYkKI692vjfj/rgYe9jmOeB604ZYieeD -# ap5Lc6zfGvAW2XFKiMrLTvksztXdnsjZYj6x4M3GaPnbAd9zYCnCEolYnEXXJa2S -# AH02AbCy2WZka643eA+GPP4nOvtwYIHsvc0ikJYPsM228KhMU5/c8/9f3INabyjt -# pF8UxiPJ9Yt87inFWLbzwa9WBL7hXKvn25ub1y+nZYlZXlAiF79HR8oCMgpXmVa9 -# OjZ8vQcy9ODtJQK2UhW5uK2lV+HxkP8eew== +# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz +# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgA8N59XJuBB +# N0V5DWUpBQYyIAbxNGPjwZeNYP88nWwMwzGt8RJ56xbiOYLp65MN0oya5FqjLHaC +# u2shRZ2tLRMteOfNROwDKGFXZ8AvCRAlmR2e9/wg2z1Lh9RJX6hV7Yx0qmKNj2D9 +# zNwRICnDk9QwSZ+cW5CZG+npDmuurOrNwxR+J0oK6UD/aMdTJ9rYCJzGpygP0orW +# xaAsCOXvZjq9dZBfLkk7QG40G+G5rcwNrsOFJaYr3n0LtngkrDebzWZj7GoYzUjF +# rWgEV7wJ98wRtRwltDpfAyl9K1EQe7TubDzQW4rmFw+00tsoEpjgc8IOPxrOhGOt +# DSDGAHkbYOj0KTSd6aHr5Ogr5raENQsykpbdy7kQ/bgfSHP/o4GOB4k2C3J9+smO +# 5dhHVoyecMWmDbmDl28nN8yVW6NJLeu8NCd7zCfaVwuJzixU34vP7HcMyOMRnBBA +# WTJTHdwU5DW3RjBbh3k1Yp5Xev09ysE/H5ZwSon1j5hoaKzoPIKETnjY4hnZEnpb +# 2942gEICxePiXlg69ZhfPcYvzHs+yUjjCRyf7DWhWXjs3lY0ci0BUXLQME7pS6DT +# y7vjKIxmn+2pCSLtO1FTDGIlEop86adVJvoBtU0OZaU3q6s3qBCBzEwlL3iMHlaY +# n6YFc5sG5pLm3evxp6HjJ0AsxHQbcql87g== # SIG # End signature block diff --git a/scripts/installatie.ps1 b/scripts/installatie.ps1 index 35742ae..9d5d7b8 100644 --- a/scripts/installatie.ps1 +++ b/scripts/installatie.ps1 @@ -328,17 +328,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA5MTIxMjU5MTVaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u -# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgCJ8t0obvnP -# Jdl+byKZqua1J1jl1U63s/speu691QQkxD/VL8rhF5jSdR3BH6VY6Wl4VdTC7VXI -# SdC/BxfFOel9YG87hR+gZwKoQhl2Jfue2yd53EOQHObLpABypsn+0zzOaShGf707 -# kcVNCve/FoQGcrQFzNySW3GgMESgECDdETXvhVbtnFl9/dp+zDzXuZj0TOYlbNX1 -# SZ5OVpCgOFLWDjVLbWNt3PYmENGz3n0JcLMg/fQtzUvKaQ8YOllPINmswauX+eBv -# GXkdUoDmjzZsaX/tzcIXprxStLhfNdgXW/c+aqyYYVmycLBQ7TSsksFGE11fmBqW -# dxjHVYdMZA8euof3x5pR5J5bpKxqAaw08bFhAWLdafoWDWUWDNt77PL9ipMYBJp0 -# gv4l+YQuoghuBpfHDKdCQP99a2+b9DnUymgMLurCVXn25FTCPMjLmuGRmLMdPY2z -# 5KqROy0yv2vVNJ/Et5ORxBvcIAsGAnQ2oRB0b4A8HXBeuYH+SvHtqqU4lQAkdiZT -# 1gLthQX8Eu/oBL0UhIYHIn/Ipr06Yn0QNHacPsoZqnFE1aQTY+mOdsjDeO4E0dO4 -# /7PS/2MD/ntWx/neoleveSXoX6JnUJmt9LXXb7IMG/JT6ucNx7A4Ylk6peviKXos -# GeqBCMjS7p/TfkIZIifsgjqU15OymH+bHg== +# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u +# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgBXvsy4zDK6 +# 9GPXRXQXjAgURJy4RWHgLuw7AmlVm6MLkC0BPI3l6tk4pD8OLUCp4sQ1OL7umIgJ +# YlirmTJipWM7Dbzd7WO6i8dVzgykxXxL8m7bZCJ/OI7OuyY4+GCgNQb4+Ml5Vnf3 +# 3i5A/xzHzpBruldStrXQYswrTrED7wpuZYxIkJVtjuNSQcWMp/AvUTVftUyp89TJ +# LGeciOjxU1RDPrahuWUxR1d+Y/q0Y4B0SCPgp8g9LoOt189oZJJajBfT24zrzZkp +# J0rVdYEK1iRK15HWtbth0IxexxdALgokjqX10xcFUrUfqzmoESUc0F+4g9cgrlnK +# PWtMI+k/V1KvcJpOgtPLR6t7AEicK+lp+KK9oDGqJjoL6ul+c8IHV8fzpT8y4ytq +# kcQnojUpt+rlgi1tKhm8OTpv6xC36KcN9r6ZGFmERl/ptqElAEWdVOf1oKiu3/Oj +# UjqzNeHj4u03uvvLlYKvq8jddHrzjEPBPTwD+FjCgjO49u1rgaKuLsH4qocY/9rq +# 7nefnAZBqR36k05nUgBfIRUEmlHIzqBH+bEFdc6zdgtOyrdudeka7QMM8oZaqdb7 +# +mZrbhtFdzg8F4KO/5A23QTAYVw+1ZdsEH7QBD8xc6sjIPNALqjoEZJlugvaF+x7 +# XRSdcQlKpk2dr9oy+POlYSXcDRNtLjT4+Q== # SIG # End signature block diff --git a/scripts/installatie2.ps1 b/scripts/installatie2.ps1 index d24f403..d8dfcb8 100644 --- a/scripts/installatie2.ps1 +++ b/scripts/installatie2.ps1 @@ -192,17 +192,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA5MTIxMjU5MTVaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp -# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgCM5iDyrSyb -# Mk8nkGuJazeY49VKQKxipmriZKJjN4woM3RlXiIC77Y2oNbqWkSGSjfBnO25DitN -# uIalkmTn2BcmgIemo2q/WBQERkw17hL+v1vl/LGmAZ66aV3dCcyTQraL6TMw8km9 -# jZ7LqJ6CnrEEEGd0EDGpu1TkbZYXE9nW8MF/gZqo1UAA1VsTsAZrIjJC6sTYOn+4 -# 9J6xMoecid23yar6kdgFedkGszJ9CwEPEHGv1KwWPIldgvEgAcK4NDkPH+niGJm4 -# UN3i9aDBEn+N0hqwU4bO5wD03GKnBVSDck5Z1gqv06LpixIhCQu+2lzeySheLC/5 -# jJFIYPZBlSP8DGjm2l7rLyxIbQmdTCnj6DQ7QwTig4a6hA7QFykIV1gbgsLtHYyI -# VbYq0cat/+h64AE4G4oInhRS2KkQOT5nGJHTLi5SEOjAaQLNjba8IEDUH5TPDytS -# 7yxuW7OLGEPKWV8aJpS1G/qMl0ggmMiAb+QCl1xrTR40qrWsGxRq95r4pf/mz5Lj -# xvrF9FDWQC5noolTceN1bptNIrSAPVepXMp5d9iTMEsUsxVGqcKycM478egrv/R5 -# YIhdrQ5gKIFirLxCRhw1pUmL7AoJCRH9jOuIjmiJuE21cDvYuzrKYp0erRitfV2E -# BFKJVCpwb/uJazGnBg1RDYuDQQbVAabcsw== +# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp +# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgBwwnkWf+jq +# x43RcfGKXoLepTvXFKsQauGxtGj7Z43fUFy2Amv+GpQ7jmS7Zlv0G84hsR7yI3Ls +# U0kXvYqHu6DEFUixZLUBZkWSBTSYXB6KqcBybyZx4wtnCcPi7/thMefnIkvIYjuR +# q+TwLMRkEciCQQlMAZghSHtQeoqaw7DlDSMmGQf3kRPxGRU1sHMVmNuCQTCDRN3u +# Fm0fEgnTOF0xTvNCo95Pym+AW1G/XZJAmwXNUm2PQEofMG+Sq9dkvIXwiNdlxb1b +# lxEtmgcO0M4C3FlhOxuyRCKC33InJimGd+lhipO0EgSC9hcr1c2/2ccWglN7PfD7 +# In8FPPaR0dTPnASdXEodXceMTzrb8Wmi2tHrrpiAXOO2Op015CDLkKNgcEwVN0Jd +# jJmpsTWd0JZv+0puka9H+A2BNL41H4f9CvSkR2sbh+fZLu0gzP1i14uItbLkJ2YF +# rmyTDnC3IVVNtNUimoblov8dsMVyVQVEzq4LMCGcxFe3Tu9NmrMItViM/XIWAyWL +# 77L1qBEjlXugwEAaecldzVFHFj7siAoCSGreswPkzIl1Z1pr/LAujBVuJpYaDNmP +# baJnal33+6HJ18OiU3rwH+6xA/vcvd/cIkMPZLK26MwrB+jL+p55IehI9WOcjXAj +# vydoUlI1T84TXM3oa/GeLl7nRyOPM3Mk2w== # SIG # End signature block