Debugging scripts import hell.

src/submissions/frontend/widgets/app.py

@@ -15,7 +15,7 @@ from __init__ import project_path
 from backend import SubmissionType, Reagent, BasicSample
 from tools import check_if_app, Settings, Report, jinja_template_loading, check_authorization, page_size
 from .functions import select_save_file, select_open_file
-from datetime import date
+# from datetime import date
 from .pop_ups import HTMLPop, AlertPop
 from .misc import Pagifier
 import logging, webbrowser, sys, shutil

src/submissions/frontend/widgets/omni_search.py

@@ -1,5 +1,5 @@
 """
-Search box that performs fuzzy search for samples
+Search box that performs fuzzy search for various object types
 """
 from pprint import pformat
 from typing import Tuple, Any, List

src/submissions/frontend/widgets/submission_details.py

@@ -174,6 +174,7 @@ class SubmissionDetails(QDialog):
         fname = select_save_file(obj=self, default_name=self.export_plate, extension="pdf")
         save_pdf(obj=self.webview, filename=fname)
 
+
 class SubmissionComment(QDialog):
     """
     a window for adding comment text to a submission

src/submissions/frontend/widgets/submission_widget.py

@@ -283,11 +283,13 @@ class SubmissionFormWidget(QWidget):
         for reagent in old_reagents:
             if isinstance(reagent, self.ReagentFormWidget) or isinstance(reagent, QPushButton):
                 reagent.setParent(None)
-        reagents, integrity_report = self.pyd.check_kit_integrity(extraction_kit=self.extraction_kit)
+        reagents, integrity_report, missing_reagents = self.pyd.check_kit_integrity(extraction_kit=self.extraction_kit)
+        expiry_report = self.pyd.check_reagent_expiries(exempt=missing_reagents)
         for reagent in reagents:
             add_widget = self.ReagentFormWidget(parent=self, reagent=reagent, extraction_kit=self.extraction_kit)
             self.layout.addWidget(add_widget)
         report.add_result(integrity_report)
+        report.add_result(expiry_report)
         if hasattr(self.pyd, "csv"):
             export_csv_btn = QPushButton("Export CSV")
             export_csv_btn.setObjectName("export_csv_btn")
@@ -338,13 +340,11 @@ class SubmissionFormWidget(QWidget):
         report = Report()
         result = self.parse_form()
         report.add_result(result)
-        # allow = not all([item.lot.isEnabled() for item in self.findChildren(self.ReagentFormWidget)])
         exempt = [item.reagent.role for item in self.findChildren(self.ReagentFormWidget) if not item.lot.isEnabled()]
-        # if allow:
-        #     logger.warning(f"Some reagents are disabled, allowing incomplete kit.")
         if self.disabler.checkbox.isChecked():
-            _, result = self.pyd.check_kit_integrity(exempt=exempt)
+            _, result, _ = self.pyd.check_kit_integrity(exempt=exempt)
             report.add_result(result)
+            # result = self.pyd.check_reagent_expiries(exempt=exempt)
         if len(result.results) > 0:
             return report
         base_submission, result = self.pyd.to_sql()