Commit graph

2184 commits

Author SHA1 Message Date
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
Martin Artnik
b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
Oleksii Kriuchykhin
f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32:22 +01:00
Oleksii Kriuchykhin
cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
aignatov-bio
5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Anton
248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin
4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
Alex Kriuchykhin
d285a0a9db
Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123) 2023-03-13 09:55:53 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
Martin Artnik
69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Alex Kriuchykhin
8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
artoscinote
b2cf5548f6
Merge pull request #5071 from artoscinote/ma_SCI_8060
Ensure user assignments stay in sync with protocol versions [SCI-8060]
2023-03-06 16:12:05 +01:00
Martin Artnik
cfcb80f642 Fix assignment sync to new protocol drafts and deletion [SCI-8060] 2023-03-06 16:06:38 +01:00
ajugo
9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
aignatov-bio
d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00
Anton
b4b5b70331 Fix draft creation [SCI-8075] 2023-03-03 15:51:36 +01:00
Martin Artnik
73ed75a73a Ensure user assignments stay in sync with protocol versions [SCI-8060] 2023-03-03 13:20:15 +01:00
Alex Kriuchykhin
4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
ajugo
ed90c912f6
Add description to cloned protocol template from protocol [SCI-8053] (#5063) 2023-03-02 15:35:18 +01:00
aignatov-bio
25644ab5a3
Fix version number for draft created from old versions [SCI-8023] (#5040) 2023-03-02 14:34:14 +01:00
ajugo
3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +01:00
Alex Kriuchykhin
420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
Anton
4eab2c25f3 Save last_modified_by on protocol update [SCI-8021] 2023-03-01 15:19:34 +01:00
Alex Kriuchykhin
9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo
b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042)
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
2023-03-01 11:33:32 +01:00
Andrej
64da4c5368 Fix connected device model for request without device id [SCI-7972] 2023-02-28 16:42:56 +01:00
Anton
6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
ajugo
96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
artoscinote
e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978
Protocol permission modal changes [SCI-7978]
2023-02-27 13:34:32 +01:00
Anton
9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01:00
ajugo
95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
Martin Artnik
7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Alex Kriuchykhin
b2ab467440
Improve loading time of current tasks widget [SCI-7999] (#5022)
* Improve loading time of current tasks widget [SCI-7999]

* Improve speed of objects search for smart annotations editor [SCI-7999]
2023-02-24 13:30:55 +01:00
Anton
dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Martin Artnik
b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio
c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables
Add step table metadata during import/export and copy [SCI-7948]
2023-02-18 08:44:37 +01:00
artoscinote
e5139b4bd2
Merge pull request #4986 from artoscinote/ma_SCI_7940
Improve file extension detection for pasted images [SCI-7940]
2023-02-17 14:59:34 +01:00
artoscinote
6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 14:59:01 +01:00
Anton
df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
Martin Artnik
cfdcffc85a Improve file extension detection for pasted images [SCI-7940] 2023-02-17 12:14:08 +01:00
Martin Artnik
43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Alex Kriuchykhin
b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
Martin Artnik
8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Martin Artnik
f880ea46ce Add connected device logging [SCI-7632] 2023-02-13 11:32:18 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
Martin Artnik
ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Alex Kriuchykhin
dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816
Fix date time inventories reminder processing [SCI-7816]
2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
Alex Kriuchykhin
02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
Alex Kriuchykhin
00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik
0a768fbfa3 Fix pasting same image multiple times [SCI-7803] 2023-01-24 11:52:20 +01:00
aignatov-bio
a72de2800f
Merge pull request #4871 from aignatov-bio/ai-sci-7619-refactor-access-modals-pet
Refactor access modals P/E/T [SCI-7619]
2023-01-24 10:14:40 +01:00
artoscinote
d319f9bf89
Fix copying multiple TinyMCE images [SCI-7803] (#4875) 2023-01-24 10:11:52 +01:00
Alex Kriuchykhin
b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Anton
37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
G-Chubinidze
913cd26e70
Update of sharing options to all teams is not saved [SCI-7421] (#4852)
* Update of sharing options to all teams is not saved
2023-01-20 14:14:34 +01:00
Martin Artnik
fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin
f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703
Improve handling of db locks [SCI-7703]
2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin
3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
Martin Artnik
5f7976ce0e Fix copying and pasting TinyMCE images [SCI-7774] 2023-01-17 14:32:25 +01:00
Martin Artnik
76025a4883 Properly assign team to tinymce asset when extracting base64 images [SCI-5098] 2023-01-17 10:49:08 +01:00
Martin Artnik
db76272602 Fix extraction of TinyMCE images [SCI-5098] 2023-01-16 16:35:36 +01:00
Martin Artnik
7cb639524b Fix parsing of RTE images [SCI-5098] 2023-01-16 16:07:14 +01:00
Martin Artnik
a043bf2cd3 Fix tinymce images for blank texts [SCI-5098] 2023-01-16 12:00:00 +01:00
Martin Artnik
a513951a7c Fix legacy tinymce step issues [SCI-5098] 2023-01-16 10:58:37 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
Martin Artnik
4df203bd13 Fix touching of protocol when changes happen [SCI-7584] 2023-01-12 16:18:31 +01:00
Martin Artnik
662b9174fa Extract pasted base64 images from RTE texts [SCI-5098] 2023-01-12 13:24:31 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
ajugo
99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
artoscinote
710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596
Don't touch result when comment is created [SCI-7596]
2023-01-04 13:14:07 +01:00
Martin Artnik
7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
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