Merge pull request #310 from usnistgov/7.4.0.dev

7.4.0.dev

Author: rptmat57

NEMO/admin.py

@@ -133,6 +133,32 @@
 from NEMO.widgets.dynamic_form import DynamicForm, PostUsageGroupQuestion, admin_render_dynamic_form_preview
 
 
+def has_fk_filter(fk_field_name: str, title: str):
+    filter_title = title
+    param = f"has_{fk_field_name}"
+
+    class HasForeignKeyFilter(admin.SimpleListFilter):
+        title = filter_title
+        parameter_name = param
+
+        def lookups(self, request, model_admin):
+            return (
+                ("yes", f"Has {title}"),
+                ("no", f"No {title}"),
+            )
+
+        def queryset(self, request, queryset):
+            value = self.value()
+            if value == "yes":
+                return queryset.filter(**{f"{fk_field_name}__isnull": False})
+            if value == "no":
+                return queryset.filter(**{f"{fk_field_name}__isnull": True})
+            return queryset
+
+    HasForeignKeyFilter.__name__ = f"Has{title.replace(' ', '')}Filter"
+    return HasForeignKeyFilter
+
+
 # Formset to require at least one inline form
 class AtLeastOneRequiredInlineFormSet(BaseInlineFormSet):
     def clean(self):
@@ -174,7 +200,11 @@ class Media:
     )
 
     _tool_calendar_color = forms.CharField(
-        required=False, max_length=9, initial="#33ad33", widget=forms.TextInput(attrs={"type": "color"})
+        label="Tool calendar color",
+        required=False,
+        max_length=9,
+        initial="#33ad33",
+        widget=forms.TextInput(attrs={"type": "color"}),
     )
 
     def __init__(self, *args, **kwargs):
@@ -229,6 +259,7 @@ class ToolAdmin(admin.ModelAdmin):
         "_category",
         "_location",
         ("_requires_area_access", admin.RelatedOnlyFieldListFilter),
+        has_fk_filter("staff_charge", "Staff Charge"),
     )
     autocomplete_fields = [
         "_primary_owner",
@@ -628,27 +659,46 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
 
 @register(StaffCharge)
 class StaffChargeAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
-    list_display = ("id", "staff_member", "customer", "start", "end", "waived")
+    list_display = ("id", "staff_member", "customer", "start", "end", "waived", "has_area_record", "has_usage_event")
     list_filter = (
         "start",
         "waived",
         ("customer", admin.RelatedOnlyFieldListFilter),
         ("staff_member", admin.RelatedOnlyFieldListFilter),
+        has_fk_filter("areaaccessrecord", "Area Record"),
+        has_fk_filter("usageevent", "Usage Event"),
     )
     date_hierarchy = "start"
     autocomplete_fields = ["staff_member", "customer", "project", "validated_by", "waived_by"]
     actions = [waive_selected_charges]
 
+    @admin.display(boolean=True, description="Usage Event")
+    def has_usage_event(self, obj) -> bool:
+        return obj.usageevent_set.exists()
+
+    @admin.display(boolean=True, description="Area Record")
+    def has_area_record(self, obj) -> bool:
+        return obj.areaaccessrecord_set.exists()
+
 
 @register(AreaAccessRecord)
 class AreaAccessRecordAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
-    list_display = ("id", "customer", "area", "project", "start", "end", "waived")
-    list_filter = (("area", TreeRelatedFieldListFilter), "start", "waived")
+    list_display = ("id", "customer", "area", "project", "start", "end", "waived", "has_staff_charge")
+    list_filter = (
+        ("area", TreeRelatedFieldListFilter),
+        "start",
+        "waived",
+        has_fk_filter("staff_charge", "Staff Charge"),
+    )
     date_hierarchy = "start"
     autocomplete_fields = ["customer", "project", "validated_by", "waived_by"]
     readonly_fields = ["has_ended"]
     actions = [waive_selected_charges]
 
+    @admin.display(boolean=True, description="Staff Charge")
+    def has_staff_charge(self, obj) -> bool:
+        return obj.staff_charge_id is not None
+
 
 @register(Configuration)
 class ConfigurationAdmin(admin.ModelAdmin):
@@ -933,14 +983,30 @@ def questions_preview(self, obj):
 
 @register(UsageEvent)
 class UsageEventAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
-    list_display = ("id", "tool", "user", "operator", "project", "start", "end", "duration", "remote_work", "waived")
+    list_display = (
+        "id",
+        "tool",
+        "user",
+        "operator",
+        "project",
+        "start",
+        "end",
+        "duration",
+        "remote_work",
+        "waived",
+        "has_staff_charge",
+    )
     list_filter = ("remote_work", "training", "start", "end", "waived", ("tool", admin.RelatedOnlyFieldListFilter))
     date_hierarchy = "start"
     autocomplete_fields = ["tool", "user", "operator", "project", "validated_by", "waived_by"]
     readonly_fields = ["has_ended"]
     actions = [waive_selected_charges]
     search_fields = ["user__username", "user__first_name", "user__last_name", "tool__name"]
 
+    @admin.display(boolean=True, description="Staff Charge")
+    def has_staff_charge(self, obj) -> bool:
+        return obj.staff_charge_id is not None
+
 
 @register(Consumable)
 class ConsumableAdmin(admin.ModelAdmin):
@@ -969,9 +1035,14 @@ class ConsumableCategoryAdmin(admin.ModelAdmin):
 @register(ConsumableWithdraw)
 class ConsumableWithdrawAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
     list_display = ("id", "customer", "merchant", "consumable", "quantity", "project", "date", "waived")
-    list_filter = ("date", "waived", ("consumable", admin.RelatedOnlyFieldListFilter))
+    list_filter = (
+        "date",
+        "waived",
+        ("consumable__category", admin.RelatedOnlyFieldListFilter),
+        ("consumable", admin.RelatedOnlyFieldListFilter),
+    )
     date_hierarchy = "date"
-    autocomplete_fields = ["customer", "merchant", "consumable", "project", "validated_by", "waived_by"]
+    autocomplete_fields = ["customer", "merchant", "consumable", "project", "validated_by", "waived_by", "usage_event"]
     actions = [waive_selected_charges]
 
 

NEMO/apps/__init__.py

@@ -4,6 +4,25 @@
 from django.contrib.auth.decorators import login_required
 
 
+def monkey_patch_json_field_for_oracle():
+    from django.db.models.fields.json import JSONField
+
+    # Save the original method
+    original_from_db_value = JSONField.from_db_value
+
+    # Define a wrapper that checks the type first
+    def patched_from_db_value(self, value, expression, connection):
+        # If the driver already parsed it into a native Python type, just return it
+        if isinstance(value, (dict, list)):
+            return value
+
+        # Otherwise, let Django handle it as usual (string/bytes parsing)
+        return original_from_db_value(self, value, expression, connection)
+
+    # Apply the patch
+    JSONField.from_db_value = patched_from_db_value
+
+
 def init_admin_site():
     from NEMO.views.customization import ApplicationCustomization, ProjectsAccountsCustomization
     from NEMO.admin import ProjectAdmin
@@ -34,6 +53,8 @@ class NEMOConfig(AppConfig):
     def ready(self):
         from NEMO.plugins import utils  # needed for checks
 
+        monkey_patch_json_field_for_oracle()
+
         if "migrate" in sys.argv or "makemigrations" in sys.argv:
             return
         from django.apps import apps

NEMO/apps/area_access/views.py

@@ -21,6 +21,7 @@
     ReservationRequiredUserError,
     ScheduledOutageInProgressError,
     UnavailableResourcesUserError,
+    UserAccessError,
 )
 from NEMO.models import (
     Area,
@@ -122,6 +123,11 @@ def login_to_area(request, door_id):
         message = f"You have not been granted physical access to any {facility_name} area. Please visit the User Office if you believe this is an error."
         return render(request, "area_access/physical_access_denied.html", {"message": message})
 
+    except UserAccessError as e:
+        log.details = f"This user raised the following error: {e.msg}"
+        log.save()
+        return render(request, "area_access/physical_access_denied.html", {"message": e.msg})
+
     max_capacity_reached = False
     reservation_requirement_failed = False
     scheduled_outage_in_progress = False

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

@@ -121,7 +121,9 @@ <h2>
             <div class="media">
                 <span class="glyphicon glyphicon-leaf pull-left notification-icon danger-highlight"></span>
                 <div class="media-body">
-                    <span class="media-heading">A required resource is unavailable: {{ r.name }} <span class="light-grey">({{ r.category }})</span></span>
+                    <span class="media-heading">A required resource is unavailable: {{ r.name }}
+                        {% if r.category %}<span class="light-grey">({{ r.category }})</span>{% endif %}
+                    </span>
                     <span class="media-middle">{{ r.restriction_message }}</span>
                 </div>
             </div>

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

@@ -82,8 +82,8 @@ <h4>When would you like to reserve the {{ tool }}?</h4>
         }
     });
 	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)});
