From dbe494b2580e78c227d3d9e71ef4232ba19c86f8 Mon Sep 17 00:00:00 2001
From: Arturo Hernandez <ahernandez@agetic.gob.bo>
Date: Tue, 12 Jun 2018 20:34:37 -0400
Subject: [PATCH] restore Attendance compatibility... simple uid is not very
 used with Attendance (mostly all works with user_id, and not local uid) so
 I'm pushing to optional argument as the original pyzk

as most users get direcctly all the records with `get_attendance()`, I think no body will notice...
---
 zk/attendance.py |  4 ++--
 zk/base.py       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zk/attendance.py b/zk/attendance.py
index f21f4da..4d68746 100644
--- a/zk/attendance.py
+++ b/zk/attendance.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 class Attendance(object):
-    def __init__(self, uid, user_id, timestamp, status, punch=0):
-        self.uid = uid
+    def __init__(self, user_id, timestamp, status, punch=0, uid=0):
+        self.uid = uid # not really used any more
         self.user_id = user_id
         self.timestamp = timestamp
         self.status = status
diff --git a/zk/base.py b/zk/base.py
index 4636b58..7366cc9 100644
--- a/zk/base.py
+++ b/zk/base.py
@@ -1301,7 +1301,7 @@ class ZK(object):
                         uid = int(user_id)
                     else:
                         uid = tuser[0].uid
-                    yield Attendance(uid, user_id, timestamp, status)
+                    yield Attendance(user_id, timestamp, status, uid=uid)#punch?
                 elif len(data) == 36: #class 2 attendance
                     user_id,  status, punch, timehex, res = unpack('<24sBB6sI', data)
                     user_id = (user_id.split(b'\x00')[0]).decode(errors='ignore')
@@ -1311,7 +1311,7 @@ class ZK(object):
                         uid = int(user_id)
                     else:
                         uid = tuser[0].uid
-                    yield Attendance(uid, user_id, timestamp, status, punch)
+                    yield Attendance(user_id, timestamp, status, punch, uid)
                 else:
                     if self.verbose: print (codecs.encode(data, 'hex')), len(data)
                     yield codecs.encode(data, 'hex')
@@ -1556,7 +1556,7 @@ class ZK(object):
                 else:
                     user_id = tuser[0].user_id
                 timestamp = self.__decode_time(timestamp)
-                attendance = Attendance(uid, user_id, timestamp, status)
+                attendance = Attendance(user_id, timestamp, status, uid=uid) # punch?
                 attendances.append(attendance)
         elif record_size == 16: # extended
             while len(attendance_data) >= 16: #TODO RETEST ZK6
@@ -1577,7 +1577,7 @@ class ZK(object):
                 else:
                     uid = tuser[0].uid
                 timestamp = self.__decode_time(timestamp)
-                attendance = Attendance(uid, user_id, timestamp, status, punch)
+                attendance = Attendance(user_id, timestamp, status, punch, uid)
                 attendances.append(attendance)
         else:
             while len(attendance_data) >= 40:
@@ -1587,7 +1587,7 @@ class ZK(object):
                 timestamp = self.__decode_time(timestamp)
                 #status = int(status.encode("hex"), 16)
 
-                attendance = Attendance(uid, user_id, timestamp, status, punch)
+                attendance = Attendance(user_id, timestamp, status, punch, uid)
                 attendances.append(attendance)
                 attendance_data = attendance_data[40:]
         return attendances