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

Design

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-05-07 15:56:22 +02:00
parent de75001c91
commit f84f602db6
14 changed files with 131 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eDosStation/About.xaml
View file

@ -6,7 +6,8 @@
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
xmlns:local="clr-namespace:eDosStation"
mc:Ignorable="d"
Title="About" Height="600" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" WindowState="Normal" >
Title="About" Height="600" Width="800" FontFamily="Segoe UI"
WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" WindowState="Normal" >
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
@ -23,7 +24,7 @@
<Paragraph>2021 Version
<TextBlock Name="aVersion" Text="1.1" />
</Paragraph>
<Table BorderBrush="#FF1E8CED" BorderThickness="1" FontFamily="Comic Sans MS" >
<Table BorderBrush="#FF1E8CED" BorderThickness="1" >
<Table.Columns>
<TableColumn Width="200" ></TableColumn>
<TableColumn Width="auto" ></TableColumn>
@ -51,10 +52,9 @@
</Table>
<Paragraph Margin="50,10,0,10" FontStyle="Italic">
<Run>Architecture and testing by Isabelle Majkowski, Luc Praet</Run>
<Run>Architecture and testing by Isabelle Majkowski, Luc Praet, Raf Aarts, Eric Boogers, Kris Bruns</Run>
<LineBreak />
<Run>Developed by Luc Vandenbroucke.</Run>
<Run>Developed by Luc Vandenbroucke</Run>
<LineBreak />
<Run>Technical info by Thermo</Run>
<LineBreak/>
@ -63,6 +63,6 @@
</FlowDocument>
</FlowDocumentScrollViewer>
<telerik:RadButton Grid.Row="2" Content="OK" Width="200" HorizontalAlignment="Center" Height="50" Click="RadButton_Click" />
<telerik:RadButton Grid.Row="2" Content="OK" Width="200" HorizontalAlignment="Center" Click="RadButton_Click" Style="{DynamicResource OkCancelButton}" />
</Grid>
</Window>

2
eDosStation/App.xaml
View file

@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:eDosStation"
StartupUri="MainWindow.xaml" Startup="Application_Startup">
StartupUri="MainWindow.xaml" Startup="Application_Startup" >
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>

2
eDosStation/DataInterface.cs
View file

@ -348,7 +348,7 @@ namespace eDosStation
u.VisitIDLocked = 0;
u.ReasonNoAccess = "Not found";
u.UserComment = "";
u.AllOk = (u.AccessAllow == true & u.VisitIDLocked == 0);
u.AllOk = (u.AccessAllow == true & u.VisitIDLocked == 0);
}
rs.Close();
}

30
eDosStation/EntryBadge.xaml
View file

