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

first beta test

Browse source
This commit is contained in:
Luc Vandenbroucke 2019-02-21 10:11:58 +01:00
parent 36cd8565e1
commit 8de35a5b7a
12 changed files with 253 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EpdBase/EpdBase.cpp
View file

@ -54,7 +54,7 @@ void EpdBase::Epd2U::Close()
void EpdBase::Epd2U::DecodeFunctionFlags()
{
EpdType = (FunctionFlags & 0x0300) >> 8;
EpdType = (FunctionFlags & 0x1F00) >> 8;
}
void EpdBase::Epd2U::DecodeStatus()

3
eDosStation/App.config
View file

@ -29,6 +29,9 @@
<setting name="Inst_Name2" serializeAs="String">
<value>Venus</value>
</setting>
<setting name="TestCSN" serializeAs="String">
<value>0428790A0B4E80</value>
</setting>
</eDosStation.Properties.Settings>
</userSettings>
</configuration>

233
eDosStation/EntryBadge.xaml
View file

@ -11,7 +11,8 @@
<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>
@ -35,132 +36,148 @@
</StackPanel>
</TabItem>
<TabItem Header="Task" Name="tbTask">
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
<Grid DataContext="{Binding Mode=OneWay, Source={StaticResource getTaskListViewSource}}" >
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
<RowDefinition Height="auto" />
<RowDefinition Height="80" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Border Grid.Row="0" Background="AliceBlue" HorizontalAlignment="Stretch" CornerRadius="10" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0">
<telerik:RadToggleButton Name="cbAlara" HorizontalAlignment="Left" Width="150" Content="Normal" TextBlock.FontSize="24" Checked="CbAlara_Checked" Unchecked="CbAlara_Checked" IsChecked="False" CornerRadius="15" />
</StackPanel>
<TextBlock Grid.Column="1" FontSize="36" TextAlignment="Center" Text="Choose a task" />
<Border Grid.Row="0" Grid.ColumnSpan="2" Background="AliceBlue" HorizontalAlignment="Stretch" CornerRadius="10" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0">
<telerik:RadToggleButton Name="cbAlara" HorizontalAlignment="Left" Width="150" Content="Normal" TextBlock.FontSize="24" Checked="CbAlara_Checked" Unchecked="CbAlara_Checked" IsChecked="False" CornerRadius="15" />
</StackPanel>
<TextBlock Grid.Column="1" FontSize="36" TextAlignment="Center" Text="Choose a task" />
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="3">
<telerik:RadToggleButton Name="cbInst1" HorizontalAlignment="Left" Width="150" Content="Inst1" TextBlock.FontSize="24" Checked="CbInst1_Checked" Unchecked="CbInst1_Checked" IsChecked="True" CornerRadius="15" />
<telerik:RadToggleButton Name="cbInst2" HorizontalAlignment="Left" Width="150" Content="Inst2" TextBlock.FontSize="24" Checked="CbInst2_Checked" Unchecked="CbInst2_Checked" IsChecked="false" Visibility="Collapsed" CornerRadius="15" />
</StackPanel>
</Grid>
</Border>
<StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Stretch" >
<ScrollViewer VerticalScrollBarVisibility="Visible" Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}" Height="753">
<ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" >
<ListBox.ItemsPanel >
<ItemsPanelTemplate >
</Border>
<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Vertical" HorizontalAlignment="Stretch" >
<ScrollViewer VerticalScrollBarVisibility="Visible" Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}" Height="753">
<ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged" >
<ListBox.ItemsPanel >
<ItemsPanelTemplate >
<telerik:RadUniformGrid Columns="3" IsItemsHost="True" />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" >
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" >
<TextBlock Text="{Binding TaskType_CODE}" Width="50" >
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding MarginExceeded}" Value="true">
<Setter Property="Background" Value="Red"></Setter>
</DataTrigger>
<DataTrigger Binding="{Binding MarginExceeded}" Value="false">
<Setter Property="Background" Value="Green"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding MarginExceeded}" Value="true">
<Setter Property="Background" Value="Red"></Setter>
</DataTrigger>
<DataTrigger Binding="{Binding MarginExceeded}" Value="false">
<Setter Property="Background" Value="Green"></Setter>
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<TextBlock Text="{Binding Task_Name}" Width="400" FontSize="18" />
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
</TextBlock>
<TextBlock Text="{Binding Task_Name}" Width="400" FontSize="18" />
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch" >
</ListBox>
<!--<telerik:RadMultiColumnComboBox DisplayMemberPath="Task_Name" Width="700" HorizontalAlignment="Stretch" >
<telerik:RadMultiColumnComboBox.ItemsSourceProvider>
<telerik:GridViewItemsSourceProvider ItemsSource="{Binding}" />
</telerik:RadMultiColumnComboBox.ItemsSourceProvider>
</telerik:RadMultiColumnComboBox>-->
</ScrollViewer>
</StackPanel>
<Grid Grid.Row="2" Margin="10,10,10,10">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
</ScrollViewer>
<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.Text>
<MultiBinding StringFormat="{}Hp10Dose L: {0} H: {1} µSv">
<Binding Path="Hp10Dose1" />
<Binding Path="Hp10Dose2" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp07Rate Off: {0} On: {1} µSv">
<Binding Path="HP07RateOFF" />
<Binding Path="HP07RateON" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="1" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp10Rate1 Off: {0} On: {1} µSv">
<Binding Path="HP10Rate1OFF" />
<Binding Path="HP10Rate1ON" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="2" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp10Rate2 Off: {0} On: {1} µSv">
<Binding Path="HP10Rate2OFF" />
<Binding Path="HP10Rate2ON" />
</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} }" />
</StackPanel>
<Grid Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,10,10,10">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100"/>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<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.Text>
<MultiBinding StringFormat="{}Hp10Dose L: {0} H: {1} µSv">
<Binding Path="Hp10Dose1" />
<Binding Path="Hp10Dose2" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="0" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp07Rate Off: {0} On: {1} µSv">
<Binding Path="HP07RateOFF" />
<Binding Path="HP07RateON" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="1" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp10Rate1 Off: {0} On: {1} µSv">
<Binding Path="HP10Rate1OFF" />
<Binding Path="HP10Rate1ON" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
<TextBlock Grid.Row="1" Grid.Column="2" >
<TextBlock.Text>
<MultiBinding StringFormat="{}Hp10Rate2 Off: {0} On: {1} µSv">
<Binding Path="HP10Rate2OFF" />
<Binding Path="HP10Rate2ON" />
</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} }" />
</Grid>
<Image Grid.Row="2" Grid.RowSpan="2" Grid.Column="0" Height="150" >
<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 Grid.Row="3" 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" />
</StackPanel>
</Grid>
<StackPanel Grid.Row="3" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" >
<telerik:RadButton Name="TaskOK" Content="OK" Click="TaskOK_Click" Width="300" Height="50" CornerRadius="10" />
</StackPanel>
</Grid>
</TabItem>
</TabItem>
<TabItem Header="EPD" Name="tbEPD">
<Grid>
<Grid.RowDefinitions>
@ -174,7 +191,8 @@
<LineBreak/>
</TextBlock>
<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" />
<Image Grid.Row="1" Source="{StaticResource iBG}"/>
<Button Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" Background="LawnGreen" Padding="10,10,10,10" Content="OK" Name="bEpdDone" Visibility="Hidden" Click="bClose_Click" />
</Grid>
</TabItem>
@ -199,3 +217,4 @@
</TabControl>
</DockPanel>
</Window>

