NEMO-CE 7.3.6__py3-none-any.whl → 7.3.8__py3-none-any.whl

NEMO/admin.py

@@ -287,7 +287,6 @@ class ToolAdmin(admin.ModelAdmin):
                     "parent_tool",
                     "_category",
                     "_operation_mode",
-                    "_qualifications_never_expire",
                     "_problem_shutdown_enabled",
                     "_reservation_required",
                     "_logout_grace_period",
@@ -342,6 +341,17 @@ class ToolAdmin(admin.ModelAdmin):
                 )
             },
         ),
+        (
+            "Qualification expiration",
+            {
+                "fields": (
+                    "_qualification_reminder_days",
+                    "_qualification_expiration_days",
+                    "_qualification_expiration_never_used_days",
+                    "_qualification_notification_email",
+                )
+            },
+        ),
         (
             "Area Access",
             {

NEMO/migrations/0141_toolqualificationexpiration.py

@@ -0,0 +1,103 @@
+# Generated by Django 4.2.27 on 2026-01-26 20:42
+
+import re
+
+import django.core.validators
+import django.db.models.deletion
+from django.db import migrations, models
+
+import NEMO.fields
+
+
+def migrate_tool_qualification_expiration_forward(apps, schema_editor):
+    Tool = apps.get_model("NEMO", "Tool")
+    Customization = apps.get_model("NEMO", "Customization")
+    tool_qualification_reminder_days = Customization.objects.filter(name="tool_qualification_reminder_days").first()
+    tool_qualification_expiration_days = Customization.objects.filter(name="tool_qualification_expiration_days").first()
+    tool_qualification_expiration_never_used_days = Customization.objects.filter(
+        name="tool_qualification_expiration_never_used_days"
+    ).first()
+    tool_qualification_notification = Customization.objects.filter(name="tool_qualification_cc").first()
+    for tool in Tool.objects.filter(_qualifications_never_expire=False, parent_tool__isnull=True):
+        if tool_qualification_expiration_days or tool_qualification_expiration_never_used_days:
+            if tool_qualification_reminder_days and tool_qualification_reminder_days.value:
+                tool._qualification_reminder_days = tool_qualification_reminder_days.value
+            if tool_qualification_expiration_days and tool_qualification_expiration_days.value:
+                tool._qualification_expiration_days = tool_qualification_expiration_days.value
+            if tool_qualification_expiration_never_used_days and tool_qualification_expiration_never_used_days.value:
+                tool._qualification_expiration_never_used_days = tool_qualification_expiration_never_used_days.value
+            if tool_qualification_notification and tool_qualification_notification.value:
+                tool._qualification_notification_email = tool_qualification_notification.value
+            tool.save()
+    if tool_qualification_reminder_days:
+        tool_qualification_reminder_days.delete()
+    if tool_qualification_expiration_days:
+        tool_qualification_expiration_days.delete()
+    if tool_qualification_expiration_never_used_days:
+        tool_qualification_expiration_never_used_days.delete()
+    if tool_qualification_notification:
+        tool_qualification_notification.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NEMO", "0140_alter_user_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="tool",
+            name="_qualification_expiration_days",
+            field=models.PositiveIntegerField(
+                db_column="qualification_expiration_days",
+                blank=True,
+                help_text="The number of days from the user’s last tool use until the qualification expires.",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="tool",
+            name="_qualification_expiration_never_used_days",
+            field=models.PositiveIntegerField(
+                db_column="qualification_expiration_never_used_days",
+                blank=True,
+                help_text="Number of days from the user's first qualification until the qualification expires (if the user never used the tool).",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="tool",
+            name="_qualification_notification_email",
+            field=NEMO.fields.MultiEmailField(
+                db_column="qualification_notification_email",
+                blank=True,
+                help_text="The email addresses to cc on tool qualification expiration and on reminders. Separate multiple emails with commas.",
+                max_length=2000,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="tool",
+            name="_qualification_reminder_days",
+            field=models.CharField(
+                db_column="qualification_reminder_days",
+                blank=True,
+                help_text="The (optional) number of days to send a reminder prior to the user's tool qualification expiration (below). A comma-separated list can be used for multiple reminders. This applies to both expiration cases.",
+                max_length=255,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        re.compile("^\\d+(?:,\\d+)*\\Z"),
+                        code="invalid",
+                        message="Enter only digits separated by commas.",
+                    )
+                ],
+            ),
+        ),
+        migrations.RunPython(migrate_tool_qualification_expiration_forward, migrations.RunPython.noop),
+        migrations.RemoveField(
+            model_name="tool",
+            name="_qualifications_never_expire",
+        ),
+    ]

NEMO/models.py

@@ -1349,10 +1349,32 @@ class Tool(SerializationByNameModel):
     _interlock = models.OneToOneField(
         "Interlock", db_column="interlock_id", blank=True, null=True, on_delete=models.SET_NULL
     )
-    _qualifications_never_expire = models.BooleanField(
-        default=False,
-        db_column="qualifications_never_expire",
-        help_text="Check this box if qualifications for this tool should never expire (even if the tool qualification expiration feature is enabled).",
+    # Qualification expiration fields
+    _qualification_reminder_days = models.CharField(
+        db_column="qualification_reminder_days",
+        null=True,
+        blank=True,
+        max_length=CHAR_FIELD_MEDIUM_LENGTH,
+        validators=[validate_comma_separated_integer_list],
+        help_text="The (optional) number of days to send a reminder prior to the user's tool qualification expiration (below). A comma-separated list can be used for multiple reminders. This applies to both expiration cases.",
+    )
+    _qualification_expiration_days = models.PositiveIntegerField(
+        db_column="qualification_expiration_days",
+        null=True,
+        blank=True,
+        help_text="The number of days from the user’s last tool use until the qualification expires.",
+    )
+    _qualification_expiration_never_used_days = models.PositiveIntegerField(
+        db_column="qualification_expiration_never_used_days",
+        null=True,
+        blank=True,
+        help_text="Number of days from the user's first qualification until the qualification expires (if the user never used the tool).",
+    )
+    _qualification_notification_email = fields.MultiEmailField(
+        db_column="qualification_notification_email",
+        null=True,
+        blank=True,
+        help_text="The email addresses to cc on tool qualification expiration and on reminders. Separate multiple emails with commas.",
     )
     # Policy fields:
     _requires_area_access = TreeForeignKey(
@@ -1530,17 +1552,6 @@ class Tool(SerializationByNameModel):
         self.raise_setter_error_if_child_tool("category")
         self._category = value
 
-    @property
-    def qualifications_never_expire(self):
-        return (
-            self.parent_tool.qualifications_never_expire if self.is_child_tool() else self._qualifications_never_expire
-        )
-
-    @qualifications_never_expire.setter
-    def qualifications_never_expire(self, value):
-        self.raise_setter_error_if_child_tool("qualifications_never_expire")
-        self._qualifications_never_expire = value
-
     @property
     def description(self):
         return self.parent_tool.description if self.is_child_tool() else self._description
@@ -1689,6 +1700,56 @@ class Tool(SerializationByNameModel):
         self.raise_setter_error_if_child_tool("interlock")
         self._interlock = value
 
+    @property
+    def qualification_reminder_days(self):
+        return (
+            self.parent_tool.qualification_reminder_days if self.is_child_tool() else self._qualification_reminder_days
+        )
+
+    @qualification_reminder_days.setter
+    def qualification_reminder_days(self, value):
+        self.raise_setter_error_if_child_tool("qualification_reminder_days")
+        self._qualification_reminder_days = value
+
+    @property
+    def qualification_expiration_days(self):
+        return (
+            self.parent_tool.qualification_expiration_days
+            if self.is_child_tool()
+            else self._qualification_expiration_days
+        )
+
+    @qualification_expiration_days.setter
+    def qualification_expiration_days(self, value):
+        self.raise_setter_error_if_child_tool("qualification_expiration_days")
+        self._qualification_expiration_days = value
+
+    @property
+    def qualification_expiration_never_used_days(self):
+        return (
+            self.parent_tool.qualification_expiration_never_used_days
+            if self.is_child_tool()
+            else self._qualification_expiration_never_used_days
+        )
+
+    @qualification_expiration_never_used_days.setter
+    def qualification_expiration_never_used_days(self, value):
+        self.raise_setter_error_if_child_tool("qualification_expiration_never_used_days")
+        self._qualification_expiration_never_used_days = value
+
+    @property
+    def qualification_notification_email(self):
+        return (
+            self.parent_tool.qualification_notification_email
+            if self.is_child_tool()
+            else self._qualification_notification_email
+        )
+
+    @qualification_notification_email.setter
+    def qualification_notification_email(self, value):
+        self.raise_setter_error_if_child_tool("qualification_notification_email")
+        self._qualification_notification_email = value
+
     @property
     def requires_area_access(self):
         return self.parent_tool.requires_area_access if self.is_child_tool() else self._requires_area_access
@@ -2379,6 +2440,11 @@ class Tool(SerializationByNameModel):
         else:
             raise ValueError(f"A {'project' if user else 'user'} must be provided for usage questions")
 
+    def get_qualification_reminder_days(self) -> List[int]:
+        if not self.qualification_reminder_days:
+            return []
+        return [int(days) for days in self.qualification_reminder_days.split(",") if days]
+
     def clean(self):
         errors = {}
         if self.parent_tool_id:

NEMO/templates/customizations/customizations_tool.html

@@ -623,97 +623,14 @@
             </div>
         </div>
         <div class="customization-separation" style="margin-bottom: 15px"></div>
-        <h3 class="customization-section-title">Tool qualification expiration</h3>
-        <p>
-            If active, this feature will remove tool qualification from a user if the user has not used the tool after a while or never used it since qualified (configured separately).
-            <p>
-                The <a href="{% url 'customization' 'templates' %}?#tool_qualification_expiration_email_id">user tool qualification expiration email</a> need to be set to enable this feature.
-            </p>
-            <br />
-            <div class="form-group {% if errors.tool_qualification_reminder_days %}has-error{% endif %}">
-                <label class="control-label col-md-3" for="tool_qualification_reminder_days">Reminder days</label>
-                <div class="col-md-5">
-                    <input type="text"
-                           id="tool_qualification_reminder_days"
-                           name="tool_qualification_reminder_days"
-                           class="form-control"
-                           value="{% if errors.tool_qualification_reminder_days %}{{ errors.tool_qualification_reminder_days.value }}{% else %}{{ tool_qualification_reminder_days }}{% endif %}" />
-                </div>
-                <div class="col-md-offset-3 col-md-9 help-block light-grey">
-                    {% if errors.tool_qualification_reminder_days %}
-                        {{ errors.tool_qualification_reminder_days.error }}
-                    {% else %}
-                        The (optional) number of days to send a reminder prior to the user's tool qualification expiration (below). A comma-separated list can be used for multiple reminders. This applies to both expiration cases.
-                    {% endif %}
-                </div>
-            </div>
-            <div class="form-group {% if errors.tool_qualification_expiration_days %}has-error{% endif %}">
-                <label class="control-label col-md-3" for="tool_qualification_expiration_days">
-                    Expiration days (previous tool usage)
-                </label>
-                <div class="col-md-5">
-                    <input type="number"
-                           step="1"
-                           id="tool_qualification_expiration_days"
-                           name="tool_qualification_expiration_days"
-                           class="form-control"
-                           value="{% if errors.tool_qualification_expiration_days %}{{ errors.tool_qualification_expiration_days.value }}{% else %}{{ tool_qualification_expiration_days }}{% endif %}" />
-                </div>
-                <div class="col-md-offset-3 col-md-9 help-block light-grey">
-                    {% if errors.tool_qualification_expiration_days %}
-                        {{ errors.tool_qualification_expiration_days.error }}
-                    {% else %}
-                        The number of days before the user's tool qualification expires since the user last used the tool.
-                    {% endif %}
-                </div>
-            </div>
-            <div class="form-group {% if errors.tool_qualification_expiration_never_used_days %}has-error{% endif %}">
-                <label class="control-label col-md-3" for="tool_qualification_expiration_never_used_days">
-                    Expiration days (no tool usage)
-                </label>
-                <div class="col-md-5">
-                    <input type="number"
-                           step="1"
-                           id="tool_qualification_expiration_never_used_days"
-                           name="tool_qualification_expiration_never_used_days"
-                           class="form-control"
-                           value="{% if errors.tool_qualification_expiration_never_used_days %}{{ errors.tool_qualification_expiration_never_used_days.value }}{% else %}{{ tool_qualification_expiration_never_used_days }}{% endif %}" />
-                </div>
-                <div class="col-md-offset-3 col-md-9 help-block light-grey">
-                    {% if errors.tool_qualification_expiration_never_used_days %}
-                        {{ errors.tool_qualification_expiration_never_used_days.error }}
-                    {% else %}
-                        The number of days before the user's tool qualification expires since the user qualified for the first time.
-                    {% endif %}
-                </div>
-            </div>
-            <div class="form-group {% if errors.tool_qualification_cc %}has-error{% endif %}">
-                <label class="control-label col-md-3" for="tool_qualification_cc">Reminder/expiration CC</label>
-                <div class="col-md-5">
-                    <input type="text"
-                           id="tool_qualification_cc"
-                           name="tool_qualification_cc"
-                           class="form-control"
-                           value="{% if errors.tool_qualification_cc %}{{ errors.tool_qualification_cc.value }}{% else %}{{ tool_qualification_cc }}{% endif %}"
-                           placeholder="information@example.org" />
-                </div>
-                <div class="col-md-offset-3 col-md-9 help-block light-grey">
-                    {% if errors.tool_qualification_cc %}
-                        {{ errors.tool_qualification_cc.error }}
-                    {% else %}
-                        Extra email address to copy when a user's tool qualification reminder/expiration email is sent. A comma-separated list can be used.
-                    {% endif %}
-                </div>
-            </div>
-            <div class="customization-separation" style="margin-bottom: 15px"></div>
-            <div class="text-center">{% button type="save" value="Save settings" %}</div>
-        </div>
-        <script type="text/javascript">
+        <div class="text-center">{% button type="save" value="Save settings" %}</div>
+    </div>
+    <script type="text/javascript">
         $("#tool-tab-link").click(function() {setTimeout(on_tool_tab_show, 50)});
         function on_tool_tab_show()
         {
             auto_size_textarea(document.getElementById('tool_control_configuration_setting_template'))
         }
         on_tool_tab_show();
-        </script>
-    </form>
+    </script>
+</form>

NEMO/templates/tool_control/tool_status.html

@@ -17,7 +17,7 @@
                         History</a>
                     </li>
                 {% endif %}
-                {% if show_usage_data_tab and not hide_data_history or show_usage_data_tab and user.is_any_part_of_staff %}
+                {% if not hide_data_history or user.is_any_part_of_staff %}
                     <li style="width: 48%; text-align: center">
                         <a href="#usage_data" style="padding: 10px 5px;" onclick="load_usage_data('{{ tool.id }}');">Usage Data History</a>
                     </li>
@@ -50,7 +50,7 @@
                         <a href="#config" onclick="load_config_history('{{ tool.id }}');">Config History</a>
                     </li>
                 {% endif %}
-                {% if show_usage_data_tab and not hide_data_history or show_usage_data_tab and user.is_any_part_of_staff %}
+                {% if not hide_data_history or user.is_any_part_of_staff %}
                     <li>
                         <a href="#usage_data" onclick="load_usage_data('{{ tool.id }}');">Run Data History</a>
                     </li>

NEMO/templates/tool_control/usage_data.html

@@ -98,21 +98,61 @@
         </div>
     </div>
 </form>
-{% if run_data_table.rows or pre_run_data_table.rows %}
+{% if data_table.rows or run_data_table.rows or pre_run_data_table.rows %}
     <ul class="nav nav-tabs" id="usage-tabs">
+        {% if data_table.rows %}
+            <li class="active">
+                <a data-toggle="tab" href="#run-data-tab">Usage history</a>
+            </li>
+        {% endif %}
         {% if pre_run_data_table.rows %}
-            <li class="{% if pre_run_data_table.rows %}active{% endif %}">
+            <li>
                 <a data-toggle="tab" href="#pre-run-data-tab">Pre-Run Data</a>
             </li>
         {% endif %}
         {% if run_data_table.rows %}
-            <li class="{% if not pre_run_data_table.rows %}active{% endif %}">
-                <a data-toggle="tab" href="#run-data-tab">Run Data</a>
+            <li>
+                <a data-toggle="tab" href="#post-run-data-tab">Post-Run Data</a>
             </li>
         {% endif %}
     </ul>
     <div class="tab-content" style="margin-bottom: 0;">
-        <div class="tab-pane {% if pre_run_data_table.rows %}active{% endif %}" id="pre-run-data-tab">
+        <div class="tab-pane active" id="run-data-tab">
+            <div class="col-md-12">
+                <div class="form-group pull-right extra-side-padding" style="padding-top: 10px">
+                    {% button type="export" value="Export" onclick="load_usage_data('"|concat:tool_id|concat:"', 'all');" %}
+                </div>
+            </div>
+            <div class="panel-body">
+                {% if data_table.rows %}
+                    <table class="table table-bordered table-condensed" style="margin-top: 10px">
+                        <thead>
+                            <tr>
+                                {% for header in data_table.flat_headers %}<th>{{ header }}</th>{% endfor %}
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for row in data_table.flat_rows %}
+                                <tr>
+                                    {% for item in row %}
+                                        <td>
+                                            {% if item|class_name == "list" %}
+                                                {{ item|join:", " }}
+                                            {% else %}
+                                                {{ item|default_if_none:"" }}
+                                            {% endif %}
+                                        </td>
+                                    {% endfor %}
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                {% else %}
+                    <span class="italic">No run data was found between these dates</span>
+                {% endif %}
+            </div>
+        </div>
+        <div class="tab-pane" id="pre-run-data-tab">
             <div class="col-md-12">
                 <div class="form-group pull-right extra-side-padding" style="padding-top: 10px">
                     {% button type="export" value="Export" onclick="load_usage_data('"|concat:tool_id|concat:"', 'pre-run');" %}
@@ -147,7 +187,7 @@
                 {% endif %}
             </div>
         </div>
-        <div class="tab-pane {% if not pre_run_data_table.rows %}active{% endif %}" id="run-data-tab">
+        <div class="tab-pane" id="post-run-data-tab">
             <div class="col-md-12">
                 <div class="form-group pull-right extra-side-padding" style="padding-top: 10px">
                     {% button type="export" value="Export" onclick="load_usage_data('"|concat:tool_id|concat:"', 'run');" %}

NEMO/tests/test_tools/test_tool_qualification_expiration.py

@@ -7,7 +7,7 @@ from django.utils import timezone
 
 from NEMO.models import Account, EmailLog, Project, Qualification, Tool, UsageEvent, User
 from NEMO.tests.test_utilities import NEMOTestCaseMixin
-from NEMO.views.customization import EmailsCustomization, ToolCustomization
+from NEMO.views.customization import EmailsCustomization
 from NEMO.views.timed_services import do_manage_tool_qualifications
 
 
@@ -45,7 +45,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         )
 
         # Never used days set but not regular days
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -59,7 +60,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
         # Expiration days are set but never used days are not
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -72,8 +74,9 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         qualification_date = datetime.today() - timedelta(days=3)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.save()
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
         # Qualification was NOT removed
@@ -84,8 +87,9 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         qualification_date = datetime.today() - timedelta(days=3)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -96,15 +100,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         mock_exist.return_value = True
         mock_open.return_value = ContentFile(b"Email template", name="template")
 
-        # Tool is exempt
-        self.tool._qualifications_never_expire = True
-        self.tool.save()
-
         qualification_date = datetime.today() - timedelta(days=3)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        # Tool is exempt, meaning no qualification expiration need to be added
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -121,7 +120,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -134,7 +134,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         qualification_date = datetime.today() - timedelta(days=2)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -151,7 +152,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -172,7 +174,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -189,7 +192,8 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         qualification_date = datetime.today() - timedelta(days=3)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
@@ -210,9 +214,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
+        self.tool.qualification_expiration_days = 3
+        self.tool.qualification_notification_email = "qualif_cc@example.com"
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
-        ToolCustomization.set("tool_qualification_cc", "qualif_cc@example.com")
         # Set alternate email for user
         prefs = self.user.get_preferences()
         prefs.email_alternate = "user.alternate@example.com"
@@ -239,9 +244,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         qualification_date = datetime.today() - timedelta(days=20)
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.qualification_notification_email = "qualif_cc@example.com"
+        self.tool.save()
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
-        ToolCustomization.set("tool_qualification_cc", "qualif_cc@example.com")
         # Set alternate email for user
         prefs = self.user.get_preferences()
         prefs.email_alternate = "user.alternate@example.com"
@@ -273,9 +279,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
         # Set reminder 2 days before expiration
-        ToolCustomization.set("tool_qualification_reminder_days", 2)
+        self.tool.qualification_expiration_days = 3
+        self.tool.qualification_reminder_days = "3,2"
+        self.tool.save()
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
         # Qualification was NOT removed (3 days disqualified, but only 2 days since qualification)
@@ -292,9 +299,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
         # Set reminder 2 days before expiration
-        ToolCustomization.set("tool_qualification_reminder_days", 2)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.qualification_reminder_days = "3,2"
+        self.tool.save()
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
         # Qualification was NOT removed (3 days disqualified, but only 2 days since qualification)
@@ -315,9 +323,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
             user=self.user, operator=self.user, tool=self.tool, project=self.project, start=usage_date
         )
 
