Martin Artnik
15543d5222
Do not touch protocol if step or checklist is checked [SCI-7584]
2023-01-04 12:33:11 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic
2023-01-04 10:08:38 +01:00
Anton
9c488d5a0c
Add new access user modal [SCI-7518]
2023-01-03 14:43:03 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views
2022-12-22 13:33:25 +01:00
Anton
d1a68adb22
Add access modal for protocols [SCI-7518]
2022-12-22 13:27:46 +01:00
Oleksii Kriuchykhin
72f1cf2704
Fix viewer permissions for inventories [SCI-7422]
2022-12-20 13:26:38 +01:00
Oleksii Kriuchykhin
5fea4722ac
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-19 15:39:32 +01:00
Oleksii Kriuchykhin
9900b62e03
Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577]
2022-12-13 16:12:08 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids
2022-12-08 15:58:11 +01:00
Giga Chubinidze
864e92e03b
hound styling fix
2022-12-07 14:36:32 +04:00
Giga Chubinidze
96987977d1
fixed default visible column logic
2022-12-07 14:35:25 +04:00
Martin Artnik
df4654189b
Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]""
...
This reverts commit 50e7531ffa
2022-12-06 12:43:30 +01:00
ajugo
02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] ( #4659 )
...
* Implement experiment table sort flyout [SCI-7451]
* Implement archive sort options for experiment table [SCI-7497]
* Fix hound [SCI-7451]
* Clean code for experiment table view sorting [SCI-7497]
* Fix hound [SCI-7451]
2022-12-05 10:30:20 +01:00
Giga Chubinidze
769fe7ebd8
fixed id sorting on reports removed model duplicate code
2022-12-05 13:17:15 +04:00
G-Chubinidze
df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172
...
Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] [SCI-7201]
2022-12-02 20:16:05 +04:00
Oleksii Kriuchykhin
78660fb1aa
Improve sorting of task results [SCI-7543]
2022-12-02 14:58:36 +01:00
ajugo
847280489a
Add report id to the report datatable [SCI-7199] ( #4453 )
...
* Add report id to the report datatable [SCI-7199]
* Remove report id migration [SCI-7199]
2022-12-02 11:41:32 +01:00
Oleksii Kriuchykhin
0d6c6ccd9e
Introduce searchability by ID in global search field [SCI-7208]
2022-12-02 11:16:18 +01:00
artoscinote
4664ef1d9b
Implement task cloning in experiments table [SCI-7382] ( #4653 )
...
* Implement task cloning in experiments table [SCI-7382]
* Fix provisioning status polling [SCI-7382]
* Remove unused method [SCI-7382]
* Fix linter issues [SCI-7382]
* Fix fetching last clone number [SCI-7382]
* Fixing experiment duplication [SCI-7382]
* Add truncation to cloned name [SCI-7382]
* Add readable scope to batch clone action [SCI-7382]
* Move 'Clone' to translations, simplify JS [SCI-7382]
2022-12-01 15:08:59 +01:00
Oleksii Kriuchykhin
b032cfbd35
Add task moving action to experiment table view [SCI-7381]
2022-12-01 13:33:07 +01:00
Oleksii Kriuchykhin
9b72474943
Add versioning implementation to protocols data layer [SCI-7513]
2022-11-30 19:52:36 +01:00
Giga Chubinidze
b695903ea4
added frozen string literal
2022-11-30 11:39:28 +04:00
Giga Chubinidze
8d97641110
Add IDs to pdf and docx reports [SCI-7200]
2022-11-29 11:38:08 +04:00
G-Chubinidze
fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175
...
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-28 15:57:46 +04:00
Giga Chubinidze
ba0ebfbe29
Update sorting on Projects and Experiments pages [SCI-7175]
2022-11-26 01:18:54 +04:00
Alex Kriuchykhin
b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
...
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
Giga Chubinidze
43f8370a08
add IDs to the protocol templates tables [SCI-7179]
2022-11-22 13:55:41 +04:00
Alex Kriuchykhin
dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181
...
Remove old step code [SCI-7181]
2022-11-22 10:52:06 +01:00
ajugo
42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] ( #4612 )
...
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]
* Fix zebra enabled [SCI-7430]
2022-11-14 10:43:09 +01:00
G-Chubinidze
8e63bfb7c2
Update my_module.rb
2022-11-09 14:46:36 +04:00
G-Chubinidze
996cb68fdd
Update my_module.rb
2022-11-09 14:45:18 +04:00
G-Chubinidze
62b48ee59a
updated my_module rb, added searchable id attribute
2022-11-09 13:36:55 +04:00
Giga Chubinidze
18fe2cd207
update display of the current tasks with IDs [SCI-7205]
2022-11-08 16:06:48 +04:00
Oleksii Kriuchykhin
82d4b03cf6
Fix global activities user selection dropdown [SCI-7402]
2022-11-07 21:58:06 +01:00
G-Chubinidze
81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172
2022-10-28 15:05:38 +04:00
artoscinote
938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377
...
Add ENV setting for max step text length [SCI-7377]
2022-10-25 16:04:36 +02:00
Martin Artnik
ebe0ffa286
Add ENV setting for max step text length [SCI-7377]
2022-10-25 13:08:33 +02:00
ajugo
ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] ( #4574 )
2022-10-25 13:07:45 +02:00
Andrej
745be5a0f7
Remove old step code [SCI-7181]
2022-10-24 13:07:10 +02:00
Oleksii Kriuchykhin
7d3f48199a
Fix shared repositories migration, update sharing logic and permissions [SCI-7360]
2022-10-21 11:00:52 +02:00
Oleksii Kriuchykhin
94978ea2ea
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
2022-10-20 16:19:02 +02:00
Oleksii Kriuchykhin
5ba6fe08d6
Fix protocol permission propagation [SCI-7348]
2022-10-19 17:26:13 +02:00
Andrej
538f141aaf
Change default density for label templates [SCI-7346]
2022-10-18 09:41:25 +02:00
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
...
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Alex Kriuchykhin
51da8edacc
Merge pull request #4533 from okriuchykhin/ok_SCI_7336
...
Fix project users assignment to newly created experiments [SCI-7336]
2022-10-17 10:15:44 +02:00
Alex Kriuchykhin
c725e1f100
Merge pull request #4521 from okriuchykhin/ok_SCI_7325
...
Fix protocol import in templates [SCI-7325]
2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin
a3b8f98b24
Fix project users assignment to newly created experiments [SCI-7336]
2022-10-14 10:23:57 +02:00
Oleksii Kriuchykhin
e43aa30193
Unify tags loading order [SCI-6943]
2022-10-13 13:55:36 +02:00
Oleksii Kriuchykhin
1bd3a7e783
Fix protocol import in templates [SCI-7325]
2022-10-12 14:27:21 +02:00
Oleksii Kriuchykhin
f0ea7ea2a4
Add option to disable local password log in [SCI-7298]
2022-10-12 10:30:09 +02:00
ajugo
0493d6f31d
Fix label template preview issues [SCI-7313] ( #4514 )
...
* Add preview label at open modal [SCI-7313]
* Add density and unit to the label template [SCI-7313]
2022-10-11 10:58:37 +02:00
Oleksii Kriuchykhin
9322052f9d
Add logic for user role updates for team child objects [SCI-7292]
2022-10-10 15:27:42 +02:00
Alex Kriuchykhin
5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308
...
Fix user invitation modal [SCI-7308]
2022-10-07 14:53:34 +02:00
Alex Kriuchykhin
4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291
...
Update teams table with new user assignments system [SCI-7291]
2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin
173e3b09cd
Fix user invitation modal [SCI-7308]
2022-10-06 17:55:51 +02:00
Alex Kriuchykhin
9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290
...
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-06 15:45:48 +02:00
Alex Kriuchykhin
d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293
...
Fix project visibility for team admins [SCI-7293]
2022-10-06 15:45:29 +02:00
Alex Kriuchykhin
5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295
...
Assign user to public projects after adding to a team [SCI-7295]
2022-10-06 15:45:17 +02:00
ajugo
f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] ( #4471 )
...
* Remove icon from the status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
* Fix status repository column at label print time [SCI-7267]
2022-10-06 11:53:12 +02:00
Oleksii Kriuchykhin
9a05bf04bd
Assign user to public projects after adding to a team [SCI-7295]
2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin
b87ed7db8e
Fix project visibility for team admins [SCI-7293]
2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin
0a8ebef095
Update teams table with new user assignments system [SCI-7291]
2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin
cf34ddcbd1
Fix user role loading for Team in permission checking concern [SCI-7290]
2022-10-04 13:53:45 +02:00
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
ajugo
b7861f5fdb
Add zebra javascript print library [SCI-7245] ( #4455 )
2022-09-23 12:34:43 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] ( #4448 )
...
* Add validation to print modal [SCI-7052]
* Fix dropdown on label modal print [SCI-7052]
* Fix hound [SCI-7052]
* Rename validation endpoint [SCI-7052]
* Add zpl label printing and fix fluics printing [SCI-7221]
* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
artoscinote
50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"
2022-09-21 10:07:44 +02:00
artoscinote
6faa59581e
Merge pull request #4427 from artoscinote/ma_SCI_7163
...
Skip previews for non-supported images in team zip export [SCI-7163]
2022-09-19 13:59:35 +02:00
artoscinote
cf3a233f4e
Merge branch 'develop' into ma_SCI_7177
2022-09-19 13:58:33 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps
2022-09-15 11:25:25 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions
2022-09-14 14:34:02 +02:00
aignatov-bio
33f210638a
Merge branch 'features/team-permissions' into ok_SCI_6947
2022-09-14 14:31:45 +02:00
aignatov-bio
9e63dcab22
Merge pull request #4207 from okriuchykhin/ok_SCI_6918
...
Update repository sharing actions [SCI-6918]
2022-09-14 14:23:52 +02:00
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
Giga Chubinidze
22aa04a5ac
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:57:17 +04:00
Giga Chubinidze
133302964c
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:53:41 +04:00
Giga Chubinidze
0a1b879c3d
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 15:49:12 +04:00
Martin Artnik
b836b9a12b
Add task IDs to canvas view [SCI-7177]
2022-09-13 12:42:12 +02:00
Giga Chubinidze
2c393a1bef
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:31:04 +04:00
Giga Chubinidze
fbbe394029
exposed prefixed ids for projects table [SCI_7172]
2022-09-13 13:24:06 +04:00
Anton
7d02b9f26d
Fix repository selection in reports [SCI-7167]
2022-09-13 09:59:11 +02:00
aignatov-bio
06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
...
Add ability to disable zebra printers [SCI-7148]
2022-09-12 13:54:52 +02:00
Martin Artnik
2e3956aaf9
Skip previews for non-supported images in team zip export [SCI-7163]
2022-09-12 12:31:17 +02:00
Oleksii Kriuchykhin
b8dc0617b2
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
2022-09-09 13:31:16 +02:00
Oleksii Kriuchykhin
bb6e638528
Add activities for label template actions [SCI-7086]
2022-09-08 16:35:53 +02:00
Alex Kriuchykhin
8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
...
Update tests with new team user assignments [SCI-6843]
2022-09-05 14:34:16 +02:00
Anton
47e20d1b27
Add ability to disable zebra printers [SCI-7148]
2022-09-05 12:37:03 +02:00
Oleksii Kriuchykhin
e27d063b61
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:10:16 +02:00
Alex Kriuchykhin
a5fc66a6f3
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
...
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-09-01 14:13:18 +02:00
Oleksii Kriuchykhin
bf8f838214
Update repository sharing actions [SCI-6918]
2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
f586c73dc8
Convert team_repository to polymorphic relation [SCI-6917]
2022-08-31 16:42:08 +02:00
Oleksii Kriuchykhin
eb04bc974d
Update tests with new team user assignments [SCI-6843]
2022-08-31 16:37:00 +02:00
Anton
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +02:00
Martin Artnik
194963a94e
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
2022-08-30 11:48:09 +02:00
Oleksii Kriuchykhin
b2b059b7e1
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-08-29 09:59:13 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] ( #4369 )
2022-08-26 10:53:55 +02:00
Anton
e22af8830a
Add activties to step duplication [SCI-7109]
2022-08-24 13:45:39 +02:00
Anton
bc112dd6af
Add step duplication [SCI-7109]
2022-08-23 17:54:33 +02:00
Anton
1bac9aeb4c
Add duplication to components [SCI-7108]
2022-08-22 15:03:49 +02:00
artoscinote
610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] ( #4339 )
2022-08-10 12:05:24 +02:00
aignatov-bio
6334b481ef
Merge pull request #4337 from aignatov-bio/ai-sci-7080-fix-step-element-deletetion
...
Fix step element delete callback [SCI-7080]
2022-08-10 11:03:17 +02:00
Anton
5cd887831c
Fix step element delete callback [SCI-7080]
2022-08-10 10:50:18 +02:00
Oleksii Kriuchykhin
d1a46b3fc2
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 14:15:49 +02:00
artoscinote
464f9935a4
Migration fixes [SCI-7046] ( #4321 )
2022-08-08 11:21:38 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] ( #4316 )
...
* Implement typed label templates [SCI-7046]
* Add structure.sql, fix migration [SCI-7046]
* Fix method name [SCI-7046]
* Add dependent option to team - label_template relation [SCI-7046]
* Migration code style, add input sanitization [SCI-7046]
* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
aignatov-bio
e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
...
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton
31202922af
Add general layout for template [SCI-7030]
2022-08-04 10:51:30 +02:00
Anton
8c080ea04c
Add promo page for label templates [SCI-7029]
2022-08-02 14:51:18 +02:00
Oleksii Kriuchykhin
cb71bb4a99
Fix copying of TinyMCE images when loading protocol from repository [SCI-7043]
2022-08-02 13:43:50 +02:00
Anton
67df01711f
Add edit actions to label templates [SCI-7019]
2022-07-28 14:42:13 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
Anton
a8ccc18b8b
Fix protocol save to repository [SCI-6965]
2022-07-25 12:53:27 +02:00
Alex Kriuchykhin
7874a3e1c5
Fix updating protocol from repository [SCI-6993] ( #4266 )
2022-07-20 10:14:48 +02:00
ajugo
1cd5a35b32
Fix refresh task name from linked protocol [SCI-6992] ( #4256 )
2022-07-15 10:14:49 +02:00
Anton
e320571876
Update protocol name on save with link [SCI-6989]
2022-07-14 12:59:12 +02:00
artoscinote
ee792b89df
Fix loading repositories that contain tables [SCI-6951] ( #4200 )
2022-07-11 10:58:20 +02:00
Oleksii Kriuchykhin
d0d528aeac
Update inventory global sharing logic to use new user assignments [SCI-6947]
2022-07-07 22:31:07 +02:00
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] ( #4203 )
2022-07-07 12:00:35 +02:00
Alex Kriuchykhin
a7e88e59bd
Update global search to use new step text elements [SCI-6873] ( #4165 )
2022-07-06 14:20:55 +02:00
Alex Kriuchykhin
9aeb107635
Fix saving protocol to repository [SCI-6935] ( #4190 )
2022-07-06 11:45:04 +02:00
Alex Kriuchykhin
7af1684db0
Fix import of repository checklist items [SCI-6962] ( #4198 )
2022-07-06 11:44:41 +02:00
aignatov-bio
5b37a96e79
Merge pull request #4174 from aignatov-bio/ai-sci-6759-load-save-protocol-from-repository
...
Fix load/save protocol to repository [SCI-6759]
2022-07-05 12:57:59 +02:00
Martin Artnik
910c36af08
Merge branch 'features/step-editing-improvements' into develop
2022-07-05 10:12:10 +02:00
Oleksii Kriuchykhin
17178c28d5
Update repository sharing actions [SCI-6918]
2022-07-01 11:55:27 +02:00
Oleksii Kriuchykhin
3fbc5af9a1
Convert team_repository to polymorphic relation [SCI-6917]
2022-06-29 15:22:22 +02:00
Oleksii Kriuchykhin
c79ff8f050
Migrate TeamRepository to new permissions [SCI-6916]
2022-06-28 13:13:36 +02:00
artoscinote
800f856ab1
Handle step description with the new step_texts structure [SCI-6890] ( #4176 )
2022-06-28 09:56:24 +02:00
Anton
bf13708e31
Fix load/save protocol to repository [SCI-6759]
2022-06-27 13:14:45 +02:00
Oleksii Kriuchykhin
589a7d3219
Add team reference to user assignments model [SCI-6915]
2022-06-24 10:44:28 +02:00
ajugo
c39f0a4e4d
Fix missing bell reminder [SCI-6911] ( #4163 )
2022-06-17 10:01:36 +02:00
Alex Kriuchykhin
6148c6accf
Merge pull request #4161 from okriuchykhin/ok_SCI_6907
...
Fix repository export in export all [SCI-6907]
2022-06-10 11:13:14 +02:00
Oleksii Kriuchykhin
9df833111d
Fix repository export in export all [SCI-6907]
2022-06-10 11:04:44 +02:00
Alex Kriuchykhin
a57881fac4
Merge pull request #4155 from okriuchykhin/ok_SCI_6805_v2
...
Improve inventory stock saving with comment [SCI-6805]
2022-06-10 10:41:56 +02:00
Oleksii Kriuchykhin
f82c2af244
Improve inventory stock saving with comment [SCI-6805]
2022-06-09 13:18:00 +02:00
artoscinote
e114f9b880
Update protocols.io importer and import from repository [SCI-6872] ( #4138 )
2022-06-08 15:55:50 +02:00
Oleksii Kriuchykhin
07716e56a5
Improve Inventory table loading time [SCI-6886]
2022-06-08 13:23:39 +02:00
ajugo
13798374ed
Add consume column to assigned item export [SCI-6841] ( #4115 )
...
* Add consume column to assigned item export [SCI-6841]
* Fix hound [SCI-6841]
2022-06-03 10:10:00 +02:00
ajugo
9d4c97f191
Add task assignment API [SCI-6846] ( #4123 )
...
* Add user assignment to task API [SCI-6846]
* Add test for task assignments [SCI-6846]
2022-06-03 10:09:42 +02:00
Martin Artnik
02c813bf06
Fix text serializer and file activity logging
2022-06-02 11:32:31 +02:00
Martin Artnik
9abbe22c26
Merge branch 'develop' into features/step-editing-improvements
2022-06-02 11:26:39 +02:00
artoscinote
ab5cb19d6e
Add step activities, fix checklists [SCI-6852] ( #4136 )
...
* Add step activities, fix checklists [SCI-6852]
* Linter fix [SCI-6852]
2022-06-02 11:15:32 +02:00
aignatov-bio
c5f3b4affb
Merge pull request #4133 from aignatov-bio/ai-sci-6878-fix-docx-preview-after-replace-file
...
Fix Docx preview after replace file [SCI-6878]
2022-06-02 11:07:40 +02:00
Anton
08e7ea3014
Add step text option to report wizard [SCI-6865]
2022-06-01 15:53:40 +02:00
Anton
cf36ad0fb4
Fix Docx preview after replace file [SCI-6878]
2022-06-01 12:16:19 +02:00
Alex Kriuchykhin
d5c80b8ab0
Merge pull request #4101 from okriuchykhin/ok_SCI_6805
...
Improve stock consumption recording [SCI-6805]
2022-06-01 12:01:33 +02:00
artoscinote
23872f519b
Implement step element sorting modal [SCI-6849] ( #4124 )
...
* Implement step element sorting modal [SCI-6849]
* Implement step reordering modal [SCI-6850]
* Refactor reorderable items a bit [SCI-6850]
2022-05-30 13:45:51 +02:00
ajugo
e3c337aa3d
Renaming settings section and remove caching for Settings class [SCI-5625] ( #4100 )
...
* Renaming settings section and remove caching for Settings class [SCI-5625]
* Code fix for setting model [SCI-5625]
* Clean code [SCI-5625]
2022-05-26 13:27:18 +02:00
ajugo
a23eea7523
Hide stock column at importing items after stock is disabled [SCI-6801] ( #4093 )
...
* Add stock column check at importing inventory items [SCI-6801]
* Fix hound message [SCI-6801]
2022-05-24 11:49:36 +02:00
artoscinote
6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] ( #4111 )
2022-05-24 11:13:47 +02:00
Oleksii Kriuchykhin
c120a357cd
Add permissions for Report model [SCI-6834]
2022-05-24 10:59:21 +02:00
Oleksii Kriuchykhin
6febad1b95
Update the exiting permissions helpers so they will check new permissions [SCI-6821]
2022-05-24 10:49:49 +02:00
Alex Kriuchykhin
679b29b32d
Merge pull request #4099 from okriuchykhin/ok_SCI_6820
...
Add migration for user team roles, including protocols and inventories [SCI-6820]
2022-05-24 10:33:35 +02:00
Oleksii Kriuchykhin
39cfcd5522
Add migration for user team roles, including protocols and inventories [SCI-6820]
2022-05-23 16:28:53 +02:00
Oleksii Kriuchykhin
1b63da13b4
Improve stock consumption recording [SCI-6805]
2022-05-18 17:02:12 +02:00
Oleksii Kriuchykhin
03ec4cb319
Setup user assignments relations for team, inventory and protocol [SCI-6818]
2022-05-17 14:32:14 +02:00
Anton
9aaf4a136e
Add menu to attachment cards [SCI-6816]
2022-05-17 10:41:34 +02:00
artoscinote
b486f3fd31
Implement checklists [SCI-6789] ( #4089 )
2022-05-11 15:51:26 +02:00
Anton
24d68da455
Fix tinymce assets for steps [SCI-6809]
2022-05-11 13:01:23 +02:00
Oleksii Kriuchykhin
823e552ef6
Fix displaying of stock consumption units [SCI-6795]
2022-05-10 10:19:37 +02:00
Anton
6a827022f6
Add insert step element dropdown [SCI-6758]
2022-05-03 13:22:26 +02:00
Oleksii Kriuchykhin
b6501fcf36
Fix blank stock consumption representation in reports [SCI-6769]
2022-04-25 17:10:44 +02:00
aignatov-bio
3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality
...
Add step creation/deletion functionality [SCI-6754]
2022-04-25 12:46:33 +02:00
aignatov-bio
957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold
...
Add negative validation for threshold [SCI-6743]
2022-04-25 12:46:20 +02:00
Anton
ba3c73439a
Add step creation/deletion functionality [SCI-6754]
2022-04-25 12:40:14 +02:00
Anton
c9d114e71e
Add bell icon for negative stock [SCI-6770]
2022-04-25 12:29:10 +02:00
Anton
b56f11fc18
Add negative validation for treshold [SCI-6743]
2022-04-25 12:18:22 +02:00
Martin Artnik
4bd5df4e0e
Fix snapshot creation with stock consumption [SCI-6762]
2022-04-22 10:49:42 +02:00
Alex Kriuchykhin
e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712
...
Add models for step orderable elements, migrate step descriptions [SCI-6712]
2022-04-22 09:33:41 +02:00
Alex Kriuchykhin
42ae32f81a
Merge pull request #4025 from okriuchykhin/ok_SCI_6419
...
Improve stock ledger records creation [SCI-6419]
2022-04-19 13:32:58 +02:00
Oleksii Kriuchykhin
5a17ad6be9
Add models for step orderable elements, migrate step descriptions [SCI-6712]
2022-04-19 13:26:13 +02:00
Oleksii Kriuchykhin
e50d52e8ef
Improve stock ledger records creation [SCI-6419]
2022-04-18 16:24:27 +02:00
Anton
441f6b977d
Fix decimals in stock consumption modal [SCI-6732]
2022-04-15 11:40:47 +02:00
artoscinote
6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] ( #4024 )
2022-04-15 10:55:14 +02:00
aignatov-bio
4f2fd79f67
Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports
...
Fix stock consumption in reports [SCI-6735]
2022-04-14 14:51:38 +02:00
Anton
c73dc5ea2f
Fix markup
2022-04-14 14:47:51 +02:00
Anton
84f91634d3
Fix stock consumption in reports [SCI-6735]
2022-04-14 14:46:09 +02:00
artoscinote
30ee6cd40c
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]
2022-04-14 14:27:31 +02:00
aignatov-bio
5ac9f51220
Add aibility to delete stock column [SCI-6723] ( #4017 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:23 +02:00
artoscinote
04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] ( #4010 )
2022-04-13 11:35:45 +02:00
Alex Kriuchykhin
94083cf270
Revert "tmp ( #3935 )" ( #4014 )
...
This reverts commit 043086d55f
2022-04-13 11:11:07 +02:00
Alex Kriuchykhin
043086d55f
tmp ( #3935 )
2022-04-13 11:09:48 +02:00
Alex Kriuchykhin
1385c6964c
Fix sorting by time and time range columns [SCI-6683] ( #4011 )
2022-04-12 15:56:20 +02:00
ajugo
0a5e93a018
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]
2022-04-08 14:09:00 +02:00
ajugo
0ca9ae2ab9
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]
2022-04-08 11:30:44 +02:00
artoscinote
401a32edd9
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]
2022-04-04 11:04:03 +02:00
artoscinote
da6188df94
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]
2022-04-01 13:54:08 +02:00
Alex Kriuchykhin
9e07766314
Fix saving of inventory date time reminders saving [SCI-6672] ( #3976 )
2022-03-31 14:59:29 +02:00
aignatov-bio
c480f28a09
Fix red dot for datetime columns [SCI-6684] ( #3977 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:57:58 +02:00
artoscinote
229a27750f
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]
2022-03-30 14:33:26 +02:00
Alex Kriuchykhin
ac7a6edab5
Always use Tika text extractor in server mode [SCI-6658] ( #3957 )
2022-03-30 14:08:36 +02:00
aignatov-bio
ca53c3058a
Stock modal bugs [SCI-6667] ( #3970 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-30 14:03:07 +02:00
Martin Artnik
45a325e824
Merge branch 'develop' into features/stock-management
2022-03-30 11:10:40 +02:00
artoscinote
36fbfcab2f
Implement hide all repository reminders button [SCI-6505] ( #3940 )
2022-03-30 10:54:55 +02:00
aignatov-bio
1c50081de5
Add stock management toggling [SCI-6653] ( #3967 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-29 12:33:28 +02:00
aignatov-bio
673f8c1a2a
Fix multiple stock bugs [SCI-6651] ( #3959 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-28 12:43:09 +02:00
Alex Kriuchykhin
5d111d3350
Improve error reporting in task status transition [SCI-6611] ( #3952 )
2022-03-25 15:38:15 +01:00
aignatov-bio
004aeda601
Add stock filters [SCI-6547] ( #3938 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 10:05:07 +01:00
artoscinote
97c15eaac0
Implement clearing hidden repository reminders [SCI-6507] ( #3936 )
2022-03-23 09:51:42 +01:00
ajugo
7cba738a9b
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]
2022-03-22 13:33:58 +01:00
aignatov-bio
0cfedb2155
Add datetime reminders to columns modal [SCI-6556] ( #3934 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-18 14:40:09 +01:00
ajugo
d1610fba53
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]
2022-03-15 10:24:35 +01:00
Anton
8b8e2c6d92
Merge branch 'develop' into features/stock-management
2022-03-14 11:56:38 +01:00
artoscinote
35dfa15e57
Implement hidden repository cell reminders [SCI-6504] ( #3933 )
2022-03-11 12:38:45 +01:00
Alex Kriuchykhin
378fbb6b76
Apply user's time zone in advanced filters for time data type [SCI-6585] ( #3930 )
2022-03-10 13:49:09 +01:00
aignatov-bio
10743921d4
Add reminders to stock modal [SCI-6557] ( #3917 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:19:15 +01:00
aignatov-bio
d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] ( #3924 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:18:34 +01:00
artoscinote
d577fcc824
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]
2022-03-09 14:13:48 +01:00
aignatov-bio
7f7bf0533a
Fix tests [SCI-6486] ( #3913 )
...
* Fix tests [SCI-6486]
* Fix rspec tests [SCI-6486]
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:12:16 +01:00
Alex Kriuchykhin
96e6cd3c1d
Fix time range advanced filtering [SCI-6585] ( #3922 )
2022-03-08 10:20:53 +01:00
artoscinote
ea6873b465
Implement low stock threshold column [SCI-6555] ( #3907 )
2022-03-03 11:13:17 +01:00
Alex Kriuchykhin
cc96a7e372
Fix advanced filters for numbers [SCI-6577] ( #3899 )
2022-02-28 10:31:42 +01:00
artoscinote
69964aae7b
Fix time range value filter [SCI-6580] ( #3896 )
2022-02-25 14:29:39 +01:00
Alex Kriuchykhin
e750295b07
Fix filtering in repository snapshots [SCI-6423] ( #3887 )
2022-02-23 09:24:38 +01:00
artoscinote
b8b7773a3f
Fix today, this month, this year operators [SCI-6527] ( #3845 )
2022-02-22 14:14:16 +01:00
artoscinote
463e1a8014
Fix date/time range filtering [SCI-6574] ( #3882 )
2022-02-22 13:29:50 +01:00
Alex Kriuchykhin
6b51b8a35c
Fix handling of date values in repositories [SCI-6551] ( #3877 )
2022-02-21 12:08:35 +01:00
Alex Kriuchykhin
f9e77991c6
Fix handling of empty values for numeric filter type [SCI-6543] ( #3866 )
2022-02-17 15:26:24 +01:00
artoscinote
5654eddbb0
Fix using multiple file filters [SCI-6533] ( #3860 )
2022-02-16 11:05:16 +01:00
artoscinote
40b2062775
Fix DateTime range filtering [SCI-6528] ( #3851 )
2022-02-14 13:52:38 +01:00
ajugo
ba4e6476b7
Change subject of Repository ( #3838 )
2022-02-14 10:37:58 +01:00
Alex Kriuchykhin
6cc102cfd1
Fix advanced filters for list and status data types [SCI-6524][SCI-6521] ( #3844 )
2022-02-11 13:50:42 +01:00
aignatov-bio
97898fef7a
Add error handling for saving filters [SCI-6488] ( #3835 )
...
* Add error handling for saving filters [SCI-6488]
* Refactor and clean up filter element validations [SCI-6488]
Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-02-11 13:32:27 +01:00
Alex Kriuchykhin
1e0966ac11
Fix advanced filtering for check list items [SCI-6522] ( #3841 )
2022-02-11 10:48:50 +01:00
Alex Kriuchykhin
ed8ba13525
Fix advanced search for file type columns [SCI-6518] ( #3839 )
2022-02-11 10:47:32 +01:00
Alex Kriuchykhin
79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] ( #3828 )
2022-02-11 10:46:19 +01:00
aignatov-bio
1efe3ddd37
Add stock consumption to pdf and docx [SCI-6460] ( #3816 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:09:52 +01:00
artoscinote
8d90c8ebb7
Fix filter updates after item deletion [SCI-6490] ( #3832 )
2022-02-10 09:50:34 +01:00
Alex Kriuchykhin
e6010e3313
Fix repository filters to user relation [SCI-6263] ( #3820 )
2022-02-04 10:53:19 +01:00
Alex Kriuchykhin
cc063a46b7
Fix time zone issues in advanced repository filters [SCI-6467] ( #3819 )
2022-02-04 10:30:11 +01:00
Alex Kriuchykhin
4627d15fc3
Implement import for repository stock values [SCI-6461] ( #3818 )
2022-02-04 10:29:48 +01:00
artoscinote
cdbf1f5fa0
Implement stock management activities [SCI-6452] ( #3810 )
...
* Implement stock management activities [SCI-6452]
* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00
Alex Kriuchykhin
c1972e4fb2
Fix advanced filtering with multiple filters [SCI-6471] ( #3807 )
2022-01-31 11:10:39 +01:00
Alex Kriuchykhin
fbcb94193a
Fix repository advanced filtering on time column [SCI-6467] ( #3805 )
2022-01-31 09:41:20 +01:00
aignatov-bio
c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] ( #3806 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 09:21:08 +01:00
Oleksii Kriuchykhin
dd5f8c2793
Add stock management columns to snapshots [SCI-6448]
2022-01-28 13:19:37 +01:00
aignatov-bio
2c88843924
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>
2022-01-28 11:10:56 +01:00
Oleksii Kriuchykhin
6d877e6bf7
Fix repository users list and filtering by row name [SCI-6457]
2022-01-27 22:50:04 +01:00
aignatov-bio
60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] ( #3802 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-27 14:01:09 +01:00
Oleksii Kriuchykhin
9f3b77ed15
Finalyze repository filter elements management backend [SCI-6396]
2022-01-26 10:12:46 +01:00
Alex Kriuchykhin
d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] ( #3793 )
2022-01-25 12:12:55 +01:00
Martin Artnik
711005425f
Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters
2022-01-20 13:30:33 +01:00
Martin Artnik
abac837cd4
Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters
2022-01-20 13:26:08 +01:00
artoscinote
95a36b6870
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]
2022-01-20 12:44:57 +01:00
aignatov-bio
05547da457
Add stock table renders [SCI-6412] ( #3787 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-19 13:19:56 +01:00
aignatov-bio
01f1b5bd10
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>
2022-01-18 13:17:05 +01:00
Oleksii Kriuchykhin
a4d84e1a3b
Add initial implementation of inventory stock management [SCI-6402]
2022-01-12 17:13:50 +01:00
aignatov-bio
5512db18f0
Fix state for bmt repository [SCI-6089] ( #3758 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:34:06 +01:00
Martin Artnik
023b68bfac
Fixed datatable columns for BMT repo [SCI-6385]
2021-12-21 15:15:34 +01:00
Oleksii Kriuchykhin
738da6094f
Add advanced filters to repository datatable service [SCI-6210]
2021-12-21 12:38:52 +01:00
