tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix: Updated to match the fingerprint uploader to the new attendance machine

Browse Source
This commit is contained in:
tanshu
2016-02-29 23:41:08 +05:30
parent 33b14b1ec0
commit 2e670c06ec
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
brewman/models/voucher.py
View File

@ -351,15 +351,6 @@ class Fingerprint(Base):
def query(cls): def query(cls):
return DBSession.query(cls) return DBSession.query(cls)
def create(self):
old = DBSession.query(Fingerprint).filter(Fingerprint.date == self.date) \
.filter(Fingerprint.employee_id == self.employee_id).first()
if old is None:
DBSession.add(self)
return self
else:
return old
class DbImage(Base): class DbImage(Base):
__tablename__ = 'images' __tablename__ = 'images'

16
brewman/views/fingerprint.py
View File

@ -15,7 +15,7 @@ __author__ = 'tanshu'
def show_list(request): def show_list(request):
filename = request.POST['uploadedFile'].filename filename = request.POST['uploadedFile'].filename
input_file = request.POST['uploadedFile'].file input_file = request.POST['uploadedFile'].file
reader = csv.reader(read_file(input_file), delimiter=";") reader = csv.reader(read_file(input_file), delimiter="\t")
for row in reader: for row in reader:
add_fingerprint(row) add_fingerprint(row)
transaction.commit() transaction.commit()
@ -35,12 +35,18 @@ def read_file(input_file):
def add_fingerprint(row): def add_fingerprint(row):
try: try:
employee_code = int(row[0]) employee_code = int(row[2])
date = datetime.datetime.strptime(row[3] + ' ' + row[4], '%m/%d/%Y %H:%M') date = datetime.datetime.strptime(row[6], '%Y/%m/%d %H:%M:%S')
except ValueError: except ValueError:
return return
employee_id = Employee.by_code(employee_code).id employee = Employee.by_code(employee_code)
Fingerprint(employee_id=employee_id, date=date).create() if employee is not None:
fp = Fingerprint(employee_id=employee.id, date=date)
old = DBSession.query(Fingerprint).filter(Fingerprint.date == date) \
.filter(Fingerprint.employee_id == employee.id).first()
if old is None:
DBSession.add(fp)
def get_prints(employee_id, date): def get_prints(employee_id, date):