From 8ce6d140d258c5b268e8be5aa0331b539b74ff3e Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 22 Apr 2026 18:28:37 -0700 Subject: [PATCH 1/6] Modified Room Layout web page to accommodate "no cage" entries.. --- .../web/onprc_ehr/panel/RoomLayoutPanel.js | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 1dd9304b0..7473804eb 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -184,7 +184,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var rooms = Ext4.Object.getKeys(roomMap).sort(); var dividerWidth = 3; - var height = 115; + var height = 100; var cageWidth = 51; //Modified: 10-15-2020 var hasCages = false; @@ -238,29 +238,29 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { border: false }); - currentSection.push({ - html: 'Note: a solid line indicates a solid divider, dotted line indicates mesh, and dashed indicates grooming contact.', - style: 'margin-bottom: 10px;', - border: false - }); - - //Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time - currentSection.push({ - - //Modified: 4/3/2023 R.Blasa - xtype: 'button', - text: 'Slide Descriptions', - scope: this, - style: 'margin-bottom: 10px;', - handler: function(btn){ - - var url = LABKEY.ActionURL.buildURL('onprc_ehr', 'SliderDefinition', this.containerPath); - window.open(url); - }, - - style: 'margin-bottom: 10px;', - border: false - }); + // currentSection.push({ + // html: 'Note: a solid line indicates a solid divider, dotted line indicates mesh, and dashed indicates grooming contact.', + // style: 'margin-bottom: 10px;', + // border: false + // }); + // + // //Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time + // currentSection.push({ + // + // //Modified: 4/3/2023 R.Blasa + // xtype: 'button', + // text: 'Slide Descriptions', + // scope: this, + // style: 'margin-bottom: 10px;', + // handler: function(btn){ + // + // var url = LABKEY.ActionURL.buildURL('onprc_ehr', 'SliderDefinition', this.containerPath); + // window.open(url); + // }, + // + // style: 'margin-bottom: 10px;', + // border: false + // }); } table = ONPRC.panel.RoomLayoutPanel.getRowBlockCfg(maxCage); From 522c1bdae85eb18004826ffb352c601071651627 Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 22 Apr 2026 21:05:59 -0700 Subject: [PATCH 2/6] Modified Room Layout web page to accommodate "no cage" entries.. --- .../web/onprc_ehr/panel/RoomLayoutPanel.js | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js index 7473804eb..2d449745d 100644 --- a/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js +++ b/onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js @@ -184,7 +184,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { var rooms = Ext4.Object.getKeys(roomMap).sort(); var dividerWidth = 3; - var height = 100; + var height = 75; var cageWidth = 51; //Modified: 10-15-2020 var hasCages = false; @@ -192,7 +192,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { if (roomIdx == 0 && !config.printMode){ toAdd.push(ONPRC.panel.RoomLayoutPanel.getButtonCfgs(config)); toAdd.push({ - style: 'margin-bottom: 20px;', + style: 'margin-bottom: 5px;', border: false }); } @@ -238,29 +238,29 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { border: false }); - // currentSection.push({ - // html: 'Note: a solid line indicates a solid divider, dotted line indicates mesh, and dashed indicates grooming contact.', - // style: 'margin-bottom: 10px;', - // border: false - // }); - // - // //Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time - // currentSection.push({ - // - // //Modified: 4/3/2023 R.Blasa - // xtype: 'button', - // text: 'Slide Descriptions', - // scope: this, - // style: 'margin-bottom: 10px;', - // handler: function(btn){ - // - // var url = LABKEY.ActionURL.buildURL('onprc_ehr', 'SliderDefinition', this.containerPath); - // window.open(url); - // }, - // - // style: 'margin-bottom: 10px;', - // border: false - // }); + currentSection.push({ + html: 'Note: a solid line indicates a solid divider, dotted line indicates mesh, and dashed indicates grooming contact.', + style: 'margin-bottom: 10px;', + border: false + }); + + //Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time + currentSection.push({ + + //Modified: 4/3/2023 R.Blasa + xtype: 'button', + text: 'Slide Descriptions', + scope: this, + style: 'margin-bottom: 10px;', + handler: function(btn){ + + var url = LABKEY.ActionURL.buildURL('onprc_ehr', 'SliderDefinition', this.containerPath); + window.open(url); + }, + + style: 'margin-bottom: 10px;', + border: false + }); } table = ONPRC.panel.RoomLayoutPanel.getRowBlockCfg(maxCage); From a1c8f730dbf690be68ac4848881874c00938ba78 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 23 Apr 2026 06:57:08 -0700 Subject: [PATCH 3/6] Modified Room Layout web page to accommodate "no cage" entries.. --- 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 2d449745d..d2cb34df2 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 = 75; - var cageWidth = 51; //Modified: 10-15-2020 + var cageWidth = 235; //Modified: 10-15-2020 var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ From 13a6b7c4e6198099cc0bfec73978e7a6828447c3 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 23 Apr 2026 07:03:55 -0700 Subject: [PATCH 4/6] Modified Room Layout web page to accommodate "no cage" entries.. --- 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 d2cb34df2..1877353cf 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 = 75; - var cageWidth = 235; //Modified: 10-15-2020 + var cageWidth = 135; var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ From 6e8876ed30841d59a0bc6d8c603eb9526f9cce11 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 23 Apr 2026 07:55:14 -0700 Subject: [PATCH 5/6] Modified Room Layout web page to accommodate "no cage" entries.. --- 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 1877353cf..dfdbbeecf 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 = 75; - var cageWidth = 135; + var cageWidth = 90; var hasCages = false; Ext4.each(rooms, function(room, roomIdx){ @@ -244,7 +244,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', { border: false }); - //Modified: 8-19-2019 R. Blasa Added Divider Legends Not eeded at this time + //Modified: 8-19-2019 R. Blasa Added Divider Legends Not needed at this time currentSection.push({ //Modified: 4/3/2023 R.Blasa From 914507bc153471f974f6a77f875ba44d3d6e7ed7 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 23 Apr 2026 08:09:57 -0700 Subject: [PATCH 6/6] Modified Room Layout web page to accommodate "no cage" entries.. --- 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 dfdbbeecf..b331c6582 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 = 75; - var cageWidth = 90; + var cageWidth = 60; var hasCages = false; Ext4.each(rooms, function(room, roomIdx){