+	let start_time_picker = $('#start').pickatime({interval: {{ calendar_slot_duration }}, format: "{{ pickadate_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_labels(true)});
+	let end_time_picker = $('#end').pickatime({interval: {{ calendar_slot_duration }}, format: "{{ pickadate_time_format }}", formatSubmit: "H:i", hiddenName: true, formatLabel: format_labels(false)});
 	function refresh_times()
     {
 		start_time_picker.pickatime('picker').render();

NEMO/apps/kiosk/views.py

@@ -42,7 +42,12 @@
     make_withdrawal_success_message,
     self_checkout,
 )
-from NEMO.views.customization import ApplicationCustomization, ToolCustomization, UserCustomization
+from NEMO.views.customization import (
+    ApplicationCustomization,
+    CalendarCustomization,
+    ToolCustomization,
+    UserCustomization,
+)
 from NEMO.views.get_projects import get_projects
 from NEMO.views.tasks import save_task
 from NEMO.views.tool_control import (
@@ -387,6 +392,7 @@ def tool_reservation(request, tool_id, user_id, back):
         "project": project,
         "customer": customer,
         "back": back,
+        "calendar_slot_duration": CalendarCustomization.get_slot_resolution_minutes(),
         "tool_reservation_times": list(
             Reservation.objects.filter(
                 cancelled=False, missed=False, shortened=False, tool=tool, start__gte=timezone.now()

NEMO/constants.py

@@ -16,3 +16,7 @@
 
 # Name of the media folder under which only staff can see files
 MEDIA_PROTECTED = "protected"
+
+# Policy setting names
+MAIN_POLICY_SETTING = "MAIN_NEMO_POLICY_CLASS"
+EXTRA_POLICIES_SETTING = "EXTRA_NEMO_POLICY_CLASSES"

NEMO/middleware.py

@@ -114,7 +114,7 @@ def process_request(self, request):
 
 class NEMOAuditlogMiddleware:
     """
-    Middleware to couple the request's user to log items. This is accomplished by currying the
+    Middleware to couple the request's user to log items. This is carried out by currying the
     signal receiver with the user from the request (or None if the user is not authenticated).
     """
 

NEMO/migrations/0143_usageevent_staff_charge.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.27 on 2026-02-14 16:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0142_alter_tool__adjustment_request_reviewers_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="usageevent",
+            name="staff_charge",
+            field=models.ForeignKey(
+                blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="NEMO.staffcharge"
+            ),
+        ),
+    ]