Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
35a382d
Bugfix for template renaming
LeviCameron1 Mar 30, 2026
26f8063
Bug fix for context menu disappearing from the page if it was positio…
LeviCameron1 Mar 30, 2026
20580a4
update watch config to get correct path for ios testing
LeviCameron1 Mar 31, 2026
572a4e4
bug fix for layout editor not adding mods to real room after loading …
LeviCameron1 Mar 31, 2026
e173faf
Update legend text spacing
LeviCameron1 Mar 31, 2026
7fa07ce
Add group svg wrapper to room objects allowing them to have context m…
LeviCameron1 Apr 2, 2026
6a434aa
Bug fix for gate switching object after adding groups
LeviCameron1 Apr 2, 2026
1a03470
Fix deletion and movement for room objects
LeviCameron1 Apr 3, 2026
447606a
Update permissions for tables
LeviCameron1 Apr 3, 2026
05dc6e6
Add permissions to drag objects across layout
LeviCameron1 Apr 3, 2026
014be8e
Add permissions for adding to layout, updating border size, clearing …
LeviCameron1 Apr 6, 2026
6e02bd5
Add session log for forms
LeviCameron1 Apr 8, 2026
2f41981
Fix bug with opening menu
LeviCameron1 Apr 8, 2026
4e4915b
remove console logs, add console errors instead for error messages
LeviCameron1 Apr 8, 2026
06a6677
Add permissions to edit the room
LeviCameron1 Apr 9, 2026
2fb94f2
Add restraint modification and window blind modification
LeviCameron1 Apr 9, 2026
c07c996
Add room object context menu and gate saving
LeviCameron1 Apr 13, 2026
e3a70c9
Update RoomLayout.tsx
LeviCameron1 Apr 13, 2026
7d8e3ed
Fix bug with the svg loading not working for cage popups
LeviCameron1 Apr 14, 2026
0d3ec2c
Add new mods to java types
LeviCameron1 Apr 14, 2026
35718df
Bug fix for save a cage with no separator style mods causing issues
LeviCameron1 Apr 14, 2026
07c929e
Remove room objects depending on permissions instead of blocking them…
LeviCameron1 Apr 15, 2026
db14e84
Add updated legend
LeviCameron1 Apr 15, 2026
59676d8
Update list styling
LeviCameron1 Apr 16, 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
2 changes: 1 addition & 1 deletion CageUI/ios-webpack/watch.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const constants = require('./constants');
const path = require('path');
// relative to the <lk_module>/node_modules/@labkey/build/webpack dir
const entryPoints = require('../src/client/entryPoints.js');
const host = require("host");
const host = require("./host");


const devServer = {
Expand Down
9 changes: 9 additions & 0 deletions CageUI/resources/web/CageUI/static/cage.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 39 additions & 71 deletions CageUI/resources/web/CageUI/static/legend.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions CageUI/src/client/api/labkeyActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { ActionURL, Ajax, Query, Security, Utils } from '@labkey/api';
import { Command, QueryRequestOptions, SaveRowsOptions, SaveRowsResponse } from '@labkey/api/dist/labkey/query/Rows';
import { GetUserPermissionsOptions } from '@labkey/api/dist/labkey/security/Permission';
import { SelectDistinctOptions } from '@labkey/api/dist/labkey/query/SelectDistinctRows';
import { CageMods, Rack, RackConditionOption, Room } from '../types/typings';
import { CageMods, Rack, RackConditionOption, Room, SessionLog } from '../types/typings';
import { buildURL } from '@labkey/components';
import { RackSwitchOption } from '../types/homeTypes';

Expand Down Expand Up @@ -142,7 +142,7 @@ export const labkeyGetUserPermissions = (config?: GetUserPermissionsOptions) =>
});
};

export function saveRoomLayout(room: Room, mods: CageMods[], prevRoomName: string, prevRackCondition?: RackConditionOption): Promise<{
export function saveRoomLayout(room: Room, mods: CageMods[], prevRoomName: string, sessionLog: SessionLog, prevRackCondition?: RackConditionOption): Promise<{
success: boolean,
errors: any[]
}> {
Expand All @@ -164,7 +164,7 @@ export function saveRoomLayout(room: Room, mods: CageMods[], prevRoomName: strin
method: 'POST',
success: (res) => resolve(JSON.parse(res.response)),
failure: Utils.getCallbackWrapper((error) => reject(error)),
jsonData: {mods: mods, room: room, prevRoomName: newPrevRoomName, isDefault: isDefault, prevRackCondition: prevRackCondition},
jsonData: {mods: mods, room: room, prevRoomName: newPrevRoomName, isDefault: isDefault, prevRackCondition: prevRackCondition, sessionLog: sessionLog},
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion CageUI/src/client/api/popularQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const cageModLookup = async (columns: string[], filterArray: Filter.IFilt
if (res.rows.length !== 0) {
return res.rows as EHRCageMods[];
} else {
console.log('Error cageui modifications', res);
console.error('Error cageui modifications', res);
}
};

Expand Down
Loading
Loading