From b6cfd862f9afbbae2bb6bac596505310617aa877 Mon Sep 17 00:00:00 2001
From: Arturo Hernandez <ahernandez@agetic.gob.bo>
Date: Mon, 11 Jun 2018 18:28:52 -0400
Subject: [PATCH] test status vs punch

---
 test_machine.py  |  4 ++--
 zk/attendance.py |  3 ++-
 zk/base.py       | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/test_machine.py b/test_machine.py
index 5d554da..4f37979 100755
--- a/test_machine.py
+++ b/test_machine.py
@@ -197,7 +197,7 @@ try:
         i = 0
         for att in attendance:
             i +=1
-            print ("ATT {:>6}: uid:{:>3}, user_id:{:>8} t: {}, s:{}".format(i, att.uid, att.user_id, att.timestamp, att.status))
+            print ("ATT {:>6}: uid:{:>3}, user_id:{:>8} t: {}, s:{} p:{}".format(i, att.uid, att.user_id, att.timestamp, att.status, att.punch))
         print ('    took {:.3f}[s]'.format(final - inicio))
     print ('')
     print ('--- sizes & capacity ---')
@@ -217,7 +217,7 @@ try:
                 #counter += 1 #enable to implemet a poorman timeout
                 print ("timeout {}".format(counter))
             else:
-                print ("ATT {:>6}: uid:{:>3}, user_id:{:>8} t: {}, s:{}".format(counter, att.uid, att.user_id, att.timestamp, att.status))
+                print ("ATT {:>6}: uid:{:>3}, user_id:{:>8} t: {}, s:{} p:{}".format(counter, att.uid, att.user_id, att.timestamp, att.status, att.punch))
             if counter >= 10:
                 conn.end_live_capture = True
         print('')
diff --git a/zk/attendance.py b/zk/attendance.py
index de11bc2..f21f4da 100644
--- a/zk/attendance.py
+++ b/zk/attendance.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 class Attendance(object):
-    def __init__(self, uid, user_id, timestamp, status):
+    def __init__(self, uid, user_id, timestamp, status, punch=0):
         self.uid = uid
         self.user_id = user_id
         self.timestamp = timestamp
         self.status = status
+        self.punch = punch
 
     def __str__(self):
         return '<Attendance>: {} : {}'.format(self.user_id, self.timestamp)
diff --git a/zk/base.py b/zk/base.py
index 43676b8..4636b58 100644
--- a/zk/base.py
+++ b/zk/base.py
@@ -1292,8 +1292,8 @@ class ZK(object):
                 """if len (data) == 5:
                     
                     continue"""
-                if len(data) == 12: #class 1 attendance
-                    user_id, status, match, timehex = unpack('<IBB6s', data)
+                if len(data) == 12: #class 1 attendance #TODO: RETEST ZK6
+                    user_id, status, punch, timehex = unpack('<IBB6s', data)
                     user_id = str(user_id)
                     timestamp = self.__decode_timehex(timehex)
                     tuser = list(filter(lambda x: x.user_id == user_id, users))
@@ -1303,7 +1303,7 @@ class ZK(object):
                         uid = tuser[0].uid
                     yield Attendance(uid, user_id, timestamp, status)
                 elif len(data) == 36: #class 2 attendance
-                    user_id,  status, match, timehex, res = unpack('<24sBB6sI', data)
+                    user_id,  status, punch, timehex, res = unpack('<24sBB6sI', data)
                     user_id = (user_id.split(b'\x00')[0]).decode(errors='ignore')
                     timestamp = self.__decode_timehex(timehex)
                     tuser = list(filter(lambda x: x.user_id == user_id, users))
@@ -1311,7 +1311,7 @@ class ZK(object):
                         uid = int(user_id)
                     else:
                         uid = tuser[0].uid
-                    yield Attendance(uid, user_id, timestamp, status)
+                    yield Attendance(uid, user_id, timestamp, status, punch)
                 else:
                     if self.verbose: print (codecs.encode(data, 'hex')), len(data)
                     yield codecs.encode(data, 'hex')
@@ -1546,8 +1546,8 @@ class ZK(object):
         if self.verbose: print ("record_size is ", record_size)
         attendance_data = attendance_data[4:] #total size not used
         if record_size == 8 : #ultra old format
-            while len(attendance_data) >= 8:
-                uid, status, timestamp = unpack('HH4s', attendance_data.ljust(8, b'\x00')[:8])
+            while len(attendance_data) >= 8:#TODO RETEST ZK6!!!
+                uid, status, timestamp, punch = unpack('HB4sB', attendance_data.ljust(8, b'\x00')[:8])
                 if self.verbose: print (codecs.encode(attendance_data[:8], 'hex'))
                 attendance_data = attendance_data[8:]
                 tuser = list(filter(lambda x: x.uid == uid, users))
@@ -1559,8 +1559,8 @@ class ZK(object):
                 attendance = Attendance(uid, user_id, timestamp, status)
                 attendances.append(attendance)
         elif record_size == 16: # extended
-            while len(attendance_data) >= 16:
-                user_id, timestamp, status, verified, reserved, workcode = unpack('<I4sBB2sI', attendance_data.ljust(16, b'\x00')[:16])
+            while len(attendance_data) >= 16: #TODO RETEST ZK6
+                user_id, timestamp, status, punch, reserved, workcode = unpack('<I4sBB2sI', attendance_data.ljust(16, b'\x00')[:16])
                 user_id = str(user_id)
                 if self.verbose: print(codecs.encode(attendance_data[:16], 'hex'))
                 attendance_data = attendance_data[16:]
@@ -1577,17 +1577,17 @@ class ZK(object):
                 else:
                     uid = tuser[0].uid
                 timestamp = self.__decode_time(timestamp)
-                attendance = Attendance(uid, user_id, timestamp, status)
+                attendance = Attendance(uid, user_id, timestamp, status, punch)
                 attendances.append(attendance)
         else:
             while len(attendance_data) >= 40:
-                uid, user_id, sparator, timestamp, status, space = unpack('<H24sc4sB8s', attendance_data.ljust(40, b'\x00')[:40])
+                uid, user_id, status, timestamp, punch, space = unpack('<H24sB4sB8s', attendance_data.ljust(40, b'\x00')[:40])
                 if self.verbose: print (codecs.encode(attendance_data[:40], 'hex'))
                 user_id = (user_id.split(b'\x00')[0]).decode(errors='ignore')
                 timestamp = self.__decode_time(timestamp)
                 #status = int(status.encode("hex"), 16)
 
-                attendance = Attendance(uid, user_id, timestamp, status)
+                attendance = Attendance(uid, user_id, timestamp, status, punch)
                 attendances.append(attendance)
                 attendance_data = attendance_data[40:]
         return attendances