From 440bf9736294fd7062a6e41a49a22d476757b1e6 Mon Sep 17 00:00:00 2001
From: 4yn <changsiyuan1999@gmail.com>
Date: Tue, 5 Nov 2019 14:40:03 +0800
Subject: [PATCH] Change to 4D NRIC, add gitignore

---
 .gitignore                                    |   1 +
 SL Clearance Management System/.gitignore     |   2 +
 .../BusinessLogic/SLVMSDataBaseConnection.cs  |   2 +-
 .../Model/PersonnelDetails.cs                 |   4 +
 .../Model/VisitorRecord.cs                    |   3 +-
 .../SL Clearance Management System.csproj     | 616 +++++++++---------
 .../View/AllVisitorHistory.xaml               |   2 +-
 .../View/BookInPersonnel.xaml                 |   2 +-
 .../View/DashBoard.xaml                       |   4 +-
 .../View/LookUpClearance.xaml                 |   4 +-
 .../PersonnelParticularsEntryControl.xaml     |   2 +-
 .../PersonnelParticularsEntryControl.xaml.cs  |   7 +-
 .../ReviewPersonnelParticularsControl.xaml    |   2 +-
 .../SelectEscortPersonnelDialogueControl.xaml |   2 +-
 .../View/VisitorHistoryLookup.xaml            |   8 +-
 .../VisitorHistoryLookupViewModel.cs          |   8 +-
 16 files changed, 343 insertions(+), 326 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 SL Clearance Management System/.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..88dbff1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.vs/
diff --git a/SL Clearance Management System/.gitignore b/SL Clearance Management System/.gitignore
new file mode 100644
index 0000000..cd42ee3
--- /dev/null
+++ b/SL Clearance Management System/.gitignore	
@@ -0,0 +1,2 @@
+bin/
+obj/
diff --git a/SL Clearance Management System/BusinessLogic/SLVMSDataBaseConnection.cs b/SL Clearance Management System/BusinessLogic/SLVMSDataBaseConnection.cs
index 94bde50..4804ea0 100644
--- a/SL Clearance Management System/BusinessLogic/SLVMSDataBaseConnection.cs	
+++ b/SL Clearance Management System/BusinessLogic/SLVMSDataBaseConnection.cs	
@@ -92,7 +92,7 @@ public SLDataBaseConnection(string dataBaseLocation = null) {
                 Environment.Exit(1);
             }
 
-            _connectionString = $"Provider=\'{OleDbProvider}\';Data Source=\'{DataBaseLocation}\'";
+            _connectionString = $"Provider=\'{OleDbProvider}\';Data Source=\'{DataBaseLocation}\';";
             if(RunConnectionTest())
                 return;
 
diff --git a/SL Clearance Management System/Model/PersonnelDetails.cs b/SL Clearance Management System/Model/PersonnelDetails.cs
index cdb5874..18fcf08 100644
--- a/SL Clearance Management System/Model/PersonnelDetails.cs	
+++ b/SL Clearance Management System/Model/PersonnelDetails.cs	
@@ -43,6 +43,10 @@ public string NRIC
                 RaisePropertyChangedEvent(nameof(NRIC));
             }
         }
