Further fixes to water system

WNPRC_EHR/resources/queries/study/WaterScheduleWithWeight.sql

@@ -13,6 +13,7 @@ SELECT
     provideFruit AS provideFruit,
     provideFruitTitle AS provideFruitTitle,
     dataSource AS dataSource,
+    waterSource AS conditionAtTime,
     assignedTo AS assignedToCoalesced,
     assignedToTitle AS assignedToTitleCoalesced,
     frequency AS frequencyCoalesced,

WNPRC_EHR/resources/queries/study/WaterScheduleWithWeight/.qview.xml

@@ -0,0 +1,32 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="lsid" />
+        <column name="objectIdCoalesced"/>
+        <column name="waterOrderObjectId"/>
+        <column name="projectCoalesced"/>
+        <column name="Id" />
+        <column name="date" />
+        <column name="dateOrdered"/>
+        <column name="location"/>
+        <column name="volume" />
+        <column name="provideFruit"/>
+        <column name="provideFruitTitle"/>
+        <column name="dataSource"/>
+        <column name="assignedToCoalesced"/>
+        <column name="assignedToTitleCoalesced"/>
+        <column name="frequencyCoalesced"/>
+        <column name="frequencyMeaningCoalesced"/>
+        <column name="displaytimeofday"/>
+        <column name="rawDate"/>
+        <column name="mlsPerKg"/>
+        <column name="conditionAtTime"/>
+        <column name="qcstate" />
+        <column name="taskid" />
+    </columns>
+    <sorts>
+        <sort column="date" descending="false"/>
+        <sort column="location" />
+        <sort column="Id"/>
+
+    </sorts>
+</customView>

WNPRC_EHR/resources/queries/study/demographicsMostRecentWaterCondition.query.xml

@@ -1,7 +1,7 @@
 <query xmlns="http://labkey.org/data/xml/query">
     <metadata>
         <tables xmlns="http://labkey.org/data/xml">
-            <table tableName="demographicsMostRecentWaterCondition" tableDbType="TABLE" useColumnOrder="true">
+            <table tableName="demographicsMostRecentWaterCondition" tableDbType="NOT_IN_DB" useColumnOrder="true">
                 <tableUrl />
                 <insertUrl />
                 <importUrl />
@@ -12,12 +12,12 @@
 
                     </column>
                     <column columnName="mostRecentWaterConditionDate">
-                        <columntitle>Start Date</columntitle>
+                        <columnTitle>Start Date Water Condition</columnTitle>
                         <formatString>yyyy-MM-dd</formatString>
                     </column>
 
                     <column columnName="mostRecentWaterCondition">
-                        <columnTitle>Condition</columnTitle>
+                        <columnTitle>Water Condition</columnTitle>
                         <fk>
                             <fkDbSchema>ehr_lookups</fkDbSchema>
                             <fkTable>water_source</fkTable>

WNPRC_EHR/resources/queries/study/demographicsMostRecentWaterCondition.sql

@@ -2,6 +2,7 @@ SELECT
 
 wsa.id,
 wsa.MostRecentWaterConditionDate,
