From 9ef08db6ee76e4c3ed6d9a1b336d5abc9e848b12 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 6 Apr 2026 14:01:57 -0700
Subject: [PATCH] Housing clinical history fix. Death history format fix.

---
 .../src/org/labkey/nirc_ehr/history/DeathDataSource.java     | 5 +++++
 .../org/labkey/nirc_ehr/history/NIRCHousingDataSource.java   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java
index a48ad181..7817284f 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java
@@ -29,9 +29,14 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
         StringBuilder sb = new StringBuilder();
 
         if(rs.hasColumn(FieldKey.fromString("reason/title")) && rs.getObject(FieldKey.fromString("reason/title")) != null)
+        {
             sb.append(safeAppend(rs, "Disposition", "reason/title"));
+        }
         else
+        {
             sb.append("Disposition: Unknown");
+            sb.append("\n");
+        }
 
         if(rs.hasColumn(FieldKey.fromString("remark")) && rs.getObject(FieldKey.fromString("remark")) != null)
             sb.append(safeAppend(rs, "Remark", "remark"));
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCHousingDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCHousingDataSource.java
index 97ddc389..bd0d8cae 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCHousingDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCHousingDataSource.java
@@ -21,7 +21,7 @@ public NIRCHousingDataSource(Module module)
     @Override
     protected Set<String> getColumnNames()
     {
-        return PageFlowUtil.set("Id", "date", "cage/cage", "room/fullRoom");
+        return PageFlowUtil.set("Id", "date", "cage/cage", "room/fullRoom", "reason", "remark");
     }
 
     @Override
@@ -41,7 +41,8 @@ else if(rs.hasColumn(room) && rs.getObject(room) != null)
             value = rs.getString(room);
         }
 
-        sb.append(safeAppend(rs, "Moved to", value));
+        sb.append(PageFlowUtil.filter("Moved to : " + value));
+        sb.append("\n");
         sb.append(safeAppend(rs, "Reason", "reason"));
         sb.append(safeAppend(rs, "Remark", "remark"));