+        public string NRIC4D
+        {
+            get => _nric.Substring(5, 4);
+        }
         public string Rank
         {
             get => _rank;
diff --git a/SL Clearance Management System/Model/VisitorRecord.cs b/SL Clearance Management System/Model/VisitorRecord.cs
index f49ea45..72e0e13 100644
--- a/SL Clearance Management System/Model/VisitorRecord.cs	
+++ b/SL Clearance Management System/Model/VisitorRecord.cs	
@@ -6,7 +6,8 @@ public class VisitorRecord
     {
         public string NRIC => Visitor?.NRIC ?? "NA";
         public string EscortNRIC => Escort?.NRIC ?? "NA";
-
+        public string NRIC4D => Visitor?.NRIC4D ?? "NA";
+        public string EscortNRIC4D => Escort?.NRIC4D ?? "NA";
 
         public PersonnelDetails Visitor { get; set; }
         public PersonnelDetails Escort { get; set; }
diff --git a/SL Clearance Management System/SL Clearance Management System.csproj b/SL Clearance Management System/SL Clearance Management System.csproj
index 33c86c0..3a6693c 100644
--- a/SL Clearance Management System/SL Clearance Management System.csproj	
+++ b/SL Clearance Management System/SL Clearance Management System.csproj	
@@ -1,309 +1,309 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{FEB497A8-E963-4646-96A5-77F9588C48FC}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>SLCMS</RootNamespace>
-    <AssemblyName>SLCMS</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>SLCMS.SLVisitorApp</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>icon.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="SLVisitorApp.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="BusinessLogic\FakeDataTest.cs" />
-    <Compile Include="BusinessLogic\Global.cs" />
-    <Compile Include="BusinessLogic\SLVMSDataBaseConnection.cs" />
-    <Compile Include="View\LookUpClearance.xaml.cs">
-      <DependentUpon>LookUpClearance.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Model\BluePassBulkClearance.cs" />
-    <Compile Include="Model\VisitorPassEntry.cs" />
-    <Compile Include="SLClearanceApp.xaml.cs">
-      <DependentUpon>SLClearanceApp.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="SLClearanceManagementMainWindow.xaml.cs">
-      <DependentUpon>SLClearanceManagementMainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Themes\Converters\BoolToIndexConverter.cs" />
-    <Compile Include="Themes\Converters\BoolToYesNoConverter.cs" />
-    <Compile Include="Themes\Converters\InverseBooleanConverter.cs" />
-    <Compile Include="Model\Clearance.cs" />
-    <Compile Include="Model\Enums\ClearanceLevelEnum.cs" />
-    <Compile Include="Model\Enums\PassConditionEnum.cs" />
-    <Compile Include="Model\VisitorRecord.cs" />
-    <Compile Include="Model\PersonnelDetails.cs" />
-    <Compile Include="Model\VisitorPass.cs" />
-    <Compile Include="Themes\Converters\NullORFalseToBooleanFalseConvertor.cs" />
-    <Compile Include="Themes\Converters\NullToBooleanFalseConvertor.cs" />
-    <Compile Include="Themes\Converters\TabIndexConverter.cs" />
-    <Compile Include="ViewModel\AllVisitorHistoryViewModel.cs" />
-    <Compile Include="ViewModel\MainWindowViewModel.cs" />
-    <Compile Include="ViewModel\PassManagementViewModel.cs" />
-    <Compile Include="ViewModel\BookInPersonnelViewModel.cs" />
-    <Compile Include="ViewModel\DashBoardViewModel.cs" />
-    <Compile Include="ViewModel\Interactive\EventArgs.cs" />
-    <Compile Include="ViewModel\Interactive\EventRaiser.cs" />
-    <Compile Include="ViewModel\Interactive\RelayCommand.cs" />
-    <Compile Include="ViewModel\UploadBulkClearanceViewModel.cs" />
-    <Compile Include="ViewModel\VisitorHistoryLookupViewModel.cs" />
-    <Compile Include="View\AllVisitorHistory.xaml.cs">
-      <DependentUpon>AllVisitorHistory.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\ElasticSlackLoadingIndicator.xaml.cs">
-      <DependentUpon>ElasticSlackLoadingIndicator.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\PassManagement.xaml.cs">
-      <DependentUpon>PassManagement.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\BookInPersonnel.xaml.cs">
-      <DependentUpon>BookInPersonnel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\DashBoard.xaml.cs">
-      <DependentUpon>DashBoard.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Themes\Converters\DataGridSearchValueConverter.cs" />
-    <Compile Include="Themes\Interactive\DataGridTextSearch.cs" />
-    <Compile Include="Themes\Converters\LeftMarginMultiplierConverter.cs" />
-    <Compile Include="Themes\Converters\StringEmptyConverter.cs" />
-    <Compile Include="View\SettingsUserControl.xaml.cs">
-      <DependentUpon>SettingsUserControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UIControls\CircularProgressBar.xaml.cs">
-      <DependentUpon>CircularProgressBar.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UIControls\SelectEscortPersonnelDialogueControl.xaml.cs">
-      <DependentUpon>SelectEscortPersonnelDialogueControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UIControls\PersonnelParticularsEntryControl.xaml.cs">
-      <DependentUpon>PersonnelParticularsEntryControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UIControls\ReviewPersonnelParticularsControl.xaml.cs">
-      <DependentUpon>ReviewPersonnelParticularsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UIControls\ClearanceDetailsEntryControl.xaml.cs">
-      <DependentUpon>ClearanceDetailsEntryControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\UploadBulkClearance.xaml.cs">
-      <DependentUpon>UploadBulkClearance.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\VisitorHistoryLookup.xaml.cs">
-      <DependentUpon>VisitorHistoryLookup.xaml</DependentUpon>
-    </Compile>
-    <Page Include="View\LookUpClearance.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SLClearanceApp.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SLClearanceManagementMainWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SLVisitorManagementMainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="SLVisitorApp.xaml.cs">
-      <DependentUpon>SLVisitorApp.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="SLVisitorManagementMainWindow.xaml.cs">
-      <DependentUpon>SLVisitorManagementMainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\AllVisitorHistory.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\ElasticSlackLoadingIndicator.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\PassManagement.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\BookInPersonnel.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\DashBoard.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\SettingsUserControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UIControls\CircularProgressBar.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UIControls\SelectEscortPersonnelDialogueControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UIControls\PersonnelParticularsEntryControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UIControls\ReviewPersonnelParticularsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UIControls\ClearanceDetailsEntryControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\UploadBulkClearance.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\VisitorHistoryLookup.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.6.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="Assets\607PLAB.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Assets\SLVMS_DB_Default.accdb" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FEB497A8-E963-4646-96A5-77F9588C48FC}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>SLCMS</RootNamespace>
+    <AssemblyName>SLCMS</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>SLCMS.SLVisitorApp</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="SLVisitorApp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="BusinessLogic\FakeDataTest.cs" />
+    <Compile Include="BusinessLogic\Global.cs" />
+    <Compile Include="BusinessLogic\SLVMSDataBaseConnection.cs" />
+    <Compile Include="View\LookUpClearance.xaml.cs">
+      <DependentUpon>LookUpClearance.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Model\BluePassBulkClearance.cs" />
+    <Compile Include="Model\VisitorPassEntry.cs" />
+    <Compile Include="SLClearanceApp.xaml.cs">
+      <DependentUpon>SLClearanceApp.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SLClearanceManagementMainWindow.xaml.cs">
+      <DependentUpon>SLClearanceManagementMainWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Themes\Converters\BoolToIndexConverter.cs" />
+    <Compile Include="Themes\Converters\BoolToYesNoConverter.cs" />
+    <Compile Include="Themes\Converters\InverseBooleanConverter.cs" />
+    <Compile Include="Model\Clearance.cs" />
+    <Compile Include="Model\Enums\ClearanceLevelEnum.cs" />
+    <Compile Include="Model\Enums\PassConditionEnum.cs" />
+    <Compile Include="Model\VisitorRecord.cs" />
+    <Compile Include="Model\PersonnelDetails.cs" />
+    <Compile Include="Model\VisitorPass.cs" />
+    <Compile Include="Themes\Converters\NullORFalseToBooleanFalseConvertor.cs" />
+    <Compile Include="Themes\Converters\NullToBooleanFalseConvertor.cs" />
+    <Compile Include="Themes\Converters\TabIndexConverter.cs" />
+    <Compile Include="ViewModel\AllVisitorHistoryViewModel.cs" />
+    <Compile Include="ViewModel\MainWindowViewModel.cs" />
+    <Compile Include="ViewModel\PassManagementViewModel.cs" />
+    <Compile Include="ViewModel\BookInPersonnelViewModel.cs" />
+    <Compile Include="ViewModel\DashBoardViewModel.cs" />
+    <Compile Include="ViewModel\Interactive\EventArgs.cs" />
+    <Compile Include="ViewModel\Interactive\EventRaiser.cs" />
+    <Compile Include="ViewModel\Interactive\RelayCommand.cs" />
+    <Compile Include="ViewModel\UploadBulkClearanceViewModel.cs" />
+    <Compile Include="ViewModel\VisitorHistoryLookupViewModel.cs" />
+    <Compile Include="View\AllVisitorHistory.xaml.cs">
+      <DependentUpon>AllVisitorHistory.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\ElasticSlackLoadingIndicator.xaml.cs">
+      <DependentUpon>ElasticSlackLoadingIndicator.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\PassManagement.xaml.cs">
+      <DependentUpon>PassManagement.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\BookInPersonnel.xaml.cs">
+      <DependentUpon>BookInPersonnel.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\DashBoard.xaml.cs">
+      <DependentUpon>DashBoard.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Themes\Converters\DataGridSearchValueConverter.cs" />
+    <Compile Include="Themes\Interactive\DataGridTextSearch.cs" />
+    <Compile Include="Themes\Converters\LeftMarginMultiplierConverter.cs" />
+    <Compile Include="Themes\Converters\StringEmptyConverter.cs" />
+    <Compile Include="View\SettingsUserControl.xaml.cs">
+      <DependentUpon>SettingsUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UIControls\CircularProgressBar.xaml.cs">
+      <DependentUpon>CircularProgressBar.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UIControls\SelectEscortPersonnelDialogueControl.xaml.cs">
+      <DependentUpon>SelectEscortPersonnelDialogueControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UIControls\PersonnelParticularsEntryControl.xaml.cs">
+      <DependentUpon>PersonnelParticularsEntryControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UIControls\ReviewPersonnelParticularsControl.xaml.cs">
+      <DependentUpon>ReviewPersonnelParticularsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UIControls\ClearanceDetailsEntryControl.xaml.cs">
+      <DependentUpon>ClearanceDetailsEntryControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UploadBulkClearance.xaml.cs">
+      <DependentUpon>UploadBulkClearance.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\VisitorHistoryLookup.xaml.cs">
+      <DependentUpon>VisitorHistoryLookup.xaml</DependentUpon>
+    </Compile>
+    <Page Include="View\LookUpClearance.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SLClearanceApp.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SLClearanceManagementMainWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SLVisitorManagementMainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="SLVisitorApp.xaml.cs">
+      <DependentUpon>SLVisitorApp.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SLVisitorManagementMainWindow.xaml.cs">
+      <DependentUpon>SLVisitorManagementMainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\AllVisitorHistory.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\ElasticSlackLoadingIndicator.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\PassManagement.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\BookInPersonnel.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\DashBoard.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\SettingsUserControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UIControls\CircularProgressBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UIControls\SelectEscortPersonnelDialogueControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UIControls\PersonnelParticularsEntryControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UIControls\ReviewPersonnelParticularsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UIControls\ClearanceDetailsEntryControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UploadBulkClearance.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\VisitorHistoryLookup.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="icon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.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="Assets\607PLAB.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\SLVMS_DB_Default.accdb" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/SL Clearance Management System/View/AllVisitorHistory.xaml b/SL Clearance Management System/View/AllVisitorHistory.xaml
index b165286..6705d3e 100644
--- a/SL Clearance Management System/View/AllVisitorHistory.xaml	
+++ b/SL Clearance Management System/View/AllVisitorHistory.xaml	
@@ -60,7 +60,7 @@
                 <DataGridTextColumn Header="Book In Time"    MinWidth="120" MaxWidth="120" Binding="{Binding Path=StartTime, Mode=OneWay, StringFormat=\{0:dd/MM/yy HH:mm:ss\}}"/>
                 <DataGridTextColumn Header="Book Out Time"   MinWidth="120" MaxWidth="120" Binding="{Binding Path=EndTime, Mode=OneWay, StringFormat=\{0:dd/MM/yy HH:mm:ss\}}"  SortDirection="Descending"/>
                 <DataGridTextColumn Header="Pass No."        Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=PersonnelPass, Mode=OneWay}"/>
