Merge pull request #275 from usnistgov/7.0.2.dev

7.0.2.dev

Author: rptmat57

Dockerfile

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

Dockerfile.splash_pad

@@ -3,7 +3,7 @@ FROM python:3.11
 RUN apt-get update && apt-get upgrade -y && apt-get install -y systemctl rsync vim less
 
 COPY . /nemo/
-RUN pip install /nemo/
+RUN python3 -m pip install /nemo/
 RUN rm --recursive --force /nemo
 
 RUN mkdir /nemo

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

@@ -459,7 +459,7 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
         }
         {# Auto hide tooltips on kiosk page after 30 seconds #}
 	    $(document).on('shown.bs.tooltip',  function () {
-          var tooltip = $('.tooltip');
+          let tooltip = $('.tooltip');
           setTimeout(function () {
             tooltip.hide();
           }, 30000);

NEMO/apps/kiosk/templates/kiosk/tool_reservation.html

@@ -64,35 +64,49 @@ <h4>When would you like to reserve the {{ tool }}?</h4>
 	{% for item in tool_reservation_times %}
 	unavailable_times.push([{{ item.start|date:"U" }},{{ item.end|date:"U" }}]);
 	{% endfor %}
-	let start_date_picker = $('#start_date').pickadate({format: "{{ pickadate_date_format }}", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: function(event) {
-        var date = start_date_picker.pickadate('picker').get('select', '{{ pickadate_date_format }}');
-        end_date_picker.pickadate('picker').set('select', date);
-	    refresh_times;
-	 }
-	});
+	let start_date_picker = $('#start_date').pickadate(
+    {
+        format: "{{ pickadate_date_format }}",
+        formatSubmit: "yyyy-mm-dd",
+        firstDay: 1,
+        hiddenName: true,
+        onSet: function(event)
+        {
+            let date = start_date_picker.pickadate('picker').get('select', '{{ pickadate_date_format }}');
+            end_date_picker.pickadate('picker').set('select', date);
+            refresh_times();
+        }
+    });
 	let end_date_picker = $('#end_date').pickadate({format: "{{ pickadate_date_format }}", formatSubmit: "yyyy-mm-dd", firstDay: 1, hiddenName: true, onSet: refresh_times});
 	let start_time_picker = $('#start').pickatime({interval: 15, format: "{{ pickadate_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_labels(true)});
 	let end_time_picker = $('#end').pickatime({interval: 15, format: "{{ pickadate_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_labels(false)});
 	// set initial date
-	if ('{{ start_date|default_if_none:'' }}') {
-		start_date_picker.pickadate('picker').set('select', '{{ start_date }}', {format: '{{ pickadate_date_format }}'})
+	if ('{{ start_date|default_if_none:'' }}')
+    {
+		start_date_picker.pickadate('picker').set('select', '{{ start_date }}', {format: '{{ pickadate_date_format }}'});
 	}
-	function refresh_times() {
+	function refresh_times()
+    {
 		start_time_picker.pickatime('picker').render();
 		end_time_picker.pickatime('picker').render();
 	}
-	function format_labels(is_start){
-        return function format_label(time) {
+	function format_labels(is_start)
+    {
+        return function format_label(time)
+        {
             let date_picker = is_start ? start_date_picker : end_date_picker;
-            if (date_picker.pickadate('picker').get('select') && unavailable_times.length > 0) {
+            if (date_picker.pickadate('picker').get('select') && unavailable_times.length > 0)
+            {
                 let date_selected = date_picker.pickadate('picker').get('select').pick; // selected date in milliseconds
                 let time_selected = time.pick * 60 * 1000; // time in milliseconds
                 let date_time_selected = (date_selected + time_selected)/1000; // back to seconds to compare with python timestamp
-                for (let i=0 ; i < unavailable_times.length; i++) {
+                for (let i=0 ; i < unavailable_times.length; i++)
+                {
                     let times = unavailable_times[i];
                     let start = times[0];
                     let end = times[1];
-                    if (date_time_selected >= start && date_time_selected < end) {
+                    if (date_time_selected >= start && date_time_selected < end)
+                    {
                         return '<sp !an>{{ pickadate_time_format }}</sp !an> <sm !all> !alre!ad!y re!serve!d</sm !all>';
                     }
                 }

NEMO/interlocks.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 import socket
 import struct
 from abc import ABC, abstractmethod
 from logging import getLogger
 from time import sleep
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, TYPE_CHECKING
 from xml.etree import ElementTree
 
 import requests
@@ -15,12 +17,14 @@
 from pymodbus.exceptions import ConnectionException
 from requests import Response
 
-from NEMO.admin import InterlockAdminForm, InterlockCardAdminForm
 from NEMO.exceptions import InterlockError
 from NEMO.models import Interlock as Interlock_model, InterlockCardCategory, User
 from NEMO.typing import QuerySetType
 from NEMO.utilities import BasicDisplayTable, EmailCategory, export_format_datetime, format_datetime
 
+if TYPE_CHECKING:
+    from NEMO.admin import InterlockCardAdminForm, InterlockAdminForm
+
 interlocks_logger = getLogger(__name__)
 
 DEFAULT_CHANNEL_NAME = "Channel/Relay/Coil"

NEMO/static/mobile.js

@@ -2,14 +2,14 @@ function mobile_search(query_element, get_base_url_callback, hide_type)
 {
 	hide_type = hide_type || false;
 	query_element = $(query_element);
-	var results_target = $(query_element.data('search-results-target')).html('');
-	var query = query_element.val();
+	let results_target = $(query_element.data('search-results-target')).html('');
+	let query = query_element.val();
 	if(query.length < 2)
 		return;
-	var search_base = query_element.data('search-base');
-	var result_count = 0;
-	var matching_regular_expression = new RegExp(query, 'i');
-	var results = '<div class="list-group">';
+	let search_base = query_element.data('search-base');
+	let result_count = 0;
+	let matching_regular_expression = new RegExp(query, 'i');
+	let results = '<div class="list-group">';
 	$.each(search_base, function(item_index, item)
 	{
 		if(matching_regular_expression.test(item.name))

NEMO/templates/calendar/calendar.html

@@ -800,7 +800,7 @@
     let item_tree_tools = $("#item-tree-tool");
     let item_tree_areas = $("#item-tree-area");
 	let event_type = get_event_type();
-    let extra_links_personal_schedule = $("#extra-links-personal-schedule");
+    let extra_links_personal_schedule = $("#extra-links-personal-schedule, #checkbox-personal-schedule-personal-schedule");
     let extra_links_all_tools = $("#extra-links-all-tools");
     let extra_links_all_areas = $("#extra-links-all-areas");
     let extra_links_all_areastools = $("#extra-links-all-areastools");

NEMO/templates/customizations/customizations.html

@@ -12,10 +12,12 @@ <h1 style="margin-top: 0;">Customization</h1>
         <div class="col-sm-3">
             <ul class="nav nav-pills nav-stacked" id="tabs">
                 {% for customization_instance in customization.instances %}
-                    <li class="{% if customization_instance.key == customization.key %}active{% endif %}">
-                        <a id="{{ customization_instance.key }}-tab-link"
-                           href="{% url 'customization' customization_instance.key %}">{{ customization_instance.title }}</a>
-                    </li>
+                    {% if customization_instance.template %}
+                        <li class="{% if customization_instance.key == customization.key %}active{% endif %}">
+                            <a id="{{ customization_instance.key }}-tab-link"
+                               href="{% url 'customization' customization_instance.key %}">{{ customization_instance.title }}</a>
+                        </li>
+                    {% endif %}
                 {% endfor %}
             </ul>
         </div>

NEMO/templates/customizations/customizations_templates.html

@@ -620,6 +620,11 @@ <h3 class="customization-section-title" id="weekend_access_email_id">Weekend acc
         </ul>
         {% include 'customizations/customizations_upload.html' with element=weekend_access_email name='weekend access email' key='templates' %}
     </div>
+    {% for customization_instance in customization.instances %}
+        {% if customization_instance.template_templates %}
+            {% include customization_instance.template_templates %}
+        {% endif %}
+    {% endfor %}
 </div>
 <script>
     function sort_comp(element)

NEMO/tests/test_urls_api.py

@@ -0,0 +1,44 @@
+from datetime import datetime
+
+from django.conf import settings
+from django.test import TestCase
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APIClient
+
+from NEMO.models import User
+from NEMO.tests.test_utilities import login_as
+from NEMO.urls import router
+
+
+class TestAPIUrls(TestCase):
+    def setUp(self):
+        user = User.objects.create(username="test", is_superuser=True)
+        self.client = APIClient()
+        login_as(self.client, user)
+
+    def test_all_api_urls(self):
+        # Iterate through all registered URLs in the DRF router
+        for prefix, viewset, basename in router.registry:
+            # Get list of routes for this prefix/viewset
+            routes = router.get_routes(viewset)
+            for route in routes:
+                # Reverse the list path
+                try:
+                    full_url = reverse(f"{basename}-{route.mapping['get']}")
+                except Exception:
+                    continue  # Skip if URL cannot be reversed
+
+                try:
+                    # Make a GET request to the URL (or any method supported)
+                    today = datetime.now().date().strftime(settings.DATE_INPUT_FORMATS[0])
+                    data = None if basename != "billing" else {"start": today, "end": today}
+                    response = self.client.get(full_url, data=data)
+                    # Assert that the response is acceptable
+                    self.assertEqual(
+                        response.status_code,
+                        status.HTTP_200_OK,
+                        msg=f"URL {full_url} returned unexpected status code {response.status_code}",
+                    )
+                except Exception as error:
+                    self.fail(f"Error while testing URL {full_url}: {error}")

NEMO/urls.py

@@ -104,6 +104,7 @@ def sort_urls(url_path):
 router.register(r"reservation_configuration_options", api.ConfigurationOptionViewSet)
 router.register(r"resources", api.ResourceViewSet)
 router.register(r"scheduled_outages", api.ScheduledOutageViewSet)
+router.register(r"staff_assistance_requests", api.StaffAssistanceRequestsViewSet)
 router.register(r"staff_charges", api.StaffChargeViewSet)
 router.register(r"tasks", api.TaskViewSet)
 router.register(r"tools", api.ToolViewSet)

NEMO/views/calendar.py

@@ -1,3 +1,4 @@
+import json
 import re
 from datetime import datetime, timedelta
 from http import HTTPStatus
@@ -7,7 +8,7 @@
 
 from django.contrib.auth.decorators import login_required
 from django.db.models import Q
-from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
@@ -177,18 +178,9 @@ def event_feed(request):
     if event_type == "reservations":
         return reservation_event_feed(request, start, end)
     if event_type == "reservations and use":
-        # We need to remove the json array brackets from the original responses (last [ of reservations and first ] of usage)
-        reservation_feed = reservation_event_feed(request, start, end)
-        reservation_feed_content = reservation_feed.content
-        position = reservation_feed_content.rfind("]".encode())
-        if position != -1:
-            reservation_feed_content = (
-                reservation_feed_content[:position] + "".encode() + reservation_feed_content[position + 1 :]
-            )
-        reservation_feed.content = reservation_feed_content + usage_event_feed(request, start, end).content.replace(
-            "[".encode(), "".encode(), 1
-        )
-        return reservation_feed
+        reservation_feed = json.loads(reservation_event_feed(request, start, end).content)
+        usage_feed = json.loads(usage_event_feed(request, start, end).content)
+        return JsonResponse(reservation_feed + usage_feed, safe=False)
     elif event_type == f"{facility_name.lower()} use":
         return usage_event_feed(request, start, end)
     # Only staff may request a specific user's history...

NEMO/views/customization.py

@@ -1,8 +1,10 @@
 from abc import ABC
 from datetime import date, datetime
-from typing import Dict, Iterable, List
+from logging import getLogger
+from typing import Dict, Iterable, List, Optional
 
 from dateutil.relativedelta import relativedelta
+from django.apps import apps
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.storage import default_storage
@@ -13,7 +15,8 @@
 )
 from django.http import HttpResponseNotFound
 from django.shortcuts import redirect, render
-from django.template import Context, Template
+from django.template import Context, Template, TemplateDoesNotExist
+from django.template.loader import get_template
 from django.utils import timezone
 from django.views.decorators.http import require_GET, require_POST
 
@@ -34,6 +37,8 @@
 )
 from NEMO.utilities import RecurrenceFrequency, date_input_format, datetime_input_format, quiet_int
 
+customization_logger = getLogger(__name__)
+
 
 class CustomizationBase(ABC):
     _instances = {}
@@ -45,8 +50,34 @@ def __init__(self, key, title):
         self.key = key
         self.title = title
 
-    def template(self) -> str:
-        return f"customizations/customizations_{self.key}.html"
+    def template(self) -> Optional[str]:
+        # We want to check if there is a customization template file in the app template dir
+        # Otherwise we load it from the main template dir
+        app = apps.get_containing_app_config(type(self).__module__)
+        if app:
+            for app_dir in [app.label, app.name, ""]:
+                try:
+                    template_path = f"{app_dir}{'/' if app_dir else ''}customizations/customizations_{self.key}.html"
+                    get_template(template_path)  # will raise TemplateDoesNotExist if not found
+                    return template_path
+                except TemplateDoesNotExist:
+                    pass
+        customization_logger.debug(f"could not find any template for customization: {self.key}")
+
+    def template_templates(self) -> Optional[str]:
+        # We have a similar approach here except we are looking for a very specific file
+        # named customizations_{key}_templates.html, and we are only looking in the app template dirs
+        app = apps.get_containing_app_config(type(self).__module__)
+        if app:
+            for app_dir in [app.label, app.name, ""]:
+                try:
+                    template_path = (
+                        f"{app_dir}{'/' if app_dir else ''}customizations/customizations_{self.key}_templates.html"
+                    )
+                    get_template(template_path)  # will raise TemplateDoesNotExist if it doesn't exist
+                    return template_path
+                except TemplateDoesNotExist:
+                    pass
 
     def context(self) -> Dict:
         files_dict = {name: get_media_file_contents(name + extension) for name, extension in type(self).files}

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "NEMO"
-version = "7.0.1"
+version = "7.0.2"
 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"

resources/settings.py

@@ -3,6 +3,8 @@
 from django.conf import global_settings
 from rest_framework.settings import DEFAULTS
 
+BASE_DIR = "/nemo"
+
 # ------------------------------------------------------------------
 # -------------------- Django settings for NEMO --------------------
 # ------------------------------------------------------------------
@@ -237,7 +239,7 @@
 # -------------------- Email written to files --------------------
 # Uncomment the following for testing
 # EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
-# EMAIL_FILE_PATH = "/nemo/emails/"
+# EMAIL_FILE_PATH = BASE_DIR + "/emails/"
 
 # See the list of timezones https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TIME_ZONE = "America/New_York"
@@ -246,16 +248,16 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": "/nemo/nemo.db",
+        "NAME": BASE_DIR + "/nemo.db",
     }
 }
 
 # Comment this line out for dev. This makes sure static files have a version to avoid
 # having to clear browser cache between releases.
 STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
-STATIC_ROOT = "/nemo/static/"
+STATIC_ROOT = BASE_DIR + "/static/"
 STATIC_URL = "/static/"
-MEDIA_ROOT = "/nemo/media/"
+MEDIA_ROOT = BASE_DIR + "/media/"
 MEDIA_URL = "/media/"
 
 # Make this unique, and do not share it with anybody.
@@ -284,12 +286,12 @@
         "error_file": {
             "level": "WARNING",  # Log all warnings and errors to this file
             "class": "logging.FileHandler",
-            "filename": "/nemo/logs/nemo_error.log",
+            "filename": BASE_DIR + "/logs/nemo_error.log",
             "formatter": "verbose",
         },
         "file": {
             "class": "logging.FileHandler",
-            "filename": "/nemo/logs/nemo.log",
+            "filename": BASE_DIR + "/logs/nemo.log",
             "formatter": "simple",
         },
         "console": {