69
eDosStation/EntryBadge.xaml.cs
View file

@ -58,6 +58,14 @@ namespace eDosStation
this.Close();
return false;
}
bool isBG = (ep.epdType == 0);
if (isBG && !CurTaskRow.EPDRad.Equals("BG"))
{
MessageBox.Show("Wrong EPD Type", "EDP", MessageBoxButton.OK, MessageBoxImage.Hand, MessageBoxResult.OK, MessageBoxOptions.ServiceNotification);
this.Close();
return false;
}
statusEPD.Text = $"EPD: {ep.b.CurrentDeviceID}";
ep.ReadTresholds();
@ -149,12 +157,17 @@ namespace eDosStation
//ep.K5 = 13100;
//ep.K6 = 1310;
if (ep.K6 != 1310)
if (!isBG)
{
MessageBox.Show("Alarm");
if (ep.K6 != 1310)
{
MessageBox.Show("Alarm");
}
else
{
ep.WriteCalibration();
}
}
ep.WriteCalibration();
}
ep.SetIssued();
@ -189,11 +202,11 @@ namespace eDosStation
}
private void SetFilter(bool isAlara)
private void SetFilter(bool isAlara)
{
StringBuilder fi = new StringBuilder();
if (Inst1==true) fi.Append($"{(Inst2 ? "(" : "") } Inst_CODE = {Properties.Settings.Default.Inst_CODE1} ");
if (Inst2==true) fi.Append($" {(Inst1 ? "or" : "") } Inst_CODE={Properties.Settings.Default.Inst_CODE2} {(Inst1 ? ")" : "")} ");
if (Inst1 == true) fi.Append($"{(Inst2 ? "(" : "") } Inst_CODE = {Properties.Settings.Default.Inst_CODE1} ");
if (Inst2 == true) fi.Append($" {(Inst1 ? "or" : "") } Inst_CODE={Properties.Settings.Default.Inst_CODE2} {(Inst1 ? ")" : "")} ");
fi.Append($" {(Inst1 || Inst2 ? "AND" : "") } TaskType_CODE { (isAlara ? ">=" : "<")} '1000' ");
System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
@ -209,15 +222,15 @@ namespace eDosStation
}
getTaskListViewSource.View.MoveCurrentToFirst();
}
void AskTask()
{
if (_User == null || _User.VisitIDLocked==true || _User.AccessAllow==false)
if (_User == null || _User.VisitIDLocked == true || _User.AccessAllow == false)
{
tbNotAllowed.IsSelected = true;
if (_User.VisitIDLocked == true) tReasonNoAccess.Text = "Alarm status not cleared";
else if (_User.AccessAllow==false) tReasonNoAccess.Text = "Access not allowed";
else if (_User.AccessAllow == false) tReasonNoAccess.Text = "Access not allowed";
else tReasonNoAccess.Text = "No identification";
}
else
@ -229,7 +242,7 @@ namespace eDosStation
}
tbTask.IsSelected = true;
SetFilter(false);
}
}
@ -331,6 +344,7 @@ namespace eDosStation
System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
var rv = getTaskListViewSource.View.CurrentItem as DataRowView;
CurTaskRow = rv.Row as DataSet1.GetTaskInfoRow;
GetEPD();
}
}
@ -359,16 +373,16 @@ namespace eDosStation
}
private void CbAlara_Checked(object sender, RoutedEventArgs e)
{
bool isAlara = (cbAlara.IsChecked == true);
if (isAlara) cbAlara.Content = "Alara"; else cbAlara.Content = "Normal";
SetFilter(isAlara);
}
private void CbInst1_Checked(object sender, RoutedEventArgs e)
@ -401,7 +415,7 @@ namespace eDosStation
bEpdDone.Visibility = Visibility.Hidden;
cbInst1.Content = Properties.Settings.Default.Inst_Name1;
if (Properties.Settings.Default.Inst_CODE2>0)
if (Properties.Settings.Default.Inst_CODE2 > 0)
{
cbInst2.Content = Properties.Settings.Default.Inst_Name2;
cbInst2.Visibility = Visibility.Visible;
@ -422,16 +436,19 @@ namespace eDosStation
//getTaskListViewSource.View.MoveCurrentToFirst();
////Real
//t = new System.Threading.Thread(() => Starter());
//t.Start();
////Debug
_User = new User("0428790A0B4E80", string.Empty);
Dispatcher.InvokeAsync(AskTask);
string TestCSN = Properties.Settings.Default.TestCSN;
if (string.IsNullOrWhiteSpace(TestCSN))
{
////Real
t = new System.Threading.Thread(() => Starter());
t.Start();
}
else
{
////Debug
_User = new User(TestCSN, string.Empty);
Dispatcher.InvokeAsync(AskTask);
}
}
}
}

