Merge pull request #306 from usnistgov/7.3.3.dev

7.3.3.dev

Author: rptmat57

NEMO/admin.py

@@ -115,6 +115,7 @@
     ToolUsageQuestions,
     ToolWaitList,
     TrainingSession,
+    UnplannedOutage,
     UsageEvent,
     User,
     UserDocuments,
@@ -271,7 +272,17 @@ class ToolAdmin(admin.ModelAdmin):
             },
         ),
         ("Approval", {"fields": ("_adjustment_request_reviewers",)}),
-        ("Reservation", {"fields": ("_reservation_horizon", "_missed_reservation_threshold", "_abuse_weight")}),
+        (
+            "Reservation",
+            {
+                "fields": (
+                    "_reservation_horizon",
+                    "_missed_reservation_threshold",
+                    "_late_cancellation_reservation_threshold",
+                    "_abuse_weight",
+                )
+            },
+        ),
         (
             "Usage policy",
             {
@@ -514,7 +525,17 @@ class AreaAdmin(DraggableMPTTAdmin):
             },
         ),
         ("Approval", {"fields": ("adjustment_request_reviewers", "access_request_reviewers")}),
-        ("Reservation", {"fields": ("reservation_horizon", "missed_reservation_threshold", "abuse_weight")}),
+        (
+            "Reservation",
+            {
+                "fields": (
+                    "reservation_horizon",
+                    "missed_reservation_threshold",
+                    "late_cancellation_reservation_threshold",
+                    "abuse_weight",
+                )
+            },
+        ),
         (
             "Policy",
             {
@@ -811,7 +832,7 @@ class ReservationAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.M
         "project",
         "start",
         "end",
-        "duration",
+        "duration_rounded",
         "cancelled",
         "missed",
         "shortened",
@@ -1801,6 +1822,24 @@ class ScheduledOutageAdmin(admin.ModelAdmin):
         ("creator", admin.RelatedOnlyFieldListFilter),
     )
     autocomplete_fields = ["tool", "creator"]
+    date_hierarchy = "start"
+
+
+@register(UnplannedOutage)
+class UnplannedOutageAdmin(admin.ModelAdmin):
+    list_display = ("id", "tool", "start", "end")
+    list_filter = (("tool", admin.RelatedOnlyFieldListFilter),)
+    autocomplete_fields = ["tool"]
+    date_hierarchy = "start"
+
+    def has_delete_permission(self, request, obj=None):
+        return request.user.is_superuser
+
+    def has_add_permission(self, request):
+        return request.user.is_superuser
+
+    def has_change_permission(self, request, obj=None):
+        return request.user.is_superuser
 
 
 @register(News)

NEMO/apps/area_access/templates/area_access/base.html

@@ -35,13 +35,7 @@
         <div id="area-container">
             <div id="default_content">
                 {% block default_content %}{% endblock %}
-                <div id="occupancy"></div>
-                <div id="usage_title"></div>
-                <div class="tab-pane{% if tools_exist and tab == 'tools' %} active{% endif %} info-tooltip-container"
-                     id="tools">
-                    <div id="usage"></div>
-                </div>
-                <div id="alerts"></div>
+                <div id="dynamic_content"></div>
             </div>
             <div id="error" style="display: none">
                 <h1>There was a problem communicating with the web server. Please visit the user office for assistance.</h1>
@@ -82,12 +76,26 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
         {% with show_badge_number=customizations|get_item:"show_badge_number" %}
 		let area_access_badge_reader = new BadgeReader(send_badge_number, "{{ badge_reader.send_key }}", {% if badge_reader.record_key %}"{{ badge_reader.record_key }}",{% else %}undefined,{% endif %} {{ show_badge_number|yesno:"true,false" }});
         {% endwith %}
-		let timeout_handle = null;
+        let timeout_handle = null;
 		let countdown_handle = null;
+
+        // Reorder divs based on URL parameter order
+        const dynamic_container = $("#dynamic_content");
         const current_url_parameters = new URLSearchParams(window.location.search);
+
+        for (const [key, value] of current_url_parameters.entries()) {
+            if (key === 'occupancy') {
+                dynamic_container.append('<div id="occupancy"></div>');
+            } else if (key === 'usage') {
+                dynamic_container.append('<div id="usage_title"></div><div class="info-tooltip-container" id="tools"><div id="usage"></div></div>');
+            } else if (key === 'alerts') {
+                dynamic_container.append('<div id="alerts"></div>');
+            }
+        }
+
 		let occupancy = current_url_parameters.get('occupancy');
-		let usage = new URLSearchParams(window.location.search).get('usage') !== null;
-        let alerts = new URLSearchParams(window.location.search).get('alerts') !== null;
+		let usage = current_url_parameters.get('usage') !== null;
+        let alerts = current_url_parameters.get('alerts') !== null;
 
 		let default_content_element = $("#default_content");
 		let status_element = $("#status");
@@ -145,9 +153,9 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
 		function revert_to_default_content()
 		{
 			$('body').removeClass();
-			fetch_occupancy();
-			fetch_usage();
-            fetch_alerts();
+            if (occupancy) fetch_occupancy();
+            if (usage) fetch_usage();
+            if (alerts) fetch_alerts();
 			clear_timeout();
 			status_element.hide();
 			error_element.hide();

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

@@ -45,13 +45,7 @@
             <div class="container-fluid">
                 <div id="default_content">
                     {{ customizations|get_item:"kiosk_message"|default_if_none:"<h1>Scan your badge to control tools</h1>"|safe }}
-                    <div id="occupancy"></div>
-                    <div id="usage_title"></div>
-                    <div class="tab-pane{% if tools_exist and tab == 'tools' %} active{% endif %} info-tooltip-container"
-                         id="tools">
-                        <div id="usage"></div>
-                    </div>
-                    <div id="alerts"></div>
+                    <div id="dynamic_content"></div>
                 </div>
                 <div id="error" style="display: none">
                     <h1>There was a problem communicating with the web server. Please visit the user office for assistance.</h1>
@@ -100,7 +94,21 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
         {% endwith %}
 		let timeout_handle = null;
 		let countdown_handle = null;
+
+        // Reorder divs based on URL parameter order
+        const dynamic_container = $("#dynamic_content");
         const current_url_parameters = new URLSearchParams(window.location.search);
+
+        for (const [key, value] of current_url_parameters.entries()) {
+            if (key === 'occupancy') {
+                dynamic_container.append('<div id="occupancy"></div>');
+            } else if (key === 'usage') {
+                dynamic_container.append('<div id="usage_title"></div><div class="info-tooltip-container" id="tools"><div id="usage"></div></div>');
+            } else if (key === 'alerts') {
+                dynamic_container.append('<div id="alerts"></div>');
+            }
+        }
+
 		const occupancy = current_url_parameters.get("occupancy");
         const usage = current_url_parameters.get("usage") !== null;
         const alerts = current_url_parameters.get("alerts") !== null;
@@ -184,9 +192,9 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
 		}
 		function revert_to_default_content()
 		{
-			fetch_occupancy();
-            fetch_usage();
-            fetch_alerts();
+			if (occupancy) fetch_occupancy();
+            if (usage) fetch_usage();
+            if (alerts) fetch_alerts();
 			clear_timeout();
 			close_numpads();
 			close_keyboards();
@@ -487,10 +495,7 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
 		}
 		function fetch_occupancy()
 		{
-            if(occupancy)
-            {
-			    ajax_get('{% url 'kiosk_occupancy' %}', {'occupancy': occupancy}, function(response) { $("#occupancy").html(response); });
-            }
+            ajax_get('{% url 'kiosk_occupancy' %}', {'occupancy': occupancy}, function(response) { $("#occupancy").html(response); });
 		}
         function logout_user(tool_id, badge_number)
 		{
@@ -499,25 +504,19 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
 		}
         function fetch_usage()
 		{
-            if(usage)
-            {
-                $("#usage_title").html("<h2>Tools in use</h2>")
-                ajax_get('{% url 'kiosk_usage' %}', {'interest': 'tools'},
-                    function(response) {
-                        $("#usage").html(response);
-                        $(".in_use").css("display", "table-row");
-                        $(".idle").hide();
-                        $(".glyphicon-remove-circle").hide();
-                    }
-                );
-            }
+            $("#usage_title").html("<h2>Tools in use</h2>")
+            ajax_get('{% url 'kiosk_usage' %}', {'interest': 'tools'},
+                function(response) {
+                    $("#usage").html(response);
+                    $(".in_use").css("display", "table-row");
+                    $(".idle").hide();
+                    $(".glyphicon-remove-circle").hide();
+                }
+            );
         }
         function fetch_alerts()
         {
-            if(alerts)
-            {
-                $("#alerts").load("{% url 'kiosk_alerts' %}");
-            }
+            $("#alerts").load("{% url 'kiosk_alerts' %}");
         }
 		function close_numpads()
 		{

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

@@ -100,7 +100,7 @@ <h4>{{ message }}</h4>
                     <span style="padding-left:10px;">Shut down the tool so that it may not be used until this problem is resolved.</span>
                 </label>
             </div>
-            {% if customer|is_staff_on_tool:tool and tool.interlock %}
+            {% if customer|is_staff_on_tool:tool and tool.interlock and customizations|get_item:"tool_interlock_ask_when_shutting_down_problem" == "enabled" %}
                 <div class="checkbox" id="tool_problem_lock">
                     <label>
                         <input name="lock" type="checkbox" {% if form.lock.value %}checked{% endif %} />

NEMO/migrations/0138_area_late_cancellation_reservation_threshold_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.27 on 2026-01-19 17:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0137_area_nemo_area_tree_id_lft_idx"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="area",
+            name="late_cancellation_reservation_threshold",
+            field=models.PositiveIntegerField(
+                blank=True,
+                db_column="late_cancellation_reservation_threshold",
+                help_text='The amount of time (in minutes) before its start time that a area reservation may be canceled before it is automatically marked as "missed" and hidden from the calendar. Usage can be from any user, regardless of who the reservation was originally created for. The cancellation process is triggered by a timed job on the web server.',
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="tool",
+            name="_late_cancellation_reservation_threshold",
+            field=models.PositiveIntegerField(
+                blank=True,
+                db_column="late_cancellation_reservation_threshold",
+                help_text='The amount of time (in minutes) before its start time that a tool reservation may be canceled before it is automatically marked as "missed" and hidden from the calendar.',
+                null=True,
+            ),
+        ),
+    ]

NEMO/migrations/0139_unplannedoutage.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.27 on 2026-01-22 21:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0138_area_late_cancellation_reservation_threshold_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UnplannedOutage",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("start", models.DateTimeField()),
+                ("end", models.DateTimeField(blank=True, null=True)),
+                ("tool", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="NEMO.tool")),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]

NEMO/migrations/0140_alter_user_options.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.27 on 2026-01-22 21:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0139_unplannedoutage"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="user",
+            options={
+                "ordering": ["first_name"],
+                "permissions": (
+                    ("trigger_timed_services", "Can trigger timed services"),
+                    ("use_billing_api", "Can use billing API"),
+                    ("use_project_billing", "Can use project billing"),
+                    ("kiosk", "Kiosk services"),
+                    ("can_impersonate_users", "Can impersonate other users"),
+                ),
+            },
+        ),
+    ]