Assessment Detail/Value adjustments

hawc/apps/assessment/forms.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 from textwrap import dedent
 
-import numpy as np
 from django import forms
 from django.conf import settings
 from django.contrib import admin
@@ -238,18 +237,6 @@ def clean(self):
             if not cleaned_data.get("uncertainty"):
                 msg = "Required for Noncancer evaluation types."
                 self.add_error("uncertainty", msg)
-        if (
-            cleaned_data.get("value")
-            and cleaned_data.get("pod_value")
-            and cleaned_data.get("uncertainty")
-        ):
-            if not np.isclose(
-                cleaned_data["value"],
-                cleaned_data["pod_value"] / cleaned_data["uncertainty"],
-                rtol=0.01,
-            ):
-                msg = "POD / uncertainty is not equal to value."
-                self.add_error("value", msg)
 
     @property
     def helper(self):

hawc/apps/assessment/migrations/0038_alter_assessmentdetail_qa_id.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.0.6 on 2024-06-05 17:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("assessment", "0037_delete_blog"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="assessmentdetail",
+            name="qa_id",
+            field=models.CharField(
+                blank=True,
+                help_text="Quality Assurance (QA) tracking identifier, if one exists.",
+                max_length=32,
+                verbose_name="Quality Assurance (QA) tracking identifier",
+            ),
+        ),
+    ]

hawc/apps/assessment/models.py

@@ -1,8 +1,10 @@
 import json
 import logging
 import uuid
+from collections import namedtuple
 from typing import Any, NamedTuple
 
+import numpy as np
 import pandas as pd
 from django.apps import apps
 from django.conf import settings
@@ -16,6 +18,7 @@
 from django.template.defaultfilters import truncatewords
 from django.urls import reverse
 from django.utils import timezone
+from django.utils.functional import cached_property
 from pydantic import BaseModel as PydanticModel
 from reversion import revisions as reversion
 
@@ -533,7 +536,7 @@ class AssessmentDetail(models.Model):
         default=constants.PeerReviewType.NONE,
     )
     qa_id = models.CharField(
-        max_length=16,
+        max_length=32,
         blank=True,
         verbose_name="Quality Assurance (QA) tracking identifier",
         help_text="Quality Assurance (QA) tracking identifier, if one exists.",
@@ -720,6 +723,16 @@ def get_assessment(self):
     def get_absolute_url(self):
         return reverse("assessment:values-detail", args=[self.pk])
 
+    @cached_property
+    def check_calculated_value(self, rtol: float = 0.01) -> NamedTuple:
+        # check if calculated value is different than reported value
+        check = namedtuple("check", ["show_warning", "calculated_value", "tolerance"])
+        if self.value and self.pod_value and self.uncertainty and self.uncertainty > 0:
+            calculated = self.pod_value / self.uncertainty
+            if not np.isclose(self.value, calculated, rtol=rtol):
+                return check(True, calculated, rtol)
+        return check(False, 0, rtol)
+
 
 class Attachment(models.Model):
     objects = managers.AttachmentManager()

hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html

@@ -65,6 +65,14 @@ <h3>Assessment Value for {{object.assessment}}</h3>
       {% endfor %}
     </tbody>
   </table>
+  {% if obj_perms.edit and object.check_calculated_value.show_warning %}
+    {% alert warning %}
+      <p><b>Note: this message only appears to team members and higher.</b></p>
+      <p>
+        The calculated {{object.get_value_type_display}} ({{object.check_calculated_value.calculated_value|stringformat:'.3g'}} {{object.value_unit|default:""}}), is > {{object.check_calculated_value.tolerance|percentage}} different than the reported value ({{object.value}} {{object.value_unit|default:""}}). The calculated value was generated using the formula POD / UF, or {{object.pod_value}} / {{object.uncertainty}} = {{object.check_calculated_value.calculated_value|stringformat:'.3g'}}. This difference may be due to the level of precision the {{object.get_value_type_display}} is reported, but please review in case of an error.
+      </p>
+    {% endalert %}
+  {% endif %}
 {% endblock %}
 
 {% block extrajs %}

make.bat

@@ -51,7 +51,7 @@ goto :eof
 :sync-dev
 python -m pip install -U pip uv
 uv pip install -e ".[dev,docs]"
-uv pip install -e client
+uv pip install -e "client/"
 yarn --cwd frontend
 python manage.py migrate
 python manage.py recreate_views

tests/hawc/apps/assessment/test_forms.py

@@ -219,13 +219,6 @@ def test_errors(self, db_keys):
         assert form.is_valid() is False
         assert form.errors["uncertainty"] == ["Required for Noncancer evaluation types."]
 
-        # pod/uncertainty != value
-        data = valid_data.copy()
-        data.update(uncertainty=100)
-        form = AssessmentValueForm(data=data, parent=assessment)
-        assert form.is_valid() is False
-        assert form.errors["value"] == ["POD / uncertainty is not equal to value."]
-
     def test_extra(self, db_keys):
         assessment = Assessment.objects.get(id=db_keys.assessment_working)
         valid_data = self.valid_data.copy()