-                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC, Mode=OneWay}"/>
+                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC4D, Mode=OneWay}"/>
                 <DataGridTextColumn Header="Name of Visitor" Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Visitor.RankAndName, Mode=OneWay}"/>
                 <DataGridTextColumn Header="Escort NRIC"     Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Name of Escort"  Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Escort.RankAndName, Mode=OneWay, FallbackValue='NA'}" />
diff --git a/SL Clearance Management System/View/BookInPersonnel.xaml b/SL Clearance Management System/View/BookInPersonnel.xaml
index d96786e..e49ffe6 100644
--- a/SL Clearance Management System/View/BookInPersonnel.xaml	
+++ b/SL Clearance Management System/View/BookInPersonnel.xaml	
@@ -319,7 +319,7 @@
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="Visitor NRIC"
                                 Width="90"
-                                Binding="{Binding Path=NRIC, Mode=OneWay}"/>
+                                Binding="{Binding Path=NRIC4D, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Name of Visitor"
                                 Width="150"
                                 Binding="{Binding Path=Visitor.RankAndName, Mode=OneWay}"/>
diff --git a/SL Clearance Management System/View/DashBoard.xaml b/SL Clearance Management System/View/DashBoard.xaml
index 591b5ca..cf378fb 100644
--- a/SL Clearance Management System/View/DashBoard.xaml	
+++ b/SL Clearance Management System/View/DashBoard.xaml	
@@ -60,9 +60,9 @@
                     LoadingRow="VisitorInCampDataGrid_LoadingRow" SelectionChanged="VisitorInCampDataGrid_SelectionChanged" RowHeight="30">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Pass No."        Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=PersonnelPass, Mode=OneWay}"/>