+wsa.room || '-' || wsa.cage as location,
 (
     SELECT wsainner.project
     FROM study.waterScheduledAnimals wsainner
@@ -23,7 +24,10 @@ wsa.MostRecentWaterConditionDate,
 FROM(
     SELECT
         wsaouter.id as id,
-        max(wsaouter.date) AS MostRecentWaterConditionDate
+        max(wsaouter.date) AS MostRecentWaterConditionDate,
+        max(wsaouter.id.dataset.activehousing.room) AS room,
+        max(wsaouter.id.dataset.activehousing.cage) AS cage,
+
     FROM study.waterScheduledAnimals wsaouter
     WHERE wsaouter.qcstate.publicdata = true AND wsaouter.condition IS NOT NULL
     GROUP BY wsaouter.id

WNPRC_EHR/resources/queries/study/waterScheduleCoalesced.query.xml

@@ -138,15 +138,13 @@
                             <fkDbSchema>ehr_lookups</fkDbSchema>
                             <fkTable>water_source</fkTable>
                             <fkColumnName>value</fkColumnName>
-                            <fkDisplayColumn>title</fkDisplayColumn>
                         </fk>
                     </column>
                     <column columnName="provideFruit">
                         <fk>
                             <fkDbSchema>ehr_lookups</fkDbSchema>
                             <fkTable>husbandry_fruit</fkTable>
                             <fkColumnName>value</fkColumnName>
-                            <fkDisplayColumn>title</fkDisplayColumn>
                         </fk>
 
                     </column>

WNPRC_EHR/resources/queries/study/waterScheduleCoalesced/Treatments.qview.xml

@@ -10,7 +10,7 @@
         <column name="waterSource"/>
         <column name="assignedTo"/>
         <column name="provideFruit"/>
-        <column name="qcstate/Label">
+        <column name="qcstate">
             <properties>
                 <property name="columnTitle" value="Status"/>
             </properties>
@@ -26,6 +26,6 @@
     <filters>
         <filter column="dateOrdered" operator="dategte" value="-30d"/>
         <filter column="Id/dataset/demographics/calculated_status" operator="eq" value="Alive"/>
-        <filter column="qctate/Label" operator="neqornull" value="Completed"/>
+        <filter column="qcstate" operator="neqornull" value="Completed"/>
     </filters>
 </customView>

WNPRC_EHR/resources/queries/study/waterScheduledAnimalWithOutEntries.query.xml

@@ -0,0 +1,33 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="waterScheduledAnimalsWithOutEntries" tableDbType="NOT_IN_DB" useColumnOrder="true">
+                <tableUrl />
+                <insertUrl />
+                <importUrl />
+                <updateUrl />
+                <deleteUrl />
+                <columns>
+                    <column columnName="Id">
+
+                    </column>
+                    <column columnName="date">
+                        <columnTitle>Date</columnTitle>
+                        <formatString>yyyy-MM-dd</formatString>
+                    </column>
+                    <column columnName="project">
+                        <columnTitle>Project</columnTitle>
+                    </column>
+                    <column columnName="location">
+                        <columnTitle>Location</columnTitle>
+                        <fk>
+                            <fkDbSchema>ehr_lookups</fkDbSchema>
+                            <fkTable>cage</fkTable>
+                            <fkColumnName>location</fkColumnName>
+                        </fk>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
+</query>

WNPRC_EHR/resources/queries/study/waterScheduledAnimalWithOutEntries.sql

@@ -1,7 +1,18 @@
 PARAMETERS(CheckDate TIMESTAMP)
 
-SELECT DISTINCT(id), CheckDate AS date, project AS project FROM
-    (SELECT a.id, a.MostRecentWaterCondition, a.MostRecentWaterConditionDate, a.project FROM study.demographicsMostRecentWaterCondition a
+SELECT
+    DISTINCT(id),
+    CheckDate AS date,
+    project AS project,
+    location as location
+FROM
+    (SELECT
+        a.id,
+        a.MostRecentWaterCondition,
+        a.MostRecentWaterConditionDate,
+        a.project,
+        a.location
+    FROM study.demographicsMostRecentWaterCondition a
      WHERE NOT EXISTS (
          SELECT 1 FROM study.waterTotalByDate b
                        WHERE a.id = b.id AND b.date = CheckDate AND b.TotalWater IS NOT NULL

WNPRC_EHR/resources/queries/study/waterScheduledAnimalWithOutEntries/.qview.xml

@@ -0,0 +1,11 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id" />
+        <column name="location"/>
+        <column name="date" />
+        <column name="project"/>
+    </columns>
+    <sorts>
+        <sort column="date" descending="true"/>
+    </sorts>
+</customView>

WNPRC_EHR/resources/queries/study/waterTotalByDate.sql

@@ -9,46 +9,64 @@ SELECT
        cal.targetdate AS date,
        waterSummary.TotalWater,
        waterSummary.provideFruit,
-       waterSummary.remark,
+       waterSummary.remarksConcat,
        waterSummary.volumeGivenInLabSub,
        waterSummary.volumeGivenInCage,
        waterSummary.volumeGivenInImage,
        waterSummary.volumeGivenInProcedure,
        waterSummary.performedConcat,
        odrwc.currentWaterCondition,
+       odrwc.latestConditionDate,
        waterSummary.project,
-       waterSummary.qcstate,
-       waterSummary.curRoom,
-       waterSummary.curCage
+       waterSummary.qcstate
 
 FROM ehr_lookups.calendar cal
- LEFT OUTER JOIN (SELECT drwc.Id AS Id,
-                 MIN(drwc.date) AS firstDate,
-                 (SELECT wsainner.condition
-                  FROM study.waterScheduledAnimals wsainner
-                  WHERE drwc.id = wsainner.id
-                  ORDER BY wsainner.date DESC LIMIT 1) AS currentWaterCondition
-
+ LEFT OUTER JOIN (
+    SELECT
+        drwc.Id AS Id,
+        MIN(drwc.date) AS firstDate,
+        (SELECT
+            wsainner.condition
+            FROM study.waterScheduledAnimals wsainner
+            WHERE drwc.id = wsainner.id
+            ORDER BY wsainner.date DESC LIMIT 1) AS currentWaterCondition,
+        (SELECT
+            wsa2inner.date
+            FROM study.waterScheduledAnimals wsa2inner
+            WHERE drwc.id = wsa2inner.id
+            ORDER BY wsa2inner.date DESC LIMIT 1) AS latestConditionDate
         FROM study.waterScheduledAnimals drwc
-        GROUP BY Id) odrwc
-        ON cal.targetdate >= CAST (odrwc.firstDate AS DATE) AND cal.targetdate <= curdate()
-LEFT OUTER JOIN(
-    SELECT Id AS innerId,
-    CAST(iwg.date as DATE) as date,
-    COALESCE (SUM(CASE WHEN iwg.location = 'lab' THEN iwg.volume ELSE 0 END),0) AS volumeGivenInLabSub,
-    COALESCE (SUM(CASE WHEN iwg.location = 'animalRoom' THEN iwg.volume ELSE 0 END),0) AS volumeGivenInCage,
-    COALESCE (SUM(CASE WHEN iwg.location = 'imaging' THEN iwg.volume ELSE 0 END), 0) AS volumeGivenInImage,
-    COALESCE (SUM(CASE WHEN iwg.location = 'procedureRoom' THEN iwg.volume ELSE 0 END), 0) AS volumeGivenInProcedure,
-    COALESCE(SUM(iwg.volume), 0) AS TotalWater,
-    COALESCE(GROUP_CONCAT(iwg.provideFruit.title,'; '),'') AS provideFruit,
-    COALESCE(GROUP_CONCAT(iwg.remarks,'; '),'') AS remark,
-    COALESCE(GROUP_CONCAT(iwg.performedby, ';'),'') AS performedConcat,
-    MAX(iwg.project) AS project,
-    COALESCE(MAX(iwg.qcstate),1) AS qcstate,
-    MAX(iwg.id.curLocation.room) as curRoom,
-    MAX(iwg.id.curLocation.cage) as curCage,
-    FROM study.waterGiven iwg WHERE qcstate.label = 'Completed'
-    GROUP BY iwg.Id, CAST(iwg.date AS DATE)
-    )waterSummary
-ON CAST(cal.targetdate AS DATE) = waterSummary.date AND waterSummary.innerId = Id
-WHERE cal.targetdate <= curdate() AND Id IS NOT NULL
+        GROUP BY Id
+ ) odrwc
+ ON cal.targetdate >= CAST (odrwc.firstDate AS DATE)
+ AND cal.targetdate <= curdate()
+ AND ( Id.death.date IS NULL OR cal.targetdate <= CAST(Id.death.date AS DATE) )
+
+ LEFT OUTER JOIN (
+    SELECT
+        Id AS innerId,
+        CAST(iwg.date as DATE) as date,
+        COALESCE (SUM(CASE WHEN iwg.location = 'lab' THEN iwg.volume ELSE 0 END),0) AS volumeGivenInLabSub,
+        COALESCE (SUM(CASE WHEN iwg.location = 'animalRoom' THEN iwg.volume ELSE 0 END),0) AS volumeGivenInCage,
+        COALESCE (SUM(CASE WHEN iwg.location = 'imaging' THEN iwg.volume ELSE 0 END), 0) AS volumeGivenInImage,
+        COALESCE (SUM(CASE WHEN iwg.location = 'procedureRoom' THEN iwg.volume ELSE 0 END), 0) AS volumeGivenInProcedure,
+        COALESCE(SUM(iwg.volume), 0) AS TotalWater,
+        COALESCE(GROUP_CONCAT(iwg.provideFruit.title,'; '),'') AS provideFruit,
+        COALESCE(GROUP_CONCAT(iwg.remarks,'; '),'') AS remarksConcat,
+        COALESCE(GROUP_CONCAT(iwg.performedby, ';'),'') AS performedConcat,
+        MAX(iwg.project) AS project,
+        COALESCE(MAX(iwg.qcstate),1) AS qcstate,
+    FROM study.waterGiven iwg
+    WHERE
+        qcstate.label = 'Completed'
+        AND ( iwg.Id.death.date IS NULL OR CAST(iwg.date as DATE) <= iwg.Id.death.date )
+    GROUP BY
+        iwg.Id,
+        CAST(iwg.date AS DATE)
+ )waterSummary
+ON
+    CAST(cal.targetdate AS DATE) = waterSummary.date
+    AND waterSummary.innerId = Id
+WHERE
+    cal.targetdate <= curdate()
+    AND Id IS NOT NULL

WNPRC_EHR/resources/queries/study/waterTotalByDate/.qview.xml

@@ -1,6 +1,7 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
     <columns>
         <column name="Id" />
+        <column name="Id/curLocation/location"/>
         <column name="date" />
         <column name="TotalWater" />
         <column name="provideFruit"/>
@@ -12,6 +13,7 @@
         <column name="volumeGivenInProcedure" />
         <column name="performedConcat" />
         <column name="currentWaterCondition" />
+        <column name="latestConditionDate" />
         <column name="project"/>
         <column name="qcstate" />
     </columns>

WNPRC_EHR/resources/queries/study/waterTotalByDateWithWeight.query.xml

@@ -39,6 +39,9 @@
                     <column columnName="InnerMlsPerKg">
                         <columnTitle>Allowed MlsPerKg</columnTitle>
                     </column>
+                    <column columnName="remarksConcat">
+                        <columnTitle>Water Given Remarks</columnTitle>
+                    </column>
 
                 </columns>
             </table>

WNPRC_EHR/resources/queries/study/waterTotalByDateWithWeight.sql

@@ -14,12 +14,15 @@ SELECT wtbd.Id as Id,
        wtbd.volumeGivenInImage,
        wtbd.volumeGivenInProcedure,
        wtbd.currentWaterCondition,
+       wtbd.remarksConcat,
        waterScheduledAnimalsOuter.condition AS conditionAtTime,
+       waterScheduledAnimalsOuter.endDate as endDateCondition,
+
        CAST(waterScheduledAnimalsOuter.mlsperKg AS NUMERIC) AS InnerMlsPerKg,
        waterScheduledAnimalsOuter.project,
        wtbd.performedConcat,
        wtbd.qcstate,
-       wtbd.curRoom || '-' || wtbd.curCage AS location,
+       COALESCE(CAST(wtbd.TotalWater/weigthDates.weight AS NUMERIC), 0) AS zeroOrmlsPerKg,
        'waterTotal' AS dataSource
 FROM study.waterTotalByDate wtbd
 

WNPRC_EHR/resources/queries/study/waterTotalByDateWithWeight/.qview.xml

@@ -1,20 +1,22 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
     <columns>
         <column name="Id"/>
+        <column name="Id/lastHousing/location"/>
+        <column name="Id/curLocation/location"/>
+        <column name="Id/Demographics/calculated_status"/>
         <column name="date"/>
         <column name="TotalWater"/>
         <column name="mlsPerKg"/>
+        <column name="remarksConcat"/>
         <column name="weight"/>
         <column name="volumeGivenInLabSub"/>
         <column name="volumeGivenInCage"/>
         <column name="volumeGivenInImage"/>
         <column name="volumeGivenInProcedure"/>
-        <column name="currentWaterCondition"/>
         <column name="conditionAtTime"/>
         <column name="performedConcat"/>
         <column name="InnerMlsPerKg"/>
         <column name="location"/>
-        <column name="dataSource"/>
         <column name="qcstate"/>
 
     </columns>

WNPRC_EHR/resources/queries/study/waterTotalByDateWithWeight/tooLittleWater.qview.xml

@@ -0,0 +1,31 @@
+<customView xmlns="http://labkey.org/data/xml/queryCustomView">
+    <columns>
+        <column name="Id"/>
+        <column name="Id/lastHousing/location"/>
+        <column name="Id/curLocation/location"/>
+        <column name="Id/Demographics/calculated_status"/>
+        <column name="date"/>
+        <column name="TotalWater"/>
+        <column name="mlsPerKg"/>
+        <column name="remarksConcat"/>
+        <column name="weight"/>
+        <column name="volumeGivenInLabSub"/>
+        <column name="volumeGivenInCage"/>
+        <column name="volumeGivenInImage"/>
+        <column name="volumeGivenInProcedure"/>
+        <column name="conditionAtTime"/>
+        <column name="performedConcat"/>
+        <column name="InnerMlsPerKg"/>
+        <column name="location"/>
+        <column name="qcstate"/>
+
+    </columns>
+    <sorts>
+        <sort column="date" descending="true"/>
+    </sorts>
+    <filters>
+<!--        <filter column="mlsPerKg" operator="lte" value="10"/>-->
+        <filter column="zeroOrmlsPerKg" operator="lte" value="10"/>
+        <filter column="currentWaterCondition" operator="eq" value="regulated"/>
+    </filters>
+</customView>