From 5dbd7a7ded3cfd120d401f672a9f7063052cec9b Mon Sep 17 00:00:00 2001
From: "chris.watts90@outlook.com" <chris.watts90@outlook.com>
Date: Fri, 21 Apr 2017 08:15:27 +0100
Subject: [PATCH 1/3] change card reader decision code to prevent null ref in
 main app.

#79
---
 .../CardReaderService/CardReaderService.cs           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs
index 9422698..6f6d5d8 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/CardReaderService.cs
@@ -52,15 +52,13 @@ namespace CardReaderService
                 }
 
                 var readerNameConfig = ConfigurationHandler.ConfigurationHandler.GetConfiguration("ReaderName");
-                if (string.IsNullOrEmpty(readerNameConfig))
+                if (string.IsNullOrEmpty(readerNameConfig) || (!readerNames.Contains(readerNameConfig)))
                 {
-                    if (!readerNames.Contains(readerNameConfig))
-                    {
-                        _logger.Warn("No reader found with the name: {0}, defaulting to first available reader {1}",
-                            readerNameConfig, readerNames.First());
+                    _logger.Warn("No reader found with the name: {0}, defaulting to first available reader {1}",
+                        readerNameConfig, readerNames.First());
 
-                        readerNameConfig=readerNames.First();
-                    }
+                    readerNameConfig = readerNames.First();
+                    
                 }
                 _logger.Trace("Choosing reader: {0}", readerNameConfig);
                 _readerName = readerNameConfig;

From 54c86b41ed51814a2e33f05f5d2746e9472be9f1 Mon Sep 17 00:00:00 2001
From: "chris.watts90@outlook.com" <chris.watts90@outlook.com>
Date: Fri, 21 Apr 2017 08:16:10 +0100
Subject: [PATCH 2/3] Add reference to ConfigurationHandler project.

Add component tag for ConfigurationHandler dll
#78
---
 .../CardReaderServiceInstaller.wixproj                    | 8 ++++++++
 .../CardReaderServiceInstaller/Common.wxs                 | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
index a8847dc..c5bbea3 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/CardReaderServiceInstaller.wixproj
@@ -37,6 +37,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\ConfigurationHandler\ConfigurationHandler.csproj">
+      <Name>ConfigurationHandler</Name>
+      <Project>{115250f6-f8c4-4f9b-a15f-251ea258d963}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\Interfaces\Interfaces.csproj">
       <Name>Interfaces</Name>
       <Project>{b7347b72-e208-423a-9d99-723b558ea3d7}</Project>
diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
index 9bb6fef..e8a39b4 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderServiceInstaller/Common.wxs
@@ -8,6 +8,12 @@
               KeyPath="yes"
               Source="$(var.Interfaces.TargetDir)Interfaces.dll" />
       </Component>
+      <Component Id="ConfigurationHandler" Guid="{54C7ACE7-02DE-4EDC-BDDC-7DC6F34F6AF8}">
+        <File Id="ConfigurationHandlerDll"
+              Checksum="yes"
+              KeyPath="yes"
+              Source="$(var.ConfigurationHandler.TargetDir)ConfigurationHandler.dll"/>
+      </Component>
     </ComponentGroup>
 	</Fragment>
 </Wix>

From 06e3dbcdee2bccd95c6178fdba1cee2068cbc076 Mon Sep 17 00:00:00 2001
From: "chris.watts90@outlook.com" <chris.watts90@outlook.com>
Date: Fri, 21 Apr 2017 08:16:38 +0100
Subject: [PATCH 3/3] add missing knockout context menu css and js files.

#78
---
 .../WebApiServerHostInstaller/WebPages.wxs           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
index 294e388..0d47858 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
@@ -93,6 +93,12 @@
               KeyPath="yes"
               Checksum="yes"/>
       </Component>
+      <Component Id="KnockoutContextMenuJs" Guid="{C48C75F7-E4C3-45D7-8041-0BF7A8EEC077}">
+        <File Id="knockout.contextmenu.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\knockout.contextmenu.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="WWWStaticFonts" Directory="STATICWWWFONTS" >
@@ -177,6 +183,12 @@
               KeyPath="yes"
               Checksum="yes"/>
       </Component>
+      <Component Id="KnockoutContextMenuCss" Guid="{D5C5C0F3-500C-419C-A327-5342AFF08204}">
+        <File Id="knockout.contextmenu.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\knockout.contextmenu.css"
+              KeyPath="yes"
+              Checksum="yes" />
+      </Component>
     </ComponentGroup>
     
 	</Fragment>