Merge pull request #307 from usnistgov/7.3.4.dev

7.3.4.dev

Author: rptmat57

NEMO/admin.py

@@ -247,7 +247,6 @@ class ToolAdmin(admin.ModelAdmin):
                     "_category",
                     "_operation_mode",
                     "qualified_users",
-                    "_qualifications_never_expire",
                     "_problem_shutdown_enabled",
                 )
             },
@@ -300,6 +299,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

@@ -1310,10 +1310,32 @@ class OperationMode(object):
     _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(
@@ -1459,17 +1481,6 @@ def category(self, value):
         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
@@ -1618,6 +1629,56 @@ def interlock(self, value):
         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
@@ -2194,6 +2255,11 @@ def get_usage_questions(
         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

@@ -541,97 +541,14 @@ <h3 class="customization-section-title">Tool wait list</h3>
             </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

@@ -16,7 +16,7 @@ <h1>{{ tool.name_or_child_in_use_name }}</h1>
                         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>
@@ -49,7 +49,7 @@ <h1 class="pull-left" style="margin-right:20px; margin-top:0; margin-bottom:10px
                         <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>