scinote-web/app/services/dashboard/recent_work_service.rb

269 lines
13 KiB
Ruby
Raw Normal View History

2020-03-06 20:51:18 +08:00
# frozen_string_literal: true
module Dashboard
class RecentWorkService
include PermissionExtends
2020-03-06 20:51:18 +08:00
include InputSanitizeHelper
include Rails.application.routes.url_helpers
def initialize(user, team, mode)
@user = user
@team = team
@mode = mode
end
def call
all_activities = @team.activities.where(owner_id: @user.id)
all_activities = join_project_user_roles(all_activities)
all_activities = join_report_project_user_roles(all_activities)
all_activities = join_experiment_user_roles(all_activities)
all_activities = join_my_module_user_roles(all_activities)
all_activities = join_result_user_roles(all_activities)
all_activities = join_protocol_user_roles(all_activities)
all_activities = join_step_user_roles(all_activities)
team_activities = all_activities.where(subject_type: %w(Team RepositoryBase ProjectFolder))
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
project_activities = all_activities.where.not(project_user_roles: { id: nil })
report_activities = all_activities.where.not(report_project_user_roles: { id: nil })
experiment_activities = all_activities.where.not(experiment_user_roles: { id: nil })
my_module_activities = all_activities.where.not(my_module_user_roles: { id: nil })
result_activities = all_activities.where.not(result_my_module_user_roles: { id: nil })
protocol_activities = all_activities.where.not(protocol_my_module_user_roles: { id: nil })
protocol_repository_activities = all_activities.where(project_id: nil, subject_type: 'Protocol')
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
step_activities = all_activities.where.not(step_my_module_user_roles: { id: nil })
activities = team_activities.or(project_activities)
.or(report_activities)
.or(experiment_activities)
.or(my_module_activities)
.or(result_activities)
.or(protocol_activities)
.or(step_activities)
.or(protocol_repository_activities)
activities = activities.where.not(type_of: Extends::DASHBOARD_BLACKLIST_ACTIVITY_TYPES)
.select('MAX(activities.created_at) AS last_change', :subject_id, :subject_type)
.group(:subject_id, :subject_type)
.order(last_change: :desc)
query = Activity.from("(#{activities.to_sql}) AS activities")
2020-03-11 21:30:41 +08:00
.results_joins
.protocols_joins
.my_modules_joins(:from_results, :from_protocols)
.experiments_joins(:from_my_modules)
.projects_joins(:from_experiments)
.repositories_joins
.reports_joins
.where('repositories.archived IS NOT TRUE')
.where('projects.archived IS NOT TRUE')
.where('experiments.archived IS NOT TRUE')
.where('my_modules.archived IS NOT TRUE')
.where('protocols.protocol_type != ? OR protocols.protocol_type IS NULL',
Protocol.protocol_types[:in_repository_archived])
.select('
2020-03-09 22:10:51 +08:00
CASE
WHEN my_modules.id IS NOT NULL THEN
CONCAT(\'tsk\', my_modules.id)
WHEN experiments.id IS NOT NULL THEN
CONCAT(\'exp\', experiments.id)
WHEN projects.id IS NOT NULL THEN
CONCAT(\'pro\', projects.id)
WHEN protocols.id IS NOT NULL THEN
CONCAT(\'prt\', protocols.id)
WHEN repositories.id IS NOT NULL THEN
CONCAT(\'inv\', repositories.id)
WHEN reports.id IS NOT NULL THEN
CONCAT(\'rpt\', reports.id)
END AS group_id,
COALESCE (
my_modules.name,
experiments.name,
projects.name,
protocols.name,
repositories.name,
2020-03-09 22:10:51 +08:00
reports.name
) AS name,
2020-03-09 22:10:51 +08:00
reports.project_id AS report_project_id,
2020-03-09 22:10:51 +08:00
subject_id,
subject_type,
last_change
2020-03-06 20:51:18 +08:00
')
ordered_query = Activity.from("(#{query.to_sql}) AS activities").where.not(group_id: nil)
.select(:group_id,
:name,
'MAX(last_change) AS last_change',
'MAX(report_project_id) AS report_project_id')
.group(:group_id, :name)
.order('MAX(last_change) DESC').limit(Constants::SEARCH_LIMIT)
query_filter = "(group_id LIKE 'tsk%' OR group_id LIKE 'exp%' OR group_id LIKE 'pro%')" if @mode == 'projects'
query_filter = "group_id LIKE 'prt%'" if @mode == 'protocols'
query_filter = "group_id LIKE 'inv%'" if @mode == 'repositories'
query_filter = "group_id LIKE 'rpt%'" if @mode == 'reports'
ordered_query = ordered_query.where(query_filter) unless @mode == 'all'
recent_objects = ordered_query.as_json.map do |recent_object|
recent_object.deep_symbolize_keys!
recent_object.delete_if { |_k, v| v.nil? }
recent_object[:last_change] = I18n.l(
DateTime.parse(recent_object[:last_change]).in_time_zone(@user.settings[:time_zone] || 'UTC'),
2020-03-06 22:24:57 +08:00
format: :full_with_comma
)
recent_object[:subject_type] = override_subject_type(recent_object)
recent_object[:name] = escape_input(recent_object[:name])
recent_object[:url] = generate_url(recent_object)
recent_object
2020-03-09 22:10:51 +08:00
end
2020-03-06 20:51:18 +08:00
recent_objects
2020-03-06 20:51:18 +08:00
end
private
def join_project_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN projects project_subjects
ON project_subjects.id = activities.subject_id AND activities.subject_type='Project'
LEFT OUTER JOIN user_assignments project_user_assignments
ON project_user_assignments.assignable_type = 'Project'
AND project_user_assignments.assignable_id = project_subjects.id
AND project_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles project_user_roles
ON project_user_roles.id = project_user_assignments.user_role_id
AND project_user_roles.permissions @> ARRAY['#{ProjectPermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_report_project_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN projects report_project_subjects
ON report_project_subjects.id = activities.project_id AND activities.subject_type='Report'
LEFT OUTER JOIN user_assignments report_project_user_assignments
ON report_project_user_assignments.assignable_type = 'Project'
AND report_project_user_assignments.assignable_id = report_project_subjects.id
AND report_project_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles report_project_user_roles
ON report_project_user_roles.id = report_project_user_assignments.user_role_id
AND report_project_user_roles.permissions @> ARRAY['#{ProjectPermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_experiment_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN experiments experiment_subjects
ON experiment_subjects.id = activities.subject_id AND activities.subject_type='Experiment'
LEFT OUTER JOIN user_assignments experiment_user_assignments
ON experiment_user_assignments.assignable_type = 'Experiment'
AND experiment_user_assignments.assignable_id = experiment_subjects.id
AND experiment_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles experiment_user_roles
ON experiment_user_roles.id = experiment_user_assignments.user_role_id
AND experiment_user_roles.permissions @> ARRAY['#{ExperimentPermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_my_module_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN my_modules my_module_subjects
ON my_module_subjects.id = activities.subject_id AND activities.subject_type='MyModule'
LEFT OUTER JOIN user_assignments my_module_user_assignments
ON my_module_user_assignments.assignable_type = 'MyModule'
AND my_module_user_assignments.assignable_id = my_module_subjects.id
AND my_module_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles my_module_user_roles
ON my_module_user_roles.id = my_module_user_assignments.user_role_id
AND my_module_user_roles.permissions @> ARRAY['#{MyModulePermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_result_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN results result_subjects
ON result_subjects.id = activities.subject_id AND activities.subject_type='Result'
LEFT OUTER JOIN my_modules result_my_modules
ON result_subjects.my_module_id = result_my_modules.id
LEFT OUTER JOIN user_assignments result_my_module_user_assignments
ON result_my_module_user_assignments.assignable_type = 'MyModule'
AND result_my_module_user_assignments.assignable_id = result_my_modules.id
AND result_my_module_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles result_my_module_user_roles
ON result_my_module_user_roles.id = result_my_module_user_assignments.user_role_id
AND result_my_module_user_roles.permissions @> ARRAY['#{MyModulePermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_protocol_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN protocols protocol_subjects
ON protocol_subjects.id = activities.subject_id AND activities.subject_type='Protocol'
LEFT OUTER JOIN my_modules protocol_my_modules
ON protocol_subjects.my_module_id = protocol_my_modules.id
LEFT OUTER JOIN user_assignments protocol_my_module_user_assignments
ON protocol_my_module_user_assignments.assignable_type = 'MyModule'
AND protocol_my_module_user_assignments.assignable_id = protocol_my_modules.id
AND protocol_my_module_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles protocol_my_module_user_roles
ON protocol_my_module_user_roles.id = protocol_my_module_user_assignments.user_role_id
AND protocol_my_module_user_roles.permissions @> ARRAY['#{MyModulePermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def join_step_user_roles(activities)
Version 1.25.0 (#4087) * Add initial implementation of inventory stock management [SCI-6402] * Add stock column type (#3786) * Add stock column type * Create new stock column [SCI-6410] * Small fixed for stock column [SCI-6410] * Add stock column validations [SCI-6410] Co-authored-by: Anton <anton@scinote.net> * Add stock table renders [SCI-6412] (#3787) Co-authored-by: Anton <anton@scinote.net> * Implemented stock management modal [SCI-6417] (#3788) * Implement inventory stock management modal [SCI-6417] * Add generalized validation mechanic, some bugfixes [SCI-6417] * Fix permission check and method name in RepositoryStockValue [SCI-6417] * Add stock and consumption to assigned items section [SCI-6434] (#3793) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781) * Fix invalid return in reports jobs [SCI-6409] (#3777) * Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] * Add current/new amount section to stock [SCI-6416] (#3791) Co-authored-by: Anton <anton@scinote.net> * Task stock consumption modal[SCI-6444][SCI-6445] (#3798) Add main logic for consumption on task [SCI-6444] Co-authored-by: Anton <anton@scinote.net> * Add stock management columns to snapshots [SCI-6448] * Handle stock management in full table views [SCI-6440] * Implement stock management activities [SCI-6452] (#3810) * Implement stock management activities [SCI-6452] * PR code fixes [SCI-6452] * Implement import for repository stock values [SCI-6461] (#3818) * Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) * Add front-end validation for comments field [SCI-6464] (#3829) Co-authored-by: Anton <anton@scinote.net> * Add stock consumption to pdf and docx [SCI-6460] (#3816) Co-authored-by: Anton <anton@scinote.net> * Add support of repository snapshots to assigned items section [SCI-6439] (#3828) * Change subject of Repository (#3838) * Fixed full view assigned items modal stock consumption (#3846) * Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) * Implement low stock threshold column [SCI-6555] (#3907) * Stock column fixes [SCI-6455] (#3878) * Fix issues with stock column management [SCI-6455] * Refactor stock column in datatables [SCI-6455] * Fix tests [SCI-6486] (#3913) * Fix tests [SCI-6486] * Fix rspec tests [SCI-6486] Co-authored-by: Anton <anton@scinote.net> * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911) * Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] * Implement bell icon [SCI-6500] * Refactor reminder cells scope [SCI-6554] * Add red dot for date/datetime reminder [SCI-6499] (#3924) Co-authored-by: Anton <anton@scinote.net> * Add reminders to stock modal [SCI-6557] (#3917) Co-authored-by: Anton <anton@scinote.net> * Add flyout for repository reminders [SCI-6501] (#3926) Co-authored-by: Anton <anton@scinote.net> * Fix moving experiment [SCI-6602] (#3927) * Update Rails to 6.1.4.7 [SCI-6615] (#3928) * Task inventory activity for assigned item consumption [SCI-6453] (#3830) * Add task inventory activity [SCI-6453] * Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) * Bump version to 1.24.2 * Implement hidden repository cell reminders [SCI-6504] (#3933) * Low stock flyout reminders [SCI-6502] (#3932) * Display low stock flyout reminder [SCI-6502] * Display low stock flyout reminder [SCI-6502] * Adapt showing stock reminders for every bell icon click [SCI-6502] * Correct hound error [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix event registration for fetching reminder data [SCI-6502] * Fix hound [SCI-6502] * Remove not needed line [SCI-6502] * Add reminder template [SCI-6502] * Add clearing messages [SCI-6502] * Displaying low stock warning [SCI-6497] (#3912) * Low stock warning [SCI-6497 * Fix some bugs [SCI-6497] * Fix to long line [SCI-6497] * Clean not needed information in renderes [SCI-6497] * Icon bell reminder for an assigned item on the task [SCI-6506] (#3929) * Add bell icon on assigned task [SCI-6506] * Add flyout and improve quering [SCI-6506] * Refactor repository toolbar [SCI-6545] (#3943) Co-authored-by: Anton <anton@scinote.net> * Add datetime reminders to columns modal [SCI-6556] (#3934) Co-authored-by: Anton <anton@scinote.net> * Hide reminders for archived repositories [SCI-6609] (#3941) * Hide reminders for archived repositories [SCI-6609] * Always pass repository in datatable helper [SCI-6609] * Handle locked stock consumption state [SCI-6608] (#3942) * Change env variable name for s3 bucket region [SCI-6603] (#3944) * Add last_transition_error column to tasks [SCI-6610] (#3949) * Add microtransactions to stock consumptions [SCI-6626] (#3948) Co-authored-by: Anton <anton@scinote.net> * Date remidner flyout [SCI-6503] (#3937) * Implement date reminder flyout [SCI-6503] * Show only days left for date reminder [SCI-6503] * Pluralize day in reminders [SCI-6503] * Create partials for different reminders [SCI-6503] * Unify css for reminder [SCI-6503] * Add micro interactions for stock modal [SCI-6625] (#3947) Co-authored-by: Anton <anton@scinote.net> * Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) * Bump lodash-es from 4.17.15 to 4.17.21 (#3939) Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash-es dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Implement clearing hidden repository reminders [SCI-6507] (#3936) * Add stock filters [SCI-6547] (#3938) Co-authored-by: Anton <anton@scinote.net> * Fix assign view for task repository [SCI-6648] (#3954) Co-authored-by: Anton <anton@scinote.net> * Add micro-interactions to reminders flyout [SCI-6627] (#3951) Co-authored-by: Anton <anton@scinote.net> * Improve error reporting in task status transition [SCI-6611] (#3952) * Add ordering to global search results [SCI-6639] (#3960) * Fix multiple stock bugs [SCI-6651] (#3959) Co-authored-by: Anton <anton@scinote.net> * Fix large previews for csv files [SCI-6619] (#3961) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953) * Add alias to cell sort query, to prevent join conflicts [SCI-6649] * Added value_type to join condition to make use of DB index [SCI-6649] * Update front end validation for columns managment [SCI-6657] (#3962) Co-authored-by: Anton <anton@scinote.net> * Print protocol smart annotation and table improvements [SCI-6566] (#3925) * Improve table printing in the print menu [SCI-6566] * Open smart annotation in new tab for print view [SCI-6566] * Unify naming of same parameter [SCI-6566] * Fix typo [SCI-6566] * Fix hound errors [SCI-6566] * Add stock management toggling [SCI-6653] (#3967) Co-authored-by: Anton <anton@scinote.net> * Fix caching of an experiment card dropdown [SCI-6606] (#3963) * Add stock consumption permission to user roles [SCI-6665] (#3966) * Show archive icon only on archived projects in the header [SCI-6617] (#3965) * Fix assigned items fullview modal [SCI-6664] (#3968) * Implement hide all repository reminders button [SCI-6505] (#3940) * Viewer role does not see any tasks in archived project [SCI-6616] (#3958) * Fix viewer role not see any tasks in archived project [SCI-6616] * Fix rollback for add read archive permission migration [SCI-6616] * Stock modal bugs [SCI-6667] (#3970) Co-authored-by: Anton <anton@scinote.net> * Always use Tika text extractor in server mode [SCI-6658] (#3957) * Implement stock consumption via the API [SCI-6642] (#3964) * Implement stock consumption via the API [SCI-6642] * Remove unnecessary attribute from InventoryItemSerializer [SCI-6642] * Amend permission check, add nested transaction support to consume_stock method [SCI-6642] * Toolbar fixes [SCI-6670] (#3973) Co-authored-by: Anton <anton@scinote.net> * Make stock column work properly with different orders [SCI-6677] (#3974) * Fix filters loading for stock filter [SCI-6687] (#3975) Co-authored-by: Anton <anton@scinote.net> * Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) * Fix red dot for datetime columns [SCI-6684] (#3977) Co-authored-by: Anton <anton@scinote.net> * Fix saving of inventory date time reminders saving [SCI-6672] (#3976) * Bump puma from 5.6.2 to 5.6.4 (#3972) Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Don't load reminders if the stock feature is disabled [SCI-6673] (#3981) * Don't load reminders if the stock feature is disabled [SCI-6673] * Don't load reminders if the stock feature is disabled [SCI-6673] * Unify stock management enabled check [6673] * Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton <anton@scinote.net> * Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) * Implement failed snapshot pop-up on task screen [SCI-6612] (#3950) * Implement failed snapshot pop-up on task screen [SCI-6612] * Copy change [SCI-6612] * Proper handling of snapshot transition error [SCI-6612] * Move modal auto open logic to JS file [SCI-6612] * Remove unnecessary .html_safe [SCI-6612] * Fix assigning and consuming items [SCI-6686] (#3985) * Repository toolbar CSS fixes [SCI-6676] (#3984) Co-authored-by: Anton <anton@scinote.net> * Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) * Fix reminder dropdown on task screen [SCI-6678] (#3987) Co-authored-by: Anton <anton@scinote.net> * Fix inventory sorting with date time reminders [SCI-6683] (#3980) * Fix css stock modal [SCI-6675] (#3989) Co-authored-by: Anton <anton@scinote.net> * Stock column management UX/UI fixes [SCI-6674] (#3979) * Fix red dot for dates in repository [SCI-6696] (#3991) Co-authored-by: Anton <anton@scinote.net> * Added styling for failed snapshots in sidebar [SCI-6636] (#3990) * Added styling for failed snapshots in sidebar [SCI-6636] * Simplify markup for failed icon [SCI-6636] * Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) * Override error styling in stock column management [SCI-6674] (#3995) * Fix repository full view tables without stock management [SCI-6703] (#3994) * Add pagination to projects list [SCI-6655] * Add reminder preset to date(time) reminders [SCI-6693] (#3996) * Fix color on consumption link [SCI-6686] (#3992) * Fix sorting by date time columns in inventories [SCI-6683] (#4002) * Improve loading of the dashboard [SCI-6618] (#4001) * Stock modal UX fixes [SCI-6714] (#3998) Co-authored-by: Anton <anton@scinote.net> * Fix css for stotck modal [SCI-6698] (#3999) Co-authored-by: Anton <anton@scinote.net> * API: add endpoint for updating of stock [SCI-6549] (#3955) * Add test for Stock repository cell [SCI-6549] * Create and update stock inventory cell [SCI-6549] * Fix hound errors [SCI-6549] * Fix ledger recording [SCI-6549] * Fix api endpoint [SCI-6549] * Fix hound [SCI-6549] * Fix collapsing of assigned items tables [SCI-6705] (#4000) * API: add endpoint for creating stock column [SCI-6550] (#3956) * Add test for repositoty stock column api [SCI-6550] * Create and update stock column [SCI-6550] * Change stock unit [SCI-6550] * Fix hound [SCI-6550] * Fix on delete [SCI-6550] * Fix houd [SCI-6550] * Removed autofocus clear on open reminder flyout [SCI-6690] (#4003) * Removed clear autofocus on open reminder flyout [SCI-6690] * Fix hound [SCI-6690] * Adding/changing stock consumption [SCI-6708] (#4005) * Adding/changing stock consumption [SCI-6708] * Fix hound [SCI-6708] * Remove date red dots for snapshots [SCI-6715] (#4004) Co-authored-by: Anton <anton@scinote.net> * Add snapshot error message below task status [SCI-6614] (#4009) * Add repository snapshot error modal [SCI-6613] (#3993) * Bump nokogiri from 1.13.3 to 1.13.4 (#4008) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add pagination for experiments [SCI-6656] * Fix sorting by time and time range columns [SCI-6683] (#4011) * Bump moment from 2.24.0 to 2.29.2 (#4006) Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.2. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.2) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Align items in assigned item section [SCI-6707] (#4007) * Add locking and unique index to repository row assigning [SCI-6591] (#3921) * tmp (#3935) * Revert "tmp (#3935)" (#4014) This reverts commit 043086d55fe0c7adeac528662e1433ccdb91aed0. * Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) * Fix removing stock reminder threshold [SCI-6724] (#4010) * Stock small ux fixes [SCI-6714] (#4015) Co-authored-by: Anton <anton@scinote.net> * Add aibility to delete stock column [SCI-6723] (#4017) Co-authored-by: Anton <anton@scinote.net> * Fix red dot for date reminders [SCI-6696] (#4016) Co-authored-by: Anton <anton@scinote.net> * Change the way setting stock works [SCI-6730] (#4018) * Fix error modal opening on successful snapshot [SCI-6726] (#4019) * Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021) * Refactor and fix how stock consumption is displayed [SCI-6734] * Refactor and fix display of stock warnings [SCI-6734] * Fix stock consumption in reports [SCI-6735] * Fix markup * Focus authenticator code field [SCI-6716] (#4022) * Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) * Fix decimals in stock consumption modal [SCI-6732] * Add edit title for stock consumption modal [SCI-6731] * Highlight negative stock in modal with red [SCI-6729] * Stock management test [SCI-6420] (#3946) * Initial test for stock management * Repository stock values adding [does not work] SCI-6420 * Fix typos SCI-6420 * Fix test [SCI-6420] * Test changes [SCI-6402] * Remove locking test [SCI-6420] * Remove lock [SCI-6420] * Remove serializer [SCI-6420] * Fix stock test and add ledger creation on consume [SCI-6420] * Fix inviting users to team [SCI-6725] (#4026) * Improve stock ledger records creation [SCI-6419] * Fix stock modal add/remove value preset value [SCI-6740] * API GET repository stock column output fix [SCI-6550] (#4030) * Add include stock unit items to Stock column get [SCI-6550] * Fix stock column test [SCI-6550] * Fix hound [SCI-6550] * Move list-type column includes to param, unify naming [SCI-6738] (#4036) * Add default includes for inventory columns with lists [SCI-6738] * Move list-type column includes to param, unify naming [SCI-6738] * Fix snapshot consumption display [SCI-6734] (#4035) * Fix decimal render function [SCI-6742] (#4037) Co-authored-by: Anton <anton@scinote.net> * Add comment to repository stock activities [SCI-6746] * Fix default stock column default units selection [SCI-6744] * Add negative validation for stock [SCI-6743] * Highlight negative value in consumption modal [SCI-6741] * Fix snapshot creation with stock consumption [SCI-6762] * Update stock value without reloading the table [SCI-6745] (#4041) * Allow tag creation on task level if you have permission [SCI-6573] (#4031) * Enable team normal user to edit repository files [SCI-6765] (#4049) * Add negative validation for treshold [SCI-6743] * Copy fix [SCI-6762] (#4048) * Add bell icon for negative stock [SCI-6770] * Fix formatting of stock consumption on tasks [SCI-6737] (#4050) * Fix duplicated inventories on tasks for export all [SCI-6776] * Stock / stock consumption display fixes [SCI-6771] (#4054) * Fix blank stock consumption representation in reports [SCI-6769] * Upgrade Rails to 6.1.5.1 * Show last page message only after second page [SCI-6761] * Small CSS fixes for repository [SCI-6767] * Added validations for date(time) column reminder [SCI-6775] (#4063) * Upgrade Ruby to 2.7.6 * Open repository on print view [SCI-6566] (#4055) * Fix saving of new date time columns with reminders [SCI-6774] (#4068) * Improve input field for adding new team [SCI-6155] * Allow deleteion of stock columns when stock management is disabled [SCI-6800] * Update default label template [SCI-6763] (#4064) * Stock editing and reminder fixes [SCI-6803] (#4078) * Fix stock editing after adding new value [SCI-6803] * Don't load reminders for snapshots [SCI-6803] * Improve loading time of canvas view/edit [SCI-6797] * Fix stock consumption rounding [SCI-6807] * Fix displaying of stock consumption units [SCI-6795] * Fix task dropdown actions [SCI-6817] * Fix archived tasks view [SCI-6822] * Fix display of repository snapshot with stock consumption [SCI-6824] * Fix duplicated counters on task card [SCI-6825] * Bump version to 1.25.0 Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com> Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Co-authored-by: Anton <anton@scinote.net> Co-authored-by: ajugo <andrej.jugovic7@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-11 16:39:51 +08:00
activities.joins(
"LEFT OUTER JOIN steps step_subjects
ON step_subjects.id = activities.subject_id AND activities.subject_type='Step'
LEFT OUTER JOIN protocols step_protocols
ON step_subjects.protocol_id = step_protocols.id
LEFT OUTER JOIN my_modules step_my_modules
ON step_protocols.my_module_id = step_my_modules.id
LEFT OUTER JOIN user_assignments step_my_module_user_assignments
ON step_my_module_user_assignments.assignable_type = 'MyModule'
AND step_my_module_user_assignments.assignable_id = step_my_modules.id
AND step_my_module_user_assignments.user_id = #{@user.id}
LEFT OUTER JOIN user_roles step_my_module_user_roles
ON step_my_module_user_roles.id = step_my_module_user_assignments.user_role_id
AND step_my_module_user_roles.permissions @> ARRAY['#{MyModulePermissions::ACTIVITIES_READ}']::varchar[]"
)
end
def generate_url(recent_object)
object_id = recent_object[:group_id].gsub(/[^0-9]/, '')
case recent_object[:subject_type]
2020-03-06 20:51:18 +08:00
when 'MyModule'
protocols_my_module_path(object_id)
2020-03-06 20:51:18 +08:00
when 'Experiment'
canvas_experiment_path(object_id)
2020-03-06 20:51:18 +08:00
when 'Project'
project_path(object_id)
2020-03-06 20:51:18 +08:00
when 'Protocol'
edit_protocol_path(object_id)
when 'RepositoryBase'
repository_path(object_id)
2020-03-06 20:51:18 +08:00
when 'Report'
edit_project_report_path(recent_object[:report_project_id], object_id) if recent_object[:report_project_id]
2020-03-06 20:51:18 +08:00
end
end
2020-03-06 22:12:40 +08:00
def override_subject_type(recent_object)
if recent_object[:group_id].include?('pro')
2020-03-09 22:10:51 +08:00
'Project'
elsif recent_object[:group_id].include?('exp')
2020-03-09 22:10:51 +08:00
'Experiment'
elsif recent_object[:group_id].include?('tsk')
2020-03-09 22:10:51 +08:00
'MyModule'
elsif recent_object[:group_id].include?('prt')
2020-03-09 22:10:51 +08:00
'Protocol'
elsif recent_object[:group_id].include?('inv')
'RepositoryBase'
elsif recent_object[:group_id].include?('rpt')
2020-03-09 22:10:51 +08:00
'Report'
end
end
2020-03-06 20:51:18 +08:00
end
end