-        ToolCustomization.set("tool_qualification_expiration_days", 3)
         # Set reminder 1 day before expiration
-        ToolCustomization.set("tool_qualification_reminder_days", 1)
+        self.tool.qualification_expiration_days = 3
+        self.tool.qualification_reminder_days = "1"
+        self.tool.save()
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
         # Qualification was NOT removed (3 days disqualified, but only 2 days since qualification)
@@ -334,9 +343,10 @@ class ToolQualificationTestCase(NEMOTestCaseMixin, TestCase):
         Qualification.objects.create(tool=self.tool, user=self.user, qualified_on=qualification_date)
         EmailsCustomization.set("user_office_email_address", "user_office@example.com")
 
-        ToolCustomization.set("tool_qualification_expiration_never_used_days", 3)
         # Set reminder 1 day before expiration
-        ToolCustomization.set("tool_qualification_reminder_days", 1)
+        self.tool.qualification_expiration_never_used_days = 3
+        self.tool.qualification_reminder_days = "1"
+        self.tool.save()
         # Trigger the expiration timed service
         do_manage_tool_qualifications()
         # Qualification was NOT removed (3 days disqualified, but only 2 days since qualification)

NEMO/views/api.py

@@ -413,10 +413,15 @@ class ToolViewSet(ModelViewSet):
         "_category": string_filters,
         "_operational": boolean_filters,
         "_location": string_filters,
