CARDS-2549 / CARDS-2555: Only consider patient forms in the cards:uns…

…ubmitted permission restriction
data-team-uhn · Aug 1, 2024 · 372ec9d · 372ec9d
1 parent 5bb8017
commit 372ec9d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...io/uhndata/cards/permissions/internal/unsubmitted/UnsubmittedFormsRestrictionPattern.java b/...io/uhndata/cards/permissions/internal/unsubmitted/UnsubmittedFormsRestrictionPattern.java
@@ -101,13 +101,14 @@ public boolean matches(final Tree tree, final PropertyState property)
 
     private boolean isUnsubmitted(final Tree form)
     {
+        boolean isSubmitted = false;
+        boolean isPatientForm = false;
         PropertyState flags = form.getProperty("statusFlags");
         for (int i = 0; i < flags.count(); ++i) {
-            if ("SUBMITTED".equals(flags.getValue(Type.STRING, i))) {
-                return false;
-            }
+            isSubmitted |= "SUBMITTED".equals(flags.getValue(Type.STRING, i));
+            isPatientForm |= "PATIENT SURVEY".equals(flags.getValue(Type.STRING, i));
         }
-        return true;
+        return isPatientForm && !isSubmitted;
     }
 
     private boolean isForm(final Tree node)