Opt out user office from missed reservation notifications

Dockerfile

@@ -12,6 +12,17 @@ RUN mkdir /nemo
 WORKDIR /nemo
 ENV DJANGO_SETTINGS_MODULE "settings"
 ENV PYTHONPATH "/nemo/"
+
+# Gunicorn config options
+ENV GUNICORN_WORKER_CLASS ""
+ENV GUNICORN_WORKER_COUNT ""
+ENV GUNICORN_THREAD_COUNT ""
+ENV GUNICORN_KEEPALIVE_SECONDS ""
+ENV GUNICORN_CAPTURE_OUTPUT ""
+
+# NEMO extra python packages
+ENV NEMO_EXTRA_PIP_PACKAGES ""
+
 COPY gunicorn_configuration.py /etc/
 
 EXPOSE 8000/tcp

NEMO/actions.py

@@ -3,6 +3,7 @@
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 
+from NEMO.mixins import BillableItemMixin
 from NEMO.models import Area, Configuration, Interlock, InterlockCard, Tool, User
 from NEMO.typing import QuerySetType
 from NEMO.utilities import new_model_copy
@@ -176,3 +177,10 @@ def duplicate_configuration(model_admin, request, queryset: QuerySetType[Configu
             messages.error(
                 request, f"{original_name} could not be duplicated because of the following error: {str(error)}"
             )
+
+
+@admin.action(description="Waive selected charges")
+def waive_selected_charges(model_admin, request, queryset: QuerySetType[BillableItemMixin]):
+    for charge in queryset:
+        charge.waive(request.user)
+        messages.success(request, f"{model_admin.model.__name__} #{charge.id} has been successfully waived")

NEMO/admin.py

@@ -29,6 +29,7 @@
     rebuild_area_tree,
     synchronize_with_tool_usage,
     unlock_selected_interlocks,
+    waive_selected_charges,
 )
 from NEMO.forms import BuddyRequestForm, RecurringConsumableChargeForm, UserPreferencesForm
 from NEMO.mixins import ModelAdminRedirectMixin, ObjPermissionAdminMixin
@@ -475,7 +476,18 @@ def save_model(self, request, obj: Area, form, change):
 
 @register(TrainingSession)
 class TrainingSessionAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
-    list_display = ("id", "trainer", "trainee", "tool", "project", "type", "date", "duration", "qualified")
+    list_display = (
+        "id",
+        "trainer",
+        "trainee",
+        "tool",
+        "project",
+        "type",
+        "date",
+        "duration",
+        "qualified",
+        "usage_event",
+    )
     list_filter = (
         "qualified",
         "date",
@@ -486,7 +498,8 @@ class TrainingSessionAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, adm
         ("trainee", admin.RelatedOnlyFieldListFilter),
     )
     date_hierarchy = "date"
-    autocomplete_fields = ["trainer", "trainee", "tool", "project", "validated_by"]
+    autocomplete_fields = ["trainer", "trainee", "tool", "project", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         """We only want staff user and tool superusers to be possible trainers"""
@@ -504,15 +517,17 @@ class StaffChargeAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.M
         ("staff_member", admin.RelatedOnlyFieldListFilter),
     )
     date_hierarchy = "start"
-    autocomplete_fields = ["staff_member", "customer", "project", "validated_by"]
+    autocomplete_fields = ["staff_member", "customer", "project", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
 
 @register(AreaAccessRecord)
 class AreaAccessRecordAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.ModelAdmin):
     list_display = ("id", "customer", "area", "project", "start", "end")
     list_filter = (("area", TreeRelatedFieldListFilter), "start")
     date_hierarchy = "start"
-    autocomplete_fields = ["customer", "project", "validated_by"]
+    autocomplete_fields = ["customer", "project", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
 
 @register(Configuration)
@@ -590,10 +605,15 @@ class ProjectDocumentsInline(DocumentModelAdmin):
 
 @register(Project)
 class ProjectAdmin(admin.ModelAdmin):
-    list_display = ("name", "id", "get_application_identifier", "account", "active", "start_date")
+    list_display = ("name", "id", "get_application_identifier", "account", "active", "get_managers", "start_date")
     filter_horizontal = ("only_allow_tools",)
     search_fields = ("name", "application_identifier", "account__name")
-    list_filter = ("active", ("account", admin.RelatedOnlyFieldListFilter), "start_date")
+    list_filter = (
+        "active",
+        ("account", admin.RelatedOnlyFieldListFilter),
+        "start_date",
+        ("manager_set", admin.RelatedOnlyFieldListFilter),
+    )
     inlines = [ProjectDocumentsInline]
     form = ProjectAdminForm
     autocomplete_fields = ["account"]
@@ -602,6 +622,10 @@ class ProjectAdmin(admin.ModelAdmin):
     def get_application_identifier(self, project: Project):
         return project.application_identifier
 
+    @display(description="PIs", ordering="manager_set")
+    def get_managers(self, project: Project):
+        return mark_safe("<br>".join([pi.get_name() for pi in project.manager_set.all()]))
+
     def save_model(self, request, obj, form, change):
         """
         Audit project creation and modification. Also save any project membership changes explicitly.
@@ -667,7 +691,8 @@ class ReservationAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin, admin.M
     )
     date_hierarchy = "start"
     inlines = [ConfigurationOptionInline]
-    autocomplete_fields = ["user", "creator", "tool", "project", "cancelled_by", "validated_by"]
+    autocomplete_fields = ["user", "creator", "tool", "project", "cancelled_by", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
 
 class ReservationQuestionsForm(forms.ModelForm):
@@ -718,11 +743,14 @@ class ReservationQuestionsAdmin(admin.ModelAdmin):
     form = ReservationQuestionsForm
     filter_horizontal = ("only_for_tools", "only_for_areas", "only_for_projects")
     readonly_fields = ("questions_preview",)
+    list_filter = ["enabled", "tool_reservations", "area_reservations"]
+    list_display = ["name", "enabled", "tool_reservations", "area_reservations"]
     fieldsets = (
         (
             None,
             {
                 "fields": (
+                    "enabled",
                     "name",
                     "questions",
                     "questions_preview",
@@ -743,9 +771,10 @@ 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")
-    list_filter = ("remote_work", "start", "end", ("tool", admin.RelatedOnlyFieldListFilter))
+    list_filter = ("remote_work", "training", "start", "end", ("tool", admin.RelatedOnlyFieldListFilter))
     date_hierarchy = "start"
-    autocomplete_fields = ["tool", "user", "operator", "project", "validated_by"]
+    autocomplete_fields = ["tool", "user", "operator", "project", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
 
 @register(Consumable)
@@ -777,7 +806,8 @@ class ConsumableWithdrawAdmin(ObjPermissionAdminMixin, ModelAdminRedirectMixin,
     list_display = ("id", "customer", "merchant", "consumable", "quantity", "project", "date")
     list_filter = ("date", ("consumable", admin.RelatedOnlyFieldListFilter))
     date_hierarchy = "date"
-    autocomplete_fields = ["customer", "merchant", "consumable", "project", "validated_by"]
+    autocomplete_fields = ["customer", "merchant", "consumable", "project", "validated_by", "waived_by"]
+    actions = [waive_selected_charges]
 
 
 @register(RecurringConsumableCharge)
@@ -798,6 +828,14 @@ class Meta:
         widgets = {"password": forms.PasswordInput(render_value=True)}
         fields = "__all__"
 
+    def clean_extra_args(self):
+        extra_args = self.cleaned_data["extra_args"]
+        try:
+            return json.dumps(json.loads(extra_args), indent=4)
+        except:
+            pass
+        return extra_args
+
     def clean(self):
         if any(self.errors):
             return
@@ -1667,11 +1705,21 @@ class ToolUsageCounterAdmin(admin.ModelAdmin):
         "tool_usage_question",
         "value",
         "warning_threshold",
+        "default_value",
+        "staff_members_can_reset",
+        "qualified_users_can_reset",
+        "superusers_can_reset",
         "last_reset",
         "last_reset_by",
         "is_active",
     )
-    list_filter = (("tool", admin.RelatedOnlyFieldListFilter), "last_reset")
+    list_filter = (
+        "staff_members_can_reset",
+        "qualified_users_can_reset",
+        "superusers_can_reset",
+        ("tool", admin.RelatedOnlyFieldListFilter),
+        "last_reset",
+    )
     readonly_fields = ("warning_threshold_reached",)
     form = ToolUsageCounterAdminForm
     autocomplete_fields = ["tool", "last_reset_by"]
@@ -1723,6 +1771,7 @@ class AdjustmentRequestAdmin(admin.ModelAdmin):
     )
     date_hierarchy = "last_updated"
     actions = [adjustment_requests_export_csv, adjustment_requests_mark_as_applied]
+    readonly_fields = ["creation_time"]
 
     @admin.display(description="Diff")
     def get_time_difference(self, adjustment_request: AdjustmentRequest):
@@ -1866,7 +1915,10 @@ class EmailLogAdmin(admin.ModelAdmin):
     list_display = ["id", "category", "sender", "to", "subject", "when", "ok"]
     list_filter = ["category", "ok"]
     search_fields = ["subject", "content", "to"]
-    readonly_fields = ("content_preview",)
+    readonly_fields = (
+        "when",
+        "content_preview",
+    )
     date_hierarchy = "when"
 
     def content_preview(self, obj):

NEMO/apps/area_access/apps.py

@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class AreaAccessConfig(AppConfig):
+    name = "NEMO.apps.area_access"
+
+    def ready(self):
+        """
+        This code will be run when Django starts.
+        """
+        pass

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

@@ -71,7 +71,7 @@ <h1 style="color:lightgrey" id="badge_number"></h1>
             </div>
             <div id="countdown" class="countdown" style="position: fixed; bottom: 0; right: 0;font-size: x-large"></div>
         </div>
-        {% include 'base/footer.html' %}
+        {% include 'base/footer.html' with no_links=True %}
         <script type="text/javascript">
         {% with show_badge_number="application"|customization:"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" }});

NEMO/apps/area_access/templates/area_access/farewell_screen.html

@@ -1,4 +1,6 @@
 {% extends 'area_access/base.html' %}
 {% block title %}Farewell{% endblock %}
-{% block default_content %}<h1>Scan your badge to log out.</h1>{% endblock %}
+{% block default_content %}
+    {{ door.farewell_message|default_if_none:"<h1>Scan your badge to log out.</h1>"|safe }}
+{% endblock %}
 {% block action %}exit_area(badge_number);{% endblock %}

NEMO/apps/area_access/templates/area_access/welcome_screen.html

@@ -1,4 +1,6 @@
 {% extends 'area_access/base.html' %}
 {% block title %}Welcome{% endblock %}
-{% block default_content %}{{ door.welcome_message|safe }}{% endblock %}
+{% block default_content %}
+    {{ door.welcome_message|default_if_none:"<h1>Scan your badge to log in.</h1>"|safe }}
+{% endblock %}
 {% block action %}enter_area(badge_number, undefined);{% endblock %}

NEMO/apps/area_access/views.py

@@ -1,6 +1,7 @@
 from time import sleep
 
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.exceptions import ValidationError
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.defaultfilters import linebreaksbr
@@ -243,7 +244,10 @@ def login_to_area(request, door_id):
 
             delay_lock_door(door.id)
 
-        log_in_user_to_area(area, user, project)
+        try:
+            log_in_user_to_area(area, user, project)
+        except ValidationError as e:
+            return render(request, "area_access/physical_access_denied.html", {"message": str(e)})
 
         dictionary = {
             "door": door,

NEMO/apps/contracts/apps.py

@@ -3,6 +3,7 @@
 
 class ContractsConfig(AppConfig):
     name = "NEMO.apps.contracts"
+    label = "contracts"
 
     def ready(self):
         """

NEMO/apps/contracts/migrations/0005_alter_contractoragreementdocuments_name_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.15 on 2024-10-04 03:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contracts", "0004_default_display_order"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contractoragreementdocuments",
+            name="name",
+            field=models.CharField(
+                blank=True, help_text="The optional name to display for this document", max_length=255, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="contractoragreementdocuments",
+            name="url",
+            field=models.URLField(blank=True, null=True, verbose_name="URL"),
+        ),
+        migrations.AlterField(
+            model_name="procurementdocuments",
+            name="name",
+            field=models.CharField(
+                blank=True, help_text="The optional name to display for this document", max_length=255, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="procurementdocuments",
+            name="url",
+            field=models.URLField(blank=True, null=True, verbose_name="URL"),
+        ),
+    ]

NEMO/apps/contracts/models.py

@@ -6,21 +6,21 @@
 from django.utils.translation import gettext_lazy as _
 
 from NEMO.apps.contracts.customization import ContractsCustomization
+from NEMO.constants import CHAR_FIELD_MEDIUM_LENGTH, MEDIA_PROTECTED
 from NEMO.models import BaseDocumentModel, BaseModel, User
-from NEMO.views.constants import CHAR_FIELD_MAXIMUM_LENGTH, MEDIA_PROTECTED
 
 
 class Procurement(BaseModel):
-    name = models.CharField(max_length=CHAR_FIELD_MAXIMUM_LENGTH, help_text=_("The name of the contract"))
+    name = models.CharField(max_length=CHAR_FIELD_MEDIUM_LENGTH, help_text=_("The name of the contract"))
     submitted_date = models.DateField(null=True, blank=True, help_text=_("The date this contract was submitted"))
     award_date = models.DateField(null=True, blank=True, help_text=_("The date this contract was awarded"))
     contract_number = models.CharField(
-        null=True, blank=True, max_length=CHAR_FIELD_MAXIMUM_LENGTH, help_text=_("The contract number")
+        null=True, blank=True, max_length=CHAR_FIELD_MEDIUM_LENGTH, help_text=_("The contract number")
     )
     requisition_number = models.CharField(
         null=True,
         blank=True,
-        max_length=CHAR_FIELD_MAXIMUM_LENGTH,
+        max_length=CHAR_FIELD_MEDIUM_LENGTH,
         help_text=_("The requisition number for this contract"),
     )
     cost = models.DecimalField(
@@ -76,7 +76,7 @@ def clean(self):
 
 
 class ContractorAgreement(BaseModel):
-    name = models.CharField(max_length=CHAR_FIELD_MAXIMUM_LENGTH, help_text=_("The name of the contractor"))
+    name = models.CharField(max_length=CHAR_FIELD_MEDIUM_LENGTH, help_text=_("The name of the contractor"))
     contract = models.ForeignKey(
         Procurement,
         null=True,

NEMO/apps/kiosk/apps.py

@@ -0,0 +1,11 @@
+from django.apps import AppConfig
+
+
+class KioskConfig(AppConfig):
+    name = "NEMO.apps.kiosk"
+
+    def ready(self):
+        """
+        This code will be run when Django starts.
+        """
+        pass