Merge pull request #309 from usnistgov/7.3.7.dev

7.3.7.dev

Author: rptmat57

Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get install -y less vim
 
 # Intall NEMO (in the current directory) and Gunicorn
 COPY . /nemo/
+RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install /nemo/ gunicorn==23.0.0
 RUN rm --recursive --force /nemo/
 

Dockerfile.splash_pad

@@ -5,6 +5,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get upgrade -y && apt-get install -y systemctl rsync vim less
 
 COPY . /nemo/
+RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install /nemo/
 RUN rm --recursive --force /nemo
 

NEMO/apps/kiosk/templates/kiosk/tool_information.html

@@ -558,12 +558,19 @@ <h2>
 	update_stop_button();
 	{% if customer.active_projects|length == 1 %}update_start_button();{% endif %}
 
-	{% if tool.in_use %}
-		$('body').on('dynamic-form-group-changed dynamic-form-field-changed', update_stop_button);
-		$('body').on('change keyup', '#downtime', update_stop_button);
-	{% else %}
-    	$('body').on('dynamic-form-group-changed dynamic-form-field-changed', update_start_button);
-	{% endif %}
+	$('body').on('dynamic-form-group-changed dynamic-form-field-changed', function (event, event_data)
+    {
+        if (event_data.questions_type === "pre")
+        {
+            update_start_button();
+        }
+        else if (event_data.questions_type === "post")
+        {
+            update_stop_button();
+        }
+    });
+	$('body').on('change keyup', '#downtime', update_stop_button);
+
     if (virtual_inputs)
     {
 	    $('#downtime').numpad({'readonly': false, 'hidePlusMinusButton': true, 'hideDecimalButton': true});

NEMO/middleware.py

@@ -4,6 +4,7 @@
 from typing import Optional
 
 from django.conf import settings
+from django.contrib.auth import SESSION_KEY
 from django.contrib.auth.middleware import RemoteUserMiddleware
 from django.http import Http404, HttpResponseForbidden
 from django.urls import NoReverseMatch, resolve, reverse
@@ -76,7 +77,11 @@ def process_view(self, request, view_function, view_ordered_arguments, view_name
         #
         # If the request is normal (instead of AJAX) and the user's session has expired
         # then the @login_required decorator will redirect them to the login page.
-        if not request.user.is_authenticated:
+        #
+        # IMPORTANT: Only do this if the session indicates the user *was* logged in.
+        # Anonymous/public users can have sessions too (CSRF, messages), and should not be blocked.
+        session_had_login = SESSION_KEY in request.session
+        if session_had_login and not request.user.is_authenticated:
             return HttpResponseForbidden() if is_ajax(request) else None
 
         # If the view is regularly polled by the webpage to update information then expiry refresh should be disabled.

NEMO/templates/tool_control/tool_status.html

@@ -1165,10 +1165,16 @@ <h4 class="media-heading">Tool properties</h4>
     show_alerts();
 	update_stop_button();
     update_start_button();
-    {% if tool.in_use %}
-	$('body').on('dynamic-form-group-changed dynamic-form-field-changed', update_stop_button);
-    {% else %}
-	$('body').on('dynamic-form-group-changed dynamic-form-field-changed', update_start_button);
-    {% endif %}
-	$('body').on('change keyup', '#downtime', update_stop_button);
+    $('body').on('change keyup', '#downtime', update_stop_button);
+    $('body').on('dynamic-form-group-changed dynamic-form-field-changed', function (event, event_data)
+    {
+        if (event_data.questions_type === "pre")
+        {
+            update_start_button();
+        }
+        else if (event_data.questions_type === "post")
+        {
+            update_stop_button();
+        }
+    });
 </script>

NEMO/views/tool_control.py

@@ -229,7 +229,8 @@ def usage_data_history(request, tool_id):
     if not last and not start and not end:
         # Default to last 25 records
         last = 25
-    usage_events = UsageEvent.objects.filter(tool_id__in=Tool.objects.get(pk=tool_id).get_family_tool_ids())
+    tool_family_ids = Tool.objects.get(pk=tool_id).get_family_tool_ids()
+    usage_events = UsageEvent.objects.filter(tool_id__in=tool_family_ids)
 
     if start:
         usage_events = usage_events.filter(end__gte=start)
@@ -241,7 +242,7 @@ def usage_data_history(request, tool_id):
         except ValueError:
             pass
 
-    all_usage_events = usage_events.order_by("-end")
+    all_usage_events = usage_events.order_by("-start")
     pre_usage_events = usage_events.order_by("-start")
     post_usage_events = usage_events.filter(end__isnull=False).order_by("-end")
     if last:
@@ -255,6 +256,8 @@ def usage_data_history(request, tool_id):
             post_usage_events = post_usage_events[:last]
 
     table_data = BasicDisplayTable()
+    if len(tool_family_ids) > 1:
+        table_data.add_header(("tool", "Tool"))
     table_data.add_header(("user", "User"))
     table_data.add_header(("operator", "Operator"))
     if show_project_info:
@@ -263,13 +266,17 @@ def usage_data_history(request, tool_id):
     table_data.add_header(("end_date", "End date"))
 
     table_pre_run_data = BasicDisplayTable()
+    if len(tool_family_ids) > 1:
+        table_data.add_header(("tool", "Tool"))
     table_pre_run_data.add_header(("user", "User"))
     table_pre_run_data.add_header(("operator", "Operator"))
     if show_project_info:
         table_pre_run_data.add_header(("project", "Project"))
     table_pre_run_data.add_header(("start_date", "Start date"))
 
     table_post_run_data = BasicDisplayTable()
+    if len(tool_family_ids) > 1:
+        table_data.add_header(("tool", "Tool"))
     table_post_run_data.add_header(("user", "User"))
     table_post_run_data.add_header(("operator", "Operator"))
     if show_project_info:
@@ -856,6 +863,7 @@ def format_usage_data(
         user_data = f"{usage_event.user.first_name} {usage_event.user.last_name}"
         operator_data = f"{usage_event.operator.first_name} {usage_event.operator.last_name}"
         run_data: Dict = loads(usage_run_data) if usage_run_data else {}
+        tool_name = usage_event.tool.name
         for question_key, question in run_data.items():
             if "user_input" in question and not question.get("readonly", False):
                 if question["type"] == "group":
@@ -889,6 +897,7 @@ def format_usage_data(
                                     table_result.formatted_value(user_input) + suffix if user_input else ""
                                 )
                             if group_usage_data:
+                                group_usage_data["tool"] = tool_name
                                 group_usage_data["user"] = user_data
                                 group_usage_data["operator"] = operator_data
                                 group_usage_data["start_date"] = format_datetime(
@@ -905,6 +914,7 @@ def format_usage_data(
                         table_result.formatted_value(question["user_input"]) + suffix if question["user_input"] else ""
                     )
         if usage_data or all_data:
+            usage_data["tool"] = tool_name
             usage_data["user"] = user_data
             usage_data["operator"] = operator_data
             usage_data["start_date"] = format_datetime(usage_event.start, "SHORT_DATETIME_FORMAT")

NEMO/widgets/dynamic_form.py

@@ -1112,6 +1112,7 @@ def get_js_event_data(item, dynamic_field_name: str, extra_data=None) -> str:
             "item_type_id": ContentType.objects.get_for_model(item).id,
             "item_id": item.id,
             "field_name": dynamic_field_name,
+            "questions_type": getattr(item, "questions_type", None),
             **extra_data,
         }
     )

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "NEMO"
-version = "7.3.6"
+version = "7.3.7"
 description = "NEMO is a laboratory logistics web application. Use it to schedule reservations, control tool access, track maintenance issues, and more."
 keywords = ["NEMO"]
 readme = "README.md"