@ -6,17 +6,18 @@
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" x:Class="eDosStation.EntryBadge"
mc:Ignorable="d"
Title="EntryBadge" Height="980" Width="1820" Loaded="Window_Loaded" FontFamily="Comic Sans MS" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing" >
Title="EntryBadge" Height="980" Width="1820"
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded"
ResizeMode="NoResize" WindowStartupLocation="CenterScreen" WindowState="Maximized" Closing="Window_Closing" >
<Window.Resources>
<local:DataSet1 x:Key="dataSet1"/>
<CollectionViewSource x:Key="getTaskListViewSource" Source="{Binding GetTaskInfo, Source={StaticResource dataSet1}}"/>
<local:Converters x:Key="BConverter"/>
<BitmapImage x:Key="iBG" UriSource="Images/EPD-MK2.png" />
<BitmapImage x:Key="iNG" UriSource="Images/EPD-N2.png" />
</Window.Resources>
<DockPanel>
<TabControl Name="tb" TabStripPlacement="Top" SelectionChanged="tb_SelectionChanged" >
<TabItem Name="tbEntry" >
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
@ -34,7 +35,7 @@
</StackPanel>
</Border>
<StackPanel VerticalAlignment="Center">
<telerik:RadButton Name="LeesCancel" Content="Cancel" Click="LeesCancel_Click" Width="300" Height="50" CornerRadius="10" TextBlock.FontSize="25" Margin="20,20,0,0" />
<telerik:RadButton Name="LeesCancel" Content="Cancel" Click="LeesCancel_Click" Margin="20,20,0,0" Style="{DynamicResource OkCancelButton}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock x:Name="CSN" />
@ -66,7 +67,7 @@
</ProgressBar.Effect>
</ProgressBar>
<TextBlock x:Name="tUserSeconds" Text="10" TextAlignment="Center" HorizontalAlignment="Stretch" />
<Button Content="OK" Name="bUserRead" Click="BUserRead_Click"/>
<telerik:RadButton Content="OK" Name="bUserRead" Click="BUserRead_Click" Style="{DynamicResource OkCancelButton}"/>
</StackPanel>
</TabItem>
<TabItem Name="tbTask">
@ -209,14 +210,14 @@
</Image>
</StackPanel>
<StackPanel Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" >
<telerik:RadButton Name="TaskCancel" Content="Cancel" Click="TaskCancel_Click" Width="300" Height="50" CornerRadius="10" TextBlock.FontSize="25" Margin="20,0,0,0" />
<telerik:RadButton Name="TaskCancel" Content="Cancel" Click="TaskCancel_Click" Width="300" Style="{DynamicResource OkCancelButton}" Margin="20,0,0,0" />
</StackPanel>
<StackPanel Grid.Row="4" Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Center" >
<telerik:RadButton Name="TaskOK" Content="OK" Click="TaskOK_Click" Width="300" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
<telerik:RadButton Name="TaskOK" Content="OK" Width="300" Click="TaskOK_Click" Style="{DynamicResource OkCancelButton}" />
</StackPanel>
</Grid>
</TabItem>
<TabItem Name="tbEPD" FontSize="25" FontFamily="Comic Sans MS" >
<TabItem Name="tbEPD" FontSize="25" >
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="100" />
@ -226,13 +227,13 @@
<RowDefinition Height="50" />
<RowDefinition Height="100" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" FontSize="25" FontFamily="Comic Sans MS" Name="epdWait" Text="w" HorizontalAlignment="Center" TextAlignment="Center" />
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" FontFamily="Comic Sans MS">
<TextBlock Grid.Row="0" FontSize="25" Name="epdWait" Text="w" HorizontalAlignment="Center" TextAlignment="Center" />
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" >
<Run Text="Issuing EPD:" />
<Run Name="statusEPD" Text="" /><LineBreak/>
</TextBlock>
<Image Grid.Row="2" Source="{StaticResource iBG}"/>
<Button Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bEpdDone" Visibility="Hidden" Click="bClose_Click" />
<telerik:RadButton Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bEpdDone" Visibility="Hidden" Click="bClose_Click" Style="{DynamicResource OkCancelButton}" />
</Grid>
</TabItem>
<TabItem Name="tbNotAllowed">
@ -243,15 +244,14 @@
<RowDefinition Height="100" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" FontFamily="Comic Sans MS">
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" >
<Run Text="No Access" />
<Run Name="tReasonNoAccess" Text="" />
<LineBreak/>
</TextBlock>
<Button Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bNoAccessDone" Click="bClose_Click">
</Button>
<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>
</Grid>
</TabItem>
</TabControl>

31
eDosStation/EpdExit.xaml
View file

@ -4,18 +4,25 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
mc:Ignorable="d"
Title="Exit" Height="450" Width="800" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
Title="Exit" Height="450" Width="800"
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
<DockPanel>
<StatusBar DockPanel.Dock="Bottom" >
<StatusBarItem Name="statusEPD" Content="Epd" />
</StatusBar>
<StackPanel Orientation="Vertical">
<TabControl>
<TabItem Name="Wait" Header="Wait">
</TabItem>
<TabItem Name="Wait" Header="Wait" HorizontalAlignment="Center" VerticalAlignment="Center" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
<TextBlock Text="Waiting for EPD" Margin="10,100,10,100" />
<telerik:RadButton Name="bCancel" Content="Cancel" Style="{DynamicResource OkCancelButton}" />
</StackPanel>
</TabItem>
<TabItem Name="ok" Header="OK">
<Grid TextBlock.FontSize="40" TextBlock.FontFamily="comic sans ms">
<Grid TextBlock.FontSize="40" >
<Grid.RowDefinitions >
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
@ -38,12 +45,11 @@
<TextBlock Name="HpDose07" />
<TextBlock Name="HpDose10" />
</StackPanel>
<Button Grid.Row="2" Grid.Column="1" Content="OK" Name="bCloseExit" Click="BCloseExit_Click" />
</Grid>
<telerik:RadButton Grid.Row="2" Grid.Column="1" Name="bCloseExit" Click="BCloseExit_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
</Grid>
</TabItem>
<TabItem Name="Alarm" Header="Alarm">
<TabItem Name="Alarm" Header="Alarm" Height="23" Margin="-2,-2,-1.8,-0.2" VerticalAlignment="Top">
<StackPanel>
<Border Background="LightYellow" TextBlock.FontSize="22" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" >
@ -58,7 +64,7 @@
<LineBreak/>
</TextBlock>
</Border>
<Button Content="OK" Height="40" Width="200" Name="bConfirmAlarm" Click="BConfirmAlarm_Click" />
<telerik:RadButton Name="bConfirmAlarm" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
</StackPanel>
</TabItem>
<TabItem Name="OtherAlarm" Header="Other Alarm">
@ -74,11 +80,12 @@
<Run> He needs to investigate the alarm.</Run>
</TextBlock>
</Border>
<Button Content="OK" Height="40" Width="200" Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" />
<telerik:RadButton Name="bConfirmAlarm2" Click="BConfirmAlarm_Click" Content="OK" Width="190" Height="50" CornerRadius="10" TextBlock.FontSize="25" />
</StackPanel>
</TabItem>
</TabControl>
</StackPanel>
</DockPanel>
</Window>

