diff --git a/core/utils/samples.py b/core/utils/samples.py index c7fedbf3..3e7b22f7 100644 --- a/core/utils/samples.py +++ b/core/utils/samples.py @@ -702,7 +702,9 @@ def create_table_molecule_pending_use(sample_list, app_name): use_type["data"] = list( core.models.MoleculePreparation.objects.filter( molecule_used_for=None, sample__in=sample_list - ).values_list("sample__sample_name", "molecule_code_id", "pk") + ) + .exclude(state__molecule_state_name="Completed") + .values_list("sample__sample_name", "molecule_code_id", "pk") ) if len(use_type["data"]) > 0: if core.models.MoleculeUsedFor.objects.filter( diff --git a/wetlab/views.py b/wetlab/views.py index d34b7f39..57983ecd 100644 --- a/wetlab/views.py +++ b/wetlab/views.py @@ -3371,7 +3371,6 @@ def handling_molecules(request): molecule_use_defined = core.utils.samples.check_if_molecule_use_defined( __package__ ) - return render( request, "wetlab/handling_molecules.html",