diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp index f46dff2..4063465 100644 --- a/EpdBase/EpdBase.cpp +++ b/EpdBase/EpdBase.cpp @@ -340,6 +340,15 @@ WORD EpdBase::Epd2U::ReadDoses() return CommitRV; } + +WORD EpdBase::Epd2U::PrepareForIssue() +{ + CommitRV = ClearDose(); + if (CommitRV) CommitRV = ClearTotalDose(); + if (CommitRV) CommitRV = ClearPeakRates(); + if (CommitRV) CommitRV = Commit(); + return CommitRV; +} WORD EpdBase::Epd2U::DeIssue() { ClearDoseRV = ClearTotalDoseRV = ClearPeakRatesRV = DeIssueEpdRV = 0; diff --git a/EpdBase/EpdBase.h b/EpdBase/EpdBase.h index d11fa2d..7145648 100644 --- a/EpdBase/EpdBase.h +++ b/EpdBase/EpdBase.h @@ -220,6 +220,8 @@ namespace EpdBase WORD ReadTresHolds(); WORD ReadDoses(); + WORD PrepareForIssue(); + WORD DeIssue(); WORD Issue(); diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp index 8f0adf9..851f9e3 100644 --- a/EpdBaseClr/EpdBaseClr.cpp +++ b/EpdBaseClr/EpdBaseClr.cpp @@ -117,6 +117,11 @@ int EpdBaseClr::Epd2::SetDeIssued() return epd->DeIssue(); } +int EpdBaseClr::Epd2::PrepareForIssue() +{ + return epd->PrepareForIssue(); +} + int EpdBaseClr::Epd2::SetIssued() { diff --git a/EpdBaseClr/EpdBaseClr.h b/EpdBaseClr/EpdBaseClr.h index 522a198..61c4df5 100644 --- a/EpdBaseClr/EpdBaseClr.h +++ b/EpdBaseClr/EpdBaseClr.h @@ -101,6 +101,8 @@ namespace EpdBaseClr { int SetIssued(); + + int PrepareForIssue(); int WriteCalibration(); int ReadTresholds(); diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs index 921dc9a..7aa0d94 100644 --- a/eDosStation/EntryBadge.xaml.cs +++ b/eDosStation/EntryBadge.xaml.cs @@ -63,7 +63,7 @@ namespace eDosStation return false; } bool isBG = (ep.epdType == 0); - if (isBG && !CurTaskRow.EPDRad.Equals("BG")) + if (isBG != CurTaskRow.EPDRad.Equals("BG")) { MessageBox.Show("Wrong EPD Type", "EDP", MessageBoxButton.OK, MessageBoxImage.Hand, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification); this.Close(); @@ -108,7 +108,7 @@ namespace eDosStation { if (LoadDoses()) { - bool isBG = (ep.epdType == 3); + bool isBG = (ep.epdType != 3); //3 = zwarte 0=grijs int? VisitID = null; using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.RemoteSQL)) { @@ -128,6 +128,8 @@ namespace eDosStation } } + int rv= ep.PrepareForIssue(); + ep.WearerID = VisitID.ToString(); ep.WearerName = _User.PersID.ToString(); diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj index 8027753..61c16e1 100644 --- a/eDosStation/eDosStation.csproj +++ b/eDosStation/eDosStation.csproj @@ -112,7 +112,9 @@ ..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Data.dll True - + + False + diff --git a/eDos_Report.htm b/eDos_Report.htm new file mode 100644 index 0000000..5bdca70 --- /dev/null +++ b/eDos_Report.htm @@ -0,0 +1,103 @@ + + + + + + + Telerik UI for WPF Upgrade Wizard Log + + + + +
+ + + + + + + + + + + + + + + +
+ +
+ Processed: 0 + Succeeded: 0 + Info: 0 + Warnings: 0 + Failed: 0 +
+
 ProjectTitleDetailsResult
+
+ +