luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test Neutron Dosimeter met Neutron task

Browse source 
Clear dose bij uitreiking
This commit is contained in:
Luc Vandenbroucke 2019-04-03 13:13:47 +02:00
parent cb22394b3b
commit 20d2bc44bf
7 changed files with 128 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
EpdBase/EpdBase.cpp
View file

@ -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;

2
EpdBase/EpdBase.h
View file

@ -220,6 +220,8 @@ namespace EpdBase
WORD ReadTresHolds();
WORD ReadDoses();
WORD PrepareForIssue();
WORD DeIssue();
WORD Issue();

5
EpdBaseClr/EpdBaseClr.cpp
View file

@ -117,6 +117,11 @@ int EpdBaseClr::Epd2::SetDeIssued()
return epd->DeIssue();
}
int EpdBaseClr::Epd2::PrepareForIssue()
{
return epd->PrepareForIssue();
}
int EpdBaseClr::Epd2::SetIssued()
{

2
EpdBaseClr/EpdBaseClr.h
View file

@ -101,6 +101,8 @@ namespace EpdBaseClr {
int SetIssued();
int PrepareForIssue();
int WriteCalibration();
int ReadTresholds();

6
eDosStation/EntryBadge.xaml.cs
View file

@ -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();

4
eDosStation/eDosStation.csproj
View file

@ -112,7 +112,9 @@
<HintPath>..\lib\RCWPF\2019.1.116.45\Telerik.Windows.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UIAutomationProvider" />
<Reference Include="UIAutomationProvider">
<Private>False</Private>
</Reference>
<Reference Include="UIAutomationTypes" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />

103
eDos_Report.htm Normal file
View file

@ -0,0 +1,103 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Telerik UI for WPF Upgrade Wizard Log</title>
<style type="text/css">
body {
margin: 0;
padding: 0;
top: 0;
left: 0;
width: 100%;
background-color: #fff;
font: normal 12px Arial, sans-serif;
line-height: 1.5;
}
#header {
display: block;
margin: 0;
padding: 20px;
height: 60px;
min-width: 600px;
background: url('file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/15.0_ee91699e/extensions/zojf0cap.dhl/Resources/T4Templates/UpgradeLog/Logo.png') no-repeat right 30px top 30px;
background-color: #0e0e0e;
color: #909090;
font: normal 10px Arial, sans-serif;
}
#header span {
display: block;
color: #fff;
font: normal 22px Arial, sans-serif;
}
#legend {
display: block;
height: 20px;
margin: 0;
padding: 0;
background-color: #0e0e0e;
font: normal 12px Arial, sans-serif;
}
#legend span {
display: block;
float: left;
height: 18px;
margin: 0;
padding: 2px 10px 0 10px;
background-color: #8e8e8e;
font: normal 12px Arial, sans-serif;
}
table#logTable {
border: 1px solid #999;
border-collapse: collapse;
}
table#logTable th, table#logTable td {
border: 1px solid #999;
padding: 5px 10px;
text-align: left;
}
table#logTable th {
border: 0;
padding: 5px 10px;
background-color: #8e8e8e;
height: 20px;
font: bold 14px Arial, sans-serif;
color: #fff;
}
</style>
</head>
<body>
<div>
<table id="logTable" cellpadding="0px" cellspacing="0px">
<tbody>
<tr>
<td colspan="5" style="padding: 0;">
<div id="header">
Telerik UI for WPF <span>Upgrade Wizard Log</span>
</div>
<div id="legend">
<span style="background-color: #0e0e0e; color: #fff;">Processed: 0</span>
<span style="background-color: green; color: #fff;">Succeeded: 0</span>
<span style="background-color: blue; color: #fff;">Info: 0</span>
<span style="background-color: gold; color: #fff;">Warnings: 0</span>
<span style="background-color: red; color: #fff;">Failed: 0</span>
</div>
</td>
</tr>
<tr>
<th>&nbsp;</th>
<th>Project</th>
<th>Title</th>
<th>Details</th>
<th>Result</th>
</tr>
<tr>
</tr>
</tbody>
</table>
</div>
</body>
</html>