huisstijl
This commit is contained in:
Luc Vandenbroucke
parent
f84f602db6
commit
6cb3546d9f
12 changed files with 121 additions and 71 deletions
|
|
@ -21,6 +21,7 @@ namespace eDosStation
|
|||
public static SqlCommand LastIDCommand;
|
||||
public static SqlCommand CheckStatus;
|
||||
public DataSet1.CommentOnEventDataTable dtCOE;
|
||||
private bool CheckUser;
|
||||
|
||||
public static int? NextID()
|
||||
{
|
||||
|
|
@ -150,7 +151,12 @@ namespace eDosStation
|
|||
return ta;
|
||||
}
|
||||
|
||||
DataSet1TableAdapters.CommentOnEventTableAdapter CommentTA()
|
||||
internal void SetCheckUser(bool pCheckUser)
|
||||
{
|
||||
this.CheckUser = pCheckUser;
|
||||
}
|
||||
|
||||
DataSet1TableAdapters.CommentOnEventTableAdapter CommentTA()
|
||||
{
|
||||
var ta = new DataSet1TableAdapters.CommentOnEventTableAdapter();
|
||||
ta.Connection.ConnectionString = currentConStr;
|
||||
|
|
@ -333,7 +339,7 @@ namespace eDosStation
|
|||
u.VisitIDLocked = Values[rs.GetOrdinal("VisitIDLocked")] as int?;
|
||||
u.ReasonNoAccess = Values[rs.GetOrdinal("ReasonNoAccess")].ToString().Replace("\\n", "\n");
|
||||
u.UserComment = Values[rs.GetOrdinal("Comment")].ToString();
|
||||
u.AllOk = (u.AccessAllow == true && u.VisitIDLocked == 0);
|
||||
u.AllOk = !CheckUser || (u.AccessAllow == true && u.VisitIDLocked == 0) ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -348,7 +354,7 @@ namespace eDosStation
|
|||
u.VisitIDLocked = 0;
|
||||
u.ReasonNoAccess = "Not found";
|
||||
u.UserComment = "";
|
||||
u.AllOk = (u.AccessAllow == true & u.VisitIDLocked == 0);
|
||||
u.AllOk = !CheckUser || (u.AccessAllow == true & u.VisitIDLocked == 0);
|
||||
}
|
||||
rs.Close();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,20 +18,33 @@
|
|||
<BitmapImage x:Key="iNG" UriSource="Images/EPD-N2.png" />
|
||||
</Window.Resources>
|
||||
<DockPanel>
|
||||
<TabControl Name="tb" TabStripPlacement="Top" SelectionChanged="tb_SelectionChanged" >
|
||||
<TabItem Name="tbEntry" >
|
||||
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left">
|
||||
<Image Source="/Images/logoh120.png" Height="60"/>
|
||||
</StackPanel>
|
||||
<StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Center">
|
||||
<TextBlock Foreground="white" FontSize="12">
|
||||
⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤<LineBreak/>
|
||||
⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run><LineBreak/>
|
||||
⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤<LineBreak/>
|
||||
<Run Foreground="#9F4191">⬤</Run><Run Foreground="#A1DAF7">⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run>⬤⬤⬤<Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run><Run Foreground="#A1DAF7">⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run><LineBreak/>
|
||||
<Run Foreground="#9F4191">⬤⬤⬤</Run><Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤⬤⬤</Run><Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤</Run><Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤⬤⬤⬤</Run><LineBreak/>
|
||||
<Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤</Run><Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤</Run><LineBreak/>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
<TabControl Name="tb" TabStripPlacement="Top" SelectionChanged="tb_SelectionChanged" VerticalAlignment="Center" >
|
||||
<TabItem Name="tbEntry" VerticalAlignment="Center" >
|
||||
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Border Background="AliceBlue" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" CornerRadius="10" BorderThickness="2" BorderBrush="Blue" >
|
||||
<Border Background="{Binding Mode=OneWay, Source={StaticResource sckbLB}}" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" CornerRadius="10" BorderThickness="2" BorderBrush="Blue" >
|
||||
<StackPanel HorizontalAlignment="Center" >
|
||||
<TextBlock TextAlignment="Center" Padding="10,10,10,10" >
|
||||
<LineBreak/>
|
||||
<Run Foreground="Blue" FontSize="28" FontWeight="Bold">Welcome to eDOS</Run>
|
||||
<Run Foreground="{Binding Mode=OneWay, Source={StaticResource sckbP}}" FontSize="28" FontWeight="Bold">Welcome to eDOS</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run Background="LightGreen">Entry Process is ready</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
<Run>Please scan your badge on the badge reader</Run>
|
||||
<LineBreak/><LineBreak/>
|
||||
</TextBlock>
|
||||
</TextBlock>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<StackPanel VerticalAlignment="Center">
|
||||
|
|
@ -42,8 +55,8 @@
|
|||
<TextBlock x:Name="Site" />
|
||||
<TextBlock x:Name="Code" />
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,50,0,0" Name="pTestButtons">
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="0,50,0,0" Name="pTestButtons" Visibility="Collapsed" />
|
||||
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem Name="tbUser" >
|
||||
|
|
@ -60,7 +73,7 @@
|
|||
<TextBlock x:Name="UserComment" />
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
|
||||
<ProgressBar x:Name="pUserSeconds" Background="Blue" Value="5" Maximum="10" Tag="AA" >
|
||||
<ProgressBar.Effect>
|
||||
<DropShadowEffect/>
|
||||
|
|
@ -143,21 +156,36 @@
|
|||
</ScrollViewer>
|
||||
|
||||
</StackPanel>
|
||||
<Grid Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,10,10,10">
|
||||
<Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="10,10,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto"/>
|
||||
<ColumnDefinition Width="100"/>
|
||||
<ColumnDefinition />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image Grid.Row="0" Grid.RowSpan="3" Height="120" VerticalAlignment="Center" >
|
||||
<Image.Style>
|
||||
<Style TargetType="{x:Type Image}">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Source" Value="{StaticResource iBG}"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Source" Value="{StaticResource iNG}"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Image.Style>
|
||||
</Image>
|
||||
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding ID_Task,StringFormat={}Task:{0}}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Hp07Dose,StringFormat={}Hp07Dose: {0:0.00} µSv}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="2" >
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding ID_Task,StringFormat={}Task:{0}}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="2" Text="{Binding Hp07Dose,StringFormat={}Hp07Dose: {0:0.00} µSv}" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="3" >
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}Hp10Dose L: {0} H: {1} µSv">
|
||||
<Binding Path="Hp10Dose1" />
|
||||
|
|
@ -173,7 +201,7 @@
|
|||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" >
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" >
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}Hp10Rate1 Off: {0} On: {1} µSv">
|
||||
<Binding Path="HP10Rate1OFF" />
|
||||
|
|
@ -181,7 +209,7 @@
|
|||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="1" Grid.Column="2" >
|
||||
<TextBlock Grid.Row="1" Grid.Column="3" >
|
||||
<TextBlock.Text>
|
||||
<MultiBinding StringFormat="{}Hp10Rate2 Off: {0} On: {1} µSv">
|
||||
<Binding Path="HP10Rate2OFF" />
|
||||
|
|
@ -189,31 +217,16 @@
|
|||
</MultiBinding>
|
||||
</TextBlock.Text>
|
||||
</TextBlock>
|
||||
<TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding EPDRad,StringFormat={}Type: {0} }" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding FNGain_ANGainValue,StringFormat={}Gain: {0:0.00} }" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding MinWorkerDosisMargin,StringFormat={}Margin: {0:0.00} }" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding EPDRad,StringFormat={}Type: {0} }" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding FNGain_ANGainValue,StringFormat={}Gain: {0:0.00} }" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="3" Text="{Binding MinWorkerDosisMargin,StringFormat={}Margin: {0:0.00} }" />
|
||||
|
||||
</Grid>
|
||||
<StackPanel Grid.Row="3" Grid.Column="0" Grid.RowSpan="1" VerticalAlignment="Center" >
|
||||
<Image Height="120" VerticalAlignment="Center" >
|
||||
<Image.Style>
|
||||
<Style TargetType="{x:Type Image}">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="BG">
|
||||
<Setter Property="Source" Value="{StaticResource iBG}"></Setter>
|
||||
</DataTrigger>
|
||||
<DataTrigger Binding="{Binding EPDRad}" Value="NG">
|
||||
<Setter Property="Source" Value="{StaticResource iNG}"></Setter>
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</Image.Style>
|
||||
</Image>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" >
|
||||
<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" Width="300" Click="TaskOK_Click" Style="{DynamicResource OkCancelButton}" />
|
||||
<telerik:RadButton Name="TaskOK" Content="OK" Width="300" Click="TaskOK_Click" Style="{DynamicResource OkCancelButton}" IsEnabled="False" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
|
|
@ -227,7 +240,7 @@
|
|||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="100" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Grid.Row="0" FontSize="25" Name="epdWait" Text="w" HorizontalAlignment="Center" TextAlignment="Center" />
|
||||
<TextBlock Grid.Row="0" FontSize="25" Name="epdWait" Text="waiting" 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/>
|
||||
|
|
|
|||
|
|
@ -392,12 +392,15 @@ namespace eDosStation
|
|||
CSN.Text = csn;
|
||||
Site.Text = string.Empty;
|
||||
Code.Text = persID.ToString();
|
||||
Dispatcher.Invoke(CheckBadge);
|
||||
Dispatcher.InvokeAsync(CheckBadge,DispatcherPriority.Background);
|
||||
}
|
||||
public void endPage()
|
||||
{
|
||||
dfReader.WaitEnd();
|
||||
dfReader.Dispose();
|
||||
if (dfReader != null)
|
||||
{
|
||||
dfReader.WaitEnd();
|
||||
dfReader.Dispose();
|
||||
}
|
||||
this.Close();
|
||||
}
|
||||
|
||||
|
|
@ -413,8 +416,6 @@ namespace eDosStation
|
|||
Code.Text = string.Empty;
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void TaskOK_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
bool isOk = false;
|
||||
|
|
@ -447,8 +448,8 @@ namespace eDosStation
|
|||
{
|
||||
tb.SelectedItem = tbEPD;
|
||||
bEpdDone.Visibility = Visibility.Hidden;//1
|
||||
epdWait.Text = "Waiting max 10 seconds";
|
||||
Dispatcher.Invoke(new Action(() => { GetEPD(); }),DispatcherPriority.ApplicationIdle);
|
||||
epdWait.Text = "Waiting for EPD (max 10 seconds)";
|
||||
Dispatcher.InvokeAsync(new Action(() => { GetEPD(); }),DispatcherPriority.Background);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -561,6 +562,7 @@ namespace eDosStation
|
|||
b.Margin = m;
|
||||
sp.Children.Add(b);
|
||||
}
|
||||
sp.Visibility = Visibility.Visible;
|
||||
}
|
||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
|
@ -628,9 +630,7 @@ namespace eDosStation
|
|||
endPage();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private void tb_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (e.AddedItems.Count>0 && e.AddedItems[0] is TabControl)
|
||||
|
|
@ -641,7 +641,7 @@ namespace eDosStation
|
|||
|
||||
private void DfReader_BadgeTO(LSWDesfirePublic.CCard Sender, EventArgs e)
|
||||
{
|
||||
this.Dispatcher.Invoke(new Action(() => endPage()));
|
||||
this.Dispatcher.InvokeAsync(new Action(() => endPage()));
|
||||
}
|
||||
|
||||
private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@
|
|||
xmlns:local="clr-namespace:eDosStation"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
mc:Ignorable="d"
|
||||
Title="Exit" Height="450" Width="800"
|
||||
Title="Exit"
|
||||
Height="980" Width="1820"
|
||||
|
||||
FontFamily="Segoe UI" FontSize="36"
|
||||
Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
|
||||
<DockPanel>
|
||||
|
|
@ -14,14 +16,14 @@
|
|||
<StatusBarItem Name="statusEPD" Content="Epd" />
|
||||
</StatusBar>
|
||||
<StackPanel Orientation="Vertical">
|
||||
<TabControl>
|
||||
<TabItem Name="Wait" Header="Wait" HorizontalAlignment="Center" VerticalAlignment="Center" >
|
||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Vertical" >
|
||||
<TabControl >
|
||||
<TabItem Name="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">
|
||||
<TabItem Name="ok" >
|
||||
<Grid TextBlock.FontSize="40" >
|
||||
<Grid.RowDefinitions >
|
||||
<RowDefinition Height="auto" />
|
||||
|
|
@ -32,14 +34,9 @@
|
|||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition />
|
||||
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
|
||||
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Name= "Wearer" Text="persID:" TextBlock.FontSize="20"/>
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Name= "EpdVisit" Text="Visit:" TextBlock.FontSize="20"/>
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Grid.RowSpan="1" Text="Dose" />
|
||||
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical" VerticalAlignment="Center" Name="DosePanel">
|
||||
<TextBlock Name="HpDose07" />
|
||||
|
|
@ -49,7 +46,7 @@
|
|||
</Grid>
|
||||
|
||||
</TabItem>
|
||||
<TabItem Name="Alarm" Header="Alarm" Height="23" Margin="-2,-2,-1.8,-0.2" VerticalAlignment="Top">
|
||||
<TabItem Name="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" >
|
||||
|
|
@ -67,7 +64,7 @@
|
|||
<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">
|
||||
<TabItem Name="OtherAlarm" >
|
||||
<StackPanel>
|
||||
<Border Background="LightYellow" TextBlock.FontSize="24" TextBlock.LineHeight="30px" Padding="20,20,20,20" >
|
||||
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" >
|
||||
|
|
|
|||
BIN
eDosStation/Images/logo500.png
Normal file
BIN
eDosStation/Images/logo500.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
BIN
eDosStation/Images/logoh120.png
Normal file
BIN
eDosStation/Images/logoh120.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.8 KiB |
BIN
eDosStation/Images/logoh60.png
Normal file
BIN
eDosStation/Images/logoh60.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
|
|
@ -36,12 +36,13 @@
|
|||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" FontSize="30" Name ="tVersion" Text="HPH eDos v" TextAlignment="Left" />
|
||||
<TextBlock Grid.Column="2" FontSize="30" Name="tbTime" Text="..." TextAlignment="Right" />
|
||||
<Image Source="/Images/logoh60.png" Height="60" HorizontalAlignment="Left" />
|
||||
<TextBlock Grid.Column="1" FontSize="30" Text="HPH eDos" TextAlignment="Center" Foreground="{StaticResource sckbP}" FontWeight="Bold" VerticalAlignment="Center" />
|
||||
<TextBlock Grid.Column="2" FontSize="30" Name="tbTime" Text="2021-04-02 08:00" TextAlignment="Right" VerticalAlignment="Center" Foreground="{StaticResource sckbP}" />
|
||||
</Grid>
|
||||
<StackPanel DockPanel.Dock="Left" Width="100" />
|
||||
<StackPanel DockPanel.Dock="right" Width="100" />
|
||||
<TextBlock DockPanel.Dock="Bottom" Text="eDosStation 2021" FontSize="12" HorizontalAlignment="Center" />
|
||||
<TextBlock DockPanel.Dock="Bottom" Name="tVersion" Text="eDosStation 2021 v" FontSize="12" HorizontalAlignment="Center" />
|
||||
<Grid >
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
|
|
@ -49,13 +50,12 @@
|
|||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Name="ibComment" Grid.Row="0" Background="Bisque">
|
||||
<TextBlock Name="itComment" HorizontalAlignment="Stretch" TextWrapping="Wrap" FontSize="15" Margin="10,10,10,10">
|
||||
</TextBlock>
|
||||
<Border Name="ibComment" Grid.Row="0" Background="Bisque" Visibility="Collapsed">
|
||||
<TextBlock Name="itComment" HorizontalAlignment="Stretch" TextWrapping="Wrap" FontSize="15" Margin="10,10,10,10" Foreground="{StaticResource sckbP}" />
|
||||
</Border>
|
||||
<telerik:RadButton Grid.Row="1" Grid.Column="0" Content="Entry" Name="bEntry" Click="BEntry_Click" Margin="20,20,20,20" CornerRadius="15" />
|
||||
<telerik:RadButton Grid.Row="2" Grid.Column="0" Content="Exit" Name="bExit" Click="BExit_Click" Margin="20,20,20,20" CornerRadius="15"/>
|
||||
<telerik:RadButton Grid.Row="3" Grid.Column="0" Content="Show EPD Dosis" Click="Button_Click" Margin="20,20,20,20" CornerRadius="15"/>
|
||||
<telerik:RadButton Grid.Row="1" Grid.Column="0" Content="Entry" Name="bEntry" Click="BEntry_Click" Margin="20,20,20,20" Style="{StaticResource bigButton}" />
|
||||
<telerik:RadButton Grid.Row="2" Grid.Column="0" Content="Exit" Name="bExit" Click="BExit_Click" Margin="20,20,20,20" Style="{StaticResource bigButton}" />
|
||||
<telerik:RadButton Grid.Row="3" Grid.Column="0" Content="Show EPD Dosis" Click="Button_Click" Margin="20,20.4,19.6,0" Style="{StaticResource bigButton}" Height="183" VerticalAlignment="Top" />
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
</Grid>
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ namespace eDosStation
|
|||
|
||||
private void setLocalStatus()
|
||||
{
|
||||
|
||||
if (!dataInterface.isOnline())
|
||||
{
|
||||
Status.Content = "*** Offline ***";
|
||||
|
|
@ -152,7 +151,7 @@ namespace eDosStation
|
|||
ibComment.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
ibComment.Visibility = Visibility.Hidden;
|
||||
ibComment.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
else
|
||||
setErrorStatus(errMsg);
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ namespace eDosStation
|
|||
}
|
||||
|
||||
dataInterface.SetStation(ID_Station);
|
||||
dataInterface.SetCheckUser(checkUser);
|
||||
|
||||
if (Error == 0) using (var cmd2 = new SqlCommand("GetInstallationsComments", co))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -195,4 +195,35 @@
|
|||
<Setter Property="Width" Value="190"/>
|
||||
<Setter Property="TextBlock.FontSize" Value="25" />
|
||||
</Style>
|
||||
|
||||
<Color x:Key="sckcLB">#A1DAF7</Color>
|
||||
<Color x:Key="sckcP">#9F4191</Color>
|
||||
<Color x:Key="sckcDP">#56256B</Color>
|
||||
<SolidColorBrush x:Key="sckbLB" Color="{StaticResource sckcLB}"/>
|
||||
<SolidColorBrush x:Key="sckbP" Color="{StaticResource sckcP}"/>
|
||||
|
||||
|
||||
<TextBlock x:Key="tbFooter" Foreground="white">
|
||||
⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤<LineBreak/>
|
||||
⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run><LineBreak/>
|
||||
⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤⬤⬤⬤<Run Foreground="#A1DAF7">⬤</Run>⬤<LineBreak/>
|
||||
<Run Foreground="#9F4191">⬤</Run><Run Foreground="#A1DAF7">⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run>⬤⬤⬤<Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run><Run Foreground="#A1DAF7">⬤</Run>⬤<Run Foreground="#A1DAF7">⬤</Run>⬤⬤<Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤</Run>⬤⬤<Run Foreground="#9F4191">⬤</Run><LineBreak/>
|
||||
<Run Foreground="#9F4191">⬤⬤⬤</Run><Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#56256B">⬤</Run><Run Foreground="#9F4191">⬤⬤⬤</Run><Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤</Run><Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤⬤⬤⬤⬤⬤⬤</Run><LineBreak/>
|
||||
<Run Foreground="#56256B">⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤</Run><Run Foreground="#A1DAF7">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤⬤⬤⬤⬤⬤⬤</Run><Run Foreground="#9F4191">⬤</Run><Run Foreground="#56256B">⬤</Run><LineBreak/>
|
||||
</TextBlock>
|
||||
|
||||
<Style x:Key="bigButton" TargetType="telerik:RadButton">
|
||||
<Setter Property="CornerRadius" Value="15"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource sckbP}"></Setter>
|
||||
<Setter Property="FontWeight" Value="Bold"/>
|
||||
<Setter Property="Background">
|
||||
<Setter.Value>
|
||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||
<GradientStop Color="White" Offset="0"/>
|
||||
<GradientStop Color="{StaticResource sckcLB}" Offset="0.5"/>
|
||||
<GradientStop Color="White" Offset="1"/>
|
||||
</LinearGradientBrush>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
|
|
@ -283,6 +283,9 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Images\EPD-MK3.png" />
|
||||
<Resource Include="Images\logo500.png" />
|
||||
<Resource Include="Images\logoh120.png" />
|
||||
<Resource Include="Images\logoh60.png" />
|
||||
<Content Include="IR_READER_MS_DLL.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue