Add Date of birth field

bencomtech · Apr 2, 2020 · 2633298 · 2633298
1 parent 08a5ff8
commit 2633298
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 165 deletions.
diff --git a/ThaiNationalIDCard.NET.Example.ConsoleApp/Program.cs b/ThaiNationalIDCard.NET.Example.ConsoleApp/Program.cs
@@ -15,6 +15,7 @@ static void Main(string[] args)
                 Console.WriteLine($"CitizenID: {personalPhoto.CitizenID}");
                 Console.WriteLine($"ThaiPersonalInfo: {personalPhoto.ThaiPersonalInfo}");
                 Console.WriteLine($"EnglishPersonalInfo: {personalPhoto.EnglishPersonalInfo}");
+                Console.WriteLine($"DateOfBirth: {personalPhoto.DateOfBirth}");
                 Console.WriteLine($"Sex: {personalPhoto.Sex}");
                 Console.WriteLine($"AddressInfo: {personalPhoto.AddressInfo}");
                 Console.WriteLine($"IssueDate: {personalPhoto.IssueDate}");

diff --git a/ThaiNationalIDCard.NET.Example.WebApi/Controllers/ReadersController.cs b/ThaiNationalIDCard.NET.Example.WebApi/Controllers/ReadersController.cs
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/Program.cs b/ThaiNationalIDCard.NET.Example.WebApi/Program.cs
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/Properties/launchSettings.json b/ThaiNationalIDCard.NET.Example.WebApi/Properties/launchSettings.json
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/Startup.cs b/ThaiNationalIDCard.NET.Example.WebApi/Startup.cs
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/ThaiNationalIDCard.NET.Example.WebApi.csproj b/ThaiNationalIDCard.NET.Example.WebApi/ThaiNationalIDCard.NET.Example.WebApi.csproj
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/appsettings.Development.json b/ThaiNationalIDCard.NET.Example.WebApi/appsettings.Development.json
diff --git a/ThaiNationalIDCard.NET.Example.WebApi/appsettings.json b/ThaiNationalIDCard.NET.Example.WebApi/appsettings.json
diff --git a/ThaiNationalIDCard.NET/Models/Personal.cs b/ThaiNationalIDCard.NET/Models/Personal.cs
@@ -7,6 +7,7 @@ public class Personal
         public string CitizenID { get; set; }
         public PersonalInfo ThaiPersonalInfo { get; set; }
         public PersonalInfo EnglishPersonalInfo { get; set; }
+        public DateTime DateOfBirth { get; set; }
         public string Sex { get; set; }
         public AddressInfo AddressInfo { get; set; }
         public DateTime IssueDate { get; set; }

diff --git a/ThaiNationalIDCard.NET/Models/PersonalPhoto.cs b/ThaiNationalIDCard.NET/Models/PersonalPhoto.cs
@@ -9,6 +9,7 @@ public PersonalPhoto(Personal personal)
             CitizenID = personal.CitizenID;
             ThaiPersonalInfo = personal.ThaiPersonalInfo;
             EnglishPersonalInfo = personal.EnglishPersonalInfo;
+            DateOfBirth = personal.DateOfBirth;
             Sex = personal.Sex;
             AddressInfo = personal.AddressInfo;
             IssueDate = personal.IssueDate;

diff --git a/ThaiNationalIDCard.NET/ThaiNationalIDCard.NET.csproj b/ThaiNationalIDCard.NET/ThaiNationalIDCard.NET.csproj
@@ -10,6 +10,7 @@
     <PackageProjectUrl>https://github.com/bencomtech/ThaiNationalIDCard.NET</PackageProjectUrl>
     <RepositoryUrl>https://github.com/bencomtech/ThaiNationalIDCard.NET</RepositoryUrl>
     <Copyright />
+    <Version>1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ThaiNationalIDCard.NET/ThaiNationalIDCardReader.cs b/ThaiNationalIDCard.NET/ThaiNationalIDCardReader.cs
@@ -100,6 +100,13 @@ private Personal GetPersonalInfo()
 
                 personal.ThaiPersonalInfo = new PersonalInfo(thaiPersonalInfo);
                 personal.EnglishPersonalInfo = new PersonalInfo(englishPersonalInfo);
+
+                string dateOfBirth = personalInfo.Substring(200, 8);
+                personal.DateOfBirth = new DateTime(Convert.ToInt32(dateOfBirth.Substring(0, 4)) - 543
+                    , Convert.ToInt32(dateOfBirth.Substring(4, 2))
+                    , Convert.ToInt32(dateOfBirth.Substring(6, 2))
+                );
+
                 personal.Sex = personalInfo.Substring(208, 1);
 
                 string addressInfo = GetUTF8FromAsciiBytes(SendCommand(apdu.AddressInfoCommand));