Can now calculate turnaround time including holidays.

src/submissions/frontend/widgets/misc.py

@@ -110,7 +110,7 @@ class AddReagentForm(QDialog):
         """
         # logger.debug(self.type_input.currentText())
         self.name_input.clear()
-        lookup = Reagent.query(reagent_role=self.type_input.currentText())
+        lookup = Reagent.query(role=self.type_input.currentText())
         self.name_input.addItems(list(set([item.name for item in lookup])))
 
 

src/submissions/frontend/widgets/submission_details.py

@@ -176,6 +176,7 @@ class SubmissionDetails(QDialog):
         if isinstance(submission, str):
             submission = BasicSubmission.query(rsl_plate_num=submission)
         submission.signed_by = getuser()
+        submission.completed = datetime.now().date()
         submission.save()
         self.submission_details(submission=self.rsl_plate_num)
 

src/submissions/frontend/widgets/submission_widget.py

@@ -542,10 +542,25 @@ class SubmissionFormWidget(QWidget):
                     # NOTE: lookup organizations suitable for submitting_lab (ctx: self.InfoItem.SubmissionFormWidget.SubmissionFormContainer.AddSubForm )
                     labs = [item.name for item in Organization.query()]
                     # NOTE: try to set closest match to top of list
+                    # try:
+                    #     labs = difflib.get_close_matches(value, labs, len(labs), 0)
+                    # except (TypeError, ValueError):
+                    #     pass
+                    if isinstance(value, dict):
+                        value = value['value']
+                    if isinstance(value, Organization):
+                        value = value.name
                     try:
-                        labs = difflib.get_close_matches(value, labs, len(labs), 0)
-                    except (TypeError, ValueError):
-                        pass
+                        looked_up_lab = Organization.query(name=value, limit=1)
+                    except AttributeError:
+                        looked_up_lab = None
+                    logger.debug(f"\n\nLooked up lab: {looked_up_lab}")
+                    if looked_up_lab:
+                        try:
+                            labs.remove(str(looked_up_lab.name))
+                        except ValueError as e:
+                            logger.error(f"Error reordering labs: {e}")
+                        labs.insert(0, str(looked_up_lab.name))
                     # NOTE: set combobox values to lookedup values
                     add_widget.addItems(labs)
                     add_widget.setToolTip("Select submitting lab.")
@@ -760,7 +775,6 @@ class SubmissionFormWidget(QWidget):
                         if looked_up_reg:
                             try:
                                 relevant_reagents.remove(str(looked_up_reg.lot))
-
                             except ValueError as e:
                                 logger.error(f"Error reordering relevant reagents: {e}")
                             relevant_reagents.insert(0, str(looked_up_reg.lot))