Skip to content

Modified Room Layout cage background color based on user selection de… #1766

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

Merged
Ohsudev merged 7 commits into from
Jun 22, 2026
Merged

Modified Room Layout cage background color based on user selection de… #1766

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f7bfd1
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
aaf59db
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
695b95f
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
95d1e7b
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
2243060
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
09e5fbb
Modified Room Layout cage background color based on user selection de…
Jun 17, 2026
4e1a341
Modified Room Layout cage background color based on user selection de…
Jun 18, 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
84 changes: 46 additions & 38 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 @@ -148,7 +148,9 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
'Cages are colored Green when they are empty. <br/> ' +
'Cages are colored Yellow when they are flagged as \"Unavailable\". <br/>' +
'Cages are colored Orange when they are flagged as \"Transfer Pending\". <br/>' +
'Cages are colored light blue when they are flagged as \"Held for Colony\".'
'Cages are colored light blue when they are flagged as \"Held for Colony\". <br/>\'' +
'Cages are colored Brown when they are flagged as \"Epen Caging\". <br/>\''+
'Cages are colored Pink when they are flagged as \"Surgery Recovery\".'
});
}

Expand Down Expand Up @@ -333,7 +335,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
var prevCage = (colIdx > 1) ? cages[colIdx - 1] : null;
var cageType = row.get('cage_type');
var status = row.get('status');
var colorcage = row.get('uuid') //redfined as cage color background Modified 11-12-2023 R. Blasa
var colorcage = row.get('uuid') //redefined as cage color background Modified 11-12-2023 R. Blasa
var cageAnimals = row.get('totalAnimals/animals');
if (prevCage){
var prevDividerInfo = config.dividerMap[prevCage.get('divider')] || {};
Expand All @@ -342,95 +344,101 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
var prevIsSeparate = prevDividerInfo.countAsSeparate;
var prevAnimals = prevCage.get('totalAnimals/animals');

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

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

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

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

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

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

}
else if (colorcage == 'Surgery Recovery' && cageType != 'Unavailable Location' )
{
bgColor = 'pink';

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

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

bgColor = 'white';
}
}
else if (status == 'Unavailable' && cageType != 'Unavailable Location')
else if (status == 'Unavailable' && cageType != 'Unavailable Location')
{
bgColor = 'yellow';
}
else if (colorcage == 'Transfer Pending')
else if (colorcage == 'Transfer Pending' && cageType != 'Unavailable Location' )
{
if (!Ext4.isEmpty(cageAnimals))
bgColor = '';
else
bgColor = 'orange';

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

}
else if (colorcage == 'Epen Caging' && cageType != 'Unavailable Location' )
{
bgColor = 'brown';

}
else if (colorcage == 'Surgery Recovery' )
{
bgColor = 'pink';

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

}
Expand Down Expand Up @@ -770,9 +778,9 @@ Ext4.define('ONPRC.window.CageDetailsWindow', {
itemId: 'cagecolortype',
store: {
type: 'labkey-store',
schemaName: 'onprc_ehr',
queryName: 'CagesBackgroundcolor',
// filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
schemaName: 'ehr_lookups',
queryName: 'cage_background',
filterArray: [LABKEY.Filter.create('datedisabled', null, LABKEY.Filter.Types.ISBLANK)],
autoLoad: true,
sort: 'sort_order'
}
Expand Down