BIN
eDosStation/Images/EPD-MK2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 56 KiB

BIN
eDosStation/Images/EPD-N2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

12
eDosStation/Properties/Settings.Designer.cs generated
View file

@ -92,5 +92,17 @@ namespace eDosStation.Properties {
this["Inst_Name2"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0428790A0B4E80")]
public string TestCSN {
get {
return ((string)(this["TestCSN"]));
}
set {
this["TestCSN"] = value;
}
}
}
}

3
eDosStation/Properties/Settings.settings
View file

@ -25,5 +25,8 @@
<Setting Name="Inst_Name2" Type="System.String" Scope="User">
<Value Profile="(Default)">Venus</Value>
</Setting>
<Setting Name="TestCSN" Type="System.String" Scope="User">
<Value Profile="(Default)">0428790A0B4E80</Value>
</Setting>
</Settings>
</SettingsFile>

8
eDosStation/Settings.xaml
View file

@ -31,9 +31,13 @@
<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" />
<Button Grid.Row="3" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
<Button Grid.Row="3" Grid.Column="1" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
<Button Grid.Row="4" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
<Button Grid.Row="4" Grid.Column="1" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
</Grid>
</Window>

2
eDosStation/Settings.xaml.cs
View file

@ -33,6 +33,7 @@ namespace eDosStation
Properties.Settings.Default.Inst_CODE2 = int.Parse(tInsCode2.Text);
Properties.Settings.Default.Inst_Name1= tInsName1.Text;
Properties.Settings.Default.Inst_Name2= tInsName2.Text;
Properties.Settings.Default.TestCSN = tTestCSN.Text;
Properties.Settings.Default.Save();
Properties.Settings.Default.Reload();
tComPort.Text = Properties.Settings.Default.comport.ToString();
@ -51,6 +52,7 @@ namespace eDosStation
tInsCode2.Text = Properties.Settings.Default.Inst_CODE2.ToString();
tInsName1.Text = Properties.Settings.Default.Inst_Name1.ToString();
tInsName2.Text = Properties.Settings.Default.Inst_Name2.ToString();
tTestCSN.Text = Properties.Settings.Default.TestCSN.ToString();
}
}
}

47
eDosStation/eDosStation.csproj
View file

@ -14,6 +14,24 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>\\scksrv1\sckcen\DOKUMENT\idpbw\TOESTELLEN\REMSnew\eDosStation\</PublishUrl>
<Install>true</Install>
<InstallFrom>Unc</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -34,6 +52,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>CFFDCEC5D1541D1BA185CEE6003129CB1EFB31A4</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>eDosStation_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@ -171,6 +201,7 @@
<None Include="DataSet1.xss">
<DependentUpon>DataSet1.xsd</DependentUpon>
</None>
<None Include="eDosStation_TemporaryKey.pfx" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@ -189,5 +220,21 @@
<Name>OkReadBadge</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\EPD-MK2.png" />
<Resource Include="Images\EPD-N2.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

10
eDosStation/eDosStation.csproj.user
View file

@ -3,4 +3,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>\\scksrv1\sckcen\DOKUMENT\idpbw\TOESTELLEN\REMSnew\eDosStation\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
</Project>