From 4409fadafaf9178b9d239339fe781c30981c0dc5 Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Wed, 11 Sep 2024 13:56:04 +0200
Subject: [PATCH] aparte writeconfig 3.0 en 3.1 geen start visit bij error

---
 EpdBase3/Epd3.h                              |   2 +-
 EpdBase3/Epd3Base.cpp                        | 323 +++++++++++--------
 EpdBase3/Epd3Base.h                          |  16 +-
 EpdBaseClr/EpdBaseClr.cpp                    |   8 +-
 TestMK3/TestMK3.cpp                          |   2 +-
 eDosLocal/UpdateLocal.sql                    | 175 +++++++++-
 eDosLocal/eDosLocal.sqlproj                  | 130 ++++----
 eDosLocal/eDosLocalProcedures.sql            | Bin 0 -> 80176 bytes
 eDosLocal/eDosLocalTables.sql                | Bin 0 -> 55330 bytes
 eDosStation/DataInterface.cs                 |   1 +
 eDosStation/DecodeResults.cs                 |   5 +-
 eDosStation/EntryBadge.xaml                  |  59 ++--
 eDosStation/EntryBadge.xaml.cs               | 103 ++++--
 eDosStation/MainWindow.xaml.cs               |  10 +-
 eDosStation/Properties/AssemblyInfo.cs       |   7 +-
 eDosStation/Properties/Resources.Designer.cs |  40 ++-
 eDosStation/Properties/Resources.resx        |  14 +
 eDosStation/Resources/BuildDate.txt          |   2 +-
 eDosStation/Settings.xaml                    |   4 +-
 eDosStation/cDevCon.cs                       |   3 +-
 scripts/Upgrader.ps1                         |  26 +-
 scripts/installatie.ps1                      |  26 +-
 scripts/installatie2.ps1                     |  26 +-
 syncEdosLocal/Program.cs                     |  92 +++---
 24 files changed, 713 insertions(+), 361 deletions(-)
 create mode 100644 eDosLocal/eDosLocalProcedures.sql
 create mode 100644 eDosLocal/eDosLocalTables.sql

diff --git a/EpdBase3/Epd3.h b/EpdBase3/Epd3.h
index 84aba27..9202135 100644
--- a/EpdBase3/Epd3.h
+++ b/EpdBase3/Epd3.h
@@ -434,7 +434,7 @@ extern "C"
 
   //enkel 3.1
   CompletionToken EPDDLL_API BeginTestLed_R3(CommsHandle hComms, float seconds, CompletionCallback callback);
-  int32_t  EPDDLL_API EmdTestLed_R3(CommsHandle hComms, CompletionToken token);
+  int32_t  EPDDLL_API EndTestLed_R3(CommsHandle hComms, CompletionToken token);
 
   CompletionToken EPDDLL_API BeginTestVibe_R3(CommsHandle hComms, float seconds, CompletionCallback callback);
   int32_t  EPDDLL_API EndTestVibe_R3(CommsHandle hComms, CompletionToken token);
diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp
index 6756f17..0db099f 100644
--- a/EpdBase3/Epd3Base.cpp
+++ b/EpdBase3/Epd3Base.cpp
@@ -7,6 +7,8 @@
 #define noDeissueWithClear
 #define ProtectSession
 
+constexpr int  SleepAfterClear = 1000;
+
 //-102 = permission
 Epd3Base::Epd3U* current;
 
@@ -32,8 +34,6 @@ int Epd3Base::Epd3U::SetFunctionReturnValue(enum eFunctions f, BYTE CanIgnore)
 	return CurrentStep;
 }
 
