Solved issue BU-ISCIII#325 Unable to create protocol parameters if it…

… is not done just after creation
luissian · Sep 29, 2024 · 407f159 · 407f159
1 parent c1de43b
commit 407f159
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/core/utils/protocols.py b/core/utils/protocols.py
@@ -176,7 +176,6 @@ def get_all_protocol_info(protocol_id):
         protocol_data.
     """
     protocol_data = {}
-    protocol_data["parameters"] = []
     protocol_obj = core.models.Protocols.objects.get(pk__exact=protocol_id)
 
     if core.models.ProtocolParameters.objects.filter(protocol_id=protocol_obj).exists():
@@ -187,6 +186,7 @@ def get_all_protocol_info(protocol_id):
         protocol_parameters = core.models.ProtocolParameters.objects.filter(
             protocol_id=protocol_obj
         ).order_by("parameter_order")
+        protocol_data["parameters"] = []
         for parameter in protocol_parameters:
             protocol_data["parameters"].append(parameter.get_all_parameter_info())
         protocol_data["protocol_id"] = protocol_id

diff --git a/wetlab/templates/wetlab/create_protocol.html b/wetlab/templates/wetlab/create_protocol.html
@@ -93,7 +93,7 @@ <h4>{{ERROR}}</h4>
                             <div class="container">
                                 <div class="row mt-4">
                                     <div class="card ">
-                                        <div class="card-header"><h3 style="text-align-center">Protocols already defined for Molecules</h3></div>
+                                        <div class="card-header"><h3 style="text-align-center">Protocols already defined</h3></div>
                                         <div class="card-body">
                                             {% if defined_protocols %}
                                                 <table class="table table-hover" id="prot_table">

diff --git a/wetlab/views.py b/wetlab/views.py
@@ -14,6 +14,7 @@
 from django.contrib.auth.decorators import login_required
 from django.core.files.storage import FileSystemStorage
 from django.shortcuts import redirect, render
+from django.urls import reverse
 
 # Local imports
 # import core.fusioncharts.fusioncharts
@@ -1988,6 +1989,11 @@ def display_protocol(request, protocol_id):
             },
         )
     protocol_data = core.utils.protocols.get_all_protocol_info(protocol_id)
+    # if there are no parameters defined for the protocol,
+    # redirect to define_protocol_parameters
+    if len(protocol_data) == 0:
+        url = reverse("define_protocol_parameters", kwargs={"protocol_id": protocol_id})
+        return redirect(url)
     kit_data = wetlab.utils.additional_kits.get_all_additional_kit_info(protocol_id)
 
     return render(