From b938511993ff0dbb9839cf6bfb978a1c382d9f22 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 7 May 2026 12:19:30 -0700 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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') {