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

Added regex exclusion for KitTypeReagentRole to trim down Bacteria Positive Control list.

Browse Source
This commit is contained in:
lwark
2024-09-16 09:51:28 -05:00
parent 7a39df5bf7
commit 7c3dfd53a0
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
## 202409.04 ## 202409.04
- Fixed wastewater sample writing bug. - Fixed wastewater sample writing bug.
- Added regex exclusion for KitTypeReagentRole to trim down Bacteria Positive Control list.
## 202409.03 ## 202409.03

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

@@ -1,6 +1,7 @@
''' '''
Contains all submission related frontend functions Contains all submission related frontend functions
''' '''
import re
import sys import sys
from PyQt6.QtWidgets import ( from PyQt6.QtWidgets import (
QWidget, QPushButton, QVBoxLayout, QWidget, QPushButton, QVBoxLayout,
@@ -723,9 +724,14 @@ class SubmissionFormWidget(QWidget):
super().__init__(scrollWidget=scrollWidget) super().__init__(scrollWidget=scrollWidget)
self.setEditable(True) self.setEditable(True)
# logger.debug(f"Attempting lookup of reagents by type: {reagent.type}") # logger.debug(f"Attempting lookup of reagents by type: {reagent.type}")
# NOTE: below was lookup_reagent_by_type_name_and_kit_name, but I couldn't get it to work.
lookup = Reagent.query(reagent_role=reagent.role) lookup = Reagent.query(reagent_role=reagent.role)
relevant_reagents = [str(item.lot) for item in lookup] looked_up_rt = KitTypeReagentRoleAssociation.query(reagent_role=reagent.role,
kit_type=extraction_kit)
try:
regex = re.compile(rf"{looked_up_rt.uses['exclude_regex']}")
except KeyError:
regex = re.compile(r"^$")
relevant_reagents = [str(item.lot) for item in lookup if not regex.match(str(item.lot))]
output_reg = [] output_reg = []
for rel_reagent in relevant_reagents: for rel_reagent in relevant_reagents:
# NOTE: extract strings from any sets. # NOTE: extract strings from any sets.
@@ -741,8 +747,8 @@ class SubmissionFormWidget(QWidget):
if check_not_nan(reagent.lot): if check_not_nan(reagent.lot):
relevant_reagents.insert(0, str(reagent.lot)) relevant_reagents.insert(0, str(reagent.lot))
else: else:
looked_up_rt = KitTypeReagentRoleAssociation.query(reagent_role=reagent.role, # looked_up_rt = KitTypeReagentRoleAssociation.query(reagent_role=reagent.role,
kit_type=extraction_kit) # kit_type=extraction_kit)
try: try:
looked_up_reg = Reagent.query(lot_number=looked_up_rt.last_used) looked_up_reg = Reagent.query(lot_number=looked_up_rt.last_used)
except AttributeError: except AttributeError: