Merge 25.11 to 26.2

Author: labkey-teamcity

nirc_ehr/resources/queries/study/clinical_observations/.qview.xml

@@ -8,6 +8,7 @@
         <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
+        <column name="category"/>
         <column name="area"/>
         <column name="observation"/>
         <column name="remark"/>

nirc_ehr/resources/queries/study/clinical_observations/Alopecia Scores.qview.xml

@@ -8,10 +8,14 @@
         <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
+        <column name="category"/>
         <column name="area"/>
         <column name="observation"/>
         <column name="remark"/>
         <column name="performedBy"/>
         <column name="QCState"/>
     </columns>
+    <filters>
+        <filter column="category" operator="contains" value="lopecia"/>
+    </filters>
 </customView>

nirc_ehr/resources/queries/study/clinical_observations/Behavior.qview.xml

@@ -8,6 +8,7 @@
         <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
+        <column name="category"/>
         <column name="area"/>
         <column name="observation"/>
         <column name="remark"/>

nirc_ehr/resources/queries/study/clinical_observations/Clinical.qview.xml

@@ -8,6 +8,7 @@
         <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
+        <column name="category"/>
         <column name="area"/>
         <column name="observation"/>
         <column name="remark"/>