Commit graph

2184 commits

Author SHA1 Message Date
Martin Artnik
a952f3ba70 Implement low stock notification [SCI-9522] 2023-10-19 11:33:40 +02:00
Anton
db3f217bba Implement acitvity notifications
[SCI-9512]
2023-10-17 14:59:50 +02:00
ajugo
9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Martin Artnik
1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
Anton
2434cca42c Clean notification model [SCI-9384] 2023-10-12 11:47:29 +02:00
Anton
726ff5e238 Remove old notification extends [SCI-9384] 2023-10-12 11:38:19 +02:00
Anton
0ad8b9f978 Migrate to noticed gem [SCI-9384] 2023-10-11 14:03:59 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik
763ede050d
Merge pull request #6392 from ivanscinote/SCI-9430-move-result-does-not-work
Fix moving result elements [SCI-9430]
2023-10-09 15:11:30 +02:00
Ivan Kljun
7c0e8221c1 Fix moving result elements [SCI-9430] 2023-10-09 14:54:22 +02:00
Alex Kriuchykhin
efa0149c9f
Merge pull request #6386 from rekonder/aj_SCI_9484
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:06:23 +02:00
Andrej
30295a313b Fix unsharing of repository rows [SCI-9484] 2023-10-09 11:05:33 +02:00
Ivan Kljun
879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
wandji20
6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Ivan Kljun
b4faefdb23 Set sequential_updates to true for acts_as_list for result orderable [SCI-9430] 2023-10-04 13:59:23 +02:00
Ivan Kljun
2919516bca Fix moving result elements bug [SCI-9430] 2023-10-04 13:37:00 +02:00
Oleksii Kriuchykhin
d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Martin Artnik
295de7b0bc Implement default name for results [SCI-9425] 2023-09-29 13:01:41 +02:00
Andrej
1aa9b17b1a Add relationship column to the inventory [SCI-9356] 2023-09-26 11:12:45 +02:00
Oleksii Kriuchykhin
fe5848ad7c Add new inventory rows connection model, add connections counter caches to rows [SCI-9363] 2023-09-25 11:24:50 +02:00
Anton
01e4ab3cd5 Removed variable 2023-09-22 12:07:56 +02:00
Anton
566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Martin Artnik
18072bbde7 Fix update of database settings values [SCI-9240] 2023-09-15 11:04:13 +02:00
Martin Artnik
160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Oleksii Kriuchykhin
45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Alex Kriuchykhin
d08c2d8bb0
Merge pull request #6101 from okriuchykhin/ok_SCI_9148
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:57:34 +02:00
Oleksii Kriuchykhin
c649ad26f3 Hide from annotations projects where user is not assigned [SCI-9148] 2023-09-14 10:54:56 +02:00
Alex Kriuchykhin
fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
Martin Artnik
520f978f35
Fix update of database settings values [SCI-9240] (#6174) 2023-09-08 14:45:39 +02:00
Alex Kriuchykhin
d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) 2023-09-08 11:35:16 +02:00
Martin Artnik
4abc2288b3
Merge pull request #6163 from artoscinote/ma_SCI_9244
Fix global search to work with new results [SCI-9244]
2023-09-07 14:17:06 +02:00
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092)
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
Martin Artnik
bf7b1c2f2a Fix global search to work with new results [SCI-9244] 2023-09-07 11:43:45 +02:00
wandji
a25e6fdda3
Add sorting options to experiment task table view [SCI-9120] (#6102) 2023-09-06 16:14:17 +02:00
Gregor Lasnibat
f172c97a79 Fix missing OVE file preview [SCI-9214] 2023-09-06 12:45:42 +02:00
aignatov-bio
c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
Add title to text component [SCI-9141]
2023-09-05 14:32:42 +02:00
Ivan Kljun
56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
artoscinote
19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180
Fix result assets when duplicating [SCI-9180]
2023-08-31 16:00:50 +02:00
Oleksii Kriuchykhin
b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik
65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
Alex Kriuchykhin
d63ec9f927
Fix shareable links association on user model [SCI-9200] (#6114) 2023-08-31 11:48:35 +02:00
Martin Artnik
8245ad9738 Fix up result element duplicate endpoints [SCI-9107] 2023-08-30 14:54:38 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Ivan Kljun
90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
artoscinote
9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
Alex Kriuchykhin
3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
Alex Kriuchykhin
b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
aignatov-bio
c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Alex Kriuchykhin
dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote
20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
Oleksii Kriuchykhin
14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Oleksii Kriuchykhin
5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Alex Kriuchykhin
4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
ajugo
9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974
Fix file URL generation on shared task page [SCI-8974]
2023-08-07 08:56:05 +02:00
Oleksii Kriuchykhin
c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
ajugo
7a6886b895
Fix rendering of RTE images for shareable links [SCI-8970] (#5913) 2023-08-04 11:24:27 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Alex Kriuchykhin
4a563d3456
Implement loading settings from both, database and env variables [SCI-8813] (#5885) 2023-08-01 10:44:27 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
Alex Kriuchykhin
9d336423ab
Fix projects exports with tables [SCI-8827] (#5840) 2023-07-21 16:44:03 +02:00
Alex Kriuchykhin
7cb8feefb9
Fix permission checking in WOPI controller [SCI-8856] (#5833) 2023-07-21 11:53:10 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Andrej
2a5f55aed8 Fix result table rendering in reports [SCI-8897] 2023-07-19 11:53:47 +02:00
Soufiane
3775727857
Fix project export issue [SCI-8827] (#5767) 2023-07-17 15:33:02 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane
6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758)
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
2023-07-12 15:42:34 +02:00
artoscinote
5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
ajugo
836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709)
Add permissions for shareable links and som fixes for controller [SCI-8747]
2023-07-05 16:21:26 +02:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 13:38:59 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Oleksii Kriuchykhin
e5fe82a297 Fix file name of inventory export, add archived columns to exports [SCI-8760] 2023-06-28 10:22:26 +02:00
Martin Artnik
d1302d322b Fix zip export [SCI-8734] 2023-06-23 11:18:16 +02:00
artoscinote
3658a224b2
Merge pull request #5650 from okriuchykhin/ok_SCI_8718
Limit execution time of file text extraction jobs to 5 minutes [SCI-8718]
2023-06-23 09:55:52 +02:00
Oleksii Kriuchykhin
e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Oleksii Kriuchykhin
f44e339c7f Limit execution time of file text extraction jobs to 5 minutes [SCI-8718] 2023-06-22 11:39:10 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote
91ee51105c
Merge pull request #5574 from G-Chubinidze/gc_SCI-8218
"i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218]
2023-06-16 11:34:59 +02:00
Giga Chubinidze
f05ddac07d fixed syntax error 2023-06-16 13:32:39 +04:00
Giga Chubinidze
67b7c8fe07 updated logic 2023-06-16 12:49:05 +04:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575)
Disable project links if team admin is missing read permission [SCI-8381]
2023-06-12 12:55:32 +02:00
Alex Kriuchykhin
f0c2624179
Implement inventories export backend logic [SCI-8444] (#5578) 2023-06-12 10:29:17 +02:00
Giga Chubinidze
95437c69a4 included name 2023-06-08 12:54:01 +04:00
Giga Chubinidze
aa5caf3cc3 refactor 2023-06-08 11:54:59 +04:00
Alex Kriuchykhin
98e1962372
Fix viewable_by_user method for Step [SCI-8625] (#5569) 2023-06-06 15:29:58 +02:00
Alex Kriuchykhin
eacf2c0c23
Use correct permissions in repository row assigning filters [SCI-8616] (#5565) 2023-06-06 13:53:12 +02:00
ajugo
e8501e0754
Add well plates to project export report [SCI-8605] (#5552) 2023-06-02 18:56:52 +02:00
Alex Kriuchykhin
a0616adf17
Improve speed of protocol templates table loading [SCI-8553] (#5509) 2023-05-30 12:41:53 +02:00
Alex Kriuchykhin
1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
Oleksii Kriuchykhin
f8f3fd8c5e Remove Tika server mode, update version [SCI-8367] 2023-05-17 13:44:40 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373)
Update reports for plate templates and add headers to docx tables [SCI-8375]
2023-05-10 16:15:14 +02:00
Alex Kriuchykhin
ab318df1af
Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371) 2023-05-09 16:23:29 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
ajugo
a288708368
Add API endpoint for protocol templates [SCI-7456] (#5321)
* Add API endpoint for protocol templates [SCI-7456]

* Create protocol template api serializer [SCI-7456]
2023-05-03 15:55:36 +02:00
Soufiane
32c483316f
Enable searching by ID when smart annotating [SCI-7944] (#5055)
Add objects search by ID in smart annotations [SCI-7944]
2023-05-03 11:05:29 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Alex Kriuchykhin
9e058af0a3
Fix default public user role assignment for projects [SCI-7969] (#5334) 2023-04-21 11:58:34 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
Soufiane
5e321b761d
Enable support of files larger than 4GB in zip [SCI-8267] (#5278)
Update rubyzip gem to the latest version and enable support for large files [SCI-8267]
2023-04-11 11:36:27 +02:00
ajugo
9f1b60eda4
Fix changing public protocol role for old protocols [SCI-8275] (#5270) 2023-04-07 13:25:25 +02:00
artoscinote
890687052b
Fix permission team scoping in API [SCI-8265] (#5261) 2023-04-06 15:26:39 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
Martin Artnik
1e464d7861 Remove unused assignment clone method [SCI-8263] 2023-04-04 15:39:10 +02:00
artoscinote
df21102215
Merge pull request #5254 from artoscinote/ma_SCI_8263
Clear user assignments when duplicating protocol [SCI-8263]
2023-04-04 15:23:15 +02:00
Martin Artnik
e26ed3d852 Clear user assignments when duplicating protocol [SCI-8263] 2023-04-04 14:09:52 +02:00
artoscinote
42a6f258a4
Merge pull request #5252 from okriuchykhin/ok_SCI_8199
Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199]
2023-04-04 14:02:59 +02:00
aignatov-bio
a17a893daf
TinyMCE after image parsing strip description [SCI-8258] (#5253) 2023-04-04 13:52:35 +02:00
Oleksii Kriuchykhin
a70d8dea74 Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199] 2023-04-04 13:42:20 +02:00
Alex Kriuchykhin
ed9f3d49d4
Merge pull request #5248 from artoscinote/ma_SCI_8259
Properly copy visibility and public assignments when cloning protocol [SCI-8259]
2023-04-04 11:31:21 +02:00
ajugo
cd2a1be9e0
Fix linked protocol without linked_at [SCI-8255] (#5249) 2023-04-04 11:25:02 +02:00
Martin Artnik
ec0657b7b9 Properly copy visibility and public assignments when cloning protocol [SCI-8259] 2023-04-04 11:20:38 +02:00
Oleksii Kriuchykhin
c937122b2f Transfer protocol linked_at timestamp when cloning tasks [SCI-8256] 2023-04-04 10:42:52 +02:00
Alex Kriuchykhin
bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131
Handle removal of last owner public group [SCI-8131]
2023-04-03 13:02:38 +02:00
Martin Artnik
132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote
a1c1b6e5a7 Refactor the solution [SCI-8227]
Co-Author okriuchykhin <oleksii@scinote.net>
2023-03-31 17:39:17 +02:00
sboursen-scinote
aa75782766 Fix hound [SCI-8227] 2023-03-31 16:56:12 +02:00
sboursen-scinote
021913d6a8 Fix hound [SCI-8227] 2023-03-31 16:54:52 +02:00
sboursen-scinote
9b8db8befd FIX: Duplicated task with linked protocol loses template loaded timestamp [SCI-8227] 2023-03-31 16:49:40 +02:00
ajugo
f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
Alex Kriuchykhin
f5b43f248f
Merge pull request #5205 from artoscinote/ma_SCI_8200
Update public user assignments on public role change [SCI-8200]
2023-03-27 13:13:09 +02:00
Alex Kriuchykhin
3d8717e994
Merge pull request #5186 from okriuchykhin/ok_SCI_8177
Improve error handling in protocol archive/restore actions [SCI-8177]
2023-03-27 13:11:11 +02:00
Martin Artnik
efcda1e057 Update public user assignments on public role change [SCI-8200] 2023-03-27 13:11:00 +02:00
Alex Kriuchykhin
69445f26e8
Merge pull request #5203 from okriuchykhin/ok_SCI_6931
Update protocols migration for linked protocols [SCI-6931]
2023-03-27 11:45:43 +02:00
Oleksii Kriuchykhin
9885dc0f29 Update protocols migration for linked protocols [SCI-6931] 2023-03-27 11:39:09 +02:00
Alex Kriuchykhin
678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
2023-03-24 13:58:57 +01:00