-                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC, Mode=OneWay}"/>
+                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC4D, Mode=OneWay}"/>
                 <DataGridTextColumn Header="Name of Visitor" Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Visitor.RankAndName, Mode=OneWay}"/>
-                <DataGridTextColumn Header="Escort NRIC"     Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC, Mode=OneWay, FallbackValue='NA'}" />
+                <DataGridTextColumn Header="Escort NRIC"     Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC4D, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Name of Escort"  Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Escort.RankAndName, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Visitor Contact No." Width="120" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Visitor.Contact, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Veh. Pass"       Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=VehiclePass, Mode=OneWay}"/>
diff --git a/SL Clearance Management System/View/LookUpClearance.xaml b/SL Clearance Management System/View/LookUpClearance.xaml
index de41aa3..d8db3fa 100644
--- a/SL Clearance Management System/View/LookUpClearance.xaml	
+++ b/SL Clearance Management System/View/LookUpClearance.xaml	
@@ -306,10 +306,10 @@
                     controls:DataGridTextSearch.SearchValue="{Binding ElementName=SearchTextBox, Path=Text, UpdateSourceTrigger=PropertyChanged}"
                     LoadingRow="VisitorInCampDataGrid_LoadingRow" SelectionChanged="VisitorInCampDataGrid_SelectionChanged" RowHeight="30">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC, Mode=OneWay}"/>
