landon/Submissions-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Before merging enforce names.

Browse Source
This commit is contained in:
Landon Wark
2024-03-22 14:36:31 -05:00
parent e35081392e
commit 47bc58cd7d
8 changed files with 163 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/submissions/frontend/widgets/app.py
View File

@@ -124,7 +124,7 @@ class App(QMainWindow):
Show the 'about' message
"""
output = f"Version: {self.ctx.package.__version__}\n\nAuthor: {self.ctx.package.__author__['name']} - {self.ctx.package.__author__['email']}\n\nCopyright: {self.ctx.package.__copyright__}"
about = AlertPop(message=output, status="information")
about = AlertPop(message=output, status="Information")
about.exec()
def openDocs(self):

32
src/submissions/frontend/widgets/submission_table.py
View File

@@ -178,12 +178,14 @@ class SubmissionsSheet(QTableView):
except AttributeError:
continue
if sub.extraction_info != None:
existing = json.loads(sub.extraction_info)
# existing = json.loads(sub.extraction_info)
existing = sub.extraction_info
else:
existing = None
# Check if the new info already exists in the imported submission
try:
if json.dumps(new_run) in sub.extraction_info:
# if json.dumps(new_run) in sub.extraction_info:
if new_run in sub.extraction_info:
logger.debug(f"Looks like we already have that info.")
continue
except TypeError:
@@ -194,13 +196,16 @@ class SubmissionsSheet(QTableView):
logger.debug(f"Updating {type(existing)}: {existing} with {type(new_run)}: {new_run}")
existing.append(new_run)
logger.debug(f"Setting: {existing}")
sub.extraction_info = json.dumps(existing)
# sub.extraction_info = json.dumps(existing)
sub.extraction_info = existing
except TypeError:
logger.error(f"Error updating!")
sub.extraction_info = json.dumps([new_run])
# sub.extraction_info = json.dumps([new_run])
sub.extraction_info = [new_run]
logger.debug(f"Final ext info for {sub.rsl_plate_num}: {sub.extraction_info}")
else:
sub.extraction_info = json.dumps([new_run])
# sub.extraction_info = json.dumps([new_run])
sub.extraction_info = [new_run]
sub.save()
self.report.add_result(Result(msg=f"We added {count} logs to the database.", status='Information'))
@@ -250,30 +255,35 @@ class SubmissionsSheet(QTableView):
continue
# check if pcr_info already exists
if hasattr(sub, 'pcr_info') and sub.pcr_info != None:
existing = json.loads(sub.pcr_info)
# existing = json.loads(sub.pcr_info)
existing = sub.pcr_info
else:
existing = None
# check if this entry already exists in imported submission
try:
if json.dumps(new_run) in sub.pcr_info:
# if json.dumps(new_run) in sub.pcr_info:
if new_run in sub.pcr_info:
logger.debug(f"Looks like we already have that info.")
continue
else:
count += 1
except TypeError:
logger.error(f"No json to dump")
if existing != None:
if existing is not None:
try:
logger.debug(f"Updating {type(existing)}: {existing} with {type(new_run)}: {new_run}")
existing.append(new_run)
logger.debug(f"Setting: {existing}")
# sub.pcr_info = json.dumps(existing)
sub.pcr_info = json.dumps(existing)
except TypeError:
logger.error(f"Error updating!")
sub.pcr_info = json.dumps([new_run])
# sub.pcr_info = json.dumps([new_run])
sub.pcr_info = [new_run]
logger.debug(f"Final ext info for {sub.rsl_plate_num}: {sub.pcr_info}")
else:
sub.pcr_info = json.dumps([new_run])
# sub.pcr_info = json.dumps([new_run])
sub.pcr_info = [new_run]
sub.save()
self.report.add_result(Result(msg=f"We added {count} logs to the database.", status='Information'))
@@ -305,7 +315,7 @@ class SubmissionsSheet(QTableView):
# find submissions based on date range
subs = BasicSubmission.query(start_date=info['start_date'], end_date=info['end_date'])
# convert each object to dict
records = [item.report_dict() for item in subs]
records = [item.to_dict(report=True) for item in subs]
logger.debug(f"Records: {pformat(records)}")
# make dataframe from record dictionaries
detailed_df, summary_df = make_report_xlsx(records=records)

15
src/submissions/frontend/widgets/submission_widget.py
View File

@@ -151,23 +151,28 @@ class SubmissionFormContainer(QWidget):
return
# Check if PCR info already exists
if hasattr(sub, 'pcr_info') and sub.pcr_info != None:
existing = json.loads(sub.pcr_info)
# existing = json.loads(sub.pcr_info)
existing = sub.pcr_info
else:
existing = None
if existing != None:
# update pcr_info
try:
logger.debug(f"Updating {type(existing)}: {existing} with {type(parser.pcr)}: {parser.pcr}")
if json.dumps(parser.pcr) not in sub.pcr_info:
# if json.dumps(parser.pcr) not in sub.pcr_info:
if parser.pcr not in sub.pcr_info:
existing.append(parser.pcr)
logger.debug(f"Setting: {existing}")
sub.pcr_info = json.dumps(existing)
# sub.pcr_info = json.dumps(existing)
sub.pcr_info = existing
except TypeError:
logger.error(f"Error updating!")
sub.pcr_info = json.dumps([parser.pcr])
# sub.pcr_info = json.dumps([parser.pcr])
sub.pcr_info = [parser.pcr]
logger.debug(f"Final pcr info for {sub.rsl_plate_num}: {sub.pcr_info}")
else:
sub.pcr_info = json.dumps([parser.pcr])
# sub.pcr_info = json.dumps([parser.pcr])
sub.pcr_info = [parser.pcr]
logger.debug(f"Existing {type(sub.pcr_info)}: {sub.pcr_info}")
logger.debug(f"Inserting {type(json.dumps(parser.pcr))}: {json.dumps(parser.pcr)}")
sub.save(original=False)