Commit graph

3276 commits

Author SHA1 Message Date
Anton
7233f4c8ab Merge branch 'features/new-datatable' of github.com:scinote-eln/scinote-web into features/new-datatable 2024-01-11 15:27:10 +01:00
Anton
de72f60cc1 Merge branch 'develop' into features/new-datatable 2024-01-11 15:14:36 +01:00
Anton
62edf89699 Replace reports table [SCI-9803] 2024-01-11 10:06:39 +01:00
Oleksii Kriuchykhin
3b97571777 Merge branch 'features/inventory-items-relationships' into develop 2024-01-10 17:10:20 +01:00
Soufiane
a7dd9d49b2
Add links to items in linked/unlinked related activities [SCI-9718] (#6921) 2024-01-10 15:32:01 +01:00
Anton
3346c55941 Merge branch 'develop' into features/new-datatable 2024-01-09 10:36:21 +01:00
ajugo
a6c0c7294b
Improve objects loading and permissions checking for repository rows [SCI-9763] (#6875) 2024-01-09 09:37:50 +01:00
wandji
a201c96aef
Fix issue add/removing stock [SCI-9966] (#6909) 2024-01-09 09:33:14 +01:00
wandji
c43dd38af4
Fix CSS issues add relationship modal [SCI-9955] (#6897) 2024-01-08 14:49:38 +01:00
wandji
16bf3217e4
Fix issue opening item card [SCI-9961] (#6898)
* Fix issue opening item card [SCI-9961]

* Fix failing tests [SCI-9961]
2024-01-08 11:30:04 +01:00
wandji
465c8d1f80
Unify API step and result elements controllers implementation and types [SCI-9907] (#6854)
* Unify api step and result elements controllers implementation and types [SCI-9907]

* Update wrong serializer types [SCI-9907]

* Rename result and step text types [SCI-9907]

* Combine result and step assets serializer [SCI-9907]
2024-01-08 10:31:14 +01:00
Anton
993a8da518 Migrate inventory tables [SCI-9804] 2024-01-05 19:03:14 +01:00
Soufiane
c3f8e873e9
Fix 500 error when adding stock to item [SCI-9498] (#6883) 2024-01-05 13:10:45 +01:00
Oleksii Kriuchykhin
95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Soufiane
67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
wandji
9ade9e890f
Render webhooks form url errors using data-error-text attribute [SCI-9743] (#6869) 2024-01-03 19:08:33 +01:00
Anton
4671754d52 Migrate protocols table [SCI-9802] 2024-01-03 14:57:32 +01:00
Soufiane
cbe1eef8af
Add the ability to unlink parent/child items [SCI-9712] (#6725) 2024-01-03 14:15:30 +01:00
Martin Artnik
7308e18435
Merge pull request #6836 from G-Chubinidze/gc_SCI_9839
Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template) [SCI-9839]
2024-01-03 11:34:55 +01:00
Soufiane
5ca33bb96a
Add activities for item relationships [SCI-9718] (#6788) 2023-12-21 12:33:06 +01:00
Gregor Lasnibat
3e4ccbcc75
(fix) Item card minor issue [SCI-9814_v2] (#6846) 2023-12-21 11:55:12 +01:00
Anton
79969492dd Replace tasks table [SCI-9801] 2023-12-20 17:47:09 +01:00
wandji
a4e573e02f
Rename relationships inventory column SCI-[9905] (#6850) 2023-12-20 16:24:39 +01:00
Soufiane
6d65315741
Fix wide table scroll bar issues on shared tasks [SCI-9762] (#6767) 2023-12-20 10:11:15 +01:00
wandji
54b1c182d8
Add V2 API endpoints for step elements [SCI-9650] (#6825)
* Add V2 API endpoints for step elements [SCI-9650]

* Rewrite step controller actions in order to read V2 step serializer [SCI-9650]
2023-12-19 15:36:41 +01:00
Giga Chubinidze
9ff30b2795 Add 12 well plate option - "Insert content" select menu (protocol, results, protocol template) 2023-12-18 12:32:33 +04:00
Soufiane
453ec32e8f
Add CSS classes to relationships add button [SCI-9781] (#6811) 2023-12-14 12:49:53 +01:00
ajugo
a343701299
Implement api v2 for results [SCI-9651] (#6699) 2023-12-14 11:31:12 +01:00
Oleksii Kriuchykhin
372ef32f03 Merge branch 'develop' into features/inventory-items-relationships 2023-12-14 11:28:04 +01:00
Gregor Lasnibat
eb1401789e
Merge pull request #6818 from lasniscinote/gl_SCI_9845
(fix) Wording improvments for the 'Delete attachments' modal [SCI-9845]
2023-12-14 09:01:47 +01:00
Anton
c3b4360ff5 Merge branch 'develop' into features/new-datatable 2023-12-13 16:11:35 +01:00
Oleksii Kriuchykhin
970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +01:00
Gregor Lasnibat
f5791f5fa7 (fix) Wording improvments for the 'Delete attachments' modal [SCI-9845] 2023-12-13 15:36:37 +01:00
Alex Kriuchykhin
741e053ef4
Add checking for ability to share a repository with allowed write [SCI-9853] (#6807) 2023-12-13 15:31:21 +01:00
Soufiane
456bd0922f
Make item relationship togglable [SCI-9669] (#6648)
* Make item relationship togglable [SCI-9669]

* Fix broken tests [SCI-9669]
2023-12-12 12:54:15 +01:00
Martin Artnik
b1492ff0ce
Merge pull request #6801 from ivanscinote/SCI-9865-ik
Make scheduler run only on worker [SCI-9865]
2023-12-12 11:01:20 +01:00
Ivan Kljun
d4d5209535 Make scheduler run only on worker [SCI-9865] 2023-12-12 10:56:26 +01:00
Anton
985dddef17 Finish experiment table [SCI-9800] 2023-12-11 15:57:45 +01:00
Soufiane
a37d4ead47
Improve wording in Protocol templates and Inventory [SCI-9685] (#6789) 2023-12-11 13:58:04 +01:00
Martin Artnik
c7c72983ca
Merge pull request #6793 from G-Chubinidze/gc_SCI_9811
[CAPA] Unable to view assigned persons within a task [SCI-9811]
2023-12-11 13:35:07 +01:00
Anton
75f7437001 Fix markup 2023-12-11 09:26:13 +01:00
Martin Artnik
af7bae48a0 Implement delivery notifications, fix specs [SCI-9856] 2023-12-08 13:57:43 +01:00
Ivan Kljun
aa04e9014c Create notification recipient class for change_users_role_on_team_activity [SCI-9847] 2023-12-07 14:36:12 +01:00
Anton
7ffad5b659 Experiments table migration [SCI-9800] 2023-12-07 12:53:21 +01:00
Anton
65e9e5abb4 Merge branch 'develop' into features/new-datatable 2023-12-07 09:51:45 +01:00
Anton
687bac024a Migrate access modal to VUE [SCI-9799] 2023-12-06 14:12:22 +01:00
Martin Artnik
7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Oleksii Kriuchykhin
d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Martin Artnik
94e8a8d89f
Merge pull request #6759 from ivanscinote/SCI-9782-ik
Create RepositoryItemRecipients for Low Stock and Date/Date&Time notifications [SCI-9782]
2023-12-06 10:40:34 +01:00
Ivan Kljun
8c31680573 Create RepositoryItemRecipients for Low Stock and Date/Date&Time notifications [SCI-9782] 2023-12-06 10:38:24 +01:00