+                <DataGridTextColumn Header="Visitor NRIC"    Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC4D, Mode=OneWay}"/>
                 <DataGridTextColumn Header="Veh. Num"        Width="100"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=VehicleNum, Mode=OneWay}"/>
                 <DataGridTextColumn Header="Name of Visitor" Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Visitor.RankAndName, Mode=OneWay}"/>
-                <DataGridTextColumn Header="Escort NRIC"     Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC, Mode=OneWay, FallbackValue='NA'}" />
+                <DataGridTextColumn Header="Escort NRIC"     Width="100" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC4D, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Name of Escort"  Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Escort.RankAndName, Mode=OneWay, FallbackValue='NA'}" />
                 <DataGridTextColumn Header="Visitor Contact No." Width="120" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Visitor.Contact, Mode=OneWay, FallbackValue='NA'}" />
             </DataGrid.Columns>
diff --git a/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml b/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml
index 1f3b5b8..64b0e81 100644
--- a/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml	
+++ b/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml	
@@ -92,7 +92,7 @@
         <TextBlock Grid.Row="6" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="13" Text="Vehicle:"/>
         <TextBlock Grid.Row="7" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Top"    Margin="0,3,0,0" FontSize="13" Text="Remarks:"/>
 
-        <TextBox x:Name="VisitorNricTextBox" Grid.Row="0" Grid.Column="1" Margin="2" FontSize="12" Foreground="White" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Center" Text="{Binding Path=NRIC, FallbackValue='NA'}" IsReadOnly="True" IsTabStop="False">
+        <TextBox x:Name="VisitorNricTextBox" Grid.Row="0" Grid.Column="1" Margin="2" FontSize="12" Foreground="White" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Center" Text="{Binding Path=NRIC4D, FallbackValue='NA', Mode=OneWay}" IsReadOnly="True" IsTabStop="False" TextChanged="VisitorNricTextBox_TextChanged">
             <TextBox.Style>
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
                     <Style.Triggers>