+        "_missed_reservation_threshold": number_filters,
+        "_late_cancellation_reservation_threshold": number_filters,
+        "_qualification_reminder_days": string_filters,
+        "_qualification_expiration_days": number_filters,
+        "_qualification_expiration_never_used_days": number_filters,
+        "_qualification_notification_email": string_filters,
         "_requires_area_access": key_filters,
         "_requires_area_occupancy_minimum": number_filters,
         "_problem_shutdown_enabled": boolean_filters,
-        "_qualifications_never_expire": boolean_filters,
     }
 
 

NEMO/views/calendar.py

@@ -440,7 +440,6 @@ def configuration_agenda_event_feed(request, start, end):
         if item_id and not all_tools:
             events = events.filter(**{f"{item_type.value}__id": item_id})
 
-    # TODO: Filter events that only have to do with the current user's primary, backup and superuser tools.
     personal_schedule = request.GET.get("personal_schedule")
 
     dictionary = {
@@ -877,8 +876,8 @@ def modify_reservation(request, current_user, start_delta, end_delta):
     reservation_to_cancel.cancellation_time = now
     reservation_to_cancel.cancelled_by = current_user
 
-    if reservation_to_cancel.start != new_reservation.start:
-        # Only check if it has a different time, since penalties for extending a reservation
+    if reservation_to_cancel.start < new_reservation.start:
+        # Only check if it has a different time that is later. If moved earlier, it's fine
         check_for_late_cancellation(current_user, reservation_to_cancel)
 
     policy_problems, overridable = policy.check_to_save_reservation(

NEMO/views/customization.py

@@ -683,10 +683,6 @@ class ToolCustomization(CustomizationBase):
         "tool_control_use_for_other_remote": "Use this tool for a remote project",
         "tool_control_note_show": "",
         "tool_control_note_copy_reservation": "",
-        "tool_qualification_reminder_days": "",
-        "tool_qualification_expiration_days": "",
-        "tool_qualification_expiration_never_used_days": "",
-        "tool_qualification_cc": "",
         "tool_problem_max_image_size_pixels": "750",
         "tool_problem_send_to_all_qualified_users": "",
         "tool_problem_allow_regular_user_preferences": "",
@@ -709,17 +705,13 @@ class ToolCustomization(CustomizationBase):
         if (
             name
             in [
-                "tool_qualification_expiration_days",
                 "tool_problem_max_image_size_pixels",
                 "tool_configuration_near_future_days",
             ]
             and value
         ):
             validate_integer(value)
-        if name == "tool_qualification_reminder_days" and value:
-            # Check that we have an integer or a list of integers
-            validate_comma_separated_integer_list(value)
-        elif name == "tool_qualification_cc" or name == "tool_grant_access_emails":
+        if name == "tool_grant_access_emails":
             recipients = tuple([e for e in value.split(",") if e])
             for email in recipients:
                 validate_email(email)

NEMO/views/timed_services.py

@@ -898,24 +898,17 @@ def manage_tool_qualifications(request):
 
 def do_manage_tool_qualifications(request=None):
     user_office_email = EmailsCustomization.get("user_office_email_address")
-    qualification_reminder_days = ToolCustomization.get("tool_qualification_reminder_days")
-    qualification_expiration_days = ToolCustomization.get("tool_qualification_expiration_days")
-    qualification_expiration_never_used = ToolCustomization.get("tool_qualification_expiration_never_used_days")
     template = get_media_file_contents("tool_qualification_expiration_email.html")
     if user_office_email and template:
-        if qualification_expiration_days or qualification_expiration_never_used:
-            qualification_expiration_days = quiet_int(qualification_expiration_days, None)
-            qualification_expiration_never_used = quiet_int(qualification_expiration_never_used, None)
-            # Only applies if there is no qualification level or the qualification level has qualify_user set to True
-            for qualification in (
-                Qualification.objects.filter(
-                    user__is_active=True, user__is_staff=False, tool___qualifications_never_expire=False
-                )
-                .filter(Q(qualification_level__isnull=True) | Q(qualification_level__qualify_user=True))
-                .prefetch_related("tool", "user")
-            ):
-                user = qualification.user
-                tool = qualification.tool
+        # Only applies if there is no qualification level or the qualification level has qualify_user set to True
+        for qualification in (
+            Qualification.objects.filter(user__is_active=True, user__is_staff=False)
+            .filter(Q(qualification_level__isnull=True) | Q(qualification_level__qualify_user=True))
+            .prefetch_related("tool", "user")
+        ):
+            user = qualification.user
+            tool = qualification.tool
+            if tool.qualification_expiration_days or tool.qualification_expiration_never_used_days:
                 last_tool_use = None
                 try:
                     # Last tool use cannot be before the last time they qualified
@@ -924,15 +917,15 @@ def do_manage_tool_qualifications(request=None):
                         qualification.qualified_on,
                     )
                     expiration_date: date = (
-                        last_tool_use + timedelta(days=qualification_expiration_days)
-                        if qualification_expiration_days
+                        last_tool_use + timedelta(days=tool.qualification_expiration_days)
+                        if tool.qualification_expiration_days
                         else None
                     )
                 except UsageEvent.DoesNotExist:
                     # User never used the tool, use the qualification date
                     expiration_date: date = (
-                        qualification.qualified_on + timedelta(days=qualification_expiration_never_used)
-                        if qualification_expiration_never_used
+                        qualification.qualified_on + timedelta(days=tool.qualification_expiration_never_used_days)
+                        if tool.qualification_expiration_never_used_days
                         else None
                     )
                 # Check for staff on tools
@@ -945,25 +938,37 @@ def do_manage_tool_qualifications(request=None):
                             "Qualification expired",
                         )
                         send_tool_qualification_expiring_email(
-                            qualification, last_tool_use, expiration_date, request=request
+                            qualification,
+                            last_tool_use,
+                            expiration_date,
+                            tool.qualification_notification_email,
+                            request=request,
                         )
