diff --git a/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql b/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql index 11b12359e..b80930159 100644 --- a/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql +++ b/onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql @@ -54,11 +54,11 @@ FROM ehr_lookups.cage c --for the next 2 horizontal joins, use the highest effective row, determined above --find the highest cage with a non-separating divider -LEFT JOIN ehr_lookups.cage joined ON (joined.cage_type != 'No Cage' and c.status.value != 'Unavailable' and c.room = joined.room and c.cagePosition.row = joined.cagePosition.row and joined.divider.countAsSeparate = false and c.cagePosition.columnIdx > joined.cagePosition.columnIdx) +LEFT JOIN ehr_lookups.cage joined ON ((joined.cage_type != 'No Cage' or joined.cage_type != 'Unavailable Location') and c.status.value != 'Unavailable' and c.room = joined.room and c.cagePosition.row = joined.cagePosition.row and joined.divider.countAsSeparate = false and c.cagePosition.columnIdx > joined.cagePosition.columnIdx) --find the highest cage with a separating divider -LEFT JOIN ehr_lookups.cage sep ON (sep.cage_type != 'No Cage' and c.room = sep.room and c.cagePosition.row = sep.cagePosition.row and sep.divider.countAsSeparate = true and c.cagePosition.columnIdx > sep.cagePosition.columnIdx) +LEFT JOIN ehr_lookups.cage sep ON ((sep.cage_type != 'No Cage' or sep.cage_type != 'Unavailable Location') and c.room = sep.room and c.cagePosition.row = sep.cagePosition.row and sep.divider.countAsSeparate = true and c.cagePosition.columnIdx > sep.cagePosition.columnIdx) -WHERE c.cage_type != 'No Cage' +WHERE (c.cage_type != 'No Cage' or c.cage_type != 'Unavailable Location') GROUP BY c.room, c.cagePosition.row, c.cage, c.cagePosition.columnIdx, c.divider, c.divider.countAsSeparate, c.cage_type \ No newline at end of file diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index b331c6582..b8da5eced 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -184,8 +184,8 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var rooms = Ext4.Object.getKeys(roomMap).sort(); var dividerWidth = 3; - var height = 75; - var cageWidth = 60; + var height = 115; + var cageWidth = 78; //Modified: 5-27-2026 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ @@ -297,7 +297,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { else if (animals.length){ Ext4.each(animals, function(animal){ animalItems.push({ - html: '' + animal + '' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '', + html: '' + animal + '' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '', animal: animal, border: false, bodyStyle: { @@ -359,6 +359,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'grey'; } } + else if (cageType == 'Unavailable Cage') + { + bgColor = 'transparent'; + } else if (status == 'Unavailable') { bgColor = 'yellow'; @@ -399,6 +403,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { else bgColor = 'grey'; } + if (cageType == 'Unavailable Cage'){ + bgColor = 'transparent'; + } + else if (status == 'Unavailable') { bgColor = 'yellow'; @@ -454,7 +462,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { //Modified: 4-8-2020 R.Blasa Contains symbol representing divider types items: [{ html: row.get('cage_type') == 'No Cage' ? 'No Cage' : ('' + ri + colIdx + '' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + ''), - bodyStyle: { + bodyStyle: { 'background-color': 'transparent' }, listeners: { @@ -470,6 +478,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { }, [row, config], config) } },{ + + html: row.get('cage_type') == 'Unavailable Cage' ? 'Unavailable Cage' : '', + + },{ border: false, style: 'margin-top: 10px;', bodyStyle: { @@ -634,6 +646,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { Ext4.apply(this, { border: false, itemId: 'roomLayoutPanel', + width: 1450, defaults: { border: false },