4
eDosStation/MainWindow.xaml
View file

@ -6,7 +6,9 @@
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
mc:Ignorable="d"
Title="eDose Station" Height="814.417" Width="1316.258" FontFamily="Comic Sans MS" FontSize="36"
Title="eDose Station" Height="814.417" Width="1316.258"
FontFamily="Segoe UI"
FontSize="36"
WindowStartupLocation="CenterScreen" WindowState="Maximized"
Loaded="Window_Loaded" GotFocus="Window_GotFocus" LostFocus="Window_LostFocus"
>

4
eDosStation/Properties/AssemblyInfo.cs
View file

@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.1.0")]
[assembly: AssemblyFileVersion("1.3.1.0")]
[assembly: AssemblyVersion("1.4.1.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]

52
eDosStation/Settings.xaml
View file

@ -4,9 +4,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
mc:Ignorable="d"
Title="Settings" Height="263.656" Width="492.731" Loaded="Window_Loaded">
<Grid>
Title="Settings" Height="338.281" Width="617.009"
FontFamily="Segoe UI" FontSize="20"
Loaded="Window_Loaded">
<Grid >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
@ -15,43 +18,38 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="20" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="400"/>
</Grid.ColumnDefinitions>
<TextBlock Text="Com port"></TextBlock>
<ComboBox Name="cComPort" Grid.Column="1" />
<!--<TextBox Name="tComPort" Text="1" Grid.Column="1" />-->
<TextBlock Text="EPD Reader Com port"></TextBlock>
<telerik:RadComboBox Name="cComPort" Grid.Column="1" />
<TextBlock Grid.Row="1" Grid.Column="0" Text="Installatie 1"></TextBlock>
<ComboBox Name="CIns1" Grid.Row="1" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
<!--<TextBox Grid.Row="1" Name="tInsCode1" Text="1" Grid.Column="1" />-->
<!--<TextBox Grid.Row="1" Name="tInsName1" Text="BR1" Grid.Column="2" />-->
<TextBlock Grid.Row="1" Grid.Column="0" Text="Installation 1"></TextBlock>
<telerik:RadComboBox Name="CIns1" Grid.Row="1" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Installation 2"></TextBlock>
<telerik:RadComboBox Name="CIns2" Grid.Row="2" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
<TextBlock Grid.Row="2" Grid.Column="0" Text="Installatie 2"></TextBlock>
<ComboBox Name="CIns2" Grid.Row="2" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
<!--<TextBox Grid.Row="2" Name="tInsCode2" Text="11" Grid.Column="1" />-->
<!--<TextBox Grid.Row="2" Name="tInsName2" Text="Venus" Grid.Column="2" />-->
<TextBlock Grid.Row="3" Grid.Column="0" Text="Test CSN"></TextBlock>
<TextBox Grid.Row="3" Name="tTestCSN" Text="" Grid.Column="1" />
<TextBlock Grid.Row="4" Grid.Column="0" Text="Badgelezers" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<ComboBox Grid.Row="4" Grid.ColumnSpan="2" Name="cbReaders" Text="" Grid.Column="1" />
<telerik:RadComboBox Grid.Row="4" Grid.Column="1" Name="cbReaders" />
<TextBlock Grid.Row="5" Grid.Column="0" Text="ValidationButtons" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<CheckBox Grid.Row="5" Grid.ColumnSpan="2" Name="cbValidation" Grid.Column="1" />
<TextBlock Grid.Row="5" Grid.Column="0" Text="Check user status" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<CheckBox Grid.Row="5" Grid.ColumnSpan="2" Name="cbCheckUsers" Grid.Column="1" Padding="10,0,10,0" VerticalAlignment="Center" />
<TextBlock Grid.Row="6" Grid.Column="0" Text="Beep EPD" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<TextBox Grid.Row="6" Grid.ColumnSpan="2" Name="tBeep" Text="" Grid.Column="1" />
<TextBlock Grid.Row="6" Grid.Column="0" Text="ValidationButtons" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<CheckBox Grid.Row="6" Grid.ColumnSpan="2" Name="cbValidation" Grid.Column="1" Padding="10,0,10,0" VerticalAlignment="Center" />
<Button Grid.Row="8" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
<Button Grid.Row="8" Grid.Column="2" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
<TextBlock Grid.Row="7" Grid.Column="0" Text="Beep EPD" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
<TextBox Grid.Row="7" Grid.ColumnSpan="2" Name="tBeep" Text="" Grid.Column="1" />
<telerik:RadButton Grid.Row="9" Grid.Column="0" Name="bOK" Content="OK" Click="BOK_Click" Style="{DynamicResource OkCancelButton}" />
<telerik:RadButton Grid.Row="9" Grid.Column="1" Name="bCancel" Content="Cancel" Click="BCancel_Click" Style="{DynamicResource OkCancelButton}" HorizontalAlignment="Right" />
</Grid>
</Window>

5
eDosStation/Settings.xaml.cs
View file

@ -31,7 +31,6 @@ namespace eDosStation
string thiscom = cComPort.SelectedItem.ToString().Replace("COM","");
thisStation.ComPort = int.Parse(thiscom);
DataSet1.InstallationRow ir = CIns1.SelectedItem as DataSet1.InstallationRow;
thisStation.Inst_CODE1 = ir.Inst_CODE;
thisStation.Inst_Name1 = ir.InstallationName;
@ -51,6 +50,7 @@ namespace eDosStation
//thisStation.Inst_Name2 = tInsName2.Text;
//thisStation.TestCSN = tTestCSN.Text;
thisStation.Reader = cbReaders.Text;
thisStation.checkUser = cbCheckUsers.IsChecked != null ? cbCheckUsers.IsChecked.Value : false;
thisStation.Update();
this.Close();
if (thisStation.Error>0)
@ -93,12 +93,13 @@ namespace eDosStation
//tInsCode2.Text = thisStation.Inst_CODE2.ToString();
//tInsName1.Text = thisStation.Inst_Name1.ToString();
//tInsName2.Text = thisStation.Inst_Name2.ToString();
tTestCSN.Text = thisStation.TestCSN;
//tTestCSN.Text = thisStation.TestCSN;
tBeep.Text = thisStation.useBeep.ToString();
cbValidation.IsChecked = thisStation.useTestButtons;
cbCheckUsers.IsChecked= thisStation.checkUser;
bool rv = thisStation.dataInterface.checkCon(false);
var a = new LSWDesfirePublic.CCard();

46
eDosStation/ShowEPDDose.xaml
View file

@ -5,12 +5,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:eDosStation"
mc:Ignorable="d"
Title="ShowEPDDose" Height="450" Width="800" Loaded="Window_Loaded" Unloaded="Window_Unloaded" WindowStartupLocation="CenterScreen">
Title="ShowEPDDose" Height="450" Width="800" Loaded="Window_Loaded" Unloaded="Window_Unloaded" WindowStartupLocation="CenterScreen"
FontFamily="Segoe UI">
<DockPanel>
<StatusBar DockPanel.Dock="Bottom" >
<StatusBarItem Name="statusEPD" Content="Epd" />
</StatusBar>
<Grid TextBlock.FontSize="24" TextBlock.FontFamily="Comic Sans MS">
<Grid TextBlock.FontSize="24" >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
@ -27,26 +28,25 @@
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Wearer" />
<TextBlock Grid.Row="0" Grid.Column="0" Text="PersID" Padding="20,0,20,0"/>
<TextBlock Grid.Row="0" Grid.Column="1" Name ="Wearer" Text=""/>
<TextBlock Grid.Row="0" Grid.Column="2" Text ="EpdVisit" />
<TextBlock Grid.Row="0" Grid.Column="3" Name ="EpdVisit" Text=""/>
<TextBlock Grid.Row="0" Grid.Column="2" Text ="Visit#" Padding="20,0,20,0" />
<TextBlock Grid.Row="0" Grid.Column="3" Name ="EpdVisit" Text="" Padding="20,0,20,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="2" Grid.Column="0" Text="Issued ?" Padding="20,0,20,0" />
<TextBlock Grid.Row="2" Grid.Column="1" Text="no" Name ="isIssued" Padding="20,0,20,0" />
<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" />
<TextBlock Grid.Row="3" Grid.Column="0" Text="Alarm ?" Padding="20,0,20,0"/>
<TextBlock Grid.Row="3" Grid.Column="1" Text="no" Name ="hasAlarm" Padding="20,0,20,0"/>
<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" Padding="20,0,20,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"/>
@ -57,12 +57,12 @@
<TextBlock Name="HpDose10" />
</StackPanel>
</StackPanel>
<TextBlock Grid.Row="6" Grid.Column="0" Text="Dose Treshold" />
<TextBlock Grid.Row="6" Grid.Column="0" Text="Dose Treshold" Padding="20,0,20,0" />
<StackPanel Grid.Row="6" Grid.Column="1" Orientation="Vertical" >
<StackPanel Orientation="Horizontal">
<TextBlock Name="HP07AlarmDosel" Width="200" />
<TextBlock Name="HP07AlarmDose" />
<TextBlock Name="HP07AlarmDosel" Width="200" />
<TextBlock Name="HP07AlarmDose" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Name="HP10AlarmDose1l" Width="200" />
@ -74,9 +74,9 @@
</StackPanel>
</StackPanel>
</Grid>
</DockPanel>
</Window>

15
eDosStation/Station.cs
View file

@ -4,6 +4,7 @@ using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
@ -22,6 +23,7 @@ namespace eDosStation
public string Reader { get; internal set; }
public bool useTestButtons { get; set; }
public byte useBeep { get; set; }
public bool checkUser { get; internal set; }
public bool Changed = false;
public int Error = 0;
@ -88,7 +90,14 @@ namespace eDosStation
if (rs.IsDBNull(c)) useBeep = 0b00010110; else useBeep = (byte)Values[c];
}
catch { useBeep = 0b00010110; }
}
try
{
c = rs.GetOrdinal("checkUser");
if (rs.IsDBNull(c)) checkUser = false; else checkUser= (bool)Values[c];
}
catch { checkUser=false; }
}
else
{
ID_Station = 0;
@ -100,6 +109,7 @@ namespace eDosStation
TestCode = System.Configuration.ConfigurationManager.AppSettings["TestCode"];
Changed = true;
Reader = System.Configuration.ConfigurationManager.AppSettings["Reader"];
checkUser = false;
}
rs.Close();
}
@ -179,6 +189,9 @@ namespace eDosStation
if (!string.IsNullOrEmpty(Reader))
cmd.Parameters.AddWithValue("@Reader", Reader);
if (!string.IsNullOrEmpty(Reader))
cmd.Parameters.AddWithValue("@checkUser", checkUser);
try
{
co = dataInterface.getCon(true);

9
eDosStation/eDosDict.xaml
View file

@ -1,5 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
xmlns:local="clr-namespace:eDosStation">
<Style x:Key="ScrollBarPageButton"
TargetType="{x:Type RepeatButton}">
@ -186,4 +187,12 @@
</Setter.Value>
</Setter>
</Style>
<Style x:Key="OkCancelButton" TargetType="telerik:RadButton">
<Setter Property="Width" Value="190"/>
<Setter Property="CornerRadius" Value="10"/>
<Setter Property="Height" Value="50"/>
<Setter Property="Width" Value="190"/>
<Setter Property="TextBlock.FontSize" Value="25" />
</Style>
</ResourceDictionary>

6
eDosStation/eDosDictionary.xaml Normal file
View file

@ -0,0 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
</ResourceDictionary>

4
eDosStation/eDosStation.csproj
View file

@ -185,6 +185,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="eDosDictionary.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="EntryBadge.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>