-                    if qualification_reminder_days:
-                        for remaining_days in [int(days) for days in qualification_reminder_days.split(",")]:
+                    if tool.get_qualification_reminder_days():
+                        for remaining_days in tool.get_qualification_reminder_days():
                             if expiration_date - timedelta(days=remaining_days) == date.today():
                                 send_tool_qualification_expiring_email(
-                                    qualification, last_tool_use, expiration_date, remaining_days, request=request
+                                    qualification,
+                                    last_tool_use,
+                                    expiration_date,
+                                    tool.qualification_notification_email,
+                                    remaining_days,
+                                    request=request,
                                 )
     return HttpResponse()
 
 
 def send_tool_qualification_expiring_email(
-    qualification: Qualification, last_tool_use: date, expiration_date: date, remaining_days: int = None, request=None
+    qualification: Qualification,
+    last_tool_use: date,
+    expiration_date: date,
+    cc_email: List[str],
+    remaining_days: int = None,
+    request=None,
 ):
     user_office_email = EmailsCustomization.get("user_office_email_address")
     template = get_media_file_contents("tool_qualification_expiration_email.html")
     # Add extra cc emails
-    tool_qualification_cc = ToolCustomization.get("tool_qualification_cc")
-    ccs = [e for e in tool_qualification_cc.split(",") if e]
     if remaining_days:
         subject_expiration = f" expires in {remaining_days} days!"
     else:
