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

Exit screen

Browse source
This commit is contained in:
Luc Vandenbroucke 2019-02-12 07:33:18 +01:00
parent 2c6f8b475a
commit bba97a296a
9 changed files with 113 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EpdBase/EpdBase.cpp
View file

@ -205,7 +205,6 @@ WORD EpdBase::Epd2U::TurnOn()
return 0;
}
WORD EpdBase::Epd2U::ReadTresHolds()
{
Hp10THDose1 = Hp10THDose2 = Hp07THDose = 0;
@ -237,7 +236,6 @@ WORD EpdBase::Epd2U::ReadTresHolds()
WORD EpdBase::Epd2U::ReadDoses()
{
ReadDosesQualityRV = ReadPeaksRV = CommitRV = 0;
ReadDosesQualityRV = ReadDosesQuality(
&Hp10Dose,

11
EpdBaseClr/EpdBaseClr.cpp
View file

@ -81,8 +81,15 @@ int EpdBaseClr::Epd2::GetDoses()
}
Hp10PeakTime = System::DateTime::Now.AddSeconds(-(epd->Hp10Time - epd->EpdClock));
Hp07PeakTime = System::DateTime::Now.AddSeconds(-(epd->Hp07Time - epd->EpdClock));
if (Hp10Peak > 0 && epd->Hp10Time > 0)
Hp10PeakTime = System::DateTime::Now.AddSeconds(-(epd->EpdClock - epd->Hp10Time));
else
Hp10PeakTime = System::Nullable<System::DateTime>();;
if (Hp07Peak>0 && epd->Hp07Time>0)
Hp07PeakTime = System::DateTime::Now.AddSeconds(-(epd->EpdClock - epd->Hp07Time ));
else
Hp10PeakTime = System::Nullable<System::DateTime>();
QualityData = epd->QualityData;
K1 = epd->K1;

4
EpdBaseClr/EpdBaseClr.h
View file

@ -36,8 +36,8 @@ namespace EpdBaseClr {
double Hp10;
double Hp07Peak;
double Hp10Peak;
System::DateTime Hp10PeakTime;
System::DateTime Hp07PeakTime;
System::Nullable<System::DateTime> Hp10PeakTime;
System::Nullable<System::DateTime> Hp07PeakTime;
double Hp07Total;
double Hp10Total;

48
eDosStation/DataSet1.Designer.cs generated
View file

@ -665,6 +665,8 @@ namespace eDosStation {
private global::System.Data.DataColumn columnDescription;
private global::System.Data.DataColumn columnInst_CODE;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public GetTaskInfoDataTable() {
@ -866,6 +868,14 @@ namespace eDosStation {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn Inst_CODEColumn {
get {
return this.columnInst_CODE;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@ -923,7 +933,8 @@ namespace eDosStation {
double HP07RateOFF,
double FNGain_ANGainValue,
string InstallationActivity,
string Description) {
string Description,
int Inst_CODE) {
GetTaskInfoRow rowGetTaskInfoRow = ((GetTaskInfoRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@ -946,7 +957,8 @@ namespace eDosStation {
HP07RateOFF,
FNGain_ANGainValue,
InstallationActivity,
Description};
Description,
Inst_CODE};
rowGetTaskInfoRow.ItemArray = columnValuesArray;
this.Rows.Add(rowGetTaskInfoRow);
return rowGetTaskInfoRow;
@ -997,6 +1009,7 @@ namespace eDosStation {
this.columnFNGain_ANGainValue = base.Columns["FNGain_ANGainValue"];
this.columnInstallationActivity = base.Columns["InstallationActivity"];
this.columnDescription = base.Columns["Description"];
this.columnInst_CODE = base.Columns["Inst_CODE"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -1044,6 +1057,8 @@ namespace eDosStation {
base.Columns.Add(this.columnInstallationActivity);
this.columnDescription = new global::System.Data.DataColumn("Description", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDescription);
this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnInst_CODE);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnID_Task}, true));
this.columnID_Task.AutoIncrement = true;
@ -1618,6 +1633,22 @@ namespace eDosStation {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public int Inst_CODE {
get {
try {
return ((int)(this[this.tableGetTaskInfo.Inst_CODEColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
}
}
set {
this[this.tableGetTaskInfo.Inst_CODEColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsTask_NameNull() {
@ -1845,6 +1876,18 @@ namespace eDosStation {
public void SetDescriptionNull() {
this[this.tableGetTaskInfo.DescriptionColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsInst_CODENull() {
return this.IsNull(this.tableGetTaskInfo.Inst_CODEColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public void SetInst_CODENull() {
this[this.tableGetTaskInfo.Inst_CODEColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@ -2232,6 +2275,7 @@ namespace eDosStation.DataSet1TableAdapters {
tableMapping.ColumnMappings.Add("FNGain_ANGainValue", "FNGain_ANGainValue");
tableMapping.ColumnMappings.Add("InstallationActivity", "InstallationActivity");
tableMapping.ColumnMappings.Add("Description", "Description");
tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
this._adapter.TableMappings.Add(tableMapping);
}

8
eDosStation/DataSet1.xsd
View file

@ -30,7 +30,7 @@
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="GetTaskInfoTableAdapter" GeneratorDataComponentClassName="GetTaskInfoTableAdapter" Name="GetTaskInfo" UserDataComponentName="GetTaskInfoTableAdapter">
<MainSource>
<DbSource ConnectionRef="RemoteSQL (Settings)" DbObjectName="HPH_REMS_new.dbo.GetTaskInfo" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DbSource ConnectionRef="RemoteSQL (Settings)" DbObjectName="HPH_REMS_new.dbo.GetTaskInfo" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="false" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="StoredProcedure" ModifiedByUser="false">
<CommandText>dbo.GetTaskInfo</CommandText>
@ -64,6 +64,7 @@
<Mapping SourceColumn="FNGain_ANGainValue" DataSetColumn="FNGain_ANGainValue" />
<Mapping SourceColumn="InstallationActivity" DataSetColumn="InstallationActivity" />
<Mapping SourceColumn="Description" DataSetColumn="Description" />
<Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
</Mappings>
<Sources />
</TableAdapter>
@ -75,7 +76,7 @@
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_RowClassName="GetTaskListRow" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent">
<xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent" msprop:Generator_RowClassName="GetTaskListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
@ -103,7 +104,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent" msprop:Generator_RowClassName="GetTaskInfoRow">
<xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_RowClassName="GetTaskInfoRow" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
@ -157,6 +158,7 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

14
eDosStation/DataSet1.xss
View file

@ -1 +1,13 @@

<?xml version="1.0" encoding="utf-8"?>
<!--<autogenerated>
This code was generated by a tool to store the dataset designer's layout information.
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:GetTaskList" ZOrder="2" X="70" Y="70" Height="153" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:GetTaskInfo" ZOrder="1" X="351" Y="70" Height="305" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes>
<Connectors />
</DiagramLayout>

1
eDosStation/EntryBadge.xaml.cs
View file

@ -120,6 +120,7 @@ namespace eDosStation
cmd1.CommandType = CommandType.StoredProcedure;
var pa = new SqlParameter("PersID", SqlDbType.Int, 4); pa.Value = _User.PersID; cmd1.Parameters.Add(pa);
pa = new SqlParameter("ID_Task", SqlDbType.Int, 4); pa.Value = CurTaskRow.ID_Task; cmd1.Parameters.Add(pa);
pa = new SqlParameter("Inst_CODE", SqlDbType.Int, 4); pa.Value = CurTaskRow.Inst_CODE; cmd1.Parameters.Add(pa);
pa = new SqlParameter("EPD_InternalID", SqlDbType.Int, 4); pa.Value = (int)ep.EpdID; cmd1.Parameters.Add(pa);
pa = new SqlParameter("isBG", SqlDbType.Bit, 4); pa.Value = isBG; cmd1.Parameters.Add(pa);
pa = new SqlParameter("ID_Visit", SqlDbType.Int, 4); pa.Direction = ParameterDirection.Output; cmd1.Parameters.Add(pa);

17
eDosStation/EpdExit.xaml
View file

@ -10,11 +10,11 @@
<StatusBar DockPanel.Dock="Bottom" >
<StatusBarItem Name="statusEPD" Content="Epd" />
</StatusBar>
<Grid>
<Grid.RowDefinitions>
<Grid TextBlock.FontSize="48" TextBlock.FontFamily="comic sans ms">
<Grid.RowDefinitions >
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
@ -24,14 +24,19 @@
</Grid.ColumnDefinitions>
<CheckBox Grid.Row="0" Grid.Column="0" Content="Issued" IsChecked="False" Name ="isIssued"/>
<TextBlock Grid.Row="0" Grid.Column="1" Name ="Wearer" Text=""/>
<TextBlock Grid.Row="0" Grid.Column="1" Name= "Wearer" Text="persID:" TextBlock.FontSize="20"/>
<TextBlock Grid.Row="0" Grid.Column="2" Name= "EpdVisit" Text="Visit:" TextBlock.FontSize="20"/>
<TextBlock Grid.Row="1" Grid.Column="0" Text="Dose" />
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical" >
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical" VerticalAlignment="Center" Name="DosePanel">
<TextBlock Name="HpDose07" />
<TextBlock Name="HpDose10" />
</StackPanel>
<Button Grid.Row="2" Grid.Column="1" Content="OK" Name="bCloseExit" Click="BCloseExit_Click" />
</Grid>
</DockPanel>
</Window>

41
eDosStation/EpdExit.xaml.cs
View file

@ -26,6 +26,9 @@ namespace eDosStation
bool EpdFound = false;
DispatcherTimer dispatcherTimer;
int Search;
SolidColorBrush GreenBrush = new SolidColorBrush(Colors.LightGreen);
SolidColorBrush AlarmBrush = new SolidColorBrush(Colors.LightCoral);
public EpdExit()
{
@ -37,7 +40,6 @@ namespace eDosStation
private void LoadDoses()
{
ep.GetStatus();
if (!ep.Issued)
{
MessageBox.Show("This EPD is not issued","EDP",MessageBoxButton.OK,MessageBoxImage.Hand,MessageBoxResult.OK,MessageBoxOptions.ServiceNotification);
@ -45,13 +47,16 @@ namespace eDosStation
return;
}
isIssued.IsChecked = ep.Issued;
Wearer.Text = ep.WearerName;
if (ep.alarmStatus != 0) DosePanel.Background = AlarmBrush; else DosePanel.Background = GreenBrush;
Wearer.Text = $"Wearer: {ep.WearerName}";
EpdVisit.Text = $"Visit: {ep.WearerID}";
ep.GetDoses();
HpDose07.Text = $"HP07: {ep.Hp07:0.00 µ Sv} ";
HpDose10.Text = $"Hp10: {ep.Hp10:0.00 µ Sv}";
HpDose07.Text = $"Hp07: {ep.Hp07:0.00} µSv ";
HpDose10.Text = $"Hp10: {ep.Hp10:0.00} µSv";
if (int.TryParse(ep.WearerID, out int VisitID)) {
bool isBG = (ep.epdType == 3);
using (var co = new System.Data.SqlClient.SqlConnection(Properties.Settings.Default.RemoteSQL))
@ -70,9 +75,10 @@ namespace eDosStation
pa = new SqlParameter("Hp07Peak", SqlDbType.Float); pa.Value = ep.Hp07Peak; cmd1.Parameters.Add(pa);
pa = new SqlParameter("Hp10Peak", SqlDbType.Float); pa.Value = ep.Hp10Peak; cmd1.Parameters.Add(pa);
pa = new SqlParameter("HP07PeakTime", SqlDbType.DateTime); pa.Value = ep.Hp07PeakTime; cmd1.Parameters.Add(pa);
pa = new SqlParameter("HP10PeakTime", SqlDbType.DateTime); pa.Value = ep.Hp10PeakTime; cmd1.Parameters.Add(pa);
pa = new SqlParameter("HP07PeakTime", SqlDbType.DateTime); cmd1.Parameters.Add(pa);
if (ep.Hp07PeakTime != null) pa.Value = ep.Hp07PeakTime; else pa.Value = DBNull.Value;
pa = new SqlParameter("HP10PeakTime", SqlDbType.DateTime); cmd1.Parameters.Add(pa);
if (ep.Hp10PeakTime != null) pa.Value = ep.Hp10PeakTime; else pa.Value = DBNull.Value;
pa = new SqlParameter("K1", SqlDbType.Int); pa.Value = ep.K1; cmd1.Parameters.Add(pa);
pa = new SqlParameter("K2", SqlDbType.Int); pa.Value = ep.K2; cmd1.Parameters.Add(pa);
pa = new SqlParameter("K3", SqlDbType.Int); pa.Value = ep.K3; cmd1.Parameters.Add(pa);
@ -89,19 +95,19 @@ namespace eDosStation
pa = new SqlParameter("errorStatus", SqlDbType.Int); pa.Value = ep.errorStatus; cmd1.Parameters.Add(pa);
pa = new SqlParameter("operatingStatus", SqlDbType.Int); pa.Value = ep.operatingStatus; cmd1.Parameters.Add(pa);
co.Open();
cmd1.ExecuteNonQuery();
co.Close();
}
}
}
ep.SetDeIssued();
HpDose07.Text = ep.Hp07.ToString()+" µSv";
HpDose10.Text = ep.Hp10.ToString() + " µSv";
return;
}
private void Window_Loaded(object sender, RoutedEventArgs e)
@ -150,5 +156,10 @@ namespace eDosStation
}
}
private void BCloseExit_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
}
}