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

ok

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-04-30 11:29:10 +02:00
commit e6efa8523a
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
eDosStation/EntryBadge.xaml.cs
View file

@ -23,8 +23,7 @@ namespace eDosStation
Boolean Inst1 = false, Inst2 = false;
private System.Threading.Tasks.Task ReaderTask =null;
private DataInterface dataInterface;
public static LSWDesfirePublic.CCard dfReader;
public LSWDesfirePublic.CCard dfReader = null;
//System.Threading.Thread t;
//bool nextCSN = false;
//bool nextSite = false;
@ -37,6 +36,7 @@ namespace eDosStation
enum eCOE { quiz=1} ;
#if SimulateEPD
public SimulateData simulData = new SimulateData();
#endif
@ -522,7 +522,6 @@ namespace eDosStation
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{
dfReader?.Dispose(); dfReader = null;
ep.Close();
}

30
eDosStation/ShowEPDDose.xaml
View file

@ -21,23 +21,33 @@
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<CheckBox Grid.Row="0" Grid.Column="0" Content="Issued" IsChecked="False" Name ="isIssued"/>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Wearer" />
<TextBlock Grid.Row="0" Grid.Column="1" Name ="Wearer" Text=""/>
<TextBlock Grid.Row="0" Grid.Column="2" Name ="EpdVisit" Text=""/>
<StackPanel Grid.Row="1" Grid.Column="0">
<CheckBox Content="Alarm" Name="cAlarm" HorizontalContentAlignment="Left" />
<StackPanel Name="sAlarm" Margin="50,0,20,0"/>
</StackPanel>
<TextBlock Grid.Row="0" Grid.Column="2" Text ="EpdVisit" />
<TextBlock Grid.Row="0" Grid.Column="3" Name ="EpdVisit" Text=""/>
<TextBlock Grid.Row="2" Grid.Column="0" Text="Dose" Margin="5,10,0,0" />
<StackPanel Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Vertical" Margin="5,10,0,0">
<Line Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Stroke="Black" Width="10" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="is Issued ?" />
<TextBlock Grid.Row="2" Grid.Column="1" Text="no" Name ="isIssued" />
<TextBlock Grid.Row="3" Grid.Column="0" Text="has Alarm ?" />
<TextBlock Grid.Row="3" Grid.Column="1" Text="no" Name ="hasAlarm"/>
<StackPanel Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Name="sAlarm" Margin="50,0,20,0"/>
<TextBlock Grid.Row="4" Grid.Column="0" Text="Dose" Margin="5,10,0,0" />
<StackPanel Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Vertical" Margin="5,10,0,0">
<StackPanel Orientation="Horizontal">
<TextBlock Name="HpDose07l" Width="200"/>
<TextBlock Name="HpDose07" />
@ -48,8 +58,8 @@
</StackPanel>
</StackPanel>
<TextBlock Grid.Row="4" Grid.Column="0" Text="Dose Treshold" />
<StackPanel Grid.Row="4" Grid.Column="1" Orientation="Vertical" >
<TextBlock Grid.Row="6" Grid.Column="0" Text="Dose Treshold" />
<StackPanel Grid.Row="6" Grid.Column="1" Orientation="Vertical" >
<StackPanel Orientation="Horizontal">
<TextBlock Name="HP07AlarmDosel" Width="200" />
<TextBlock Name="HP07AlarmDose" />

9
eDosStation/ShowEPDDose.xaml.cs
View file

@ -37,15 +37,16 @@ namespace eDosStation
{
ep.GetStatus();
isIssued.IsChecked = ep.Issued;
isIssued.Text = ep.Issued ? "Yes" : "no";
Wearer.Text = ep.WearerName;
EpdVisit.Text = $"Visit {ep.WearerID}";
EpdVisit.Text = ep.WearerID.ToString();
if ((ep.otherAlarms & 0x7f)!=0 || ep.alarmStatus>0)
{
cAlarm.IsChecked = true;
hasAlarm.Text = "Yes";
} else
cAlarm.IsChecked = false;
hasAlarm.Text = "no";
Decoder.AlarmToTextBox(sAlarm, ep);