From b86046e279719d06ba25d206399c80ef20f5e98c Mon Sep 17 00:00:00 2001
From: Luc Vandenbroucke <lvandenb@sckcen.be>
Date: Mon, 10 May 2021 14:05:31 +0200
Subject: [PATCH] versiennr

---
 SetupProject1/Product.wxs              |  2 +-
 eDosStation/About.xaml                 | 10 ++++++++++
 eDosStation/About.xaml.cs              |  1 +
 eDosStation/Properties/AssemblyInfo.cs |  4 ++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/SetupProject1/Product.wxs b/SetupProject1/Product.wxs
index 8d75b40..01bb24d 100644
--- a/SetupProject1/Product.wxs
+++ b/SetupProject1/Product.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
   <?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
-  <Product Id="*" Name="eDosStation" Language="1033" Version="1.3.1.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
+  <Product Id="*" Name="eDosStation" Language="1033" Version="1.5.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
     <Media Id="1" EmbedCab="yes" Cabinet="cab" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
diff --git a/eDosStation/About.xaml b/eDosStation/About.xaml
index b4b030e..875cfd2 100644
--- a/eDosStation/About.xaml
+++ b/eDosStation/About.xaml
@@ -48,6 +48,16 @@
                                 </Paragraph>
                             </TableCell>
                         </TableRow>
+                        <TableRow>
+                            <TableCell >
+                                <Paragraph TextAlignment="Right" Margin="0,0,20,0" >Check users quiz</Paragraph>
+                            </TableCell>
+                            <TableCell>
+                                <Paragraph>
+                                    <Run BaselineAlignment="Bottom" x:Name="checkUser" Text=""/>
+                                </Paragraph>
+                            </TableCell>
+                        </TableRow>
                     </TableRowGroup>
                 </Table>
 
diff --git a/eDosStation/About.xaml.cs b/eDosStation/About.xaml.cs
index 3a3d6c8..2c29525 100644
--- a/eDosStation/About.xaml.cs
+++ b/eDosStation/About.xaml.cs
@@ -26,6 +26,7 @@ namespace eDosStation
             aVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
             stationID.Text = station.ID_Station.ToString();
             ReadAlias();
+            if (station.checkUser) checkUser.Text = "Yes"; else checkUser.Text = "No";
         }
 
         private void RadButton_Click(object sender, RoutedEventArgs e)
diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs
index 05cdf60..f5f3fd3 100644
--- a/eDosStation/Properties/AssemblyInfo.cs
+++ b/eDosStation/Properties/AssemblyInfo.cs
@@ -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.4.1.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]