Skip to content

26.3 fb room layout project #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ohsudev wants to merge 13 commits into
base: release26.3-SNAPSHOT
Choose a base branch
from
Open

26.3 fb room layout project #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b938511
Modified Cage layout since the monkey id is showing as being too smal…
May 7, 2026
6e27721
Modified cage layout again.
May 8, 2026
99822f5
Modified cage layout again.
May 11, 2026
55547d9
Modified cage layout again.
May 12, 2026
58eaf6e
Modified cage layout again.
May 12, 2026
055744d
Modified Cage Layout program to account for the new cage type called …
May 27, 2026
a7976cd
Modified Cage Layout program to account for the new cage type called …
May 27, 2026
3349f30
Modified Cage Room Layout settings.
May 28, 2026
f70e167
Modified Cage Room layout
May 28, 2026
1793756
Modified Room Cage Layout formatting.
May 29, 2026
3f40970
Merge remote-tracking branch 'origin/25.11_fb_CageMonkeyIDSmall' into…
May 29, 2026
9726949
Modified Room Cage Layout configurations.
May 29, 2026
0e5a06f
Modified Room Cage Layout color schemes.
Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions onprc_ehr/resources/queries/ehr_lookups/connectedCages.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
51 changes: 34 additions & 17 deletions onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down Expand Up @@ -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: '<span style="font-size: 10px;">' + animals.length + ' animals</span>',
border: false,
Expand All @@ -297,7 +297,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
else if (animals.length){
Ext4.each(animals, function(animal){
animalItems.push({
html: '<span style="font-size: 9px;"><a>' + animal + '</a>' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '</span>',
html: '<span style="font-size: 11px;"><a>' + animal + '</a>' + (config.animalMap[animal] ? ': ' + Ext4.util.Format.round(config.animalMap[animal].getValue('Id/mostRecentWeight/mostRecentWeight'), 1) : '') + '</span>',
animal: animal,
border: false,
bodyStyle: {
Expand Down Expand Up @@ -342,64 +342,73 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
var prevIsSeparate = prevDividerInfo.countAsSeparate;
var prevAnimals = prevCage.get('totalAnimals/animals');

if (!prevIsSeparate && !Ext4.isEmpty(cageAnimals))
if (!prevIsSeparate && !Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = 'red';

if (prevIsSeparate && Ext4.isEmpty(cageAnimals))
if (prevIsSeparate && Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = emptyCageColor;

if (!prevIsSeparate && Ext4.isEmpty(cageAnimals) && Ext4.isEmpty(prevAnimals))
if (!prevIsSeparate && Ext4.isEmpty(cageAnimals) && Ext4.isEmpty(prevAnimals) && cageType != 'Unavailable Location')
bgColor = emptyCageColor;

if (cageType == 'No Cage'){
if (!Ext4.isEmpty(cageAnimals))
if (!Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = 'red';
else {
//NOTE: this used to use no color. i'm not sure why
bgColor = 'grey';
}
}
else if (status == 'Unavailable')
{
else if (cageType == 'Unavailable Location') {
bgColor = 'white';
}
else if (status == 'Unavailable') {
bgColor = 'yellow';
}
else if (colorcage == 'Transfer Pending')
{
if (!Ext4.isEmpty(cageAnimals))
if (!Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = '';
else
bgColor = 'orange';

}
else if (colorcage == 'Held for Colony')
{
if (!Ext4.isEmpty(cageAnimals))
if (!Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = '';
else
bgColor = '#54daff';

}
else if (colorcage == 'Empty')
{
if (Ext4.isEmpty(cageAnimals))
if (Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = emptyCageColor;

}
}
else {
//flag cage if empty
if (Ext4.isEmpty(row.get('totalAnimals/animals'))){
if (Ext4.isEmpty(row.get('totalAnimals/animals')) && cageType != 'Unavailable Location'){
bgColor = emptyCageColor;
}

//also if no cage present
if (cageType == 'No Cage'){
if (!Ext4.isEmpty(cageAnimals))
if (!Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = 'red';
else
bgColor = 'grey';
}
else if (status == 'Unavailable')
{
if (bgColor = emptyCageColor) {

bgColor = 'white';
}
}
else if (status == 'Unavailable' && cageType != 'Unavailable Location')
{
bgColor = 'yellow';
}
Expand All @@ -421,7 +430,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
}
else if (colorcage == 'Empty')
{
if (Ext4.isEmpty(cageAnimals))
if (Ext4.isEmpty(cageAnimals) && cageType != 'Unavailable Location')
bgColor = emptyCageColor;

}
Expand All @@ -430,6 +439,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 (type == 'No Cage')
html_string = 'No Cage';

if (type == 'Unavailable Location')
html_string = 'Unavailable Location';

rowItems.push({
border: false,
style: {
Expand All @@ -453,7 +469,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' : ('<span style="font-size: 11px;"><a>' + ri + colIdx + '</a>' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + '</span>'),
html: type == html_string ? html_string : ('<span style="font-size: 11px;"><a>' + ri + colIdx + '</a>' + (cageType.sqft ? ' (' + (cageType.sqft / cageType.cageslots)+ suffix + ')' : '') + (dividerInfo.displaychar ? ' [' + (dividerInfo.displaychar) + ']' : '') + '</span>'),
bodyStyle: {
'background-color': 'transparent'
},
Expand Down Expand Up @@ -634,6 +650,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
Ext4.apply(this, {
border: false,
itemId: 'roomLayoutPanel',
width: 1450,
defaults: {
border: false
},
Expand Down