From 3dc00c0057e94269f54ef857663155fb88929f28 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 20 Sep 2020 09:55:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B9=80=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=99=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=80=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=AA=E0=B9=81=E0=B8=81?=
 =?UTF-8?q?=E0=B8=99=E0=B8=99=E0=B8=B4=E0=B9=89=E0=B8=A7=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9B=E0=B9=87=E0=B8=99=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A2=20=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B2=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B5=20=E0=B9=84=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_temp_fingerscanService.cs             | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
index f44dcb5..da182a7 100644
--- a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
+++ b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
@@ -99,6 +99,27 @@ namespace TodoAPI2.Models
             return hour + ":" + minute;
         }
 
+        private string GetTimeWithSecStringForDB(DateTime d)
+        {
+            string hour = d.Hour.ToString();
+            if (d.Hour < 10)
+            {
+                hour = "0" + hour;
+            }
+            string minute = d.Minute.ToString();
+            if (d.Minute < 10)
+            {
+                minute = "0" + minute;
+            }
+            string second = d.Second.ToString();
+            if(d.Second < 10)
+            {
+                second = "0" + second;
+            }
+
+            return hour + ":" + minute + ":" + second;
+        }
+
         public List<eva_temp_fingerscanViewModel> GetListBySearch(eva_temp_fingerscanSearchModel model)
         {
             //var all_emp = emp.GetListByemployee_type(null, null);
@@ -233,7 +254,8 @@ namespace TodoAPI2.Models
                 if (theemp != null)
                 {
                     var id = theemp.id.ToString();
-                    var r2 = id.ToString() + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeStringForDB(i.checktime);
+                    var r2 = id.ToString() + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeWithSecStringForDB(i.checktime) 
+                        + "#" + GetTimeStringForDB(i.checktime);
                     var a = new input_finger();
                     a.data = r2;
                     a.base64_img = i.base64img;
@@ -254,8 +276,9 @@ namespace TodoAPI2.Models
                 string employee_id = data[0];
                 string date = data[1];
                 string time = data[2];
+                string time_old = data[3];
 
-                string sql_checking = $"select employee_id,date,time from tad_time_attendances where employee_id={employee_id} and date='{date}' and time='{time}' ";
+                string sql_checking = $"select employee_id,date,time from tad_time_attendances where employee_id={employee_id} and date='{date}' and (time='{time}' or time='{time_old}') ";
 
                 DataTable dt = db.ExecuteDataTableNpgsql(sql_checking, null);
                 if (dt.Rows.Count == 0)