cubetiq/pyztk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore Attendance compatibility...

Browse Source 
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...
This commit is contained in:
Arturo Hernandez 2018-06-12 20:34:37 -04:00
parent b6cfd862f9
commit dbe494b258
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zk/attendance.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
class Attendance(object): class Attendance(object):
def __init__(self, uid, user_id, timestamp, status, punch=0): def __init__(self, user_id, timestamp, status, punch=0, uid=0):
self.uid = uid self.uid = uid # not really used any more
self.user_id = user_id self.user_id = user_id
self.timestamp = timestamp self.timestamp = timestamp
self.status = status self.status = status

10
zk/base.py
View File

@ -1301,7 +1301,7 @@ class ZK(object):
uid = int(user_id) uid = int(user_id)
else: else:
uid = tuser[0].uid 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 elif len(data) == 36: #class 2 attendance
user_id, status, punch, 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') user_id = (user_id.split(b'\x00')[0]).decode(errors='ignore')
@ -1311,7 +1311,7 @@ class ZK(object):
uid = int(user_id) uid = int(user_id)
else: else:
uid = tuser[0].uid uid = tuser[0].uid
yield Attendance(uid, user_id, timestamp, status, punch) yield Attendance(user_id, timestamp, status, punch, uid)
else: else:
if self.verbose: print (codecs.encode(data, 'hex')), len(data) if self.verbose: print (codecs.encode(data, 'hex')), len(data)
yield codecs.encode(data, 'hex') yield codecs.encode(data, 'hex')
@ -1556,7 +1556,7 @@ class ZK(object):
else: else:
user_id = tuser[0].user_id user_id = tuser[0].user_id
timestamp = self.__decode_time(timestamp) timestamp = self.__decode_time(timestamp)
attendance = Attendance(uid, user_id, timestamp, status) attendance = Attendance(user_id, timestamp, status, uid=uid) # punch?
attendances.append(attendance) attendances.append(attendance)
elif record_size == 16: # extended elif record_size == 16: # extended
while len(attendance_data) >= 16: #TODO RETEST ZK6 while len(attendance_data) >= 16: #TODO RETEST ZK6
@ -1577,7 +1577,7 @@ class ZK(object):
else: else:
uid = tuser[0].uid uid = tuser[0].uid
timestamp = self.__decode_time(timestamp) timestamp = self.__decode_time(timestamp)
attendance = Attendance(uid, user_id, timestamp, status, punch) attendance = Attendance(user_id, timestamp, status, punch, uid)
attendances.append(attendance) attendances.append(attendance)
else: else:
while len(attendance_data) >= 40: while len(attendance_data) >= 40:
@ -1587,7 +1587,7 @@ class ZK(object):
timestamp = self.__decode_time(timestamp) timestamp = self.__decode_time(timestamp)
#status = int(status.encode("hex"), 16) #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) attendances.append(attendance)
attendance_data = attendance_data[40:] attendance_data = attendance_data[40:]
return attendances return attendances