From b938511993ff0dbb9839cf6bfb978a1c382d9f22 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 7 May 2026 12:19:30 -0700 Subject: [PATCH 01/10] Modified Cage layout since the monkey id is showing as being too small from the cage layout form. --- onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index b331c6582..5078d2372 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 = 51; //Modified: 10-15-2020 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: { @@ -634,6 +634,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { Ext4.apply(this, { border: false, itemId: 'roomLayoutPanel', + width: 1450, defaults: { border: false }, From 6e27721bb2e31115f7b6925d774008b237b3b609 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 8 May 2026 09:53:06 -0700 Subject: [PATCH 02/10] Modified cage layout again. --- onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 5078d2372..f0a9f68f4 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 = 115; - var cageWidth = 51; //Modified: 10-15-2020 + var height = 80; + var cageWidth = 60; //Modified: 10-15-2020 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ From 99822f5a27dce68f6a23b7e8dd4db5c45ec3e213 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 11 May 2026 13:32:08 -0700 Subject: [PATCH 03/10] Modified cage layout again. --- onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index f0a9f68f4..2790a4a4b 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 = 80; - var cageWidth = 60; //Modified: 10-15-2020 + var height = 115; + var cageWidth = 51; //Modified: 10-15-2020 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ @@ -397,7 +397,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { if (!Ext4.isEmpty(cageAnimals)) bgColor = 'red'; else - bgColor = 'grey'; + bgColor = 'purple'; } else if (status == 'Unavailable') { From 55547d93d3684e5cc16e2ce8651b068a94ac38cb Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 11 May 2026 18:54:40 -0700 Subject: [PATCH 04/10] Modified cage layout again. --- onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 2790a4a4b..5078d2372 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -397,7 +397,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { if (!Ext4.isEmpty(cageAnimals)) bgColor = 'red'; else - bgColor = 'purple'; + bgColor = 'grey'; } else if (status == 'Unavailable') { From 58eaf6eceb2444cce480cab2654e43cc08e964fc Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 11 May 2026 18:59:05 -0700 Subject: [PATCH 05/10] Modified cage layout again. --- onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 5078d2372..dcd2fef78 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -356,7 +356,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'red'; else { //NOTE: this used to use no color. i'm not sure why - bgColor = 'grey'; + bgColor = 'transparent'; } } else if (status == 'Unavailable') @@ -397,7 +397,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { if (!Ext4.isEmpty(cageAnimals)) bgColor = 'red'; else - bgColor = 'grey'; + bgColor = ''; } else if (status == 'Unavailable') { From 055744d594629afd4226ced6c58b91795b9950c4 Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 27 May 2026 12:49:22 -0700 Subject: [PATCH 06/10] Modified Cage Layout program to account for the new cage type called "Unavailable Location" --- .../resources/queries/ehr_lookups/connectedCages.sql | 6 +++--- .../resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) 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 dcd2fef78..8182d1f8d 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -185,7 +185,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var rooms = Ext4.Object.getKeys(roomMap).sort(); var dividerWidth = 3; var height = 115; - var cageWidth = 51; //Modified: 10-15-2020 + var cageWidth = 78; //Modified: 10-15-2020 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ @@ -399,6 +399,12 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { else bgColor = ''; } + if (cageType == 'Unavailable Location'){ + if (!Ext4.isEmpty(cageAnimals)) + bgColor = 'blue'; + else + bgColor = ''; + } else if (status == 'Unavailable') { bgColor = 'yellow'; @@ -453,8 +459,10 @@ 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: { + html: row.get('cage_type') == 'Unavailable Location' ? 'Unavailable Location' : ('' + ri + colIdx + '' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + ''), + bodyStyle: { 'background-color': 'transparent' }, listeners: { From a7976cdc64cd07e2965ebd2e75a70dffe7288cc1 Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 27 May 2026 13:08:54 -0700 Subject: [PATCH 07/10] Modified Cage Layout program to account for the new cage type called "Unavailable Location" --- .../resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 8182d1f8d..467f994da 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -185,7 +185,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var rooms = Ext4.Object.getKeys(roomMap).sort(); var dividerWidth = 3; var height = 115; - var cageWidth = 78; //Modified: 10-15-2020 + var cageWidth = 78; //Modified: 5-27-2026 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ @@ -359,6 +359,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'transparent'; } } + else if (cageType == 'Unavailable Location') + { + bgColor = '#f5b027'; // light brown + } else if (status == 'Unavailable') { bgColor = 'yellow'; @@ -400,11 +404,9 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = ''; } if (cageType == 'Unavailable Location'){ - if (!Ext4.isEmpty(cageAnimals)) - bgColor = 'blue'; - else - bgColor = ''; + bgColor = '#f5b027'; //light brown } + else if (status == 'Unavailable') { bgColor = 'yellow'; From 3349f301437540f1b9ee6d489672beb45b9eadbc Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 27 May 2026 22:54:17 -0700 Subject: [PATCH 08/10] Modified Cage Room Layout settings. --- .../web/onprc_ehr/panel/RoomLayoutPanel.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 467f994da..b8da5eced 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -356,12 +356,12 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'red'; else { //NOTE: this used to use no color. i'm not sure why - bgColor = 'transparent'; + bgColor = 'grey'; } } - else if (cageType == 'Unavailable Location') + else if (cageType == 'Unavailable Cage') { - bgColor = '#f5b027'; // light brown + bgColor = 'transparent'; } else if (status == 'Unavailable') { @@ -401,10 +401,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { if (!Ext4.isEmpty(cageAnimals)) bgColor = 'red'; else - bgColor = ''; + bgColor = 'grey'; } - if (cageType == 'Unavailable Location'){ - bgColor = '#f5b027'; //light brown + if (cageType == 'Unavailable Cage'){ + bgColor = 'transparent'; } else if (status == 'Unavailable') @@ -461,9 +461,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) + ']' : '') + ''), - html: row.get('cage_type') == 'Unavailable Location' ? 'Unavailable Location' : ('' + ri + colIdx + '' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + ''), bodyStyle: { 'background-color': 'transparent' }, @@ -480,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: { From f70e167af9c40e7ac9960d8ac273c785d53f6fdb Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 28 May 2026 09:27:05 -0700 Subject: [PATCH 09/10] Modified Cage Room layout --- .../resources/web/onprc_ehr/panel/RoomLayoutPanel.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index b8da5eced..5bed6d0e7 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -359,9 +359,9 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'grey'; } } - else if (cageType == 'Unavailable Cage') + else if (cageType == 'Unavailable Location') { - bgColor = 'transparent'; + bgColor = 'white'; } else if (status == 'Unavailable') { @@ -403,8 +403,8 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { else bgColor = 'grey'; } - if (cageType == 'Unavailable Cage'){ - bgColor = 'transparent'; + if (cageType == 'Unavailable Location'){ + bgColor = 'white'; } else if (status == 'Unavailable') @@ -479,7 +479,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { } },{ - html: row.get('cage_type') == 'Unavailable Cage' ? 'Unavailable Cage' : '', + html: row.get('cage_type') == 'Unavailable Location' ? 'Unavailable Location' : '', },{ border: false, From 1793756f05399979e62188a38c0532bb3523ba17 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 29 May 2026 00:03:42 -0700 Subject: [PATCH 10/10] Modified Room Cage Layout formatting. --- .../web/onprc_ehr/panel/RoomLayoutPanel.js | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 5bed6d0e7..4ed4f4beb 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -285,7 +285,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { } var animalItems = []; - if (animals.length > 8){ //Modified: 7-5-2018 R.Blasa + if (animals.length > 8) { //Modified: 7-5-2018 R.Blasa animalItems.push({ html: '' + animals.length + ' animals', border: false, @@ -359,12 +359,10 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { bgColor = 'grey'; } } - else if (cageType == 'Unavailable Location') - { + else if (cageType == 'Unavailable Location') { bgColor = 'white'; } - else if (status == 'Unavailable') - { + else if (status == 'Unavailable') { bgColor = 'yellow'; } else if (colorcage == 'Transfer Pending') @@ -403,10 +401,6 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { else bgColor = 'grey'; } - if (cageType == 'Unavailable Location'){ - bgColor = 'white'; - } - else if (status == 'Unavailable') { bgColor = 'yellow'; @@ -438,6 +432,13 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var type = row.get('cage_type'); var cageType = config.cageTypeMap[row.get('cage_type')] || {}; var suffix = cageType.abbreviation || ''; + var html_string = ''; + if (row.get('cage_type') == 'No Cage') + html_string = 'No Cage'; + + if (row.get('cage_type') == 'Unavailable Location') + html_string = 'Unavailable Location'; + rowItems.push({ border: false, style: { @@ -461,8 +462,8 @@ 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: { + html: row.get('cage_type') == html_string ? html_string : ('' + ri + colIdx + '' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + ''), + bodyStyle: { 'background-color': 'transparent' }, listeners: { @@ -478,10 +479,6 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { }, [row, config], config) } },{ - - html: row.get('cage_type') == 'Unavailable Location' ? 'Unavailable Location' : '', - - },{ border: false, style: 'margin-top: 10px;', bodyStyle: {