@@ -980,7 +985,11 @@ def send_tool_qualification_expiring_email(
     message = render_email_template(template, dictionary, request)
     email_notification = qualification.user.get_preferences().email_send_tool_qualification_expiration_emails
     qualification.user.email_user(
-        subject=subject, message=message, from_email=user_office_email, cc=ccs, email_notification=email_notification
+        subject=subject,
+        message=message,
+        from_email=user_office_email,
+        cc=cc_email,
+        email_notification=email_notification,
     )
 
 

NEMO/views/tool_control.py

@@ -41,6 +41,7 @@ from NEMO.models import (
     ToolUsageQuestionType,
     ToolUsageQuestions,
     ToolWaitList,
+    TrainingEvent,
     UsageEvent,
     User,
 )
@@ -149,9 +150,6 @@ def tool_status(request, tool_id):
         or (user_is_qualified and broadcast_upcoming_reservation == "qualified")
         or broadcast_upcoming_reservation == "all",
         "tool_control_show_task_details": ToolCustomization.get_bool("tool_control_show_task_details"),
-        "show_usage_data_tab": ToolUsageQuestions.objects.filter(enabled=True)
-        .filter(Q(only_for_tools=None) | Q(only_for_tools__in=[tool_id]))
-        .exists(),
         "user_can_see_documents": user.is_any_part_of_staff
         or not ToolCustomization.get_bool("tool_control_show_documents_only_qualified_users")
         or user_is_qualified,
@@ -184,7 +182,8 @@ def tool_status(request, tool_id):
         if ToolCustomization.get_bool("tool_control_note_copy_reservation"):
             dictionary["reservation_note"] = current_reservation.note
 
-    dictionary["next_reservation"] = (
+    dictionary["next_reservation"] = None
+    next_reservation = (
         Reservation.objects.filter(
             start__gt=timezone.now(),
             cancelled=False,
@@ -195,6 +194,15 @@ def tool_status(request, tool_id):
         .order_by("start")
         .first()
     )
+    next_training = (
+        TrainingEvent.objects.filter(start__gt=timezone.now(), tool=tool, cancelled=False).order_by("start").first()
+    )
+    if next_reservation:
+        dictionary["next_reservation"] = next_reservation
+    if next_training:
+        if not next_reservation or next_reservation.start > next_training.start:
+            next_training.user = next_training.trainer  # for it to work with email link to user
+            dictionary["next_reservation"] = next_training
 
     # Staff need the user list to be able to qualify users for the tool.
     if user.is_staff_on_tool(tool):
@@ -254,7 +262,7 @@ 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=tool_id)
+    usage_events = UsageEvent.objects.filter(tool_id__in=Tool.objects.get(pk=tool_id).get_family_tool_ids())
 
     if start:
         usage_events = usage_events.filter(end__gte=start)
@@ -266,6 +274,7 @@ def usage_data_history(request, tool_id):
         except ValueError:
             pass
 
+    all_usage_events = usage_events.order_by("-end")
     pre_usage_events = usage_events.order_by("-start")
     post_usage_events = usage_events.filter(end__isnull=False).order_by("-end")
     if last:
@@ -274,22 +283,34 @@ def usage_data_history(request, tool_id):
                 last = int(last)
             except ValueError:
                 last = 25
+            all_usage_events = all_usage_events[:last]
             pre_usage_events = pre_usage_events[:last]
             post_usage_events = post_usage_events[:last]
 
+    table_data = BasicDisplayTable()
+    table_data.add_header(("user", "User"))
+    table_data.add_header(("operator", "Operator"))
+    if show_project_info:
+        table_data.add_header(("project", "Project"))
+    table_data.add_header(("start_date", "Start date"))
+    table_data.add_header(("end_date", "End date"))
+
     table_pre_run_data = BasicDisplayTable()
     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(("date", "Start date"))
+    table_pre_run_data.add_header(("start_date", "Start date"))
 
-    table_run_data = BasicDisplayTable()
-    table_run_data.add_header(("user", "User"))
-    table_run_data.add_header(("operator", "Operator"))
+    table_post_run_data = BasicDisplayTable()
+    table_post_run_data.add_header(("user", "User"))
+    table_post_run_data.add_header(("operator", "Operator"))
     if show_project_info:
-        table_run_data.add_header(("project", "Project"))
-    table_run_data.add_header(("date", "End date"))
+        table_post_run_data.add_header(("project", "Project"))
+    table_post_run_data.add_header(("end_date", "End date"))
+
+    for usage_event in all_usage_events:
+        format_usage_data(table_data, usage_event, None, show_project_info, csv_export, True)
 
     for usage_event in pre_usage_events:
         if usage_event.pre_run_data:
@@ -297,20 +318,21 @@ def usage_data_history(request, tool_id):
                 table_pre_run_data,
                 usage_event,
                 usage_event.pre_run_data,
-                usage_event.start,
                 show_project_info,
                 csv_export,
             )
 
     for usage_event in post_usage_events:
         if usage_event.run_data:
-            format_usage_data(
-                table_run_data, usage_event, usage_event.run_data, usage_event.end, show_project_info, csv_export
-            )
+            format_usage_data(table_post_run_data, usage_event, usage_event.run_data, show_project_info, csv_export)
 
     if csv_export:
-        response = table_run_data.to_csv() if csv_export == "run" else table_pre_run_data.to_csv()
-        filename = f"tool{'' if csv_export == 'run' else '_pre'}_usage_data_export_{export_format_datetime()}.csv"
+        response = (
+            table_data.to_csv()
+            if csv_export == "all"
+            else table_post_run_data.to_csv() if csv_export == "run" else table_pre_run_data.to_csv()
+        )
+        filename = f"tool{'' if csv_export == 'all' else 'post' if csv_export == 'run' else '_pre'}_usage_data_export_{export_format_datetime()}.csv"
         response["Content-Disposition"] = f'attachment; filename="{filename}"'
         return response
     else:
@@ -319,7 +341,8 @@ def usage_data_history(request, tool_id):
             "data_history_start": start.date() if start else None,
             "data_history_end": end.date() if end else None,
             "data_history_last": str(last),
-            "run_data_table": table_run_data,
+            "data_table": table_data,
+            "run_data_table": table_post_run_data,
             "pre_run_data_table": table_pre_run_data,
             "data_history_user": User.objects.get(id=user_id) if user_id else None,
             "show_project_info": show_project_info or False,
@@ -899,17 +922,16 @@ def format_usage_data(
     table_result: BasicDisplayTable,
     usage_event: UsageEvent,
     usage_run_data: str,
-    date_field: datetime,
     show_project_info: str,
     csv_export: str,
+    all_data: bool = False,
 ):
     usage_data = {}
-    date_data = format_datetime(date_field, "SHORT_DATETIME_FORMAT")
 
     try:
         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)