diff --git a/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml.cs b/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml.cs
index 2c725f0..47a3d87 100644
--- a/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml.cs	
+++ b/SL Clearance Management System/View/UIControls/PersonnelParticularsEntryControl.xaml.cs	
@@ -62,6 +62,11 @@ private void LookupButton_Click(object sender, RoutedEventArgs e) {
                     details.NRIC,
                     details.RankAndName);
             }
-        }
+        }
+
+        private void VisitorNricTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/SL Clearance Management System/View/UIControls/ReviewPersonnelParticularsControl.xaml b/SL Clearance Management System/View/UIControls/ReviewPersonnelParticularsControl.xaml
index d9d6ec8..4c053b4 100644
--- a/SL Clearance Management System/View/UIControls/ReviewPersonnelParticularsControl.xaml	
+++ b/SL Clearance Management System/View/UIControls/ReviewPersonnelParticularsControl.xaml	
@@ -30,7 +30,7 @@
         <TextBlock Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,3,0,0" Text="Vehicle:"/>
         <TextBlock Grid.Row="5" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,3,0,0" Text="Remarks:"/>
 
-        <TextBox Grid.Row="0" Grid.Column="1" FontSize="12" Foreground="White" Background="Transparent" Margin="0.2" BorderBrush="Transparent" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding NRIC, FallbackValue='NA'}" />
+        <TextBox Grid.Row="0" Grid.Column="1" FontSize="12" Foreground="White" Background="Transparent" Margin="0.2" BorderBrush="Transparent" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding NRIC4D, FallbackValue='NA', Mode=OneWay}" />
         <TextBox Grid.Row="1" Grid.Column="1" FontSize="12" Foreground="White" Background="Transparent" Margin="0.2" BorderBrush="Transparent" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding RankAndName, Mode=OneWay, FallbackValue='NA'}" TextWrapping="Wrap" MaxHeight="50"/>
         <TextBox Grid.Row="2" Grid.Column="1" FontSize="12" Foreground="White" Background="Transparent" Margin="0.2" BorderBrush="Transparent" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding UnitOrCompany, FallbackValue='NA'}"/>
         <TextBox Grid.Row="3" Grid.Column="1" FontSize="12" Foreground="White" Background="Transparent" Margin="0.2" BorderBrush="Transparent" IsReadOnly="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" Text="{Binding Contact, FallbackValue='NA'}"/>
diff --git a/SL Clearance Management System/View/UIControls/SelectEscortPersonnelDialogueControl.xaml b/SL Clearance Management System/View/UIControls/SelectEscortPersonnelDialogueControl.xaml
index 3a2f5e4..65db732 100644
--- a/SL Clearance Management System/View/UIControls/SelectEscortPersonnelDialogueControl.xaml	
+++ b/SL Clearance Management System/View/UIControls/SelectEscortPersonnelDialogueControl.xaml	
@@ -46,7 +46,7 @@
                     SelectedItem="{Binding Path=DataContext, ElementName=ThisControl, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" LoadingRow="VisitorInCampDataGrid_LoadingRow"
                     KeyboardNavigation.TabNavigation="None">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="NRIC"           Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC, Mode=OneWay}"  SortDirection="Ascending"/>
+                        <DataGridTextColumn Header="NRIC"           Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC4D, Mode=OneWay}"  SortDirection="Ascending"/>
                         <DataGridTextColumn Header="Name of Escort" Width="180" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=RankAndName, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Contact No."    Width="130"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=Contact, Mode=OneWay, FallbackValue='NA'}" />
                         <DataGridTextColumn Header="Veh. Num"       Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=VehicleNum, Mode=OneWay}"/>
