[bot] Fast-forward for 24.11.17 #914
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Updated on-call phone numbers with a warning about contacting HR per ticket #20205. * Fixed issue with food deprive query in colony alerts revamp (requested via ticket #20180).
* make location required, make performed by allowed to be blank * Add alert for tissues going to WIMR * Do not auto fill the stain column * Add 3 more courier locations * make java constants queryable
* update necropsy schedule to full calendar 6 * fix typo * set a background color * fix location bug * refetch calendar events correctly * remove old fullcalendar
* Removed all the unused perl notifications. * Removed the old unused java notification.
…#784) * Adding timeout to docker down * new script to load a uptodate test server * adding timeout to docker down * making new file executable * adding tmp directory * adding restore file location * adding random tmp directory * removing / from restorefile * Adding wait time for postgres * Adding wait time for postgres to start. Starting rest of containers. * adding PATH for cron job * fixing typo * adding some echos * Adding whole path for postgres file * Changing directory * Adding more echo outputs * Updating docker image to latest build from Docker Hub * removing \n and adding jobs as parameter. * correcting typo * Adding default jobs * Chaging theme of test server and name * Changing different properties from production db * Prune system * Moving prune after docker start up * getting labkey version from .env file * Adding URL for test server via module property in WNPRC Module * Adding target to open a new tab when accessing secondary test server * Adding rsync for files folder * Adding file location via .env file * correcting new env format * adding additinal platform for arm hardware * adding special driver to build arm64 * Adding builder to use arm64 * improving comment * Adding two step process to download packages first and than install * adding support for multiple platform installation for R using rig * usign bash script to download R * Changin buildard to targetarch * adding specific builder to create mutliple platform image * removing download r script and using parallel install * removing parallel building * separating remotes to be installed first * removing remotes and vizpedigree * simplifying dockerfile for cranutils * using build script to build locally and adding platform variable * fixing location of dockerfile * enabling multiple cpus * Adding documentation about docker services * adding repos * Adding documentation * fixing warnings for dockerfile * Removing wite spaces * removing dowload only scripts * simplifying insllation remotes * adding some log for docker hub
* add background color to current vol, change future draws calc * take out past blood as well * Add mL to label * Rounding some results. * Adding conditional formatting * Expanding the interval to 31 days * Expanding the interval to 31 days via JS --------- Co-authored-by: Chad Sebranek <csebranek@gmail.com>
* Initial button setup to send back to request qc state * set assignedTo field for necropsy, untested * add notification, support groups in email sending * add request on hold color to calendar * improve error handling * improve email wording * get original requester and set default value for assignedTo field * Add save button to necropsy request, change necropsy link to go to request if its a request --------- Co-authored-by: Chad Sebranek <csebranek@gmail.com>
* Start Cage UI project * work on loading cage ui svg images * Testing ReactSVG Library * Cage Review Popup added * Added some styles for modifictiona * Work on modification table UI * Separated options for selecting divider/floors/extras * Converted state management to context manager * fixed a bug where the opposite cages wouldn't properly identify the change in state for dividers * Updated cage details to combine rooms together when they are without dividers/floors * Working cage modification deletion * Removed option for multiple extra mods * Added UI catch to make sure users are aware of unsaved data before exiting * Added ability to minimize the legend * Added some legend styling * Fixed bug with changing and saving modifications not working properly * Fixed bug with cage details not getting updated * Removed unnecessary clickedCagePartners array in favor of the clicked rack This also fixed the bug with some mods not getting updated across certain scenarios * Basic Styling Changes * Added scrolling for cage modifications pop up * Added ability to add or remove racks, within limits to the SVG image * Fixed bug where name wasn't getting updated when removing a rack * Added some changes to the way racks are added and maintained * Moved layout editor to separate page * Fixed the issue with combining racks not working as expected for vertical racks * Fixed a bug with dragging and merging racks causing random positioning to occur * fixed bug with not detecting possible merges for racks on some sides * Fixed bug causing merges after the first merge to be different than expected * Fixed bug with dragging room utility objects and dragging in the layout * Removed 1x2 racks, some auto numbering, and popup for cage numbering * Implemented basic version of manual id editing * fixed issue with text getting changed instead of tspan * Fixed zoom for the grid and objects inside the grid. * Adjusted grid ratio sizes with zoom applied * Fixed drag to layout not being correct x and y coords * Fixed bug with dragging in layout editor would randomly jump objects * Code cleanup * Fixed adjacency function to work with zoom * working merging for two groups of one element, no state updates. * Fixed bug with cage numbers throwing error when trying to set * fixed issue with current merge that didn't account for zoom * Introduced a state object to track cage num, x, y and scale coordinates * Fixed bug relaying incorrect cage locations to the state * Fixed bug with checking already merged cages again when the rack was moved * Fixed bug with naming new cages after merging * Fixed bugs with merging two groups and renaming cage ids * Moved cage num event to helper since it needed to be used in more places * Update the method in which cages are initially numbered * Updated cage numbering and rack numbering when cages are placed to use the latest number plus 1 * Fixed bug with cage locations not being correctly numbered * Added context menu on right click for editing cages in the layout editor * Introduced checks to prevent two different "random" crashes in case of incorrect bindings * General Cleanup and fixed moveRack function to work with both cage locs and local room * Fixed bug with cage location not being right when multiple racks were in a room * Fixed bug causing merging to not be detected * Fixed bug with cage state not getting correct local coords for the rack group * Switched state management to work with four types of racks, and given them each their own numbering system * Added test data for beginning work on data storage * Switch room type to be array of room items instead of racks Room item is either a rack or room object (anything other than caging units) * Additions to switching from room represented by racks to room items * added some EHR types and switched logic of svgs to follow unique rack ids * added room type and fixed bug with dragging shapes to the layout * Fixed bugs with merging connecting and renaming * State management and adjacency checker updated for dealing with connections * Fixed bug with connecting merged cages not being reset correctly * Fixed bug with crashing when closing context menu then dragging new cage * Fixed bug with renaming cages of different types * changed rack group design to fit better with data * Basic support for loading previous data for single grouped racks and room objects, fixed grid disable/enable function * Implemented basic saving for layout * remove unused types/functions * Fixed bug with racks and grouped racks not being hard locked to the grid when dragging and zooming the grid * Added the ability to delete cages from the layout editor * Start Cage UI project * work on loading cage ui svg images * Testing ReactSVG Library * Cage Review Popup added * Added some styles for modifictiona * Work on modification table UI * Separated options for selecting divider/floors/extras * Converted state management to context manager * fixed a bug where the opposite cages wouldn't properly identify the change in state for dividers * Updated cage details to combine rooms together when they are without dividers/floors * Working cage modification deletion * Removed option for multiple extra mods * Added UI catch to make sure users are aware of unsaved data before exiting * Added ability to minimize the legend * Added some legend styling * Fixed bug with changing and saving modifications not working properly * Fixed bug with cage details not getting updated * Removed unnecessary clickedCagePartners array in favor of the clicked rack This also fixed the bug with some mods not getting updated across certain scenarios * Basic Styling Changes * Added scrolling for cage modifications pop up * Added ability to add or remove racks, within limits to the SVG image * Fixed bug where name wasn't getting updated when removing a rack * Added some changes to the way racks are added and maintained * Moved layout editor to separate page * Fixed the issue with combining racks not working as expected for vertical racks * Fixed a bug with dragging and merging racks causing random positioning to occur * fixed bug with not detecting possible merges for racks on some sides * Fixed bug causing merges after the first merge to be different than expected * Fixed bug with dragging room utility objects and dragging in the layout * Removed 1x2 racks, some auto numbering, and popup for cage numbering * Implemented basic version of manual id editing * fixed issue with text getting changed instead of tspan * Fixed zoom for the grid and objects inside the grid. * Adjusted grid ratio sizes with zoom applied * Fixed drag to layout not being correct x and y coords * Fixed bug with dragging in layout editor would randomly jump objects * Code cleanup * Fixed adjacency function to work with zoom * working merging for two groups of one element, no state updates. * Fixed bug with cage numbers throwing error when trying to set * fixed issue with current merge that didn't account for zoom * Introduced a state object to track cage num, x, y and scale coordinates * Fixed bug relaying incorrect cage locations to the state * Fixed bug with checking already merged cages again when the rack was moved * Fixed bug with naming new cages after merging * Fixed bugs with merging two groups and renaming cage ids * Moved cage num event to helper since it needed to be used in more places * Update the method in which cages are initially numbered * Updated cage numbering and rack numbering when cages are placed to use the latest number plus 1 * Fixed bug with cage locations not being correctly numbered * Added context menu on right click for editing cages in the layout editor * Introduced checks to prevent two different "random" crashes in case of incorrect bindings * General Cleanup and fixed moveRack function to work with both cage locs and local room * Fixed bug with cage location not being right when multiple racks were in a room * Fixed bug causing merging to not be detected * Fixed bug with cage state not getting correct local coords for the rack group * Switched state management to work with four types of racks, and given them each their own numbering system * Added test data for beginning work on data storage * Switch room type to be array of room items instead of racks Room item is either a rack or room object (anything other than caging units) * Additions to switching from room represented by racks to room items * added some EHR types and switched logic of svgs to follow unique rack ids * added room type and fixed bug with dragging shapes to the layout * Fixed bugs with merging connecting and renaming * State management and adjacency checker updated for dealing with connections * Fixed bug with connecting merged cages not being reset correctly * Fixed bug with crashing when closing context menu then dragging new cage * Fixed bug with renaming cages of different types * changed rack group design to fit better with data * Basic support for loading previous data for single grouped racks and room objects, fixed grid disable/enable function * Implemented basic saving for layout * remove unused types/functions * Fixed bug with racks and grouped racks not being hard locked to the grid when dragging and zooming the grid * Added the ability to delete cages from the layout editor * Change permission classes to fit with labkey 24.11 * Fixed bug not letting merging happen after rename * Added resizeable room border and set up default room sizes * Added room selector for saving, clear messages for saving, error for incorrect room in url, and fixed loading prev room issues * Fixed issue with inconsistent grid generation * Updated layout history table columns, fixed loading in data to work with room border, and compatibility for default rack types * Fixed bugs with loading in room border and assigning new groups after load in * Added popup after submission, fixed some bugs with submission and room checks * Fixed bug causing confirmation to reset room name unexpectedly, fixed bug with dragging grouped racks * Allowed pens to be saved * Fixed issue with saving and moving pens and loading empty rooms that were cleared * Merge in docker build for 24.11 * update docker build url * Fix bug with incorrect scaling in connected rack groups * Changed redirect window from dev link to build link * undo docker build change * Fixed bug with renaming cage numbers * Fixed bug with context menu popups not closing * Switch context menu styles * Prep for moving to own module * Switched CageUI to java based module * Fixed cage ui schema not showing up properly * Allow users to change racks in the layout editor * Simplified cage object and fixed bug with connecting racks * added room templates and clear grid * Removed option to click past the popup for layout popups * Added overlay to other two layout pop ups * Fix bug with deleting multiple cages * Added option to delete entire racks * Fixed bug loading in previous rooms * Added room gate object, Room template fixes and drag off-center bug fix * Added Gate and created reusable context menu * Fixed bug causing the start drag in layout function to not be called correctly * Refactoring * More refactoring * Bug fix for redirect causing crash for template renaming * Test for checking existance of layout editor * Somehow context was renamed. This is a fix for that. * Update WNPRC_EHRTest.java Added test for cage UI layout editor * Added security and permissions * Room list in home page now fetches data * Update cageui.xml * Added extra context for tracking default racks * Added room search list to home page * Tests and some fixes for that * Added home page map for backtracking easily * Permissions and Roles added * Added ability to open and close room gates * Added sub views for room pages and loading in previous rooms * Fixed border and scaling issues with loading rooms in the view pages * Added permissions for cage ui tables and front end checks to enable/disable certain buttons/pages * Bug fix for crashing when the user drags to the layout by clicking on a certain part of the selected object * Fix deleteRows bug in table permissions * Bug fix for cage numbering on svg load for the home view * Bug fixes for loading in a room with connected and merged racks * Added modification table and cage positioning * Add group tracking and fixed bug for finding racks in the same group * Fixed layout editor bug not allowing small cages to be paired with larger cages in some locations * Added rack modification section in cage UI home * Schema and db script for cage modifications * Bug fix for fast drag end calls would produce incorrect ids for racks * Bug fix causing rename crashing * Bug fix for layout merging being detected on incorrect cage positions * Fixed adding room callbacks so errors don't crash * Bug fix for deleting racks causing incorrect state changes * Fixed bug with deleting cages not splitting groups correctly * Bug fix for loading prev room. Effect got deleted somehow, this is adding it back. * Rack modification storage * Fix bug with group ids and same rackId naming * Modification and Cage popup added, modification state, modification fetching * added dynamic cage mods for single cages * Added table customizer and modification tables * Switched modification id convention for constants * Ctunnel capabilities using new constant naming convention * Work to the modifications editing table for individual cages * Fix bugs with mod table causing left mod to be incorrect and duplicate cage svgs * bug fix for template layouts getting cleared when saving them as another room * Cleanup logs * Update package.lock * Remove later edits to branch keeping only layout files * Fixed bug with incorrectly ending template dates * remove unused svgs for layout editor * Changing copyright to UW * Add copywriting to files --------- Co-authored-by: F. Daniel Nicolalde <fdnicolalde@wisc.edu>
* Mark CageUI as only supporting Postgres * Declare explicit dependency; add missing column
* Fix for incorrect grid snapping due to chrome version update 137 * Fix for objects to jump away from the cursor in larger scaled rooms * Fix for clear layout not removing everything correctly * Fix for the large amount of empty space in the object toolbar
* Fix for incorrect grid snapping due to chrome version update 137 * Fix for objects to jump away from the cursor in larger scaled rooms * Fix for clear layout not removing everything correctly * Fix for the large amount of empty space in the object toolbar * Fix for test failing due to lookup tables not being populated * Fix for templates not being able to be saved while renamed
labkey-klum
approved these changes
Jan 19, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Generated automatically.
Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
View all PRs: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=24.11_ff_bot_24.11.17