Fix for #269, as well as a fix for a problem where the add results bu…

…tton wasn't appearing for Updating Deployment actions.

src/sensordatainterface/templates/base-form.html

@@ -34,6 +34,7 @@ <h1 class="col-xs-12 col-sm-12 col-md-12">{{ action|capfirst }}
                                     {{ curr_result.as_table }}
                                 </tbody>
                             {% endfor %}
+                        <tbody class='add-result-btn'><tr><td></td><td><a class='add-result-btn btn btn-default col-xs-12 col-sm-12' onclick='javascript:addResultForm(this)'>+ Add Result</a></td></tr></tbody>
                     {% endif %}
 
                 <tbody>

src/sensordatainterface/views/api_views.py

@@ -234,15 +234,6 @@ def get_equipment_output_variables(request):
     )
 
 
-
-
-
-
-
-
-
-
-
 def get_action_site(request):
     if request.method == 'POST':
         action_id = request.POST.get('action_id')

src/sensordatainterface/views/edit_views.py

@@ -666,7 +666,7 @@ def get_forms_from_request(request, action_id=False):
             'calibrationstandardnumber': calibration_standard_count,
             'maintenancecode': request.POST.getlist('maintenancecode')[i - 1],
             'maintenancereason': request.POST.getlist('maintenancereason')[i - 1],
-            'instrumentoutputvariable': output_variables[0],
+            'instrumentoutputvariable': request.POST.getlist('instrumentoutputvariable'),
             'calibrationcheckvalue': request.POST.getlist('calibrationcheckvalue')[i - 1],
             'calibrationequation': request.POST.getlist('calibrationequation')[i - 1],
             'deploymentaction': request.POST.getlist('deploymentaction')[i - 1],
@@ -1260,6 +1260,8 @@ def edit_retrieval(request, deployment_id=None, retrieval_id=None):
             deployment_action = Action.objects.get(pk=request.POST.get('deployment_id'))
         else:
             deployment_action = Action.objects.get(pk=request.POST.get('deploymentaction'))
+        if 'equipmentused' not in request.POST:
+            request.POST['equipmentused'] = ''
 
         if updating:
             site_visit = Action.objects.get(pk=request.POST['actionid'])