+        run_data: Dict = loads(usage_run_data) if usage_run_data else {}
         for question_key, question in run_data.items():
             if "user_input" in question and not question.get("readonly", False):
                 if question["type"] == "group":
@@ -945,7 +967,10 @@ def format_usage_data(
                             if group_usage_data:
                                 group_usage_data["user"] = user_data
                                 group_usage_data["operator"] = operator_data
-                                group_usage_data["date"] = date_data
+                                group_usage_data["start_date"] = format_datetime(
+                                    usage_event.start, "SHORT_DATETIME_FORMAT"
+                                )
+                                group_usage_data["end_date"] = format_datetime(usage_event.end, "SHORT_DATETIME_FORMAT")
                                 if show_project_info:
                                     group_usage_data["project"] = usage_event.project.name
                                 table_result.add_row(group_usage_data)
@@ -955,10 +980,13 @@ def format_usage_data(
                     usage_data[question_key] = (
                         table_result.formatted_value(question["user_input"]) + suffix if question["user_input"] else ""
                     )
-        if usage_data:
+        if usage_data or all_data:
             usage_data["user"] = user_data
             usage_data["operator"] = operator_data
-            usage_data["date"] = date_data
+            usage_data["start_date"] = format_datetime(usage_event.start, "SHORT_DATETIME_FORMAT")
+            usage_data["end_date"] = (
+                format_datetime(usage_event.end, "SHORT_DATETIME_FORMAT") if usage_event.end else ""
+            )
             if show_project_info:
                 usage_data["project"] = usage_event.project.name
             table_result.add_row(usage_data)

{nemo_ce-7.3.6.dist-info → nemo_ce-7.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NEMO-CE
-Version: 7.3.6
+Version: 7.3.8
 Summary: NEMO Community Edition is a laboratory logistics web application based of NEMO. Use it to schedule reservations, control tool access, track maintenance issues, and more.
 Author-email: Atlantis Labs LLC <atlantis@atlantislabs.io>
 License: MIT License

{nemo_ce-7.3.6.dist-info → nemo_ce-7.3.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 NEMO/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/actions.py,sha256=CXWeXVdqqANcBANM-gBS1tuQmL1-eTItfsc4XBdWlZ4,14297
-NEMO/admin.py,sha256=INM9JBYoWQqbI0qrAH18sbAfqRiuh9UVCEw8hXmhF4o,87307
+NEMO/admin.py,sha256=6WEEMIva5e-E8FRcRbKo4rv9OQoSoxN5D-xWdpfO_Sk,87619
 NEMO/constants.py,sha256=wwg5OX_uQtZjauK7puUJEhrpNHWGDexBsQqNF1v3vUE,662
 NEMO/context_processors.py,sha256=iVqQa7ZOLW65jjP75IbiC2NPeolgCm_0eKABHpsz4ts,6712
 NEMO/decorators.py,sha256=vBl836p-AMmZEV_k1QYCReUMC7-C_G2-BNpqCjcK_eI,7428
@@ -14,7 +14,7 @@ NEMO/middleware.py,sha256=JqLnixd23Elt-XMQ5X-DoKVaSsddpMwOcf1uPWaukxQ,6339
 NEMO/migrations_utils.py,sha256=rEQTYq13rPbjRxWYeJMxt324L7SAaQrfXBB180-ZIBI,2755
 NEMO/mixins.py,sha256=f5QMQ3OaCxSgHWa2vWZxRIx_Vk35zMekLMXAS6HI1RU,20114
 NEMO/model_tree.py,sha256=Nj6u-5SkzbYQ7q0snyPt3OokH08WIUO6L-ivk8FjUHM,4632
-NEMO/models.py,sha256=g-gjeZjmRyTsJooalp9PVzolv6PP-cn3k-S9iIAPFfA,297657
+NEMO/models.py,sha256=Z90C6tI3evrQY97mxXCqzb1UINXVKjCWbeKI6HGw4s0,300481
 NEMO/parsers.py,sha256=FkKlN3_3DJ9NE6-ezSzdaFl5Qvj9b4mCxBaf6Xboyow,1707
 NEMO/permissions.py,sha256=tq3dalidpxICq8zQdSyHoXKlsZa_DRdP6nJ-WnlzNKI,949
 NEMO/policy.py,sha256=An893hR6S8-zBhTVUwOii09lPbUfO1kWRPhZAoiuuZ8,79917
@@ -216,6 +216,7 @@ NEMO/migrations/0137_area_nemo_area_tree_id_lft_idx.py,sha256=SGGh2K8TunyMzIRnl9
 NEMO/migrations/0138_area_late_cancellation_reservation_threshold_and_more.py,sha256=snXfdPumUpInH8A5hKBbEZy6azcjdDdH1OBFBZ82w_w,1438
 NEMO/migrations/0139_unplannedoutage.py,sha256=nfXnrZzXPWne-hvsYtyTWpL-oDaVQRyrBVvKrkYa03w,828
 NEMO/migrations/0140_alter_user_options.py,sha256=_sxUgIG0h5HgrMpJ_HWZ412TWqiSOmG8A_ObY3yXoHk,768
+NEMO/migrations/0141_toolqualificationexpiration.py,sha256=qFh_oEjtzGnUHSqGsoDFlDESPkYUII07GbzF73Jlw4w,4843
 NEMO/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/plugins/utils.py,sha256=t-CJXiqjHbV16QYm7Y21RzIMBAfOaCgZ5s1J6ruFuOY,6054
@@ -358,7 +359,7 @@ NEMO/templates/customizations/customizations_requests.html,sha256=2XQpylF2TdweTi
 NEMO/templates/customizations/customizations_safety.html,sha256=VXIbFwXcndqGNqvLTWgmhAzPfq6p7ZNGXZYmAfQ6cFs,5071
 NEMO/templates/customizations/customizations_shadowing_verification.html,sha256=CecVbJIFSBibyywVIJQQO76Hpj6DEsbi1xD_O14xH9M,3619
 NEMO/templates/customizations/customizations_templates.html,sha256=MHC1jI_0iVkbFvgWu-G-zNtoPuug4IX9p17rIPzUMys,39079
-NEMO/templates/customizations/customizations_tool.html,sha256=0XmxvYwBfripjtBm9Avp0cy879fy951SCrs4wGfXP98,40152
+NEMO/templates/customizations/customizations_tool.html,sha256=-ntTV8sY_RbjyXG3NEloRosMV397vUAabZDy8lB7c4A,34473
 NEMO/templates/customizations/customizations_training.html,sha256=-dyuOvvKmx7uwCtknarrTCWm4hqfcIhMEPVB1vWEFbE,17629
 NEMO/templates/customizations/customizations_upload.html,sha256=OR_bKCQaBiE1Pg6kL_uLMt0I160g2clKmRPjKABZcBg,1866
 NEMO/templates/customizations/customizations_user.html,sha256=9tncqwlww01ko1H8ad3G-ptj0fsSwqnh0DRCTGU7eFc,15097
@@ -461,8 +462,8 @@ NEMO/templates/tool_control/logout_user.html,sha256=UCII2yaDkBFqC-9tyBo8QiqRiZNV
 NEMO/templates/tool_control/past_tasks_and_comments.html,sha256=NnerYy8BKMqdvsz8PJuWuU4VN6zJfqARHm35gnwWeCM,5175
 NEMO/templates/tool_control/qualified_users.html,sha256=ZPmdePYF0aW_oJO44woEb_PRlXfOB0V4PMJVub79b6g,5974
 NEMO/templates/tool_control/tool_control.html,sha256=mAtFwqVJFzLcKgUcmKtPtvcjfpjFX6YiXRTrFSQacrc,19558
-NEMO/templates/tool_control/tool_status.html,sha256=YFGrMNC5xpEh0CHLv500IHkI3Ro5IQUydfMC_qHO1oQ,77030
-NEMO/templates/tool_control/usage_data.html,sha256=UhSixd5TD8yAzIELufB7K1DXRo_FYDNkox5KZiNpz8g,10928
+NEMO/templates/tool_control/tool_status.html,sha256=lB1FJcuGOYkPHO3cmmoSaODbJBjB2gqCKMexoFVMFzI,76934
+NEMO/templates/tool_control/usage_data.html,sha256=gogSex9YAP7jE32Qeb1AyD4NJeLaSEFd6cVQuy7KVGA,12680
 NEMO/templates/tool_control/use_tool_for_other.html,sha256=JqZM4rpy7UE_zuk8w42ShY3o7PPMd3LcW_L0RelNChk,430
 NEMO/templates/tool_credentials/tool_credentials.html,sha256=nPZsZZJmRFTXMeE_IxW-M8_zYNPHaxzsCXXxMULrN9c,3551
 NEMO/templates/training/get_projects.html,sha256=Q64ODiogehjiCJw-BWlheFXiGzEgojyTq_bA2F2mS8U,557
@@ -532,7 +533,7 @@ NEMO/tests/test_requests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 NEMO/tests/test_requests/test_adjustment_requests.py,sha256=nNycsuvDt3aYACTthQizB0aca9nJTMRV6kZu8T4v-gc,12533
 NEMO/tests/test_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/tests/test_tools/test_tool.py,sha256=tbF9XhEnqhVZWFiPNRToDRhARhXMcavaHr1KEtUCy6Q,18011
-NEMO/tests/test_tools/test_tool_qualification_expiration.py,sha256=MNv1VyEZGOeAEWYDrEwyS1l0j5ZSC-yUdjNlqb4EZJA,19062
+NEMO/tests/test_tools/test_tool_qualification_expiration.py,sha256=rwfFCuqXh9hVC_7ymsfDlsVMLa-51pCAn3EzGA4mL0k,18846
 NEMO/tests/test_tools/test_waitlist.py,sha256=FOkiAtjtmn8FYwZ4PZErGBFHdLraN7ZNsc375hgN8ao,35510
 NEMO/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/views/abuse.py,sha256=S53PaFKbBAhJkv82SU63Nat1h0YBjUZ4oPhK9LqP7VY,5811
@@ -541,18 +542,18 @@ NEMO/views/accounts_and_projects.py,sha256=2qgAfK6BRMI4Db_rWkSd8O8y7LZxTeMqNdveX
 NEMO/views/adjustment_requests.py,sha256=du-vsgjapNjbQxaFewUZYEsOOBx-u2DtnP9E6OLrkTA,29021
 NEMO/views/admin_autocomplete.py,sha256=vqAiQrg381-ga9a3XF9zrc5yCdP_SLG0L_cd1Ikfjz4,1601
 NEMO/views/alerts.py,sha256=zKUFwn1ZnRl4AP8Bcg3A6KF6eSlPoOTvVcchA06R9yk,2004
-NEMO/views/api.py,sha256=cBAFKWOdq4aUDAG1N2mQHH70BNjU9SuH4fb63XVE99w,45521
+NEMO/views/api.py,sha256=XbZHdNsWmDpPiuPN_y37lNbRZjc-w8jqxcOdHXdBULc,45833
 NEMO/views/api_billing.py,sha256=txdVWKtrT-ghq5KG-ODdjdEtbm_bdCIL-ZunltGUuFw,16415
 NEMO/views/area_access.py,sha256=iymFELXlRbwGhaYx-vLiTvfsuRQafhDk1QafhqBieEY,22538
 NEMO/views/authentication.py,sha256=pnsBH84EcgnkwhscFleX_yIzTvzg9CIiUsX13d1r8Lc,15838
 NEMO/views/buddy_requests.py,sha256=8BbQUdsHRp2kIoE5FdeY5ybH04VUBm-XHK6WonflnfA,7305
-NEMO/views/calendar.py,sha256=oC0ln7nKZ4VbLPph1xarKtsy11_JfqNtt82DSGck4AQ,72670
+NEMO/views/calendar.py,sha256=846CPZshOS4TbuYZLAxt0QOQY_5RHz0oZjxZHn0fmdc,72559
 NEMO/views/charge_validation.py,sha256=aJ1UfkFGQqyxV3GkZt8503NzOPEloyIKTylOxe0pRFY,4078
 NEMO/views/configuration_agenda.py,sha256=JMW3svUkkGrov36WsbSLn4EEY5IPIon9tMAsRI3C2iw,3168
 NEMO/views/constants.py,sha256=jhBysGdFauZE_ByAdqv9jH3s-6PZSncAacqh--0fKRE,97
 NEMO/views/consumables.py,sha256=utVY-oKTi1YwgQElHgDZMuVahb3ZetdxNx_J-7jFLxM,14367
 NEMO/views/contact_staff.py,sha256=_h2pvWsvlacmR1I-BmEXHlqr9Ms0PWcNn8Qe5I90UCY,488
-NEMO/views/customization.py,sha256=BlPMsOqAgNIqJ9SoGXVobnw0kHbsnmzDPvmNIzDHcRM,42282
+NEMO/views/customization.py,sha256=RIoUneMvgTLNWZTZ1Pdod1TiCut5uXarwiyRSVcwfcA,41807
 NEMO/views/documents.py,sha256=JmDR6ImlNstjddVuMGuADEJS2cgracinD8IX0xIrfYY,3763
 NEMO/views/email.py,sha256=-gJCDiX9uEULD33dpDOvLA38HNnOhp-gquPZzyJQ57c,17795
 NEMO/views/event_details.py,sha256=b_xH-JA7uNXt5n9vVl2AUzEPUkBDn60QcirWaH8ByTM,2786
@@ -576,8 +577,8 @@ NEMO/views/sidebar.py,sha256=SH8--3cpjgThM2WfsiYJ3VzRgM12RKXfrUkcQG5QeP4,980
 NEMO/views/staff_assistance_requests.py,sha256=zHBfH5XxYCJLfC9i30v7naMsC_zWFg4ZSP7KlZuTSRE,9231
 NEMO/views/status_dashboard.py,sha256=Wv1yu4qiKLeHFcMhNASDGEKvj14jsJ3Jf5vJlQGtqgk,24990
 NEMO/views/tasks.py,sha256=Vh3ipdSj40LRQD4_Al52C6HW4TvjMor_dDRmkzGBhCc,20447
-NEMO/views/timed_services.py,sha256=NRb2UKi5czXBHDA3dXeQlpU2vRJdOEe9QuOWA6WQHQk,61357
-NEMO/views/tool_control.py,sha256=TjslWQEkZAVvuMAxZ8xgbMV9-c5vjmPi3hm8P6OB55Y,41141
+NEMO/views/timed_services.py,sha256=exq83UVulBNGLIaW9E2xE2w_yF94ed3kPmqS_aLhdFk,61102
+NEMO/views/tool_control.py,sha256=YP11yCM8Kha2egMtl9B7v8A37kK9CqsuVlUFyctjeAU,42681
 NEMO/views/tool_credentials.py,sha256=2EYibZCuJ1rj8b0ubNv0P9SBhprWJCg403MVStO7n3w,2086
 NEMO/views/training.py,sha256=Mnoea9ZFk7BNvOB2bYoQTAFO5G5yaz51FBOcoToRt-c,8992
 NEMO/views/training_new.py,sha256=jPQewiKEoTIpRTOjoh1QXfMJaG9MglOnvKvL_Pn25lQ,52212
@@ -589,9 +590,9 @@ NEMO/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 NEMO/widgets/configuration_editor.py,sha256=aWgg6rYrgSZcPSURU0Fs48nPSBncXlRyGVPqvx89PaA,4496
 NEMO/widgets/dynamic_form.py,sha256=GnXPEc9NMc6hRLGzR3DK3cglXX0zPyLwsfWXQ01CdhM,59705
 NEMO/widgets/item_tree.py,sha256=tl1d0EgwVXFQQhCmZvcjB_1qmla9qvGxyWBLwWpgxfU,9964
-nemo_ce-7.3.6.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-nemo_ce-7.3.6.dist-info/METADATA,sha256=xrdB5tg27VBJ7G7kV7jnZgupqrhu0K_ZKdS4uQqFUCk,3804
-nemo_ce-7.3.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-nemo_ce-7.3.6.dist-info/entry_points.txt,sha256=ESVtd5EFgPSKwlEZ92GSowvz-wM7K3f11Xr15Qk2a40,55
-nemo_ce-7.3.6.dist-info/top_level.txt,sha256=PraGZBuSHU5e2U69ztvBNqTyC7zHCNCbjF3rpqqBu0o,5
-nemo_ce-7.3.6.dist-info/RECORD,,
+nemo_ce-7.3.8.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+nemo_ce-7.3.8.dist-info/METADATA,sha256=DSfcSORVj7p46BZ2CbUKZ2ZrtGX6utK1NHJNQSpHwUw,3804
+nemo_ce-7.3.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nemo_ce-7.3.8.dist-info/entry_points.txt,sha256=ESVtd5EFgPSKwlEZ92GSowvz-wM7K3f11Xr15Qk2a40,55
+nemo_ce-7.3.8.dist-info/top_level.txt,sha256=PraGZBuSHU5e2U69ztvBNqTyC7zHCNCbjF3rpqqBu0o,5
+nemo_ce-7.3.8.dist-info/RECORD,,