Removed Kittype.

src/submissions/templates/js/procedure_form.js

@@ -1,9 +1,7 @@
 
 
 
-document.getElementById("kittype").addEventListener("change", function() {
-    backend.update_kit(this.value);
-})
+
 
 var formchecks = document.getElementsByClassName('form_check');
 
@@ -46,7 +44,7 @@ var reagentRoles = document.getElementsByClassName("reagentrole");
 for(let i = 0; i < reagentRoles.length; i++) {
   reagentRoles[i].addEventListener("change", function() {
     if (reagentRoles[i].value.includes("--New--")) {
-        alert("Create new reagent.")
+//        alert("Create new reagent.")
         var br = document.createElement("br");
         var new_reg = document.getElementById("new_" + reagentRoles[i].id);
         var new_form = document.createElement("form");

src/submissions/templates/procedure_creation.html

@@ -29,12 +29,7 @@
                       <option value="{{ previous }}">{{ previous }}</option>
                     {% endfor %}
                   </select><br><br>
-                  <label>Kit Type:</label><br>
-                  <select class="dropdown" id="kittype" background-colour="{{ procedure['kittype']['colour'] }}">
-                      {% for kittype in procedure['possible_kits'] %}
-                      <option value="{{ kittype }}">{{ kittype }}</option>
-                      {% endfor %}
-                  </select><br>
+
                   {% if procedure['reagentrole'] %}
                     <br>
                     <h1><u>Reagents</u></h1>
@@ -47,6 +42,7 @@
                         {% endfor %}
                     </select>
                     <div class="new_reagent" id="new_{{ key }}"></div>
+                    <br>
                     {% endfor %}
                   {% endif %}
                 </form>
@@ -58,9 +54,10 @@
                 {% endif %}
             </div>
         </div>
-        {% if proceduretype['equipment_section'] %}
-            {{ proceduretype['equipment_section'] }}
-        {% endif %}
+        {% with equipmentroles=proceduretype['equipment'], child=True %}
+            {% include 'support/equipment_usage.html' %}
+        {% endwith %}
+
         {% include 'support/context_menu.html' %}
         {% endblock %}
 

src/submissions/templates/support/equipment_usage.html

@@ -19,7 +19,7 @@
 
 <h1><u>Equipment</u></h1>
 <br><hr><br>
-{% for equipmentrole in proceduretype['equipment_json'] %}
+{% for equipmentrole in equipmentroles %}
     <div class="grid-container">
         <div>
             <label for="{{ equipmentrole['name'] }}">{{ equipmentrole['name'] }}:</label><br>
@@ -38,6 +38,7 @@
         </div>
 
     </div>
+    <br>
 {% endfor %}
 
 {% if not child %}
@@ -48,7 +49,7 @@
 {% endfor %}
 {% endif %}
 <script>
-    const equipment_json = {{ proceduretype['equipment_json'] }};
+    const equipment_json = {{ equipmentroles }};
 
     window.addEventListener('load', function () {
         equipment_json.forEach(startup);
@@ -98,10 +99,10 @@
         dropdown_oi.json = equipmentrole;
         var equipment_name = document.getElementById(equipmentrole.name).value;
         var equipment = equipmentrole.equipment.filter(function(x){ return x.name == equipment_name })[0];
-        for (let iii = 0; iii < equipment.processes.length; iii++) {
+        for (let iii = 0; iii < equipment.process.length; iii++) {
             var opt = document.createElement('option');
-            opt.value = equipment.processes[iii].name;
-            opt.innerHTML = equipment.processes[iii].name;
+            opt.value = equipment.process[iii].name;
+            opt.innerHTML = equipment.process[iii].name;
             dropdown_oi.appendChild(opt);
         }
         updateTipChoices(equipmentrole);
@@ -117,7 +118,7 @@
         console.log(process_name);
         var equipment = equipmentrole.equipment.filter(function(x){ return x.name == equipment_name })[0];
         console.log(equipment);
-        var process = equipment.processes.filter(function(x){ return x.name == process_name })[0];
+        var process = equipment.process.filter(function(x){ return x.name == process_name })[0];
         console.log(process);
         for (let iii = 0; iii < process.tips.length; iii++) {
             var opt = document.createElement('option');