diff --git a/SL Clearance Management System/View/VisitorHistoryLookup.xaml b/SL Clearance Management System/View/VisitorHistoryLookup.xaml
index 5e39b9e..67eab41 100644
--- a/SL Clearance Management System/View/VisitorHistoryLookup.xaml	
+++ b/SL Clearance Management System/View/VisitorHistoryLookup.xaml	
@@ -35,22 +35,22 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- Search Interface -->
-                <TextBlock Grid.Row="1" Grid.Column="1" Text="DISPLAYING: " FontSize="15" FontWeight="Bold" VerticalAlignment="Center"/>
+                <TextBlock Grid.Row="1" Grid.Column="1" Text="DISPLAYING: " FontSize="15" FontWeight="Bold" VerticalAlignment="Bottom" Margin="3,0,4,8"/>
                 <TextBlock Grid.Row="1" Grid.Column="2" Text="{Binding NameofPersonnel}" FontSize="15" FontWeight="Bold" VerticalAlignment="Center" Foreground="#BDDDF4" HorizontalAlignment="Left" TextWrapping="WrapWithOverflow"/>
 
                 <!-- Data Grid -->
                 <DataGrid Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Grid.RowSpan="4"
                     x:Name="VisitorRecordsDataGrid" IsReadOnly="True" SelectionUnit="FullRow" AutoGenerateColumns="False" SelectionMode="Single"
                     LoadingRow="VisitorRecordsDataGrid_LoadingRow"
-                    controls:DataGridTextSearch.SearchValue="{Binding PersonnelNric}"
+                    controls:DataGridTextSearch.SearchValue="{Binding PersonnelNric4D}"
                     ItemsSource="{Binding ListofVisitorRecords}" SelectedItem="{Binding CurrentSelectedRecord}"
                         KeyboardNavigation.TabNavigation="None" IsTabStop="False">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="Pass Issued"   Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=PersonnelPass, Mode=OneWay}"/>
-                        <DataGridTextColumn Header="Visitor NRIC"  Width="90"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC, Mode=OneWay}"/>
+                        <DataGridTextColumn Header="Visitor NRIC"  Width="90"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=NRIC4D, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Veh. Pass"     Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=VehiclePass, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Veh. Num"      Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=VehicleNum, Mode=OneWay, FallbackValue='NA'}" />
-                        <DataGridTextColumn Header="Escort NRIC"   Width="90"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC, Mode=OneWay}"/>
+                        <DataGridTextColumn Header="Escort NRIC"   Width="90"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EscortNRIC4D, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Locker Tag"    Width="80"  CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=LockerNum, Mode=OneWay}"/>
                         <DataGridTextColumn Header="Date/Time In"  Width="135" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=StartTime, Mode=OneWay, StringFormat=\{0:dd/MM/yy HH:mm:ss\}}" SortDirection="Descending"/>
                         <DataGridTextColumn Header="Date/Time Out" Width="135" CellStyle="{StaticResource SearchableDataGridCell}" Binding="{Binding Path=EndTime, Mode=OneWay, StringFormat=\{0:dd/MM/yy HH:mm:ss\}}"/>
diff --git a/SL Clearance Management System/ViewModel/VisitorHistoryLookupViewModel.cs b/SL Clearance Management System/ViewModel/VisitorHistoryLookupViewModel.cs
index 585723b..c0381df 100644
--- a/SL Clearance Management System/ViewModel/VisitorHistoryLookupViewModel.cs	
+++ b/SL Clearance Management System/ViewModel/VisitorHistoryLookupViewModel.cs	
@@ -42,6 +42,10 @@ public string PersonnelNric {
                 RaisePropertyChangedEvent(nameof(PersonnelNric));
             }
         }
+        public string PersonnelNric4D
+        {
+            get => _personnelNric?.Substring(5, 4) ?? "NA";
+        }
         public string NameofPersonnel {
             get => _nameofPersonnel;
             set {
@@ -69,7 +73,7 @@ public IList<VisitorRecord> ListofVisitorRecords {
             }
         }
 
-        public bool NoRecordsFound => _listofVisitorRecords.Count == 0;
+        public bool NoRecordsFound => (_listofVisitorRecords?.Count == 0);
 
         public ICommand LookupVisitorCommand {
             get => _lookupVisitorCommand;
@@ -122,7 +126,7 @@ public void LookupVisitorHistory(string visitornric, string rankandFullName) {
                 return;
 
             PersonnelNric = visitornric;
-            NameofPersonnel = visitornric + " " + rankandFullName;
+            NameofPersonnel = visitornric.Substring(5,4) + " " + rankandFullName;
             ControlVisibility = Visibility.Visible;
             LookupVisitorHistoryhelper(visitornric);
             _closeDialogueButton.Focus();