Merge pull request #278 from UCHIC/django-elijah-dev

Feature added for #236
UCHIC · Mar 30, 2018 · 7601d53 · 7601d53
2 parents 552f8c1 + b457881
commit 7601d53
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/sensordatainterface/static/sensordatainterface/js/common_forms.js b/src/sensordatainterface/static/sensordatainterface/js/common_forms.js
@@ -22,6 +22,8 @@ function setOtherActions() {
         $('.InstrumentCalibration .maintenance').not('option').parents('tr').remove();
         actionTypeElem = $('.InstrumentCalibration [name="actiontypecv"]');
         actionTypeElem.select2('val', 'Instrument calibration');
+        $('.InstrumentCalibration [name="equipmentused"]').removeAttr('multiple');
+        $('.InstrumentCalibration [name="equipmentused"]').select2();
         actionTypeElem.parents('tr').hide();
     } else if (mainForm.hasClass('EquipmentDeployment')) {
         var site = $('.EquipmentDeployment').find('[name="site_id"]').val();

diff --git a/src/sensordatainterface/templates/site-visits/calibration/calibrations.html b/src/sensordatainterface/templates/site-visits/calibration/calibrations.html
@@ -7,10 +7,17 @@ <h1>Calibrations
                 {% if equipment_name %} for Equipment {{ equipment_name.equipmentserialnumber }}
                 {% endif %}</h1>
         </div>
+    {% if equipment_name %}
+        <div class="col-xs-12 col-sm-6 col-md-3 pull-right">
+            <a class="btn btn-primary btn-block new-btn" href="{% url 'create_action_from_equipment' 'InstrumentCalibration' equipment_name.equipmentid%}">New
+                Calibration</a>
+        </div>
+    {% else %}
         <div class="col-xs-12 col-sm-6 col-md-3 pull-right">
             <a class="btn btn-primary btn-block new-btn" href="{% url 'create_action' 'InstrumentCalibration' %}">New
                 Calibration</a>
         </div>
+    {% endif %}
     </div>
     <table class="data-table">
         <thead>

diff --git a/src/sensordatainterface/urls/edit_urls.py b/src/sensordatainterface/urls/edit_urls.py
@@ -74,6 +74,8 @@
         name='create_action_from_visit'),
     url(r'^actions/create-action/for_site/(?P<action_type>\w+)/(?:(?P<site_id>\d+)/)?$', edit_views.edit_action,
         name='create_action_for_site'),
+    url(r'^actions/create-action/from_equipment/(?P<action_type>\w+)/(?:(?P<equipment_id>\d+)/)?$', edit_views.edit_action,
+        name='create_action_from_equipment'),
 
     url(r'^actions/create-retrieval/(?:(?P<retrieval_id>\d+)/)?$', edit_views.edit_retrieval, name='create_retrieval'),
     url(r'^actions/create-retrieval/from_deployment/(?:(?P<deployment_id>\d+)/)?$', edit_views.edit_retrieval,

diff --git a/src/sensordatainterface/views/edit_views.py b/src/sensordatainterface/views/edit_views.py
@@ -1070,7 +1070,7 @@ def edit_site_visit_summary(request, action_id):
 
 
 @login_required(login_url=LOGIN_URL)
-def edit_action(request, action_type, action_id=None, visit_id=None, site_id=None):
+def edit_action(request, action_type, action_id=None, visit_id=None, site_id=None, equipment_id=None):
     action = 'create'
     child_relationship = CvRelationshiptype.objects.get(term='isChildOf')
 
@@ -1179,6 +1179,16 @@ def edit_action(request, action_type, action_id=None, visit_id=None, site_id=Non
 
             return response
 
+    elif equipment_id:
+        equipment_used = Equipment.objects.filter(pk=equipment_id)
+        site_visit_form = SiteVisitChoiceForm()
+        action_form = ActionForm(
+            initial={'begindatetime': datetime.now(),
+                     'begindatetimeutcoffset': -7,
+                     'enddatetimeutcoffset': -7,
+                     'equipmentused': equipment_used
+                     }
+        )
     elif action_id:
         action = 'update'
         child_action = Action.objects.get(pk=action_id)