Skip to content
Open
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions onprc_ehr/resources/web/onprc_ehr/panel/RoomLayoutPanel.js
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 = 51; //Modified: 10-15-2020
var hasCages = false;

Ext4.each(rooms, function(room, roomIdx){
Expand Down Expand Up @@ -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 @@ -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')
Expand Down Expand Up @@ -397,7 +397,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
if (!Ext4.isEmpty(cageAnimals))
bgColor = 'red';
else
bgColor = 'grey';
bgColor = '';
}
else if (status == 'Unavailable')
{
Expand Down Expand Up @@ -634,6 +634,7 @@ Ext4.define('ONPRC.panel.RoomLayoutPanel', {
Ext4.apply(this, {
border: false,
itemId: 'roomLayoutPanel',
width: 1450,
defaults: {
border: false
},
Expand Down