Mid-code cleanup

src/submissions/frontend/widgets/submission_details.py

@@ -8,7 +8,7 @@ from PyQt6.QtWebChannel import QWebChannel
 from PyQt6.QtCore import Qt, pyqtSlot
 from jinja2 import TemplateNotFound
 from backend.db.models import BasicSubmission, BasicSample, Reagent, KitType
-from tools import is_power_user, jinja_template_loading
+from tools import is_power_user, jinja_template_loading, timezone
 from .functions import select_save_file
 from .misc import save_pdf
 from pathlib import Path
@@ -176,7 +176,8 @@ class SubmissionDetails(QDialog):
         if isinstance(submission, str):
             submission = BasicSubmission.query(rsl_plate_num=submission)
         submission.signed_by = getuser()
-        submission.completed_date = datetime.now().date()
+        submission.completed_date = datetime.now()
+        submission.completed_date.replace(tzinfo=timezone)
         submission.save()
         self.submission_details(submission=self.rsl_plate_num)
 

src/submissions/frontend/widgets/turnaround.py

@@ -1,10 +1,10 @@
 from PyQt6.QtCore import QSignalBlocker
 from PyQt6.QtWebEngineWidgets import QWebEngineView
-from PyQt6.QtWidgets import QWidget, QGridLayout, QPushButton, QLabel
+from PyQt6.QtWidgets import QWidget, QGridLayout, QPushButton, QLabel, QComboBox
 from .info_tab import InfoPane
 from backend.excel.reports import TurnaroundMaker
 from pandas import DataFrame
-from backend.db import BasicSubmission
+from backend.db import BasicSubmission, SubmissionType
 from frontend.visualizations.turnaround_chart import TurnaroundChart
 import logging
 
@@ -17,6 +17,11 @@ class TurnaroundTime(InfoPane):
         super().__init__(parent)
         self.chart = None
         self.report_object = None
+        self.submission_typer = QComboBox(self)
+        subs = ["Any"] + [item.name for item in SubmissionType.query()]
+        self.submission_typer.addItems(subs)
+        self.layout.addWidget(self.submission_typer, 1, 1, 1, 3)
+        self.submission_typer.currentTextChanged.connect(self.date_changed)
         self.date_changed()
 
     def date_changed(self):
@@ -31,6 +36,16 @@ class TurnaroundTime(InfoPane):
             return
         super().date_changed()
         chart_settings = dict(start_date=self.start_date, end_date=self.end_date)
-        self.report_obj = TurnaroundMaker(start_date=self.start_date, end_date=self.end_date)
-        self.chart = TurnaroundChart(df=self.report_obj.df, settings=chart_settings, modes=[])
+        if self.submission_typer.currentText() == "Any":
+            submission_type = None
+            subtype_obj = None
+        else:
+            submission_type = self.submission_typer.currentText()
+            subtype_obj = SubmissionType.query(name = submission_type)
+        self.report_obj = TurnaroundMaker(start_date=self.start_date, end_date=self.end_date, submission_type=submission_type)
+        if subtype_obj:
+            threshold = subtype_obj.defaults['turnaround_time'] + 0.5
+        else:
+            threshold = None
+        self.chart = TurnaroundChart(df=self.report_obj.df, settings=chart_settings, modes=[], threshold=threshold)
         self.webview.setHtml(self.chart.to_html())