extra alarm : not allowed, amlarm pending

This commit is contained in:
Luc Vandenbroucke 2019-02-20 08:03:29 +01:00
parent 4c713b89df
commit 72c50d259a
4 changed files with 107 additions and 12 deletions

View file

@ -88,7 +88,7 @@
</TextBlock.Style>
</TextBlock>
<TextBlock Text="{Binding Task_Name}" Width="350" />
<TextBlock Text="{Binding Task_Name}" Width="400" FontSize="18" />
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
@ -100,6 +100,7 @@
</telerik:RadMultiColumnComboBox.ItemsSourceProvider>
</telerik:RadMultiColumnComboBox>-->
</ScrollViewer>
</StackPanel>
<Grid Grid.Row="2" Margin="10,10,10,10">
<Grid.RowDefinitions>
@ -172,11 +173,28 @@
<LineBreak/>
</TextBlock>
<TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Visibility="Hidden" Name="IssueOK">
<Run Name="Done" Text="OK" />
</TextBlock>
</Grid>
<Button Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bEpdDone" Visibility="Hidden" Click="bClose_Click" />
</Grid>
</TabItem>
</TabControl>
<TabItem Header="Not allowed" Name="tbNotAllowed">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="100" />
<RowDefinition Height="100" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" TextAlignment="Center" FontSize="25" FontFamily="Comic Sans MS">
<Run Text="No Access" />
<Run Name="tReasonNoAccess" Text="" />
<LineBreak/>
</TextBlock>
<Button Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bNoAccessDone" Click="bClose_Click">
</Button>
</Grid>
</TabItem>
</TabControl>
</DockPanel>
</Window>

View file

@ -157,7 +157,7 @@ namespace eDosStation
}
ep.SetIssued();
IssueOK.Visibility = Visibility.Visible;
bEpdDone.Visibility = Visibility.Visible;
}
}
@ -189,12 +189,23 @@ namespace eDosStation
void AskTask()
{
eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
if (_User == null || _User.VisitIDLocked==true || _User.AccessAllow==false)
{
dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, _User.Margin);
tbNotAllowed.IsSelected = true;
if (_User.VisitIDLocked == true) tReasonNoAccess.Text = "Alarm status not cleared";
else if (_User.AccessAllow==false) tReasonNoAccess.Text = "Access not allowed";
else tReasonNoAccess.Text = "No identification";
}
else
{
eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
{
dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, _User.Margin);
}
tbTask.IsSelected = true;
}
tbTask.IsSelected = true;
}
void CheckBadge()
@ -257,6 +268,13 @@ namespace eDosStation
return false;
}
private void bClose_Click(object sender, RoutedEventArgs e)
{
this.Close();
}
private void BClear_Click(object sender, RoutedEventArgs e)
{
CSN.Text = string.Empty;
@ -343,7 +361,7 @@ namespace eDosStation
private void Window_Loaded(object sender, RoutedEventArgs e)
{
tbEntry.IsSelected = true;
IssueOK.Visibility = Visibility.Hidden;
bEpdDone.Visibility = Visibility.Hidden;
eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
//using (eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter dataSet1GetTaskListTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter())

View file

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
namespace eDosStation
{
public class TouchEnabledTextBox : TextBox
{
//inside the class definition
private Process _touchKeyboardProcess = null;
public TouchEnabledTextBox()
{
this.GotFocus += TouchEnabledTextBox_GotFocus;
//this.GotTouchCapture += TouchEnabledTextBox_GotTouchCapture;
this.LostFocus += TouchEnabledTextBox_LostFocus;
}
private void TouchEnabledTextBox_GotFocus(object sender, RoutedEventArgs e)
{
string touchKeyboardPath = @"C:\Program Files\Common Files\Microsoft Shared\Ink\TabTip.exe";
_touchKeyboardProcess = Process.Start(touchKeyboardPath);
}
private void TouchEnabledTextBox_GotTouchCapture(object sender, System.Windows.Input.TouchEventArgs e)
{
string touchKeyboardPath = @"C:\Program Files\Common Files\Microsoft Shared\Ink\TabTip.exe";
_touchKeyboardProcess= Process.Start(touchKeyboardPath);
}
//add this method as a member method of the class
private void TouchEnabledTextBox_LostFocus(object sender, RoutedEventArgs eventArgs)
{
if (_touchKeyboardProcess != null)
{
_touchKeyboardProcess.Kill();
//nullify the instance pointing to the now-invalid process
_touchKeyboardProcess = null;
}
}
}
}

View file

@ -102,6 +102,7 @@
<Compile Include="ShowEPDDose.xaml.cs">
<DependentUpon>ShowEPDDose.xaml</DependentUpon>
</Compile>
<Compile Include="TouchEnabledTextBox.cs" />
<Compile Include="User.cs" />
<Page Include="eDosDict.xaml">
<SubType>Designer</SubType>