-
-
 void Epd3Base::Epd3U::SetCommitReturnValue(int step, int32_t rv)
 {
 	if (CurrentStep >= 0 && CurrentStep < MaxSteps)
@@ -47,12 +47,13 @@ void Epd3Base::Epd3U::SetCommitReturnValue(int32_t rv)
 
 uint32_t Epd3Base::Epd3U::SetEndReturnValue(int step, int32_t rv)
 {
-	if (step >= 0 && step < MaxSteps)
+	if (step >= 0 && step < MaxSteps) {
 		StepReturnValues[step][2] = rv;
-	if (rv != 0) {
-		HasStepError = 1;
-		if (StepReturnValues[step][3])  rv = 0; //if canIngore set rv ok
-		Error = GetErrorCode();
+		if (rv != 0) {
+			HasStepError = 1;
+			if (StepReturnValues[step][3])  rv = 0; //if canIngore set rv ok
+			Error = GetErrorCode();
+		}
 	}
 	return rv;
 }
@@ -62,7 +63,6 @@ uint32_t Epd3Base::Epd3U::SetEndReturnValue(int32_t rv)
 	return SetEndReturnValue(CurrentStep, rv);
 }
 
-
 int32_t Epd3Base::Epd3U::CommitAndSetRV()
 {
 	int32_t r = Commit3(epdComsHandle); 
@@ -78,7 +78,6 @@ int32_t Epd3Base::Epd3U::CommitAndSetRV(int idx[], int len)
 	return r;
 }
 
-
 int32_t Epd3Base::Epd3U::CommitAndEnd2RV(int32_t  (WINAPI *endFunction2)(CommsHandle hComms, CompletionToken token), CompletionToken token)
 {
 	int32_t r = Commit3(epdComsHandle);
@@ -95,7 +94,6 @@ int32_t Epd3Base::Epd3U::End2RV(int step, int32_t(WINAPI* endFunction2)(CommsHan
 	return r;
 }
 
-
 void WINAPI completion(CommsHandle hComms, CompletionToken token)
 {
 	SetEvent(current->hCompletion);
@@ -123,6 +121,7 @@ void WINAPI connectcallback(CommsHandle hComms, DiscoveryId ID)
 
 void WINAPI disconnectcallback(CommsHandle hComms, DiscoveryId ID)
 {
+	OutputDebugStringW(L"****    Disconnect    ****\n");
 	current->isConnected = 0;
 	current->CurrentDeviceID = 0;
 	current->DeviceCount = 0;
@@ -193,10 +192,29 @@ Epd3Base::Epd3U::~Epd3U()
 	//if (hWaitTimer != 0) { CloseHandle(hWaitTimer);  hWaitTimer = 0; }
 }
 
+int Epd3Base::Epd3U::DisconnectAndConnect()
+{
+	int rv = 0;
+	rv = Disconnect(epdComsHandle);
+	Sleep(200);
+	rv = SetConnectCallback(epdComsHandle, connectcallback);
+	int tries = 3; rv = 1;
+	while (rv && --tries>=0) {
+		rv = Connect3(epdComsHandle, Epd, true);
+		snprintf(DiagnosticsWrite, DiagnosticsWriteSize, "****    DisconnectAndConnect rv=%d tries %d ****\n", rv, tries);
+		OutputDebugStringA(DiagnosticsWrite);
+		Sleep(100);
+	}
+
+	return rv;
+}
+
+
 DWORD Epd3Base::Epd3U::StartCom()
 {
 	ErrorReason = 0;
 	ConnectRetries = 0;
+	OpenRetries = 0;
 	int step = 1;
 	int mx = 10;
 
@@ -208,29 +226,34 @@ DWORD Epd3Base::Epd3U::StartCom()
 
 	if (CommsInitialized == 0 || epdComsHandle == nullptr) {
 		step = 2;
+		SetFunctionReturnValue(fCreateReaderInterface, 0);
 		epdComsHandle = CreateReaderInterface();
-		if (epdComsHandle == nullptr) {
-			++ConnectRetries;
-			step = 3;
-			Sleep(100);
+		if (!epdComsHandle ) step = 3;
+		while (epdComsHandle == nullptr && ++ConnectRetries < 4) {
+			Sleep(200);
 			epdComsHandle = CreateReaderInterface(); //try again;
 		}
+		SetCommitReturnValue(0);
+		if (epdComsHandle) SetEndReturnValue(0); else SetEndReturnValue(-1);
+
 		if (epdComsHandle != nullptr) {
 			step = 4;
+			SetFunctionReturnValue(fOpenReader, 0);
 			Dll3RV = OpenReader(epdComsHandle, comPort);  //-6 = r_OperationFailed
-			if (Dll3RV) { //retry
-				++ConnectRetries;
-				step = 5;
-				Sleep(100);
+			if (Dll3RV) step = 5;
+			while (Dll3RV && ++OpenRetries <4  ) { //retry
+				Sleep(200);
 				Dll3RV = OpenReader(epdComsHandle, comPort);
 			}
+			SetCommitReturnValue(0);
+			if (!Dll3RV) SetEndReturnValue(0); else SetEndReturnValue(-1);
+
 			if (Dll3RV == 0)
 			{
 				step = 7;
 				CommsInitialized = 1;
 				Dll3RV = SetMultipleDiscoveryMode(epdComsHandle, false);
 				Dll3RV = SetResponseTimeout(epdComsHandle, ResponseTimeout);
-				//Dll3RV = GetRetryCount(epdComsHandle, &retries); = 3
 			}
 		}
 		else {
@@ -248,10 +271,14 @@ error:
 void Epd3Base::Epd3U::EndCom(bool doDiscon)
 {
 	int rv;
+	
 	if (CommsInitialized == 1 || CurrentDeviceID != 0) {
 		if (CommsInitialized == 1) {
+			snprintf(DiagnosticsWrite, DiagnosticsWriteSize, "****    EndCom(%d)  is Connected=%d    ****\n", doDiscon, isConnected);
+			OutputDebugStringA(DiagnosticsWrite);
+
 			if (epdComsHandle != nullptr) {
-				if (doDiscon) { DisCon(0); }
+				if (doDiscon && isConnected) { DisCon(0); }
 				//Dll3RV = CloseReader(epdComsHandle); // not necessary if followed by DestroyReaderInterface 
 				//if (Dll3RV) {
 				//	rv = 1;
@@ -293,7 +320,6 @@ int Epd3Base::Epd3U::StartDiscover(int tokentimeout)
 	ResetEvent(hCompletion);
 	ConnectTimerFired = 0;
 	isConnected = 0;
-
 	
 	Dll3RV = StartDiscovery(epdComsHandle, discovery);
 	if (Dll3RV == 0) {
@@ -325,6 +351,8 @@ int Epd3Base::Epd3U::OpenDev(DiscoveryId DeviceID)
 	{
 		Dll3RV = Connect3(epdComsHandle, DeviceID, true);
 		SetDisconnectCallback(epdComsHandle, disconnectcallback);
+		OutputDebugStringA("****    Open ****\n");
+		
 	}
 	else { Dll3RV = r_InvalidCommsHandle; }
 	return Dll3RV;
@@ -334,27 +362,47 @@ int Epd3Base::Epd3U::ReOpenDev()
 {
 	if (epdComsHandle != nullptr)
 	{
+		SetDisconnectCallback(epdComsHandle, disconnectcallback);
 		Dll3RV = Connect3(epdComsHandle, Epd, true);
+		OutputDebugStringA("****    ReOpen ****\n");
 	}
 	else {
+		OutputDebugStringA("****    ReOpen no  epdComsHandle ****\n");
 		Dll3RV = r_InvalidCommsHandle;
 	}  //no handle ..
 	return Dll3RV;
 }
 
+//
+
 int Epd3Base::Epd3U::DisCon(UINT16 alarm)
 {
+	//                      5432109876543210
+	constexpr UINT16 ca = 0b1001110011000111;
 	int rv = 0;
 	int step = 0;
+	snprintf(DiagnosticsWrite, DiagnosticsWriteSize, "****    Discon(%hu)    ****\n", alarm);
+	OutputDebugStringA(DiagnosticsWrite);
 	if (CurrentDeviceID != 0) {
 		ResetEvent(hCompletion);
 		current = this;
 		step = 1;
 		Dll3RV = SetDisconnectCallback(epdComsHandle, disconnectcallback);
 		if (alarm) {
+
+			snprintf(DiagnosticsWrite, DiagnosticsWriteSize, "****    DisconnectAndNotify(%hX,15)    HardVersionMinor: %d ****\n", ca, HardVersionMinor);
+
+			if (HardVersionMinor > 0) {
+				SetFunctionReturnValue(TestVibe, 0);
+				token = BeginTestVibe_R3(epdComsHandle, 1.0 , nullptr);
+				rv = CommitAndEnd2RV(EndTestVibe_R3, token);
+			}
+			
+			OutputDebugStringA(DiagnosticsWrite);
 			SetFunctionReturnValue(fDisconnectAndNotify,0);
-			Dll3RV = DisconnectAndNotify(epdComsHandle, alarm, 12); //1.2 secon
+			Dll3RV = DisconnectAndNotify(epdComsHandle, ca, 12); //1.2 secon
 			SetCommitReturnValue(0); SetEndReturnValue(Dll3RV);
+			Sleep(1200);
 		} else {
 			SetFunctionReturnValue(fDisconnect,0);
 			Dll3RV = Disconnect(epdComsHandle);
@@ -434,7 +482,6 @@ void Epd3Base::Epd3U::DecodeStatus()
 	EPDEprFault = checkStatus(epd3status.FaultStatus, FaultStatusFlags::EepromFailure);
 	EPDTrhFault = checkStatus(epd3status.FaultStatus, FaultStatusFlags::BadThreshold);
 
-	
 	for (int ix = 0; ix < 4; ix++)
 	{
 		DoseAlarmFlags status = epd3status.DoseAlarms[ix].Status;
@@ -485,17 +532,39 @@ int  Epd3Base::Epd3U::SetTime() //Only R3
 		utc = TimeFunctions::NowToEpdTime(Epd.Gen == EpdGeneration::Mk2);
 		token = BeginWriteRTC_R3(epdComsHandle, utc, nullptr);
 		r = CommitAndEnd2RV(EndWriteRTC_R3, token);
-		/*r = CommitSetRV();
-		if (!r) r = EndWriteRTC_R3(epdComsHandle, token);
-		SetEndReturnValue(r);*/
 	}
 	return r;
 }
+
+void WINAPI ReadStatusCompletion(CommsHandle hComms, CompletionToken token)
+{
+	int  rv = EndReadStatus(current->epdComsHandle, token, &current->epd3status);
+	rv = current->SetEndReturnValue(rv);
+	current->IssueCount = current->epd3status.IssueCount;
+	current->OperatingStatus = current->epd3status.OperatingStatus;
+	current->AlarmStatus = current->epd3status.AlarmStatus;
+	current->ErrorStatus = current->epd3status.FaultStatus;
+	current->OtherAlarms = current->epd3status.OtherBits;
+	current->DecodeStatus();	//Alarm status...
+	snprintf(current->DiagnosticsWrite, DiagnosticsWriteSize, "****    ReadStatusCompletion %04x    ****\n", current->OperatingStatus);
+	OutputDebugStringA(current->DiagnosticsWrite);
+	SetEvent(current->hCompletion);
+}
+
+int Epd3Base::Epd3U::ReadStatusOnly()
+{
+	int rv = 0;
+	ResetEvent(hCompletion);
+	SetFunctionReturnValue(eFunctions::ReadStatus, 0);
+	token = BeginReadStatus(epdComsHandle, ReadStatusCompletion);
+	rv = CommitAndSetRV();
+	return rv;
+}
 /// <summary>
 /// 
 /// </summary>
 /// <returns>0 = ok</returns>
-int Epd3Base::Epd3U::ReadStatus()
+int Epd3Base::Epd3U::ReadStatus(bool onlyStatus)
 {
 	int rv; //0=ok
 	//constexpr int maxbatch = 2;
@@ -531,24 +600,9 @@ int Epd3Base::Epd3U::ReadStatus()
 	HardVersion = HardVersionMinor = SoftVersion = FunctionFlags = 0;
 
 	step = 1;
-	//batchstep = 0;
+	
 	SetFunctionReturnValue(eFunctions::ReadStatus,0);
 	token = BeginReadStatus(epdComsHandle, nullptr);
-
-	//batchstep = 1;
-	//
-	//s[batchstep] = SetFunctionReturnValue(ReadEpdIdentities, 0);
-	//btoken[batchstep] = BeginReadEpdIdentities(epdComsHandle, nullptr);
-
-	//batchstep = 2;
-	//s[batchstep] = SetFunctionReturnValue(ReadCounts, 0);
-	//btoken[batchstep] = BeginReadCounts(epdComsHandle, nullptr, 0, nullptr);
-
-	/*batchstep = 3;
-	s[batchstep] = SetFunctionReturnValue(ReadRTC, 0);
-	btoken[batchstep] = BeginReadRTC(epdComsHandle, nullptr);*/
-
-	// after
 	rv = CommitAndSetRV();
 
 	//batchstep = 0; //ReadStatus
@@ -562,8 +616,11 @@ int Epd3Base::Epd3U::ReadStatus()
 	AlarmStatus = epd3status.AlarmStatus;
 	ErrorStatus = epd3status.FaultStatus;
 	OtherAlarms = epd3status.OtherBits;
+	DecodeStatus();	//Alarm status...
 
-	uint32_t EpdID32;
+	if (onlyStatus) goto exitroutine;
+
+	uint32_t EpdID32 ;
 	uint32_t capabilities;
 	MarkNumber_t MarkNumber; 
 	VersionNumber_t VersionNumber;
@@ -571,6 +628,12 @@ int Epd3Base::Epd3U::ReadStatus()
 	step = 2;
 	//batchstep = 1; //ReadEpdIdentities
 
+	
+	EpdID32 = 0;
+	MarkNumber.Major = 0;
+	MarkNumber.Minor=0;
+	VersionNumber.Major = 0;
+
 	SetFunctionReturnValue(ReadEpdIdentities,0);
 	token = BeginReadEpdIdentities(epdComsHandle, nullptr);
 	rv = CommitAndSetRV();
@@ -586,24 +649,18 @@ int Epd3Base::Epd3U::ReadStatus()
 	HardVersionMinor = MarkNumber.Minor;
 	SoftVersion = VersionNumber.Major;
 	VersionOK = true;
-	
-	DecodeStatus();	//Alarm status...
+
 
 	step = 3;
-	//batchstep = 2;
+	
 	SetFunctionReturnValue(ReadCounts,0);
 	token = BeginReadCounts(epdComsHandle, nullptr, 0, nullptr);
 	rv = CommitAndSetRV();
 	if (!rv) rv = EndReadCounts(epdComsHandle, token, Counts, MaxCounts, &countsRead, &utc, &seconds);
 	rv= SetEndReturnValue(rv);
-	// - 101 = InvalidParam
-	// - 104 = FunctionFail, 
-	if (rv) goto error; // (r != 0 && r != -104) {		Error = GetErrorCode();		goto error;	}
+	if (rv) goto error; 
 	decodeCounters(countsRead); //HG,SG ..
 
-	//Wearer
-
-
 	//Times
 	//1601-01-01T00:00:00Z.
 	//MK2 .. some utc... but no real time clock
@@ -630,16 +687,8 @@ int Epd3Base::Epd3U::ReadStatus()
 	step = 4;
 	if (EPDIssued) {
 		IdString_t mk3WearerID;
+		mk3WearerID.Length = 0;
 		//Mk2 EPDs only support Name and Primary ID
-		//batchstep = 0;
-		//s[batchstep]=SetFunctionReturnValue(ReadWearerId, 0);
-		//btoken[batchstep] = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Name), nullptr);
-		
-		//batchstep = 1;
-		//s[batchstep] = SetFunctionReturnValue(ReadWearerId, 0);
-		//btoken[batchstep] = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Primary), nullptr);
-		
-		//rv = CommitAndSetRV(s, 2);
 
 		//batchstep = 0;
 		SetFunctionReturnValue(ReadWearerId, 0);
@@ -669,6 +718,7 @@ int Epd3Base::Epd3U::ReadStatus()
 			if (WearerID[i] == 0xb) WearerID[i] = '0'; else  WearerID[i] |= 0x30;
 	}
 
+	exitroutine:
 	return rv;
 
 error:
@@ -698,7 +748,7 @@ int Epd3Base::Epd3U::ConnectAndStatus(int tokenSourceTimeout)
 		
 		if (dllStatus != 1) rv = 1; //Connect error
 		else if (DeviceCount < 1) rv = 2;  //TO
-		else if (isMK3 && ReadStatus() != 0) rv = 1; //Read Error
+		else if (isMK3 && ReadStatus(false) != 0) rv = 1; //Read Error
 		else rv = 0;
 	}
 	else rv = 1;
@@ -725,7 +775,6 @@ void Epd3Base::Epd3U::decodeSensitivities(int count) {
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodetotDoses(int count)
 {
 	//doses
@@ -754,7 +803,6 @@ void Epd3Base::Epd3U::decodeDoses(int count)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodePeakRates(int count)
 {
 	//Rates
@@ -782,7 +830,6 @@ void Epd3Base::Epd3U::decodePeakRates(int count)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodeCounters(int count)
 {
 	HG = SG = BC = FB = 0;
@@ -796,7 +843,6 @@ void Epd3Base::Epd3U::decodeCounters(int count)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodeBaseCounters(int count)
 {
 	D1 = D2 = D3 = D4 = 0;
@@ -810,7 +856,6 @@ void Epd3Base::Epd3U::decodeBaseCounters(int count)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodeTreshold(Mk3AlarmThresholds_t* th)
 {
 	float* pThDose = nullptr, * pThRate = nullptr, * pTHDoseWarning = nullptr, * pTHRateWarning = nullptr;
@@ -844,7 +889,6 @@ void Epd3Base::Epd3U::decodeTreshold(Mk3AlarmThresholds_t* th)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::encodeTreshold(Mk3AlarmThresholds_t* th)
 {
 	//th.MeasId
@@ -1107,7 +1151,6 @@ int  Epd3Base::Epd3U::ClearDoses()
 	return rv;
 
 }
-
 int Epd3Base::Epd3U::ClearAlarms()
 {
 	constexpr int maxbatch = 2;
@@ -1134,7 +1177,6 @@ int Epd3Base::Epd3U::ClearAlarms()
 	Error = rv;
 	return rv;
 }
-
 WORD Epd3Base::Epd3U::PrepareForIssue()
 {
 	int rv = 0;
@@ -1177,16 +1219,19 @@ WORD Epd3Base::Epd3U::PrepareForIssue()
 	if (rv != 0)
 		goto error;
 
-	Sleep(2000);
+	OutputDebugStringA("****    After clear ****\n");
+	Disconnect(epdComsHandle);
+	Sleep(SleepAfterClear);
 
 	return rv;
 
 error:
+	snprintf(DiagnosticsWrite, DiagnosticsWriteSize, "****    After clear step %d error %d ****\n", step, rv);
+	OutputDebugStringA(DiagnosticsWrite);
 	ErrorStep = step;
 	Error = rv;
 	return rv;
 }
-
 WORD Epd3Base::Epd3U::ReadAlarmConfig() {
 	//Alleen MK3 ? leeg bij MK2
 	
@@ -1196,7 +1241,6 @@ WORD Epd3Base::Epd3U::ReadAlarmConfig() {
 	if (!r) { r = EndReadAlarmConfiguration(epdComsHandle, token, alarmConfig, MaxAlarmConfig, &numAlarm);	SetEndReturnValue(r); }
 	return numAlarm;
 }
-
 WORD Epd3Base::Epd3U::ReadAlarmTresholds() {
 	//Alleen MK3 ? leeg bij MK2
 	bool isNeutron = (EpdType == EpdTypes::Mk2Neutron || EpdType == EpdTypes::Mk3Neutron);
@@ -1225,7 +1269,6 @@ WORD Epd3Base::Epd3U::ReadAlarmTresholds() {
 
 	return r;
 }
-
 WORD Epd3Base::Epd3U::WriteAlarmTresholds() {
 	//Alleen MK3 ? leeg bij MK2
 	uint32_t r;
@@ -1264,7 +1307,6 @@ error:
 	return r;
 
 }
-
 WORD Epd3Base::Epd3U::DeIssue()
 {
 	int r = 1;
@@ -1272,42 +1314,35 @@ WORD Epd3Base::Epd3U::DeIssue()
 	if (port == 0) return 0;
 	if (CurrentDeviceID == 0) return 0;
 	
-	if (EPDIssued) {
-
+	if (EPDIssued) 
+	{
 #if DeissueWithClear
-	ErrorStep = 2;
-	r = ClearDoses();
-
-	ErrorStep = 1;
-	r = ClearAlarms();
-
-	//needed after clear alarms
-	Sleep(2000);
+		ErrorStep = 2;
+		r = ClearDoses();
+		ErrorStep = 1;
+		r = ClearAlarms();
+		//needed after clear alarms
+		Sleep(2000);
 #endif
-	
-	SetFunctionReturnValue(eFunctions::DeissueEPD,0);
-	token = BeginDeissueEPD(epdComsHandle, nullptr);
-	r = CommitAndEnd2RV(EndDeissueEPD,token);
-	//r = Commit3(epdComsHandle);	SetCommitReturnValue(r);	if (!r) r = EndDeissueEPD(epdComsHandle, token);	SetEndReturnValue(r);	
-	Sleep(2000);
+		SetFunctionReturnValue(eFunctions::DeissueEPD, 0);
+		token = BeginDeissueEPD(epdComsHandle, nullptr);
+		r = CommitAndEnd2RV(EndDeissueEPD, token);
+		Sleep(100);
 	}
 
 	SetFunctionReturnValue(eFunctions::EpdOnOff,0);
 	token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
 	r = CommitAndEnd2RV(EndEpdOnOff, token);
-	//r = Commit3(epdComsHandle);	SetCommitReturnValue(r);	if (!r) r = EndEpdOnOff(epdComsHandle, token);	SetEndReturnValue(r);
 	Sleep(100);
 	
-	EndCom(true);
 	if (r) goto error;
-
 	return r;
 
 error:
+	
 	Error = r;
 	return r;
 }
-
 WORD Epd3Base::Epd3U::WriteWearer() {
 
 	int32_t r = 0;
@@ -1371,8 +1406,6 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)  //normaal is preparedone=tru
 		if (r) goto error;
 	}
 
-
-
 	step = 1;
 	if (!isConnected) r = ReOpenDev();
 	if (r) goto error;
@@ -1421,7 +1454,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)  //normaal is preparedone=tru
 	}
 	if (r)
 		goto error;
-
+	EPDIssued = 1;
 
 	
 	step = 6;
@@ -1430,8 +1463,6 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone)  //normaal is preparedone=tru
 	}
 
 	step = 7;
-	EndCom(false);
-
 	return r;
 
 error:
@@ -1530,9 +1561,11 @@ int Epd3Base::Epd3U::GetAllDeissue(bool reconnect)
 	rv = DeIssue(); //does close
 	
 	if (rv) goto error;
-
+	EndCom(isConnected);
 	return rv;
+
 error:
+	EndCom(isConnected);
 	Error = rv;
 	ErrorStep = step;
 	return rv;
@@ -1543,6 +1576,10 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain, float ChirpRate)
 {
 	int rv = 0;
 	int step = 0;
+	DWORD wrv = 0;
+	int rv1 = -1, rv2 = -1;
+
+	ResetStepReturnValues();
 
 	if (!isConnected) rv = ReOpenDev();
 	if (rv) goto error;
@@ -1551,11 +1588,22 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain, float ChirpRate)
 	rv = SetTime();
 	//synctime
 
+	OutputDebugStringW(L"****    Prepare    ****\n");
 	step = 2;
 	rv = PrepareForIssue(); //Set epd on, clear doses and alarms
 	if (rv) goto error;
-
 	
+    rv = ReOpenDev();
+	rv = ReadStatusOnly();
+	wrv= WaitForSingleObject(hCompletion, 2000);
+	if (wrv == WAIT_OBJECT_0) rv = 0;
+	else if (wrv == WAIT_TIMEOUT) {
+		rv = 1;
+	}
+
+	//rv1 = StepReturnValues[CurrentStep][1];
+	//rv2 = StepReturnValues[CurrentStep][2];
+
 	step = 3;
 	if (isNG) {
 		step = 1;
@@ -1571,7 +1619,6 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain, float ChirpRate)
 		}
 	}
 
-
 	step = 3;
 	if (!isConnected) rv = ReOpenDev();
 	rv = SetChirp(ChirpRate);
@@ -1581,14 +1628,20 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain, float ChirpRate)
 		rv = SetChirp(ChirpRate);
 	}
 	if (rv) goto error;
-	
 
 	step = 5;
 	rv = Issue(true); // data already loaded
 	if (rv) goto error;
 
+	//debug
+	/*rv = 1; 	EPDIssued = 0;	goto error;*/
+
+
+	EndCom(isConnected);
 	return rv;
+
 error:
+	EndCom(isConnected);
 	Error = rv;
 	ErrorStep = step;
 	return rv;
@@ -1600,11 +1653,12 @@ int Epd3Base::Epd3U::WriteConfig(void)
 	int32_t r = 0;
 	ECLen = 32;
 
+	snprintf(DiagnosticsWrite,DiagnosticsWriteSize,"****    WriteCfg v %d.%d ****\n", HardVersion, HardVersionMinor);
+	OutputDebugStringA(DiagnosticsWrite);
 	// Become admin
-	SetFunctionReturnValue(eFunctions::WriteAccessLevel,0);
+	SetFunctionReturnValue(eFunctions::WriteAccessLevelAdmin,0);
 	token = BeginWriteAccessLevel(epdComsHandle, AccessLevel_t::Admin, EC, ECLen, nullptr);
 	r = CommitAndEnd2RV(EndWriteAccessLevel,token);
-	
 	if (!r) {
 		displayIds = new QuickAccessDisplay_t[6]{
 			{ 0,0x0021 },
@@ -1623,17 +1677,33 @@ int Epd3Base::Epd3U::WriteConfig(void)
 	if (!r) {
 		//Unmanaged%20HtmlFiles/_display_ids.html
 		numItems = 9;
-		enables = new DisplayAttributeMap_t[9]{
-			{ 0,0xDFFF,0xFFFF },
-			{ 1,0xDFFF,0xFF07 },
-			{ 2,0xDFFF,0xFFFF },
-			{ 3,0xDFFF,0xFFFF },
-			{ 4,0xDFFF,0xFE01 },
-			{ 5,0xDFFF,0xFFFF },
-			{ 6,0xDFFF,0xFFFF },
-			{ 7,0xDFFF,0xFFFB },
-			{ 8,0xDFFF,0xFFFF }
-		};
+		if (HardVersionMinor > 0) {
+			enables = new DisplayAttributeMap_t[9]{
+			{ 0,0x3FFF,0xFFFF },
+			{ 1,0x3FFF,0xFF01 },   //{ 1,0x0FFF,0xFFE1 }
+			{ 2,0x3FFF,0xFE0F },
+			{ 3,0x3FFF,0xFE0F },
+			{ 4,0x3FFF,0xFE01 },
+			{ 5,0x3FFF,0xFF0B },
+			{ 6,0x3FFF,0xFFF9 },
+			{ 7,0x3FFF,0xFFD3 },
+			{ 8,0x3FFF,0xFFFF }
+			};
+		}
+		else {
+			enables = new DisplayAttributeMap_t[9]{
+			{ 0,0x0FFF, 0xFFFF },
+			{ 1,0x0FFF,0xFFE1 },
+			{ 2,0x0FFF,0xFE07 },
+			{ 3,0x0FFF,0xFE07 },
+			{ 4,0x0FFF,0xFE01 },
+			{ 5,0x0FFF,0xFF0B },
+			{ 6,0x0FFF,0xFFF9 },
+			{ 7,0x0FFF,0xFFD3 },
+			{ 8,0x0FFF,0xFFFF }
+				};
+		}
+
 		// 0x1 Operation Menu Back 		/0x2 On / Off  0x4 Clear Dose 0x8 Toggle Telemtry 0x10 Responder Trigger
 		//         1                     0             0              0                   0
 
@@ -1651,7 +1721,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
 		0x0000 ,
 		0x0000 ,
 		0x0000 ,
-		0x0006 ,
+		0x0004 ,
 		0x0000
 		};
 
@@ -1691,23 +1761,24 @@ int Epd3Base::Epd3U::WriteConfig(void)
 	
 	if (!r) {
 		//OffModeDisplay
-		//batchstep = 0;
 		dutyCycle = (OffModeDutyCycle)0;
 		offModeDispId = (OffModeDisplayId_t)1;
 		SetFunctionReturnValue(eFunctions::WriteOffModeDisplay_R3,1);
 		token = BeginWriteOffModeDisplay_R3(epdComsHandle, dutyCycle, offModeDispId, nullptr);
 		r = CommitAndEnd2RV(EndWriteOffModeDisplay_R3, token);
 
-		//SwitchOnFromButton	
-		//batchstep = 1;
 		uint8_t OnOfenabled = 0;
-		//s[batchstep] = SetFunctionReturnValue(eFunctions::WriteSwitchOnFromButton_R3, 0);
-		//btoken[batchstep] = BeginWriteSwitchOnFromButton_R3(epdComsHandle, OnOfenabled, nullptr);
-				
 		SetFunctionReturnValue(eFunctions::WriteSwitchOnFromButton_R3, 0);
 		token = BeginWriteSwitchOnFromButton_R3(epdComsHandle, OnOfenabled, nullptr);
 		r = CommitAndEnd2RV(EndWriteSwitchOnFromButton_R3, token);
 	
+		SetFunctionReturnValue(eFunctions::WriteAccessLevelOpen, 0);
+		token = BeginWriteAccessLevel(epdComsHandle, AccessLevel_t::Open,nullptr,0, nullptr);
+		r = CommitAndEnd2RV(EndWriteAccessLevel, token);
+
+		Sleep(200);
+		r = DisconnectAndConnect();
+		
 		Error = r;
 	}
 	
@@ -1737,4 +1808,4 @@ int Epd3Base::Epd3U::SetChirp(float Sensitivity)
 	return r;
 error:
 	return r;
-}
\ No newline at end of file
+}
diff --git a/EpdBase3/Epd3Base.h b/EpdBase3/Epd3Base.h
index 16288fe..d6f5a1a 100644
--- a/EpdBase3/Epd3Base.h
+++ b/EpdBase3/Epd3Base.h
@@ -18,10 +18,12 @@
 #define MaxSteps 50
 #define MaxBatch 4
 #define ResponseTimeout 2500
+#define DiagnosticsWriteSize 256
 
 namespace Epd3Base {
 	enum eFunctions {
-		ReadSensitivities, ReadDetectorThresholds, fReadDoses, ReadTotalDoses, ReadQualityData, ReadPeakRates, ClearTotalDose, ClearDose, ClearPeakRates, ClearFaultStatus, ClearLatchedAlarms, EpdOnOff, ReadAlarmConfiguration, ReadAlarmThresholds, WriteAlarmThresholds, WriteRateOffPercentage, DeissueEPD, SetBaselineCounters, WriteWearerId, ReadBaselineCounts, MfrLogin_R2, WriteSensitivities_R2, WriteAccessLevel
+		ReadSensitivities, ReadDetectorThresholds, fReadDoses, ReadTotalDoses, ReadQualityData, ReadPeakRates, ClearTotalDose, ClearDose, ClearPeakRates, ClearFaultStatus, ClearLatchedAlarms, EpdOnOff, ReadAlarmConfiguration, ReadAlarmThresholds, WriteAlarmThresholds, WriteRateOffPercentage, DeissueEPD, SetBaselineCounters, WriteWearerId, ReadBaselineCounts, MfrLogin_R2, WriteSensitivities_R2
+		, WriteAccessLevelAdmin, WriteAccessLevelOpen
 		, WriteQuickAccessDisplays_R3, WriteDisplayEnables_R3, WriteDisplayEnablePermissions_R3, WriteAlarmConfiguration_R3, WriteOffModeDisplay_R3, WriteSwitchOnFromButton_R3
 		, WriteChirpSensitivity, WriteChirpEnable_R3
 		, WriteRTC_R3
@@ -30,6 +32,8 @@ namespace Epd3Base {
 		, fDisconnect , fDisconnectAndNotify
 		, fStartDiscover
 		, IssueEPD, EnableProtectedSession
+		, fCreateReaderInterface,fOpenReader
+		, TestVibe
 	};
 	class Epd3U
 	{
@@ -57,6 +61,7 @@ namespace Epd3Base {
 		WORD ErrorData;
 
 		int ConnectRetries = 0;
+		int OpenRetries = 0;
 		BYTE isConnected = 0;
 
 		int32_t Dll3RV;
@@ -271,12 +276,14 @@ namespace Epd3Base {
 		int OpenDev(DiscoveryId DeviceID);
 		int ReOpenDev();
 		int DisCon(UINT16 alarm);
+		int DisconnectAndConnect();
 		
 		void CloseDev(bool CloseAll);
 		void DecodeStatus();
 		int SetTime();
 		
-		int ReadStatus();
+		int ReadStatusOnly(void);
+		int ReadStatus(bool statusOnly);
 
 		protected:
 		void decodeCounters(int count);
@@ -288,8 +295,8 @@ namespace Epd3Base {
 		void decodetotDoses(int count);
 		void decodeDoses(int count);
 		void decodePeakRates(int count);
-		public:
 
+		public:
 			int SetFunctionReturnValue(eFunctions f, BYTE CanIgnore);
 			void SetCommitReturnValue(int rv);
 			void SetCommitReturnValue(int step, int rv);
@@ -325,6 +332,9 @@ namespace Epd3Base {
 		private:
 		int WriteConfig(void);
 		void ResetStepReturnValues();
+
+		public:
+		char DiagnosticsWrite[DiagnosticsWriteSize];
 };
 }
 
diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp
index 66de5c9..4d92d24 100644
--- a/EpdBaseClr/EpdBaseClr.cpp
+++ b/EpdBaseClr/EpdBaseClr.cpp
@@ -781,7 +781,7 @@ int EpdBaseClr::Epd2::GetAll(bool close)
 	return rv;
 }
 
-//main entry point for exit
+// Main entry point for exit
 int EpdBaseClr::Epd2::GetAllDeissue(bool reconnect)
 {
 	ErrorRV = ErrorStep = 0;
@@ -806,16 +806,18 @@ int EpdBaseClr::Epd2::GetAllDeissue(bool reconnect)
 /// </summary>
 /// <param name="gain"></param>
 /// <returns></returns>
-int EpdBaseClr::Epd2::IssueAndCheck(float gain,float ChirpRate, bool WriteConfig)
+int EpdBaseClr::Epd2::IssueAndCheck(float gain, float ChirpRate, bool WriteConfig)
 {
 	int rv = 0;
 	if (!isMK3) {
 		BeforeSetIssued(epd);
 		rv = epd->IssueAndCheck(gain);
-	}	else	{
+	}
+	else {
 		epd3->WriteConfig32 = WriteConfig;
 		BeforeSetIssued(epd3); //geen interactie met epd
 		rv = epd3->IssueAndCheck(gain, ChirpRate);  // set step,error
+		EPDIssued = epd3->EPDIssued;
 	}
 	return rv;
 }
diff --git a/TestMK3/TestMK3.cpp b/TestMK3/TestMK3.cpp
index 1f754b8..a595719 100644
--- a/TestMK3/TestMK3.cpp
+++ b/TestMK3/TestMK3.cpp
@@ -7,7 +7,7 @@
 
 
 
-char comPort[] = "COM7";
+char comPort[] = "COM3";
 CommsHandle epdComsHandle;
 uint32_t EpdID;
 EpdGeneration EpdGen;
diff --git a/eDosLocal/UpdateLocal.sql b/eDosLocal/UpdateLocal.sql
index 76c4a72..9b6cb84 100644
--- a/eDosLocal/UpdateLocal.sql
+++ b/eDosLocal/UpdateLocal.sql
@@ -390,7 +390,13 @@ UPDATE [dbo].[Visit] SET InitError=@InitError WHERE ID_Station=@ID_Station AND I
 go
 GRANT EXECUTE ON [dbo].[VisitInitConfirm] TO [eDosStation];
 GO
-ALTER PROCEDURE [dbo].[VisitInit] @PersID INT,
+ALTER TABLE DBO.PersonInfoSnapshot ADD Info XML;
+GO
+IF OBJECT_ID('[dbo].[LocalEPD]') IS NULL BEGIN
+CREATE TABLE [dbo].[LocalEPD] (  [ID_STATION] INT NOT NULL , [EPD_InternalID] VARCHAR(8) NOT NULL, [ID_EPD] INT NOT NULL, [LastUsed] DATETIME null,  PRIMARY KEY([ID_STATION],[EPD_InternalID]) ) 
+end
+GO
+CREATE OR ALTER PROCEDURE [dbo].[VisitInit] @PersID INT,
     @ID_Task INT,
     @Inst_CODE INT,
     @EPD_InternalID INT,
@@ -399,32 +405,177 @@ ALTER PROCEDURE [dbo].[VisitInit] @PersID INT,
     @ID_Station INT NULL,
     @ID_Visit INT,
     @ENTRY_EPD_CLOCK DECIMAL(10, 0) NULL,
-    @epdType TINYINT = NULL
+    @epdType TINYINT = NULL,
+    @InitError INT = 0
 AS
 --Local !!
-DECLARE @ID_EPD INT;
+DECLARE @ID_EPD INT ;
+DECLARE @now DATETIME = GETDATE() ;
 
 IF @ID_Station IS NULL
     SELECT
         @ID_Station = [ID_Station]
     FROM [dbo].[StationSettings]
-    WHERE [PCNr] = HOST_NAME();
+    WHERE [PCNr] = HOST_NAME() ;
 
 SELECT
     @ID_EPD = [ID_EPD]
 FROM [dbo].[EPD]
-WHERE [EPD_InternalID] = @EPD_InternalID;
+WHERE [EPD_InternalID] = @EPD_InternalID ;
 
 IF @ID_EPD IS NULL BEGIN
     INSERT [dbo].[EPD]([EPD_InternalID], [EPD_sn], [EPDType])
-    VALUES(@EPD_InternalID, CONVERT(VARCHAR(8), @EPD_InternalID), CASE WHEN @epdType IS NOT NULL THEN @epdType
-                                                                  WHEN @isBG = 0 THEN 2 ELSE 0 END);
+    VALUES(@EPD_InternalID, CONVERT(VARCHAR(8), @EPD_InternalID), CASE WHEN @epdType IS NOT NULL
+                                                                       THEN @epdType
+                                                                  WHEN @isBG = 0
+                                                                  THEN 2
+                                                                  ELSE 0
+                                                                  END) ;
 
-    SET @ID_EPD = SCOPE_IDENTITY();
-END;
+    SET @ID_EPD = SCOPE_IDENTITY() ;
+END ;
 
-INSERT [dbo].[Visit]([ID_Station], [PersID], [Inst_CODE], [ID_Visit], [ID_Task], [EntryTime], [ID_EPD], [isBG], [isComplete], [isDeleted], [isAlarmCleared], [isAlarm], [isManualExit], [ENTRY_EPD_CLOCK], [EXIT_EPD_CLOCK], [epdType], [epdID],InitError)
-VALUES(@ID_Station, @PersID, @Inst_CODE, @ID_Visit, @ID_Task, GETDATE(), @ID_EPD, @isBG, 0, 0, 0, 0, 0, @ENTRY_EPD_CLOCK, @ENTRY_EPD_CLOCK, @epdType, @EPD_InternalID,0);
+IF NOT EXISTS
+    (
+        SELECT
+            *
+        FROM [dbo].[LocalEPD]
+        WHERE [ID_Station] = @ID_Station
+              AND [EPD_InternalID] = @EPD_InternalID
+    )
+    INSERT [dbo].[LocalEPD]([ID_EPD], [ID_Station], [EPD_InternalID], LastUsed)
+    VALUES(@ID_EPD, @ID_Station, CONVERT(VARCHAR(8), @EPD_InternalID), @now) ;
+ELSE
+    UPDATE
+        [dbo].[LocalEPD]
+    SET
+        [LastUsed] = @now
+    WHERE [ID_Station] = @ID_Station
+          AND [EPD_InternalID] = @EPD_InternalID ;
+
+
+          
+
+INSERT [dbo].[Visit]([ID_Station], [PersID], [Inst_CODE], [ID_Visit], [ID_Task], [EntryTime], [ID_EPD], [isBG], [isComplete], [isDeleted], [isAlarmCleared], [isAlarm], [isManualExit], [ENTRY_EPD_CLOCK], [EXIT_EPD_CLOCK], [epdType], [epdID], [InitError] )
+VALUES(@ID_Station, @PersID, @Inst_CODE, @ID_Visit, @ID_Task, @now, @ID_EPD, @isBG, 0, 0, 0, 0, 0, @ENTRY_EPD_CLOCK, @ENTRY_EPD_CLOCK, @epdType, @EPD_InternalID, @InitError ) ;
+
+SET @EPDVisitID = @ID_Visit * 100+@ID_Station ;
 
-SET @EPDVisitID = @ID_Visit * 100 + @ID_Station;
 GO
+USE [eDosLocal]
+GO
+/****** Object:  StoredProcedure [dbo].[GetPersonInfo]    Script Date: 9/11/2024 10:10:40 AM ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE OR ALTER PROCEDURE [dbo].[GetPersonInfo]
+    @CSN CHAR(14) = NULL,
+    @PersID INT = NULL,
+    @AllowMultipleEPD BIT = 0,
+    @CheckUser BIT = 1
+AS
+BEGIN
+    --DECLARE    @PersID INT = 12103,    @CSN CHAR(14) = null,@AllowMultipleEPD BIT = 0;
+    SET NOCOUNT ON;
+
+    DECLARE @lid_station INT,
+            @lid_visit INT;
+
+    IF @PersID IS NULL
+        SELECT @PersID = [PersID]
+        FROM [dbo].[PersonInfoSnapshot]
+        WHERE [CSN] = @CSN COLLATE SQL_Latin1_General_CP850_BIN;
+
+    SET NOCOUNT OFF;
+
+    SELECT TOP (1)
+           @lid_station = [ID_Station],
+           @lid_visit = [ID_Visit]
+    FROM [dbo].[Visit]
+    WHERE [PersID] = @PersID
+          AND [ReturnTime] IS NULL
+          AND [EntryTime] > DATEADD(YEAR, -1, GETDATE())
+		  AND [InitError]=0;
+
+    SELECT [a].[PersID],
+           [a].[Type],
+           [a].[CSN],
+           [a].[FirstName],
+           [a].[LastName],
+           [a].[NickName],
+           [AccessAllow] = CONVERT(   BIT,
+                                      CASE
+                                          WHEN @AllowMultipleEPD = 1
+                                               AND [a].[hasEPD] = 1 THEN
+                                              0
+                                          ELSE
+                                              [a].[AccessAllow]
+                                      END
+                                  ),
+           [a].[Language],
+           [a].[MarginHP10_M],
+           [a].[MarginHP10_Y],
+           [a].[Margin],
+           [a].[VisitIDLocked],
+           [a].[ID_CommentToPerson],
+           [a].[Comment],
+           [a].[Deleted],
+           [ReasonNoAccess] = CASE
+                                  WHEN @AllowMultipleEPD = 1
+                                       AND [a].[hasEPD] = 1 THEN
+                                      'EPD not returned'
+                                  WHEN ISNULL([VisitIDLocked], 0) > 0 THEN
+                                      'Locked because of alarm'
+                                  ELSE
+                                      [a].[ReasonNoAccess]
+                              END,
+           [a].[Dose_52W_microSv],
+           [a].[hasEPD],
+           [activeStation] = @lid_station,
+           [activeVisit] = @lid_visit,
+           [a].[isAgent]
+    FROM
+    (
+        SELECT [p].[PersID],
+               [p].[Type],
+               [p].[CSN],
+               [p].[FirstName],
+               [p].[LastName],
+               [p].[NickName],
+               [AccessAllow] = CASE
+                                   WHEN @CheckUser = 0 THEN
+                                       1
+                                   ELSE
+                                       [p].[AccessAllow]
+                               END,
+               [p].[Language],
+               [p].[MarginHP10_M],
+               [p].[MarginHP10_Y],
+               [p].[Margin],
+               [p].[VisitIDLocked],
+               [p].[ID_CommentToPerson],
+               [p].[Comment],
+               [p].[Deleted],
+               [p].[ReasonNoAccess],
+               [p].[Dose_52W_microSv],
+               [hasEPD] = CONVERT(   BIT,
+                                     CASE
+                                         WHEN @lid_visit IS NOT NULL THEN
+                                             1
+                                         ELSE
+                                             0
+                                     END
+                                 ),
+               [isAgent] = CONVERT(   BIT,
+                                      CASE
+                                          WHEN [p].[isAgent] IS NULL THEN
+                                              0
+                                          ELSE
+                                              [p].[isAgent]
+                                      END
+                                  )
+        FROM [dbo].[PersonInfoSnapshot] [p]
+        WHERE [p].[PersID] = @PersID
+    ) [a];
+END;
diff --git a/eDosLocal/eDosLocal.sqlproj b/eDosLocal/eDosLocal.sqlproj
index 6d0de8d..661e5b8 100644
--- a/eDosLocal/eDosLocal.sqlproj
+++ b/eDosLocal/eDosLocal.sqlproj
@@ -1,64 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <Name>eDosLocal</Name>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>4.1</ProjectVersion>
-    <ProjectGuid>{3a150025-d770-4521-ba21-16843b2d5359}</ProjectGuid>
-    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
-    <OutputType>Database</OutputType>
-    <RootPath>
-    </RootPath>
-    <RootNamespace>eDosLocal</RootNamespace>
-    <AssemblyName>eDosLocal</AssemblyName>
-    <ModelCollation>1033, CI</ModelCollation>
-    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
-    <DeployToDatabase>True</DeployToDatabase>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetLanguage>CS</TargetLanguage>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <SqlServerVerification>False</SqlServerVerification>
-    <IncludeCompositeObjects>True</IncludeCompositeObjects>
-    <TargetDatabaseSet>True</TargetDatabaseSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
-    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
-    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
-  <ItemGroup>
-    <Folder Include="Properties" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="UpdateLocal.sql" />
-    <None Include="Updates.sql" />
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Name>eDosLocal</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>4.1</ProjectVersion>
+    <ProjectGuid>{3a150025-d770-4521-ba21-16843b2d5359}</ProjectGuid>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
+    <OutputType>Database</OutputType>
+    <RootPath>
+    </RootPath>
+    <RootNamespace>eDosLocal</RootNamespace>
+    <AssemblyName>eDosLocal</AssemblyName>
+    <ModelCollation>1033, CI</ModelCollation>
+    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
+    <DeployToDatabase>True</DeployToDatabase>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetLanguage>CS</TargetLanguage>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SqlServerVerification>False</SqlServerVerification>
+    <IncludeCompositeObjects>True</IncludeCompositeObjects>
+    <TargetDatabaseSet>True</TargetDatabaseSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
+    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
+    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="UpdateLocal.sql" />
+    <None Include="Updates.sql" />
+  </ItemGroup>
+  <ItemGroup>
+    <Build Include="eDosLocalProcedures.sql" />
+    <Build Include="eDosLocalTables.sql" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eDosLocal/eDosLocalProcedures.sql b/eDosLocal/eDosLocalProcedures.sql
new file mode 100644
index 0000000000000000000000000000000000000000..1bbba85f6806123b7cc89e0a5fe0e6cd0492533d
GIT binary patch
literal 80176
zcmeHQZF60>jlN&IGy5O3A9mxUNn<;4+GJN**_PwD@mnpqX;$O$xVDqJ@ry=sllsr^
zE}jED20(&5=UiRMSDB2)zV{x2AP9m02!cHS_rLcSJBw?Jjm6&L>0*2FYH_%@DgQrS
zJX$<oJXrke;$Ifm7k7rwj~5@fzYTf%*TvtZ*5k$N#TSBMLomITx(D*?$>Oej0uR3b
zV|a!(4i|40FXgGW@nG>gd3JxXFEEd!?$gCR`S(KV@%!tc?n|lnU}!;Gc`W#zNv+rN
zZ2PDtDENHw@$m2B;{4*`;!}BYK`6T<e_zPAi}L&K;+FjH`|<J6w{2<pj+6od->wQz
zwuQ2L18;6DzLJt_i@z*xNFR6Q-*NkL8hqV3;x$GE-2I1e(ewIjaCE#E?~0c<gr9d7
z-<%Q2%=l<MSTzryF8(R=6T0BF@CUQ}&oW~V<=^YIm%=%;pDy2aL_0p0f6%z=H+%bh
zi?p9E-_9DZR&RIfvAHgC^xD~ao1bTaTRrMmEn82-&v{j8u^ZyYK$~5avX_hR<@<qn
zF6+m;dDNdS@6H;xRzEM>qx1bBbMSZ9$>$xT_q60^TQt`r@g&yK4z_sYX+9l3T@x=1
zI_j*<Go$w;`NQ?lvq5viFL^D0&qRy=u=c*Gm#sPdcz67ae&0Ilvpzp#KTejPkjUF2
zmp@CqVSDk=d1;Zx^`6%{v!?aqB>Abn;_hHCeiU9}9lGv1u|@Og@d^Iz`uiY}Pe${}
z^Xab4&jXPpc>mV!I_o#(RZjQG^J|(OSbzRa>&MCS6EX)qhB*E6A-=2r%;B&ieIaYn
zrvia!+j?6GmC8B2ISt;PU8_re_Iq%WJVZpq<nNA1;kCt2N75L*sCAz0(|d7}yu2(n
z7<*v{!_FAyyY8>8_ndB1J(pLH7k`u9zYzVF?YNze{OpKE{aR%B*5a~IF>NpKc>Rpg
z+V$yWr0cBo@#?UPds+5vvCkbx6T9Air|NipDtEU}a^(8GDk+)UFY1}rKE97bv}gNC
z_8(abyE2}aWu?3$v+|*Q-j~(g&0%-`j{Nd{CiI^K=FT7qu#Z?>UlYjPVOHOe@Am{_
zSr^#`PX`a{sg&-^uR5<`DnAgj1YO7_xF&jKLw@fICD3z^#8UnsEj=7|>UDMTP<*>r
z^7NUMZ7kjk`}Yrp(w74N-r~cdjQJZeMle?DxwMK556_9|HuRSvDd6Qt^7ny^s_oPw
z-(*8FNRU^8?315{2n6D?khOb*3_|X%EWVTfpGhvv!vF&rh1MeW9`1c<m#fl^p$2M2
zU6EzD>`AM(%Qa`*E(>jF12gRAAk&zYd&As%C@rfm2sy=SBzl9opTe=n=Z8{rS9<VF
zWFB+jKz=<E%CPG_1^O$g3C=&61kIU(%$OWI=~wC>4x=~?^0she8YDE3L7JRQ9}}&O
zQDCmtb&)G*MvMh@&3*X=3kdy&5n6V{cLf9L=lTYoDP+R8;3-?Rj+wUJp^WW_rd@UJ
z7;VeRTcWx1cq(u5IoyvuZ!9*4F;*zfB#lAX>V$mfC#5?|U#zWhW80Adwr>Xy9NBn#
zlA(81B=|t)jMDJ6$Ro1y-~n6~4SQ{IZt?!&Ki_J<W#`0H?ycv1SdZw?`p=CyeA*JL
zrtq+AcLvLSL8S1;k*39rcq!f+B69G_;$K!9IjLD~>QHD-cogsfu8KvuEP5R}Ji}E|
za$!jtE=aDd&7RV(KbCoid_JA`(LU~qwI_$lxa0$&2EB<q*%N(Cd?jaFHJ%kU%9d`6
z$AIW(t3F$dw6~xm6tj(~dmsh3CASePhh5P-+cHA1vKW2qTMNhg14pP6y~PBFW34`K
z*_!7t<m&c7*~a3JLMMKgZL~)Vkl?h($g!gbQI3So3i8Kzz?M7=aGPe|5dLMYq1AQ?
zX==|1_#(HZ|L}#lMr^f1Y_R3q1GgwG8U1R1@|IgI=$Nw||B1CgtJZS;SMBmH`hT(6
zle+))6LSB$Nbm03IR&d;^5@C`@vZz1FPgKUo;{qm@DrdzcSW)_b`VE7&N-`vc*uS-
z8%U|i`IBM&fgOCDeBeAdFRek36CNw2+alFCPe7SGH_&xYp52m?$44tCU3t7O8s$Ct
zdtd&(l+z91L%nu1Dl%!!^e^PkYQ;96h#o~R9voSN<N8r^EbTh_RMU3;IHS+@N+ZU+
z#v=ymD^KMR*Bg*xji*yT$1^tPil~B*qn!K-LbVO7CVU|1jM93Jty|8?+_Ke*`UI+B
z?#k@evl05Vp05{V-nGguCS~+`vU)7Ddb={O4`p^=9rO=d!s)9=qO}lr;WNZWo=V>p
z{)%|F$d*Ia17aphp~74dn5To5)Tg?4^LX*2L@j~Ca9$IxYzxk3gP-<l!1>@vyZ>2q
z<V~r8nAbU3^<`^2;D<KFX)Rp~;x{5|kE9iir5;FaoCDKQq>i<kaU8V%vmr(WsjT6%
z5n84eY%*w_))q$&zJ1oiOPwAX#l*t4OFs3maO71|=2PKiDzE+fw|zK2$dit2Pwo`Y
zUxkOS2TQ0c9bb>KsE`^<c;k5PTdL)>#(!RD#Gkg2$*<P2QKcPF`TNa4XIxAD8ef@{
z=eUj@L7q#+kw4oWz;dz1oFm?A-#W568}j+};ESJ=c*Ccnr*$=Dnm5)WX3UxxGilYh
zJj7vMNfzy`AtnPYurJS^ifw`Y!H&y~!K!b{cW8vz;?*Jdz}v4_<H7(>Uj{3Y>w-`B
z9Vr9Q7iH{5%eI6D-K(j4gtN*QgrZLdeMop};GAz3ciIxJA_6tN=Nj!H&5YT>CqsPW
zzVr#c4_5sa7b0}oyDe#1_psn!U<IKuVUAhkGO_T}YWrO>aCJ9nTYblxle*&7-C#ea
zY$fX9vOc5%ew&R>9tCN|ZCDdN5^ONCXm{lEkx1X6$P`Yu=NNq~1o0oN4Y`8!^X86t
zNQeb8qv22T3t8gI?Uy1u4@DNSazq~xA4AmT?&1$}68^k=humjl*&g|?Waq0M`^ZOV
zXq=$Od{(PRe#cK6<5EJD^J*8PZw*f~8%f1%7`@bZZ2okk$I}|a7JM8bjx;E?aq>@n
zTb>Jy1MJDV0#*<=B)pXIRF4?A5E&ScR~epbQvbDJc@waFDL5FDye!|gWput1O@$bU
z`oiiv)sYszgF?#Vc<+g1Y3$bbxIa=>XICiQm%dMh=WOW7fnmo!F!sT5j-nS0X3wl9
z&y~%scUxM7t(aQxvOwc@j6?Y|eN8DU<H|~>+N&N1*q?cySA_zMZA)6`VXL8a)*wDN
z#WrEys%@<?t@4S@9m+9sa1M{W1C9h%Uc1BYW3=q6q=dLMuE$@i{6ucXNscgSwRzN%
z?^Vkf;;7pzlU&4E+Z0;wpe2y4^$+>{VTKmFCGZDQ1M9@E#ahD4dno?tR4tg-|8A-J
zQ`<CK2s@`Y_xvb*Ms#}`x74C*#D(V)u%AV{0Z(Zvu83u7t!<$fo<HK*<8*7xLeKWx
z7COBwQ!lJqXRe2ieD^x>y(9gLopgB08!}(aL&E62*O{TzL(@Ku=W!p#-&T{!JXVWX
zufn^+&dy2Mhxfv4+mJjs-2L)Mv<~8_8^WLO<$w71&?+xh$eEL}7p6h`bF8g{r;V&y
zg=yMJZ#_fa?Il@ve=DCa244<&zB>|Ao~mP__b}Er?(lgg*q=%pew|GHVr!bXN}7(>
z^mdK&Cuv)6V;aM!9zLKi50(zAjJSH`8p@AZzF%FgAF!i}y;|A<T}SmO;^^-U`wXZ%
zZ5>h9o3fs$Yt3C()EMTiFY5a9))`jc+puiCvFa6o=~hH8aEd2J(l$?6cdm8~aZ>sa
zktWW9)(H7|#qpf?Ij#+f&#0N_;nwwYPj$@Gor-77<L%?=YxKIVY0}Ia7#|<w>hV3{
znz}h2ab0_kXI$6rTk(0C{CIZQXp44OcNI=Ep0etd0ehyOUavCJZr0r5hB4pm<b2df
z-ATo5PEP-N`d1x)S!HaZADLh;kh2**wbPe>?Ch=Dn_&O+)8>F_*1F#@f__>v04u_A
zixB%W_1Edl0`HTQTwQg~Ryjj98oN$hpOo2KTy^yK>Bx<&=PHMqk#CYnyt<lUj<A2~
zaUqVNt76?>Q;z8O<7Hg3Mc+TH1lKW>0;l{AW%q>prJz&)&UO|BM!G!l7JG!<;RER_
zPCfB%U&KcDC9Zu>K7SUzY{=S4&ru@k{6v0#FLm$)^>!qFjJ?9_UURg+TqZ|0B3m*(
zI5*8Q?&<e4H@+204`ghy7p*=Xw2EIJ;B@Rw**(UNcEknxnPGwNSw2ONs!I}~-jbNk
z911pvs61Np@e2H=OzsUa5JVp$KgxB5hZ{THVzA^cBOCt2MD(cZIyeKD?|0U)@ca)&
zvUnbnXZKodXx7X<!Cyzv4ZCs#5eAJ(YOOYB*jt}#kD7=wwJ0g;VDGy}6X5}8r-@tG
zwFh4bC$9@Mc4`n6=l3>MU(1}ueh$|$nu(jsO$n=+xoz0<i{HP++oM2tlrTov>9{cD
z?978lrpNRe7iYEr`0*CdTlN82M}2xCbRWAP)rVnR|13OvE|K**Bf-mdeue>&8;#~7
zBlS&(-nnxQ_7L&kDLUZRAgklLuI8rK#khkNc?sBQ(Y>;K1;Jbd^Y(d4SNHkH>9DnG
zJ5!4qcNL#FF9Tl-ngzOhI=^(MXPO=1UJ&AsID4=A?z&H;zFoPJL#Ef?Wb6(^e^BZf
zu`lBm@HLSi|KX4y#LUNY(kJvN!}FnNq~FOuoE(CFX?erck@Udoj5YEOSiI+(+23C7
zQaKK#4W-8%pRd9rF8jFd-tg(%RSGW$eiy9V$=;*`$vNBJu#E`%LeJFuiJT?l-l6I=
z(?{dFzN|rc9`_VmHQWATt47O$;qDgjMC<W?>s|C70l9ijWUY}i(c@Fi!qe@?TV1mS
zlZbU&Sz|@H4);i(o_?8oYH=QiwnRI=9z1JZDZxJR99LYmLYL~TNRac>Kj8=+q}DT1
z{6Ow(*&6&w%gaZuzTQKHyUiYpzj+`~`MEpwAUK|A0Uix*PurEOV%(<|&q~JDmD})>
z^`?DTUprG!*7dg&jo~>bm|8v7vxqz=2;Ud5x@Y$5Da>i7Ff+;jupuLM!je4KlX2yl
z!(Y#49*Q<G`}^zJOk@^8U;cVFGwMiNYx&dUYH@NsZ6|e>^>OA|#`W4!=vxc)jB)l~
z$}Yp)2>(0|(U<Y79PjD3EpLRPJ*eYPwKa}4>y=R!Tdkq8sH#CRQr^c!s0>#;8(;TJ
zvttlP)4LC1uX-ok8UHEslKXXFdlBi0E3v(!d|{r6@8dQoV7n-PHNMAHK3@xG2HB!g
zSBSgfAL5JvZ-r1jSMni;1!hFx^{=LzYf!9<u<L>Sj~3;Gy%u1#g&H$P8unawE>xad
zm~+?`S2AeJLY>owuhnYpj`-%!C4zlR-fIhq&$(YhwXj*9X?_B`g@3#rTf~fN#S!{i
zPIH*ewqjLa8fx6SE^k@=8nRpymDcGjS=Q5gw=`FvCm*p~tz|7agv@B{;&UB3Z9m;C
z7<LD+1}|@Z<i0?(1Bla?yGdAe=;?Zu`0<*whiDUb_1u#_@E!-fM`kW2(69`qXnmK%
z;VpEHL2st%_oru(<9!kJ4HH_I78mhDjKz0hL|}o-ajdQCSWB6`j3aM$vuur)&|A&2
zZdoU@T4OY3b<Ads)s8l440_DMl=Wd}=m#$w&x3`T6V>8=D)Y;xS*LjO!ttVN-Xg-{
z{u(y}4>%uc&rol3sQp0YU0=Q#nT&GGr(^QU+tax3GW8a<(gK0f%ueVn5m^beQ><ea
zqE*5=QG+YA*U0*$r(rz=^{76pb)-J$=y`3XCE572OH4B<OdL0THa2R!V}n@&etmdf
zyaL|b;h%Ga=jjrULA@vc#BfG`g#LLgC3)@IzrfmB?Pn%CkgBPeY&DW$Ds80o$Y?UT
z%xJRGaheF5(`2PBOi}KQn)tj`+s_cI>z}r2_GXe{>Ou7}a|V{U_`FrSo~wqTE^A@Q
zd>q4*mG&{g?$&XFt+)C=YLHxxGo4~IWu+~eGFa0=eVhi@!XCAkVT;dOwa4_F?mLb_
z>HBIpbJuNUUasBNYh`XH6p_Do^6z|K-xYYy3C>z8)!lnt`$oCm8g6DmR;kZR&tR}-
z8iN5IoWyt}8SrDUz&91v<7Ld$?)t(?5^qB3uU&Zq4cj~p9?*kx3y5w#pVZT7(BHV|
zMmYwEQEnWqmg}-lI%S`B$}YVv>vQj$#b*;CcO-kfMduZXpR~%plAHQkWnXu2{%N?E
z2&Y4ljjWmVc!Opx?HDi3)n~*M9zY8kBaGAh2eKY!y*4!9a8l*qZSG7T_x^yH_Za>#
zsg~xT+#51b)XF1U8s|x_N)#J&0`E@2d_d+bZYR_oX1&9u74g!W$njR8)#1cE!>x2)
z_w;3q@7TH`BZPamQU8r(-(tL8%J?FaCdMjS{UIivPQZL!6&{m>d9*Ow`M9)rJj>ET
zzCb!w!583JmKOHsxU_gYb7|3&pPb>-#uatG64}HXkZ^O8zh9Sf2|pQ;G?ZpH=EnPE
zGp~AUm_H9CW{mcr<8oa^Pm=J|Zd2}~&FegrXg9omy{(h2TDApSq<55K;d)s0iuFRZ
z!oN#zFz)A%?ptl)w0eDf9~byMM|pp4Io9#yw69T9Q`X&-_IUoA5loy2!O6Y2i@PO~
zLiys@z&apyqPqFNj&9h>C?F-%KS6<>JpjJn6o0t4wxln&bw=NR43z#;H0k%UOTMun
zz1my7pMFD1H|6FoufI2>-#FR1nto}YO4`Tuz4e21p9VeDNwv;@H}tgi{=1=v{Hb;S
zyP=2t!FZVsc{j9>H|szP`4a8?yXDImEp`V+`*d1u&7ws{tRHt`{w(^A@#(nQtnZSp
zanka@<~@At<*Q|`tt`9+??03}ANH2-9`5O|+#Z+h!Gg7N+A{3N$v-K3vV7FbQ&x`{
zthC1V^$iGENkspQr(!&w={udiR@tZg_XjhqUyH-$1H~H&^A`Cu@>nI%W1>G*mdx)X
zTC^KgGg-GtYgYPx!$)RM%+Jin7m`drGNZn?JM1}v_gH20ad)!hlszx=O;`eYaq1Xv
zt$-J3QA=o0y~PM8&ElQCt$7(|uy3Q3d6xBK288nK^>T-mV-R;*a}9$&vBdbQwxax>
zaP){XooICs*Te~&R`f$#_Wj_VBk4!|?d07K^Y$ODS8*n)gl4k0CsEdYkxqZF0cRfK
zk|>EWJyNVSVe4pvZ5A=2*{Ye%6RVw-wlMjXAmgTnNiAfnE_;q~L0s7CvF9x5VE_jR
z7cuyf9tQBZroE(r5Isz2k#KEV2+_l&G%=1GamBJ87NsZ063bdx5O=oL@v9B#_kj_U
zZbN<&aN_+w`P}$M-iYK||Fi>nDL~@Jn-<Q`0_0~+NW`nHb^L1KMD*Gq@v8-iShhjp
zR|^u6ZG*(G7Gxghwz_$F3tJwIFl>2w3tJvLFl>2w3tJvXH*9%%3ma~iLXAAmZdm(p
zId()@_Cz!L*@IuOMEZwPKV$GKmik$;9o~Y4x_)NhS560SLS%%=dIc@-SF-tRX?rMY
zrOIqh>s{t4l^zN$-8gKkcYV8Wz3s!bvHwLpzI^w?<8DK>FvDVT4}_Sqcwu=f_{I>O
zvvr_f%a(8OVm=l8#j-v1cUsgjYS!CtA=O*b6ZJrP&|@vphk<R2`wn$GZP+=jnC$mk
zFt{=7J}xuXhc@h-R*bf~555J18^ccC!aEr2LmPHZD@I%02j7ChjbUfcr}Uu>JEs++
zt?q+w!Qfihp>J*P$gsudURSSr9e<padL7|{9n?5K-q`Vc`1R#mZS+c3zQ|0>-VNyc
z$T(TFS!z9S0wdo;qb*`>uLDax>RV$yeol?65x&&Jn?hl!fqU&8H_o$aiD19@xmpP!
z*0Gf~;bO)w$FwI&aV<_f?KL?e`tQGqzKgB=asMdyE;kmxmG5~hBa?tQa_k$tBhv)_
zX+7Ua`$@(u*~XmMCF`_go4vv~nwG@5)QnHWmVeIW;`|nTyEYq42DrkvQPW6BJeA_H
z;Cn9)+2#+Tk}Oq8!79Sbu2G{UnYYbYpO#rqTJb*8UdH`AC1{PiB>FvT*_T+mz4%-i
zt6TOAs<mcu*LAzS%4h`dZi)>(l*|jrmHx$BlzDsX7gGAU+%boLxMAj^tPi1+zL0l2
zU6TLtX5|f$np^V!2k!6VVYV@z4#_^*oABnID{XTl*ReXMcBPk^YjY@T72bM*bB^#Q
zkU8UdyE**wc{LvhzmSRY+oO^glSVe{J;|s5FQaWT{1~sOm9m+j`Qcd!G}Q5>-1ia`
zt!wT!J;Gm#lw<UcBkAfNgB$()ZS_bliL`z$(ppA9w<KRx-|MQG@wnAC?tLPQ8}B*a
zEn-Pq!#v6MsixL{DJ|nRi~4M_&aCpS_oM@y<9So8B<daAJbO$td^e>%;|6f$>jdh%
zW#04-tklK)q%N}gPd${c`Uqd@l`K!$+VGZ^_-lWVeQUJ=9<`+Eq;v4t7o#zgP*BL-
z+qwoccrKZ~o*yN&*2|K}=LxWtw-ER5ejb0PdHHT4-U!_4(*vOabYR6h|9)lit~Z;3
zJ!a5p{5a#VdW`iwJJwE=P~eU$V?QcWY^aCNtf|d6a*9%KB_0PU#ix1knf)#C#hKck
zb+typz3e$WWfERQJr9h6x~z{c>+zPXvZ#?UF6EfB6s=+f``*z%d@o@&u7gt+$ilap
zy4Lt!p6eUvtpxW50q1|qzqlf5NdYB^tHbBTx-d$^{!wflcX}G%hy&wWa}1{(cg6PI
z6Q4KF+>QOtv;=yk8N1-=v{|bB%_9G0do8WdYZYF;?E=8Q`?Zt*z6$Ts{FHU}EPqL-
z0x`Fb=UI{)Q8QzfBcCSvE7YdDgCF^$NK*@{%y()*@=Ostem&I#E%99N;!fclJLbU^
zSq;(mENSd{gla#TLrE|5ZtC-9c7Qb5{#)6))-rp;8YLX&UOQiD+0$B2Wk>so;C(af
zY{N?c593Wb>^)@1`_}qKdvJea@o(~n^4j0l{wa^yH`At!w6}QI%3vM$$#RU)v#p#w
zZ}(buCED@w7P1(7j5cQ4Ei}fNRu8uZS?B3Gl~49axvW&Qdf;Iqg<68!sO!09R<Q?V
z)W>nvIv9OFo~>ONNFaKDPo%MokdS)BFng3RI!TyA=~H}0nJ?p&WqgttGOoaqmOeh}
z`@6mVFx&%aYo?sP>fvNo9lPamj*^SzYQQ}FvW}N*@57$<ca=AN&y8ti%t?3}Mt{o-
zVT{-J2a*Cg$>zn*FgkYy0$hh~vRl{B$+)PzdankUd-7*``hlE#;=GGmfpX^kM?QlT
z9g5|O?<F#w<ncqg*a9sm@!<UoxMSmu^j+`$WQo_ed`4dT->nQ^z~&jmD6yTEt3zBA
z=V|qAM@nsk@$I!&gqX=a+eR$Clf{IIb0t0nXE@u-S)N%7^eB2c`lKF1KF6618$th+
z<A-PUIS&u1`bM8{-0+KMuk-JS$n<!q_@=-_4zeEZRBCB1)A}|SwHL+<@K<dW=c$!V
z-T%~fR<rJ)7rXB34$M-llCUOzF|18hXP@m|oVo8CF<HUf!`Rh)@iu`n7WFdx56qF{
z`{JbHnv9Cx(m>px0x@%1R{ZvP3Z*||J%fkE`BUS^`$y`hagQj|VOp;~D`xR4tz~pr
z4STlgnOBeAyPt<o<^G@j;l>TV=kB^#w$~E*eI;*q!79i2fwB4}%)=>>fVq6(+%vwl
zW+D8(Y;76W4m~`6HR0z!=8;85$0-6O^t2+iaYff!Q^h)~T@~VdJv~+QG4_pAx3~mJ
zMeoLV5Tgw$+r%Av2cOFGI>P!n(t^u8;0$BwKW8wiz35%FXv@9j3}1daDep=7F4|V>
zJhjB!)E*pmH|>6>9%MYz(}M&~@KR4qwfh2$Q{a?FTXkf7WS{-&B!koOQ*W`=hx{~3
z3tG<~<-OFq`CDZ;J<%$|*@;#e&JnfBaB?Uw)3ZW(nVt^H%k(@@UZy92@-kSk`nIYT
zb@?fq7Ic1!rUl(U9n-4CwNS4-ThnGz2VC_Uw*_fy-d@`VRj-U&m|JV&3_kPj%F{9V
z$oE%$tv>Zv+n}&z4ZRJBo@4nA(>rp%%il#a;Vsa}K!XSTdho#zQ@A_$)_AA#li}td
zWP|L<uhLJm_K^Ll_6V5l4ef}I<IL96p_Q|c=T>qm_6FJS2Lrb(I}KK2U;L?i^7-?y
z0(mUoUdSI#iz9RA`+=V?hI%`a0|D<T%jUz_PFbOikA&vX0U!S5o=fRn0Fq;f&kx^v
zW;V{zD>JCtv&gVTzaoPuy^0Jb^C>d8+@r`KYk#5z1xsz-L<_3)C0cN$C((k7enbl@
zdJ!$C=tH!ilrnl68C3KiGKiM<kin|&keA@(WnKcmAuoZ~ke9$`$V=ccWF_h^WF_h?
zWF_h=WF_h;WF;*>A%kss2^nn5N628uJcO){`3J4i+B;}LmcBs?&TM`@W}wMnO243m
zHTMcK=qWxyR&UHB$m_JvtmeJv?M4q}Eq+I||L&1w|7OtdAG&x7Z2)eu+Z?1{VQfDP
z6zMbDL&Cm6y$gaj3nTu9Oe!DivxpaVEO-~;>!aP14T-L4G@-0zyHcMB)>Y797?JUl
zVO*9%?3)?BERP4J(YhYW9@0y(_wcfepN0iH06PIjvw?}pdx1RHYte`Y3%t+WzrDp<
z@fg3%DcKzM1~t<$qXXrjh5G`f=d^ksvwYW>@-up9XU*SSE)r;Cc_=bszNqR0=8AZ~
zk5U7kO^YuP%GxSdEP$vzzql5vPdsImwBks)rYT#<J-rgD_VO}_=;37$rFWOXl%8D%
z6TP|&B6@TgMD*q|i0H|c5YdY(OIsdX3718F_Kx1iSi{!Q9>CUd9z3lhJa}5icJ^cz
z;0~6uwJe^qC+lb2>{7yJF`PYF!%d0a?8%BRyJfs?rR9y4)QovzCA@iISxN1IWl*K}
zmBE--Rrjs$b!FIckE?{7;%$|6#yqVWzUO6?(3yu-!kFIlUKaNS%Iu|>{|DP|KG?YD
zmHSX$(|X@yb>A%)Ki9$2yt~!Xxh%JQ9@K@wvsoRVJWb1Us-2xx%3ki#)iXB2@jWah
zwwRexW6^TV(yUD5CA}MG+O-&KffXz7IH{>rXkVwNt>`oJ){i-D_&QVCAWg8>bNhih
zQ`#U+bK3BAd>fdNetpqeM*vP`8>cdmmlq|9t3+x&J-2vo@IfOaWlwiaaW*4Hu&+ye
z71{<XOGL==h76p4ye7Zz$n)_Cb@Y=l+wUCJ($S%o*83|#u|`pC6@}iO-fE|Of0JsX
zWmh{`L%;h|<ltbrPK-S|`3U>*S6p#q&?j07?)FDnf)#}1MvX;S^AlQdai(xi@l*w8
zOo=_#()m@^0qtBZPR*7=9jq)d6UXNJRzn{|T1zZZ7nC@(w2y&2vR!cH5`8K^W*obz
zpWc@LBo+^GmdI<i?zJ9cPseGQ6vjMO%~LrJUdF4AgM+l~E&4pM5m}}+c=g-GJSw@b
z@?q_)YUIbqJ<6@mtY4<D<fwkGcFb2d;;r#6M`1n(bgWTtiYEeH1jz%uc_e&_Ihw5^
zIYX(7quwrQw$%=0TydHPFY#H)s=b+LgVw>Dp$^m-wCcs3qxd!XihYI~^6!pBalkA6
ziypxA2=4m$G*f(vW%!fJCH(}|Y~z`n<i5Q}N_SlD%l^>Ku+nWsj5$&*dNv1NAfI7=
z7PV$_q;R!)ob4=5PZ?rYcZN4!qAz81X6*h5S{v=h3&{t8bbl%T_{NdT@@-pINVf)G
zP**O9@_Zz>1?yeIQNx33+_gf#K~JeuZ|k`&)sT8F-*a}Vq-EMNA48S2eDvpQwyE@a
zP4VtmYg4H%HS@1JPWL%E$6*6X9_5lnJr{lbEtwOVnPRie<{2ZiQ8$(tZp)q--Uq~U
zDVX!rqa`f&W}iu&!^w5j|CtKEBbw)#XpQ}0H+U*tJOguUpzKigDt?e}_03JVS?S`S
zO?v$-eVK=%tDedJ-ZW~m+K(h-a9V9<hT+WBRGx9qumun8&b96IJ2v%9+;ZA9?y4{2
zamG7V%JZ;OHPHA8*?I;c1`BUlX9j;o*|(>ZZa#_f%cpiqD@rKKGns+J^~xbrERRyd
zrzRIXb4u@J`q|T(Kj6;R5qI=^<PD#ZGx|I7g)sTN)zTJE+NI!#mPUT)Gvfv$s`Mee
z_v2$f{y8~kYwR)aUVRGI(>PI%vF0&+CTOTk!$+-5{3frgsq))`j$>x+#pmtX99>_N
z&sw#j3|P(hyj8nBhuGs5L<?g}!i=&O#2kz|Pf25jQROz5jVQ@RS$y82$7J4W+B4r`
zj1(x9^iymfU~`bktn}o3-_k=`Pyg3biG9r%LmtFa*{iWkzg3(K_(VqF-S1w+RX%jk
zUFj*_+I~&ecDRuYyHUBWoX)AOqezwI@<oZHN44oZR_M%q$t8R_oK7fjLczVlSW8+B
z%mLlq%J13KcLCg#(;ttep59A*QP!&GWwrW|{Js>T2KjxTI$y?mp&H`zquoC0^&I0^
z4|O&Y2T!xI)~4KHhjBti>__tNs=Ut)x8-p!!#EfrzkLfE@zaiCJiZb<u|DoR*^ww0
z=Ivc+@2dRaR_ITK@1IO+_oj^RHv&1QRqNmXEbup_e>WTbW3R@?aYuU3)l=(kq1LE?
zd$E2t9$Ug)M1>9{#*6=N%UTDw)JER4+KA(M{E=rn??wWqwZ2M8V2eIF2zl>I#%43-
z?kzBJ`xTeZHi){f9~mUBXw~ihFWj&|Z4f0#BWdy3yxzjwMy~5sk<9~Hq4++oqHnQJ
znJ?n+ByVZm*hAcEcVFnmuBc{G?8>(*qNUn)OwYFM%ltc#`DgnZ4~n@sW$oI=HFm?3
z_TRUz{Lk}|b!4D7u=}7{N_eJN=oxbT$hAOy!;|-FxO!o&EV~$O@H{p%fJ*py=G@oF
zOOV|IFPLY_eU0on;4@mwykO&poe9UYb`CH~nfa^VaZ*di;Ty4W_FZ#(6-G09_4{XU
zVVJ#(=gir~cV_D1JM(k#{ZTV37p3i7T$Dl%^zIny7DOaT?RefTaA3CpH(Rn6erGwh
zgsn4cS>m&<ly|^oPs_7Q2Gh!&1?EgY)Mu6f3C-8O-ID$5pGj7l7<u)lj<h7^2cp%d
zG7Db~JjCf>y-)N_k{Rb=IfL>%y%wZ#l6_&@%zYcj=ONqpNMD|Rm(d5vHa@mGj?Y7S
zd@-6B?V0V{XR<<GwfDJoWUV|q2ZBBmf-85ge_596VV1V_F(G<-nJ_K=?8_ku9L16Y
ztY2&85<?#Xqgm?d5<{;X^-FzT)^C+7pQC<f-M*eDl-Kw6%=ErJGyQMR%nsNyvj_I<
zv$uMc&%Ax$GjAvO%-ah-^LB&J9(C;pq55`&P<?wssA+bE(4~Fx&s%oJ!{qkHLwG$A
z=kgT$<1zK@5aBW%liMTKm}Zv@x_^4ZYofNDBDUIIS;=&}Ro0<qY1^A#jrMp=w`V1O
z+6_=Nj-T|m?NN!}*BHl7YNq4&H9Y>-+KX#q%}v6&TlgSjCuJ?KjO$DL#46{u_)y4b
z|D!~D@cW!ZDi9e!hPvj+s`UHSil@-9<=<MX$7S)YW+iE-y2sz1qIpJ$K*DoIOr9D0
z_+`0yzDI~2P@ekyi~Wgp=;1S#Z+9%VR>;0z#FhIO7P*Qi*W()7@2sK!KDOce>m>s6
zqmq-i4Bk9G;#>})8l651=OH2lR<ka(TG10KYsFHlrM?NQ<|DDMd26+I1Ui7xmt-ya
z^4O;NOJzM!WTjRM?b-9PRxGtz+CSckQr3#4R!jTVsufGMR?8RjEw*43gZgP6-g|C(
z8(S<jA5PcqvDCadJ*gW@&9BoFyRp<fJUzJ^OFt7iQJU4q^QGSFQ*Y0gdjC)TK40oR
zLG=KAsrLyXtJ(c*9=-*ml(+mukD&#l7+OB0$IyZy4f{i61M6wzQ2ZcP2=fs4ZNSEP
zOw)YPJf`9C<Pb^^%1SS^tXq~_O>fQ1TD~l+QASMK^-D;@mix4uL!=binVCL%?u>Q<
zea>r|tx#JC3#g~ysK?uNH;eZZnFepy@$V8cJKBfWlNGR0Q@nM&dviy;9qkX|wd~21
z+RAD2ZAuM&PXpprJx||{bsthGpzqv2ojNw|)3A)oz%)E<d6-r|myPLlO-@*c{snAV
zdAfBf?|L|<bFPPFoNv9_eXfnw?DNcPv}O3^>o3PEk6|94e9h@RDr?pJ;o9yvGS$N|
zoliY1<GkwC?(=J`W}j!C!&7C-x9ICH$19Iv9-n;8={zcH)%@Wsg{OX8J(b~@&Zj;l
z@qL75SxbGJ(_mQ%X8EVq?DNcXc&beKp8ERB@ycTum#KE!Q+edugCy4c;hf3FVk(b%
zIHvQdhh>~sz1q{}V8(%Qo_P*0!!KWdIbL}T^Z4XzPUlfs3o_-SKU3m;jA#3L7Cp?O
zlBkiLA86-bpay(;i`Ml#d|hGoJbGZV6SNVRkA%U8k9d5k?{Oaa%Ohg7Y#1$U4eO(N
dcLnzxYD~{(3Gp6~Dfg0Oe4m~Vdc4fv{|7wN?F#?^

literal 0
HcmV?d00001

diff --git a/eDosLocal/eDosLocalTables.sql b/eDosLocal/eDosLocalTables.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c8ae38b1acb18f94ab2ffc02d6795def4bb2f0f4
GIT binary patch
literal 55330
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
H7fbX1`S!Of

literal 0
HcmV?d00001

diff --git a/eDosStation/DataInterface.cs b/eDosStation/DataInterface.cs
index 5d23ce2..011ef42 100644
--- a/eDosStation/DataInterface.cs
+++ b/eDosStation/DataInterface.cs
@@ -220,6 +220,7 @@ namespace eDosStation
                 , new System.Data.SqlClient.SqlParameter("ID_Visit",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
                 , new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK",SqlDbType.Decimal,0,System.Data.ParameterDirection.Input,false,10,0,null,System.Data.DataRowVersion.Default,null)
                 , new System.Data.SqlClient.SqlParameter("epdType",SqlDbType.TinyInt,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("InitError",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
                 });
 
             VisitInitConfirmCommand = new System.Data.SqlClient.SqlCommand("[dbo].[VisitInitConfirm]", localConnection) { CommandType = System.Data.CommandType.StoredProcedure };
diff --git a/eDosStation/DecodeResults.cs b/eDosStation/DecodeResults.cs
index 25067ce..1f6325c 100644
--- a/eDosStation/DecodeResults.cs
+++ b/eDosStation/DecodeResults.cs
@@ -33,7 +33,8 @@ namespace eDosStation
             "ReadBaselineCounts", 
             "MfrLogin_R2", 
             "WriteSensitivities_R2", 
-            "WriteAccessLevel", 
+            "WriteAccessLevelAmin",
+            "WriteAccessLevelOpen",
             "WriteQuickAccessDisplays_R3", 
             "WriteDisplayEnables_R3", 
             "WriteDisplayEnablePermissions_R3", 
@@ -45,6 +46,8 @@ namespace eDosStation
                 ,"DestroyReaderInterface" //0=ok
                 ,"Disconnect" , "DisconnectAndNotify" //0=ok
                 ,"StartDiscover","IssueEPD","EnableProtectedSession_R3"
+                ,"CreateReaderInterface" 
+                ,"OpenReader","TestVibe"
         };
 
         private static string GetName(int func)
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index d792334..9e59d53 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -46,8 +46,8 @@
             <!--<StaticResource ResourceKey="tbFooter" />-->
         </StackPanel>
 
-        <TabControl Name="tb" TabStripPlacement="Top"  VerticalAlignment="Center" Padding="-1"   >
-            <TabItem Name="tbEntry" VerticalAlignment="Center"  >
+        <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"  >
@@ -98,7 +98,7 @@
                     <telerik:RadButton Content="OK" Name="bUserRead" Click="BUserRead_Click" Style="{DynamicResource OkCancelButton}" Margin="50,50,50,50"/>
                 </StackPanel>
             </TabItem>
-            <TabItem  Name="tbTask" VerticalAlignment="Top">
+            <TabItem Name="tbTask" VerticalAlignment="Top">
                 <Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -291,8 +291,8 @@
                     </StackPanel>
                 </Grid>
             </TabItem>
-            <TabItem Name="tbEPD" FontSize="25"  >
-                <Grid  DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
+            <TabItem Name="tbEPD" FontSize="25" >
+                <Grid  DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" Margin="0,0,0,218" >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
                         <RowDefinition Height="auto" />
@@ -300,7 +300,7 @@
                         <RowDefinition Height="20" />
                         <RowDefinition Height="auto" />
                     </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Name="panelWait" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical"   >
+                    <StackPanel Grid.Row="0" Name="panelWait" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" Visibility="Collapsed"   >
                         <StackPanel Orientation="Horizontal">
                             <Image Source="/Images/Mannetjet.png" Width="87" HorizontalAlignment="Left"/>
                             <TextBlock Name="tWaitFor" Margin="10,100,10,100" FontWeight="Bold" TextAlignment="Center"  >
@@ -319,6 +319,7 @@
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="auto" />
+                                <RowDefinition Height="5" />
                                 <RowDefinition Height="auto" />
                                 <RowDefinition Height="auto" />
                                 <RowDefinition Height="auto" />
@@ -335,44 +336,41 @@
                                 <ColumnDefinition Width="auto" />
                             </Grid.ColumnDefinitions>
 
-                            <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource tblHeaderLabel}"  >
+                            <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource tblHeaderLabel}" Name="FinalHeader">
                                 <Run>Ready</Run>
                                 <LineBreak/>
                                 <Run Foreground="Green">Please take your EPD</Run>
                                 <LineBreak/>
                             </TextBlock>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Task" Style="{StaticResource tblIssuedLabel}"  />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2">
+
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Task" Style="{StaticResource tblIssuedLabel}"  />
+                            <TextBlock Grid.Row="2" 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="2" Grid.Column="0" Text="Margin" Style="{StaticResource tblIssuedLabel}" TextAlignment="Right"/>
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Margin" Style="{StaticResource tblIssuedLabel}" TextAlignment="Right"/>
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding MinWorkerDosisMargin,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Name="lbHP07" Text="HP07" Style="{DynamicResource sIssuedSubHeader}" />
+                            <TextBlock Grid.Row="4" Grid.Column="2" Name="lbHP10" Text="HP10" Style="{DynamicResource sIssuedSubHeader}" />
 
-                            <TextBlock Grid.Row="3" Grid.Column="1" Name="lbHP07" Text="HP07" Style="{DynamicResource sIssuedSubHeader}" />
-                            <TextBlock Grid.Row="3" Grid.Column="2" Name="lbHP10" Text="HP10" Style="{DynamicResource sIssuedSubHeader}" />
+                            <TextBlock Grid.Row="5" Grid.ColumnSpan="2" Grid.Column="1" Text="Doses (µSv)" Style="{DynamicResource sIssuedSubHeader}" TextAlignment="Center"/>
+                            <TextBlock Grid.Row="6" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
+                            <TextBlock Grid.Row="6" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}"  Style="{StaticResource tblIssuedValue}" />
 
-                            <TextBlock Grid.Row="4" Grid.ColumnSpan="2" Grid.Column="1" Text="Doses (µSv)" Style="{DynamicResource sIssuedSubHeader}" TextAlignment="Center"/>
-
-                            <TextBlock Grid.Row="5" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
-                            <TextBlock Grid.Row="5" Grid.Column="2" Text="{Binding Hp10Dose1,Mode=OneWay,StringFormat={}{0:0.00}}"  Style="{StaticResource tblIssuedValue}" />
-
-                            <TextBlock Grid.Row="6" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
-                            <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
-                            <TextBlock Grid.Row="6" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
-
-                            <TextBlock Grid.Row="7" Grid.ColumnSpan="2" Text="Rates (µSv/h)" Style="{DynamicResource sIssuedSubHeader}" Grid.Column="1" />
-                            <TextBlock Grid.Row="8" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
-                            <TextBlock Grid.Row="8" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}"  Style="{StaticResource tblIssuedValue}" />
-
-                            <TextBlock Grid.Row="9" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
-                            <TextBlock Grid.Row="9" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
-                            <TextBlock Grid.Row="9" Grid.Column="2" Text="{Binding HP10Rate2ON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
+                            <TextBlock Grid.Row="7" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
+                            <TextBlock Grid.Row="7" Grid.Column="1" Text="{Binding Hp07Dose,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
+                            <TextBlock Grid.Row="7" Grid.Column="2" Text="{Binding Hp10Dose2,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
 
+                            <TextBlock Grid.Row="8" Grid.ColumnSpan="2" Text="Rates (µSv/h)" Style="{DynamicResource sIssuedSubHeader}" Grid.Column="1" />
+                            <TextBlock Grid.Row="9" Grid.Column="0" Text="Low alarm" Style="{StaticResource tblIssuedLabel}"/>
+                            <TextBlock Grid.Row="9" Grid.Column="2" Text="{Binding HP10Rate1ON,Mode=OneWay,StringFormat={}{0:0.00}}"  Style="{StaticResource tblIssuedValue}" />
 
+                            <TextBlock Grid.Row="10" Grid.Column="0" Text="High alarm" Style="{StaticResource tblIssuedLabel}"/>
+                            <TextBlock Grid.Row="10" Grid.Column="1" Text="{Binding HP07RateON,Mode=OneWay,StringFormat={}{0:0.00}}" Style="{StaticResource tblIssuedValue}"/>
+                            <TextBlock Grid.Row="10" 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">
@@ -383,7 +381,7 @@
                     <TextBlock Grid.Row="4" FontSize="25"  Name="statusEPD" Text="waiting" HorizontalAlignment="Center" TextAlignment="Center" />
                 </Grid>
             </TabItem>
-            <TabItem  Name="tbNotAllowed">
+            <TabItem Name="tbNotAllowed">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="300" />
@@ -395,7 +393,6 @@
                 <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>
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 64850f7..fd18034 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -239,17 +239,18 @@ namespace eDosStation
                     dataInterface.VisitInitCommand.Parameters["ENTRY_EPD_CLOCK"].Value = ep.CountsClock;
                     dataInterface.VisitInitCommand.Parameters["epdType"].Value = (byte)ep.epdType;
                     dataInterface.VisitInitCommand.Parameters["EPDVisitID"].Value = 0;
-                    using (var l = new SqlLog())
-                        try
-                        {
-                            dataInterface.VisitInitCommand.ExecuteNonQuery();
-                            l.LogCommand(dataInterface.VisitInitCommand);
-                        }
-                        catch (System.Exception ex)
-                        {
-                            l.LogCommand(ex.Message);
-                            MessageBox.Show(ex.Message);
-                        }
+                    dataInterface.VisitInitCommand.Parameters["InitError"].Value = 0;
+                    //using (var l = new SqlLog())
+                    //    try
+                    //    {
+                    //        dataInterface.VisitInitCommand.ExecuteNonQuery();
+                    //        l.LogCommand(dataInterface.VisitInitCommand);
+                    //    }
+                    //    catch (System.Exception ex)
+                    //    {
+                    //        l.LogCommand(ex.Message);
+                    //        MessageBox.Show(ex.Message);
+                    //    }
                     //StationVisitID = (int?)dataInterface.VisitInitCommand.Parameters["EPDVisitID"].Value;
                     StationVisitID = ID_Visit * 100 + thisStation.ID_Station;
                     //co.Close();
@@ -318,6 +319,7 @@ namespace eDosStation
                     if (!CurTaskRow.IsChirpRateNull()) ChirpRate = (int)CurTaskRow.ChirpRate;
 
                     //doing stuff on EPD
+                    
                     int rv = ep.IssueAndCheck(gain, ChirpRate, thisStation.WriteConfig);
 
                     if (rv != 0 || thisStation.LogAll || ep.HasStepError())
@@ -330,28 +332,50 @@ namespace eDosStation
                     lbHP07.Text = ep.Hp07Name;
                     lbHP10.Text = ep.Hp10Name;
 
-                    if (rv != 0)
+                    if (ep.EPDIssued)
                     {
-                        MessageBox.Show($"SetIssued error {rv}");
-                        step = "SqlConfirmVisit";
-                        dataInterface.VisitInitConfirmCommand.Connection = co;
-                        dataInterface.VisitInitConfirmCommand.Parameters["ID_Station"].Value = thisStation.ID_Station;
-                        dataInterface.VisitInitConfirmCommand.Parameters["ID_Visit"].Value = ID_Visit;
-                        dataInterface.VisitInitConfirmCommand.Parameters["InitError"].Value = rv;
-                        try
+                        using (var l = new SqlLog())
                         {
-                            dataInterface.VisitInitConfirmCommand.ExecuteNonQuery();
-                            //l.LogCommand(dataInterface.VisitInitCommand);
-                        }
-                        catch (System.Exception ex)
-                        {
-                            //l.LogCommand(ex.Message);
-                            MessageBox.Show(ex.Message);
-                            thisStation.splunkLog.WriteException(module, step, ex);
+                            try
+                            {
+                                dataInterface.VisitInitCommand.Parameters["InitError"].Value = rv;
+                                dataInterface.VisitInitCommand.ExecuteNonQuery();
+                                l.LogCommand(dataInterface.VisitInitCommand);
+                            }
+                            catch (System.Exception ex)
+                            {
+                                l.LogCommand(ex.Message);
+                                thisStation.splunkLog.WriteException(module, step, ex);
+                                MessageBox.Show(ex.Message);
+                            }
+
+                            //if (rv != 0)
+                            //{
+                            //    MessageBox.Show($"SetIssued error {rv}");
+                            //    step = "SqlConfirmVisit";
+                            //    dataInterface.VisitInitConfirmCommand.Connection = co;
+                            //    dataInterface.VisitInitConfirmCommand.Parameters["ID_Station"].Value = thisStation.ID_Station;
+                            //    dataInterface.VisitInitConfirmCommand.Parameters["ID_Visit"].Value = ID_Visit;
+                            //    dataInterface.VisitInitConfirmCommand.Parameters["InitError"].Value = rv;
+                            //    try
+                            //    {
+                            //        dataInterface.VisitInitConfirmCommand.ExecuteNonQuery();
+                            //        //l.LogCommand(dataInterface.VisitInitCommand);
+                            //    }
+                            //    catch (System.Exception ex)
+                            //    {
+                            //        //l.LogCommand(ex.Message);
+                            //        MessageBox.Show(ex.Message);
+                            //        thisStation.splunkLog.WriteException(module, step, ex);
+                            //        l.LogCommand(ex.Message);
+                            //    }
+                            //}
                         }
                     }
+                    else
+                        MessageBox.Show("No registration",string.Empty,MessageBoxButton.OK,MessageBoxImage.Error);
                     co.Close();
-                    ShowFinal();
+                    ShowFinal(rv);
                 }
             }
             else
@@ -369,8 +393,27 @@ namespace eDosStation
                                                   new Action(delegate { }));
         }
 
-        private void ShowFinal()
+
+        private void ShowFinal(int ReturnValue)
         {
+            Run run;
+            FinalHeader.Inlines.Clear();
+            if (ReturnValue == 0) {
+                FinalHeader.Inlines.Add(Properties.Resources.FinalEpdOkHeader); 
+                FinalHeader.Inlines.Add(new LineBreak());
+                run = new Run(Properties.Resources.FinalEpdOkSecond);
+                run.Foreground = System.Windows.Media.Brushes.Green;
+                run.Background= System.Windows.Media.Brushes.White;
+                FinalHeader.Inlines.Add(run);
+            } else {
+                FinalHeader.Inlines.Add(Properties.Resources.FinalEpdNotOkHeader);
+                FinalHeader.Inlines.Add(new LineBreak());
+                run = new Run(Properties.Resources.FinalEpdNotOkSecond);
+                run.Foreground = System.Windows.Media.Brushes.Red;
+                run.Background = System.Windows.Media.Brushes.Yellow;
+                FinalHeader.Inlines.Add(run);
+            }
+
             FinalTimeOut = false;
             dispatcherTimer = new DispatcherTimer(DispatcherPriority.Background);
             dispatcherTimer.Interval = thisStation.InfoProgressbarInterval;
@@ -378,7 +421,7 @@ namespace eDosStation
             ResultTime = DateTime.Now.AddSeconds(thisStation.InfoScreenTimeout);
             pWaitEpd.Value = pWaitEpd.Maximum = thisStation.InfoScreenTimeout;
             pWaitEpd.Visibility = Visibility.Visible;
-            tWaitFor.Text = "EPD Ready ";
+         
             panelWait.Visibility = Visibility.Collapsed;
             panelDone.Visibility = Visibility.Visible;
             bEpdCancel.Content = "OK"; bEpdCancel.IsEnabled = true;
diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs
index e2a98b7..df5640e 100644
--- a/eDosStation/MainWindow.xaml.cs
+++ b/eDosStation/MainWindow.xaml.cs
@@ -27,7 +27,7 @@ namespace eDosStation
         {
             string ers = string.Empty;
             
-            if (thisStation.RestartCom && (thisStation.RestartComFirst == true))
+            if (thisStation.RestartCom && thisStation.RestartComFirst )
             {
                 thisStation.DeviceRestart();
             }
@@ -35,7 +35,7 @@ namespace eDosStation
             var w = new ShowEPDDose(thisStation);
             w.ShowDialog();
             
-            if (thisStation.RestartCom && (thisStation.RestartComFirst == true))
+            if (thisStation.RestartCom && !thisStation.RestartComFirst )
             {
                 thisStation.DeviceRestart();
             }
@@ -49,7 +49,7 @@ namespace eDosStation
             string step = "DeviceRestart";
             try
             {
-                if (thisStation.RestartCom && (thisStation.RestartComFirst == true))
+                if (thisStation.RestartCom && thisStation.RestartComFirst)
                 {
                     thisStation.DeviceRestart();
                 }
@@ -77,7 +77,7 @@ namespace eDosStation
             step = "DeviceReset2";
             try
             {
-                if (thisStation.RestartCom && !(thisStation.RestartComFirst == true))
+                if (thisStation.RestartCom && !thisStation.RestartComFirst)
                 {
                     thisStation.DeviceRestart();
                 }
@@ -104,7 +104,7 @@ namespace eDosStation
 #endif
             w.ShowDialog();
             w = null;
-            if (thisStation.RestartCom && !(thisStation.RestartComFirst))
+            if (thisStation.RestartCom && !thisStation.RestartComFirst)
             {
                 ers = thisStation.DeviceRestart();
             }
diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs
index b3f6de5..7cf8c82 100644
--- a/eDosStation/Properties/AssemblyInfo.cs
+++ b/eDosStation/Properties/AssemblyInfo.cs
@@ -58,5 +58,8 @@ using System.Windows;
 //2.22 No clear bij deissue.
 //2.27 Display wait while issuing
 //2.28 After testing 
-[assembly: AssemblyVersion("2.28.0.0")]
-[assembly: AssemblyFileVersion("2.28.0.0")]
+//2.29 Met endcom
+//2.30 check reset voor OF na EPD verbinding
+//2.31 extra disconnect/connect
+[assembly: AssemblyVersion("2.31.0.0")]
+[assembly: AssemblyFileVersion("2.31.0.0")]
diff --git a/eDosStation/Properties/Resources.Designer.cs b/eDosStation/Properties/Resources.Designer.cs
index 9eec954..0e7533d 100644
--- a/eDosStation/Properties/Resources.Designer.cs
+++ b/eDosStation/Properties/Resources.Designer.cs
@@ -61,7 +61,7 @@ namespace eDosStation.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Thu 05/16/2024 15:48:58.18 
+        ///   Looks up a localized string similar to Wed 09/11/2024 10:46:38.88 
         ///.
         /// </summary>
         internal static string BuildDate {
@@ -69,5 +69,43 @@ namespace eDosStation.Properties {
                 return ResourceManager.GetString("BuildDate", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to EPD Failed !.
+        /// </summary>
+        internal static string FinalEpdNotOkHeader {
+            get {
+                return ResourceManager.GetString("FinalEpdNotOkHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please try again
+        ///.
+        /// </summary>
+        internal static string FinalEpdNotOkSecond {
+            get {
+                return ResourceManager.GetString("FinalEpdNotOkSecond", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to EPD Ready.
+        /// </summary>
+        internal static string FinalEpdOkHeader {
+            get {
+                return ResourceManager.GetString("FinalEpdOkHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please take your EPD
+        ///.
+        /// </summary>
+        internal static string FinalEpdOkSecond {
+            get {
+                return ResourceManager.GetString("FinalEpdOkSecond", resourceCulture);
+            }
+        }
     }
 }
diff --git a/eDosStation/Properties/Resources.resx b/eDosStation/Properties/Resources.resx
index 8a639f7..5c445af 100644
--- a/eDosStation/Properties/Resources.resx
+++ b/eDosStation/Properties/Resources.resx
@@ -121,4 +121,18 @@
   <data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="FinalEpdNotOkHeader" xml:space="preserve">
+    <value>EPD Failed !</value>
+  </data>
+  <data name="FinalEpdNotOkSecond" xml:space="preserve">
+    <value>Please try again
+</value>
+  </data>
+  <data name="FinalEpdOkHeader" xml:space="preserve">
+    <value>EPD Ready</value>
+  </data>
+  <data name="FinalEpdOkSecond" xml:space="preserve">
+    <value>Please take your EPD
+</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt
index 72ec4f5..48fce2d 100644
--- a/eDosStation/Resources/BuildDate.txt
+++ b/eDosStation/Resources/BuildDate.txt
@@ -1 +1 @@
-Mon 09/09/2024 10:26:16.80 
+Wed 09/11/2024 13:50:26.43 
diff --git a/eDosStation/Settings.xaml b/eDosStation/Settings.xaml
index accee93..ec269b9 100644
--- a/eDosStation/Settings.xaml
+++ b/eDosStation/Settings.xaml
@@ -6,10 +6,10 @@
         xmlns:local="clr-namespace:eDosStation"
         xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
         mc:Ignorable="d"
-        Title="Settings" Height="448.033" Width="702.744" 
+        Title="Settings" Height="479.533" Width="702.744" 
         FontFamily="Segoe UI" FontSize="20" 
         Loaded="Window_Loaded">
-    <Grid >
+    <Grid Margin="0,0,0,-21" >
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
diff --git a/eDosStation/cDevCon.cs b/eDosStation/cDevCon.cs
index 11766fe..e5740dc 100644
--- a/eDosStation/cDevCon.cs
+++ b/eDosStation/cDevCon.cs
@@ -44,7 +44,8 @@ namespace eDosStation
                     if (System.IO.File.Exists(DevConExePath)) hasCommand = true;
                 }
             }
-            else spl?.WriteSplunkLog(className, cspl.iseverity.warning, "No Admin");
+            else 
+                spl?.WriteSplunkLog(className, cspl.iseverity.warning, "No Admin");
         }
         private string ExecuteDevcon(string command)
         {
diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1
index af80787..51f2a23 100644
--- a/scripts/Upgrader.ps1
+++ b/scripts/Upgrader.ps1
@@ -213,17 +213,17 @@ exit
 # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
 # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MDkwOTA4NDJaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz
-# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgAvDFz5Vo34
-# 2MO+GnnnzbqXIY3Lsho9iLPCjIl6OkJbH4HbzvU5UUEo2fGVsnINfIfOVN+slEal
-# 9dpPaFdpczYf9zEGxPYpOumWqRdIY8Xl550IF5S834PiAMzlMAu7iwjDjEspk7bG
-# wcxKI+DdSdru4Uj88gbJWWYbt0967R7bi6TmFzuYC38g4sknmq9AklgykrtypG+I
-# inlzP3iorB9m3IfD3PmG7Rqp1qAsai4aXvyzEpM8SD/HNYlXyWa5/2GbqX3Qjhd6
-# XtSqFsRfZcDThGpbi53I0LxbRYc5mWUpOgCbFq3u/fWmqJ2MYQXbmP2p0zkGu4jL
-# w3l7ENgL1gGJfralDftUr+UN6tjAuUtPoV3h5tvnr22EjX+Hs8g44dXtL4FN/pfL
-# wkDvPLSBjhxoaND0/i4IzgAwWPaVuLWTSUDaZaBnxPskpfavhyT+a0V7RUutv2NZ
-# FULkI2AnX0fs8kF5XIy1K0WEAM5cyMvhD4PlZm6orNlFZI79WQ2BzDrBqUrtWQs7
-# PddaEKi+fckABsYeV9AaGsfpbt5WsUHTG8fBK4ZL3Z5saCFgc90ZxdRf+XKwwtTL
-# FqMom33K3eSpMKabSMYAI2kNGVvMWP3HnfSpqAcKsZy7dNYG25ljZkVZKmF5JV9G
-# 2951cTy1Qfx/bm2EKcXM3J2uFM5DfpPalA==
+# DQEJBTEPFw0yNDA5MTExMTUwNDNaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz
+# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgCdOGquU2OU
+# Q2fyo4YjFnW1g0vehLEpsMqn4snKEefbFcWDaEVlB+6+md4HrStpfx9de5woy+yQ
+# EdEI6CXC4FBu/vDo9kocHE2RGPNKBmXfBnVHX8G0VhyyjsqePymv9LpcM18IRgpf
+# nAgBEPIeQPLc132O2iCBKr1P8/y1kuY5QbG8e5hkLP5rk6ZB5Nw5eId1oy/vMTs3
+# DEOiIaO4Cgbguxp5z4xJ2x4xXO0rYC4NP4DYAMIEUdr2TbqR0DpfibMqandsV/dK
+# Dr6MSW4G6nTkEyo+QVh+xfmgFjO+RaQwYLfIXKfuwP6W7k+nhKCNKMYRoAyjqrsC
+# Lp/Y2WIS498FLt8qGBXOK4aTEbwCcM799m8qIKnPF2l034Y/mkjaG8G1l4xl25SA
+# ITWdQdBe0NQTJ0IXRX+PLejQbQlIe/tSdAMLlSYc1+MddMi+Qf1XB5IhqORDsRUL
+# KKc9IqhOhZDoyBwkRxWse8lqN0mioOwHUnrlv2lTDDivkaXckuzC7pPLdFAmTHxo
+# cwuMd+I2VmLgH2U7x5lALCSuPt9fbNAxvprHUTHniZVrtNH8EcCZXWs6puAgawDI
+# LNCVc78XsA510FxdJJec+XDmx3XrC/OVP9d8H51QAzZVCak0z+tZSifHyErb19LL
+# On+wO7ZduMmE9xHuwyZsuasFK1IXkxgH5w==
 # SIG # End signature block
diff --git a/scripts/installatie.ps1 b/scripts/installatie.ps1
index 8c342a5..af8bf58 100644
--- a/scripts/installatie.ps1
+++ b/scripts/installatie.ps1
@@ -328,17 +328,17 @@ exit
 # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
 # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MDkwOTA4NDJaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u
-# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgANDH5u1OSV
-# cJXiELrSQ0jqn+XQjgAPQMtzrKQA3ukod36kbfHudvnp1YlOTffz3LsAayEXf9Wv
-# HxyAF+RDHBFjcQuQRgye5HhOWNphB7xfFbMFgjQtC7pgH7vSCqqS42Zh4h9PlQCx
-# i4AfLS78d6W40Thf5ZS5TCtPE9+FjMxwOE6/4rVp0xMT1EVa6KCKczP6z9mLOVA9
-# O9CYau+9l2s3dbOHPMRYU9HPGkn6ilziy2K2skVeUuRB8bbxEFoKpcIWt7720mQ5
-# Irsw8ByyYLjNSJkCnO0nZc2xaNrHgScimeCfpQY3wIUwVV/62LMIAYLID47Xvm4h
-# kBjlhgO6fKcsrowiTbtCZLZtlZNBpjX7KBrFYLsFPCKWRS3mx7/jgdgoIs5Jr0dD
-# BGt6GYOIaapVqKvEk7p0YSpJ+tuNuz1V9jM6Yd1LmhqqeY1sJTTW058pU3DhMa9J
-# g/s9VCUaT/L51NPwnghM54l7flsjMG3RWhySONatjnQeLIwAt50iVpKrrQpGuZIR
-# WAacqX7HuGuPUWWZbKgwfaRtwUB6n6ArTqMh45AqZDzBAgSVU1UZUd52khO+GwR0
-# yucq9tFyys+iKQc4aXcHOaCvuAdbIxoQbv+3FGW0wUL2syI0/03TV/+sxOe9OlW0
-# gIyTzYLvf/X1/sTlkFHCtPZmnIrTyVRxbA==
+# DQEJBTEPFw0yNDA5MTExMTUwNDNaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u
+# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgBVDloKj3Yf
+# n7yhN54T1PZ1nKLtvU5/k4jYu5LOQzopTJJJqE9vzLLOLLhw0MlieXsuoXBDdijX
+# nA6SwUsP+eJFoQlXhAQtjEbAM7CPCNou3sGxo5tAG3RpF3N9Aq2KISXO06vtyAq+
+# 7ISuD/3omQ31Ub8g0kOvvEBb2mZaLXT84G2BYI9asyhVmYEFG4Qq4ufSm04gWUxB
+# w2KAWni3czEg6h1e5a3HzZeylYBYMVRZlbbjRYL+tdSgDX6Lfq4b/kWGRKdhdnWH
+# cloLsXREiWaD8k0EamjPWD7Sl/wFv8reyZCBLdRTmOaPxdUxeeyhdaD6qsExDnUD
+# YXiwCMGRQ+zR/zUlsHObK3igwISU2/XUs1JaDav58lP+jV+MFb5deHL+I50KYdZH
+# /4GiYRQnsZzUHuDkycay9iFSZss9WAxdEfXilnZI7rPNRVcIzTd60Rq3mIdtQXEn
+# 3zkmcCTQq4MB2O50I9fHUGT6q3SgUE4vACSqx8VdnmgWXjTnVCglNw1dYKC9FMr0
+# AAUx+Ao6pKxc+HPfln2D3Oi12ChCmIpkyq6FCU9QgshyKiYNuwDa0YX+P3EfGWct
+# vrUb0qgQA+QrnIESLN74WMDkjJpKcbr3sfOX+8hnTkQUfBv+75Ib/Vi2PalMCUFs
+# PSOnDjh++ps5WMcZ0rNM6AnZRZ11bXKeyQ==
 # SIG # End signature block
diff --git a/scripts/installatie2.ps1 b/scripts/installatie2.ps1
index 094c613..d1d1516 100644
--- a/scripts/installatie2.ps1
+++ b/scripts/installatie2.ps1
@@ -192,17 +192,17 @@ exit
 # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
 # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MDkwOTA4NDJaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp
-# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgCNlSoY6fdc
-# g6JHWpkvaNL5I5tHlHg5mXiy9aWHLNT6vWVke6fBNDLpfiRp7JjoPiBA0sWXh563
-# Vb0xjsJbW3ubDegN6jG+TbD5AH0vFXyANmVGjw8Mi4ylMMCw4QXvNo83QSQDttk7
-# ykJaYnk+DPAbU0h2/NWvkRK4y2kBGdOjTjkp4ZKubc/0rsiJg4EOnsvMz12+GNiT
-# frMAGcuix6kUe6IqdS0PjnNp8ne7oN2Nb2AuyJt944VBfVh518xPPDEtbeT2pR7X
-# 6P521k2fkOQZZpuZE/PzPSXyZ/1qB8UDbteTOpNEMKuEKy0wrIyxQf3C/mldAerW
-# 39YVgAjSCCcNW0IKF9ndLq+0xH3Ie9WppP3rvx4t9Xu1Ypq8HsrfwAMG+W1lern4
-# zVCDsGPvl0HHeHHX7ZAKqNpMmkl0oAvO+KXs1VMK7EcM80MSUwzNRfHZURAlcC08
-# j4QIt1kPqGnsKrWeMk0I6Wk81FgOJY27QG+ms4utIbbKVAFiPGXS7QcIXfFKDdu+
-# VsaBfr9SSGQj/LYBupJIbhfRHyTt8A9M2svNYvliiG+sJGtxYGhLLjMRwDCIBAAV
-# DiXSiys+jpF9yKNl7jSMjQM18u2lnKa9ZU0KB24Q244Fkjli3suRoVHU14UltG2q
-# gmuXlJyR/K7fBS1/gQ7nBuDu6WyTdKNVmg==
+# DQEJBTEPFw0yNDA5MTExMTUwNDNaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp
+# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgBuJTD9TYOz
+# QLhMKqUMcdjaOt5sPzOp10XEmwiUgAHGxTSkhsuMyfuDMblGrOPOwRgcgiJBzDur
+# AwqHknWsPr3DN3VFwXKBAudJfcj1C+iMWIhDdHT4kVHpDJWjropSL0D9Y64UUAGc
+# E/8rBldSffjSxWgsgpSFaAwZTEBHCI3XUg3yaQvIiEj3X4BVY51sin+mrxpOSIc0
+# Lz3ZtK92x8G+7mFo5/Vu+ztskVGqL1qZoFH1Igu5GynAx13ob4hjnirotzNlxP6m
+# anjirjCn127GGBwttrSgIAkp+kVkU3QIurE2jfV7G4/+QmAO6bQB1jX3kWzgJFxq
+# 9SUcRavTIBh7hK2Bk+5sAFUHgPaTVLOHWbsUGOs4nudBem+Y14+zDg7hgwtPMca6
+# XKsZ03t4seH+AjfJBNfrPgVpp1hyZy9Zww7SNIcdkYmYd6UA7Zn9JtMj7ILnRcbL
+# RYLP1Caq3+PmG2v5pOgoVjzpcTtfOztFLdrh0WOUWJpoRiQBd2AEWhGNuor2LUkF
+# 4M5KuMVoYZysX/hFXnRJiKHVtybu7LvlUg53TuPN34TAyA78ORM3upYRJ8zD+oY1
+# igE6ReWNGSqHNoR73SNfjcBo8k4DnMNDlg3/K1U9SPhFILGGanmGKM4iEP+sUqxJ
+# HLW92mevPa0g1JJaWnNnsnfQqXFOoNktEQ==
 # SIG # End signature block
diff --git a/syncEdosLocal/Program.cs b/syncEdosLocal/Program.cs
index 2b30403..5dbbe3f 100644
--- a/syncEdosLocal/Program.cs
+++ b/syncEdosLocal/Program.cs
@@ -154,6 +154,8 @@ namespace syncEdosLocal
         }
         public static bool DoorloopToDo(System.Data.SqlClient.SqlConnection fromConnection, string toConstr, System.Data.SqlClient.SqlInfoMessageEventHandler im, ref bool error, ref bool warning)
         {
+            int ciIgnoreError = -1;
+            bool ignorederror = false;
             ds = new DataSet();
             DataTable dtTables = new DataTable("Tables");
             ds.Tables.Add(dtTables);
@@ -164,6 +166,8 @@ namespace syncEdosLocal
                 {
                     spLog.KvClear();
                     cmd.CommandType = CommandType.StoredProcedure;
+                    SqlParameter pa = new SqlParameter("@withIgnoreError", true);
+                    cmd.Parameters.Add(pa);
                     spLog.KvAddCommand(spl.skeys.sqlQuery, cmd);
                     using (var ncta = new System.Data.SqlClient.SqlDataAdapter(cmd))
                     {
@@ -171,6 +175,7 @@ namespace syncEdosLocal
                         {
                             ncta.Fill(dtTables);
                             int r = dtTables.Rows.Count;
+                            ciIgnoreError = dtTables.Columns.IndexOf("ignoreError");
                             spLog.KvAdd(spl.skeys.recordsAffected, r);
                             spLog.WriteSplunkLog(string.Empty, spl.iseverity.info, "LoadTables");
                         }
@@ -230,6 +235,7 @@ namespace syncEdosLocal
 
                             foreach (DataRow rtr in dtTables.Rows)
                             {
+
                                 ucmd.Parameters["OBJECT_ID"].Value = (int)rtr[0];
                                 string src = rtr[1].ToString();
                                 dest = rtr[2].ToString();
@@ -277,11 +283,19 @@ namespace syncEdosLocal
                                 int cnt = 0;
                                 qry = LSWLib.SqlCommands.getColumnsQry(fromConnection, src);
                                 SqlConnection[] curDests = new SqlConnection[] { toConnection };
+                                System.Diagnostics.Debug.WriteLine(Task);
+                                ignorederror = false;
                                 cnt = Bulker.Execute(Task, fromConnection, curDests, qry, CommandType.Text, dest, 0, ref error);
                                 ucmd.Parameters["lastRecords"].Value = cnt;
                                 if (dest.Contains("PersonInfo"))
                                     Result.Persons = cnt;
                                 else if (dest.Contains("TaskInfo")) Result.Tasks = cnt;
+                                if (error && ciIgnoreError >= 0 && rtr[ciIgnoreError] is bool && (bool)rtr[ciIgnoreError])
+                                {
+                                    error = false;
+                                    ignorederror = true;
+                                    spLog.WriteSplunkLog(string.Empty, spLog.splunkSeverity, "ignored", Task);
+                                }
 
                                 if (sqlCmdsActivate != null)
                                     using (var cmd = new System.Data.SqlClient.SqlCommand(sqlCmdsActivate.ToString(), toConnection))
@@ -306,7 +320,7 @@ namespace syncEdosLocal
                                             spLog.WriteSplunkLog(string.Empty, spLog.splunkSeverity, "constraintsActivated", spLog.splunkError);
                                         }
                                     }
-                                ucmd.Parameters["syncError"].Value = error;
+                                ucmd.Parameters["syncError"].Value = error | ignorederror;
                                 ucmd.ExecuteNonQuery();
                                 if (error) break;
                             }
@@ -516,43 +530,43 @@ namespace syncEdosLocal
             try
             {
                 cr["ReturnTime"] = lr["ReturnTime"];
-            cr["Hp10Dose"] = lr["Hp10Dose"];
-            cr["Hp07Dose"] = lr["Hp07Dose"];
-            cr["Hp10Total"] = lr["Hp10Total"];
-            cr["Hp07Total"] = lr["Hp07Total"];
-            cr["Hp10Peak"] = lr["Hp10Peak"];
-            cr["Hp07Peak"] = lr["Hp07Peak"];
-            cr["Hp10Time"] = lr["Hp10Time"];
-            cr["Hp07Time"] = lr["Hp07Time"];
-            cr["QualityData"] = lr["QualityData"];
-            cr["K1"] = lr["K1"];
-            cr["K2"] = lr["K2"];
-            cr["K3"] = lr["K3"];
-            cr["K4"] = lr["K4"];
-            cr["K5"] = lr["K5"];
-            cr["K6"] = lr["K6"];
-            cr["SG"] = lr["SG"];
-            cr["BC"] = lr["BC"];
-            cr["FB"] = lr["FB"];
-            cr["HG"] = lr["HG"];
-            cr["alarmStatus"] = lr["alarmStatus"];
-            cr["otherAlarms"] = lr["otherAlarms"];
-            cr["errorStatus"] = lr["errorStatus"];
-            cr["operatingStatus"] = lr["operatingStatus"];
-            cr["isAlarm"] = lr["isAlarm"];
-            cr["isAlarmCleared"] = lr["isAlarmCleared"];
-            cr["ENTRY_EPD_CLOCK"] = lr["ENTRY_EPD_CLOCK"];
-            cr["EXIT_EPD_CLOCK"] = lr["EXIT_EPD_CLOCK"];
-            cr["TIME_LOST"] = lr["TIME_LOST"];
-            cr["eDosBatteryWarning"] = lr["eDosBatteryWarning"];
-            cr["eDosDose07Warning"] = lr["eDosDose07Warning"];
-            cr["eDosDose07Alarm"] = lr["eDosDose07Alarm"];
-            cr["eDosRate07Warning"] = lr["eDosRate07Warning"];
-            cr["eDosRate07Alarm"] = lr["eDosRate07Alarm"];
-            cr["eDosDose10Warning"] = lr["eDosDose10Warning"];
-            cr["eDosDose10Alarm"] = lr["eDosDose10Alarm"];
-            cr["eDosRate10Warning"] = lr["eDosRate10Warning"];
-            cr["eDosRate10Alarm"] = lr["eDosRate10Alarm"];
+                cr["Hp10Dose"] = lr["Hp10Dose"];
+                cr["Hp07Dose"] = lr["Hp07Dose"];
+                cr["Hp10Total"] = lr["Hp10Total"];
+                cr["Hp07Total"] = lr["Hp07Total"];
+                cr["Hp10Peak"] = lr["Hp10Peak"];
+                cr["Hp07Peak"] = lr["Hp07Peak"];
+                cr["Hp10Time"] = lr["Hp10Time"];
+                cr["Hp07Time"] = lr["Hp07Time"];
+                cr["QualityData"] = lr["QualityData"];
+                cr["K1"] = lr["K1"];
+                cr["K2"] = lr["K2"];
+                cr["K3"] = lr["K3"];
+                cr["K4"] = lr["K4"];
+                cr["K5"] = lr["K5"];
+                cr["K6"] = lr["K6"];
+                cr["SG"] = lr["SG"];
+                cr["BC"] = lr["BC"];
+                cr["FB"] = lr["FB"];
+                cr["HG"] = lr["HG"];
+                cr["alarmStatus"] = lr["alarmStatus"];
+                cr["otherAlarms"] = lr["otherAlarms"];
+                cr["errorStatus"] = lr["errorStatus"];
+                cr["operatingStatus"] = lr["operatingStatus"];
+                cr["isAlarm"] = lr["isAlarm"];
+                cr["isAlarmCleared"] = lr["isAlarmCleared"];
+                cr["ENTRY_EPD_CLOCK"] = lr["ENTRY_EPD_CLOCK"];
+                cr["EXIT_EPD_CLOCK"] = lr["EXIT_EPD_CLOCK"];
+                cr["TIME_LOST"] = lr["TIME_LOST"];
+                cr["eDosBatteryWarning"] = lr["eDosBatteryWarning"];
+                cr["eDosDose07Warning"] = lr["eDosDose07Warning"];
+                cr["eDosDose07Alarm"] = lr["eDosDose07Alarm"];
+                cr["eDosRate07Warning"] = lr["eDosRate07Warning"];
+                cr["eDosRate07Alarm"] = lr["eDosRate07Alarm"];
+                cr["eDosDose10Warning"] = lr["eDosDose10Warning"];
+                cr["eDosDose10Alarm"] = lr["eDosDose10Alarm"];
+                cr["eDosRate10Warning"] = lr["eDosRate10Warning"];
+                cr["eDosRate10Alarm"] = lr["eDosRate10Alarm"];
             }
             catch (System.Exception ex)
             {
@@ -581,6 +595,6 @@ namespace syncEdosLocal
         {
             spLog?.Connection_InfoMessageLog(e, ref messages);
         }
-       
+
     }
 }