sartography/uva-covid19-testing-communicator
1
0
Fork 0
mirror of https://github.com/sartography/uva-covid19-testing-communicator.git synced 2025-02-22 11:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

assure that

Browse Source
This commit is contained in:
Dan 2021-08-20 13:11:04 -04:00
parent bff5ed05d3
commit 6317b16408
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
communicator/api/admin.py
View File

@ -158,9 +158,9 @@ def get_imported_files(page = "0"):
func.count(case([(Sample.email_notified == "f" , 1)])).label("failed_emails"),
func.count(case([(Sample.text_notified == "t" , 1)])).label("successful_texts"),
func.count(case([(Sample.text_notified == "f" , 1)])).label("failed_texts")]
query = db.session.query(IvyFile.date_added,IvyFile.file_name,IvyFile.sample_count,
*cases).order_by(IvyFile.date_added.desc()).join(Sample, Sample.ivy_file.like("%" + IvyFile.file_name))\
*cases).order_by(IvyFile.date_added.desc()).join(Sample, Sample.ivy_file == IvyFile.file_name)\
.group_by(IvyFile.file_name)[int(page) * 10:(int(page) * 10) + 10]
return query

6
communicator/services/ivy_service.py
View File

@ -42,7 +42,7 @@ class IvyService(object):
samples = []
files = []
for file_name in onlyfiles:
file_samples = IvyService.samples_from_ivy_file(join(self.path, file_name))
file_samples = IvyService.samples_from_ivy_file(self.path, file_name)
ivy_file = db.session.query(IvyFile).filter(IvyFile.file_name == file_name).first()
if not ivy_file:
ivy_file = IvyFile(file_name=file_name, sample_count=len(file_samples))
@ -56,9 +56,9 @@ class IvyService(object):
return files, samples
@staticmethod
def samples_from_ivy_file(file_name):
def samples_from_ivy_file(path, file_name):
rows = []
with open(file_name, 'r') as csv_file:
with open(join(path, file_name), 'r') as csv_file:
reader = csv.DictReader(csv_file, delimiter='|')
for row in reader:
sample = IvyService.record_to_sample(row, file_name)