Commit graph

12414 commits

Author SHA1 Message Date
Martin Artnik d680b3a256
Merge pull request #6827 from ivanscinote/SCI-9862-ik
Show modal when no predefined app for opening asset locally [SCI-9862]
2024-01-05 14:26:09 +01:00
Soufiane e9d42beec4
Fix duplicated/missing attachements when bulk upload to result/step [SCI-9920] (#6879) 2024-01-05 14:23:44 +01:00
Soufiane c3f8e873e9
Fix 500 error when adding stock to item [SCI-9498] (#6883) 2024-01-05 13:10:45 +01:00
Martin Artnik 122c3aff1a Improve datepicker interactions for item sidebar [SCI-9956] 2024-01-05 12:59:17 +01:00
Oleksii Kriuchykhin 95ab33a58b Merge branch 'develop' into features/inventory-items-relationships 2024-01-05 11:27:32 +01:00
Ivan Kljun 44556f5070 Add Teleport for modals [SCI-9862] 2024-01-05 11:17:00 +01:00
sboursen-scinote e62a4a60ad Fix issues with relationships columns in inventory table [SCI-9948] 2024-01-05 10:40:12 +01:00
Ivan Kljun 53c9be6f21 Fix hound suggestions [SCI-9862] 2024-01-04 16:45:22 +01:00
Soufiane 67ea1b15fe
Implement API V2 endpoints for item relationships [SCI-9719] (#6847) 2024-01-04 16:42:25 +01:00
Alex Kriuchykhin da7b7518fc
Fix file text extraction for API results endpoints [SCI-9933] (#6874)
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
2024-01-04 14:31:56 +01:00
Ivan Kljun 60001e282c Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-9862-ik 2024-01-04 13:27:28 +01:00
Martin Artnik f2a4e91d23
Merge pull request #6848 from G-Chubinidze/gc_SCI_9880
Missing links in notifications & emails for adding and removing a user to the team [SCI-9880]
2024-01-04 11:03:26 +01:00
Martin Artnik 0a5432f5bc
Merge pull request #6872 from artoscinote/ma_SCI_9737
Fix report table action buttons initialization [SCI-9737]
2024-01-04 11:00:39 +01:00
Ivan Kljun 2306496c3b Apply hound suggestions [SCI-9862] 2024-01-04 11:00:20 +01:00
Martin Artnik 78747911b7 Fix conflicts in asset sync caused by preview generation [SCI-9935] 2024-01-04 10:40:28 +01:00
Martin Artnik e360113838 Merge branch 'develop' into features/asset-sync 2024-01-04 10:07:11 +01:00
wandji 5c0c3e0eca
Add permission helper for connecting inventory items [SCI-9915] (#6868) 2024-01-04 09:47:40 +01:00
Martin Artnik d412e600b6
Merge pull request #6830 from G-Chubinidze/gc_SCI_9841
Implement the SciNote Edit launching application modal [SCI-9841]
2024-01-04 08:54:14 +01:00
Giga Chubinidze 5e97cf9554 added subject instead of message 2024-01-04 03:31:46 +04:00
Giga Chubinidze 509024458d new linter fixes 2024-01-04 03:13:21 +04:00
Giga Chubinidze b6a84ecd87 hound fix 2024-01-04 03:04:17 +04:00
Giga Chubinidze 473fad28de hound fix 2024-01-04 02:59:08 +04:00
Giga Chubinidze 888171c22c hound fix 2024-01-04 02:58:18 +04:00
Giga Chubinidze e0003e0789 hound fix 2024-01-04 02:57:14 +04:00
Giga Chubinidze e304ad8ee6 hound fix 2024-01-04 02:55:52 +04:00
Giga Chubinidze 42133d5b8c hound fix 2024-01-04 02:54:21 +04:00
wandji 9ade9e890f
Render webhooks form url errors using data-error-text attribute [SCI-9743] (#6869) 2024-01-03 19:08:33 +01:00
wandji c82dae9d48
Fix issue opening connected relationships' inventory page [SCI-9913] (#6861) 2024-01-03 19:02:02 +01:00
wandji b36354d521
Set order for inventory and inventory items endpoints (RepositoryRowConnectionController) [SCI-9914] (#6859) 2024-01-03 17:09:37 +01:00
Alex Kriuchykhin dd312062d3
Fix permissions checking for active storage blobs belonging to different teams [SCI-9918] (#6871) 2024-01-03 17:09:15 +01:00
Soufiane 4fd6ecf112
Fix pasting multiline text inside checklist items [SCI-9881] (#6866) 2024-01-03 16:56:33 +01:00
Martin Artnik 24309a4e03 Fix report table action buttons initialization [SCI-9737] 2024-01-03 16:31:31 +01:00
G-Chubinidze 84c53cb5f5
Merge branch 'features/asset-sync' into gc_SCI_9710 2024-01-03 18:23:25 +04:00
Giga Chubinidze 544611c3fa hound fix 2024-01-03 18:19:32 +04:00
Giga Chubinidze eaf713e4bd move response status fix 2024-01-03 17:50:18 +04:00
Soufiane cbe1eef8af
Add the ability to unlink parent/child items [SCI-9712] (#6725) 2024-01-03 14:15:30 +01:00
wandji 9ac5e80aaf
Trigger label click to checkbox label [SCI-9917] (#6860) 2024-01-03 13:12:05 +01:00
Soufiane 395a214175
Prevent emitting multiple requests when opening the manage columns modal [SCI-9696] (#6867) 2024-01-03 11:50:16 +01:00
Martin Artnik bd2d843684
Merge pull request #6822 from ivanscinote/SCI-9838-ik
Implement 'Open locally' button and dropdown for thumbnail [SCI-9838]
2024-01-03 11:46:44 +01:00
Martin Artnik be08fbcd81
Merge pull request #6856 from rekonder/aj_SCI_9904
Fix repository item sidebar click away [SCI-9904]
2024-01-03 11:43:15 +01:00
Martin Artnik 416231420b
Merge pull request #6870 from artoscinote/ma_SCI_9921
Fix inventory item date notification for deleted date columns [SCI-9921]
2024-01-03 11:38:15 +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
wandji f892467d67
Fix relationship css issues on Item card [SCI-9911] (#6857)
* Fix relationship css issues on Item card [SCI-9911]

* Fix failing specs [SCI-9911]
2024-01-03 11:32:46 +01:00
Martin Artnik 5fe001867b Fix inventory item date notification for deleted date columns [SCI-9921] 2024-01-03 11:28:47 +01:00
Giga Chubinidze ebdeaf8b42 add transaction to move exp function 2024-01-03 12:58:13 +04:00
Giga Chubinidze cc8a10edb0 "Move" feature for multiple selected tasks and experiments (bulk action) 2023-12-29 12:53:46 +04:00
Giga Chubinidze 0e0f7fe0da Missing links in notifications & emails for adding and removing a user to the team [SCI-9880] 2023-12-27 12:19:19 +04:00
Andrej c0583343bf Fix repository item sidebar click away [SCI-9904] 2023-12-22 08:25:05 +01:00
Gregor Lasnibat 7c0b5d437f
(fix) CSS improvements [SCI-9614] (#6852) 2023-12-21 12:34:37 +01:00
Gregor Lasnibat 98d3a6817e
(fix) Text size on an archived task and 'Collapse all' button on results [SCI-9582] (#6853) 2023-12-21 12:34:19 +01:00
ajugo b110a78860
Fix loading of access modal for PET [SCI-9844] (#6855) 2023-12-21 12:33:49 +01:00
Soufiane 5ca33bb96a
Add activities for item relationships [SCI-9718] (#6788) 2023-12-21 12:33:06 +01:00
wandji 184944dd5f
Improve interface and interaction of relationships column [SCI-9893] (#6851)
* Improve interface and interaction of relationships column [SCI-9893]

* Fix failling specs (use column order than relationships for sorting) [SCI-9893]
2023-12-21 12:32:35 +01:00
wandji 29ffb7beb1
Restrict access to adding inventory item relationships [SCI-9898] (#6849)
* Restrict access to adding inventory item relationships [SCI-9898]

* Update permissions default data value and remove safe navigations for permissions [SCI-9898]
2023-12-21 11:57:52 +01:00
Gregor Lasnibat 3e4ccbcc75
(fix) Item card minor issue [SCI-9814_v2] (#6846) 2023-12-21 11:55:12 +01:00
wandji a4e573e02f
Rename relationships inventory column SCI-[9905] (#6850) 2023-12-20 16:24:39 +01:00
G-Chubinidze bb35e15993
Default view on Projects and Experiments pages is "Table view" [SCI-9794] (#6768) 2023-12-20 14:19:52 +01:00
Soufiane e9a76bf2a7
Implement tests for item relationships [SCI-9612] (#6820) 2023-12-20 14:18:49 +01:00
Giga Chubinidze 5305c8ad21 hound fix 2023-12-20 13:26:02 +04:00
Soufiane 6d65315741
Fix wide table scroll bar issues on shared tasks [SCI-9762] (#6767) 2023-12-20 10:11:15 +01:00
Alex Kriuchykhin cd001e83eb
Fix search inside files for keywords containing special symbols [SCI-9903] (#6845) 2023-12-19 16:29:08 +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
wandji 149f7092c6
Read edit file url from data urls attribute [SCI-9900] (#6843) 2023-12-19 15:32:31 +01:00
ajugo 0fae9ba1f0
Merge pull request #6842 from rekonder/aj_SCI_9752
Fix filter label on webhook page [SCI-9752]
2023-12-19 11:32:50 +01:00
Andrej 436be9cbdd Fix filter label on webhook page [SCI-9752] 2023-12-19 10:41:23 +01:00
Alex Kriuchykhin 43329dc318
Fix imports of protocols with tables from Protocols.io [SCI-9723] (#6839) 2023-12-19 10:39:16 +01:00
wandji 57ed60b39c
Display shared task container for all task users [SCI-9047] (#6841) 2023-12-19 10:38:15 +01:00
Giga Chubinidze 23ede59730 hound fix 2023-12-19 12:19:19 +04:00
ajugo 668ae018c1
Fix activity to_date filtering [SCI-9704] (#6840) 2023-12-18 16:28:41 +01:00
Gregor Lasnibat 8a9d4a772a
(fix) Stock value is editable to archived item in item table [SCI-9814] (#6838) 2023-12-18 15:06:45 +01:00
Gregor Lasnibat d33ef5bcaf
(fix) Attachment thumbnail is not shown in List view [SCI-9876] (#6837) 2023-12-18 13:50:56 +01:00
Gregor Lasnibat 8c0724a680
(fix) Update the multiselect dropdown color switch [SCI-9724] (#6834) 2023-12-18 13:49:44 +01:00
wandji 7b259ab781
Move manage stock modal to application view layout [SCI-9835] (#6831) 2023-12-18 11:49:54 +01:00
wandji 007567b4cc
Add flash error message for inventory items import [SCI-9739] (#6829) 2023-12-18 11:27:08 +01:00
Gregor Lasnibat d3807b0b4a
(fix) Item card behavior in cases of error states vol. 2 [SCI-9792] (#6813) 2023-12-18 11:26:26 +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
Alex Kriuchykhin 528d411910
e2e - modified and added new tags at inventories section [SCI-9813] (#6741) (#6832)
Co-authored-by: Martin Artnik <martin@scinote.net>
Co-authored-by: mvrazic <144342580+mvrazic@users.noreply.github.com>
2023-12-15 16:33:13 +01:00
wandji b91792e392
Fix linters (#6828) 2023-12-15 10:42:30 +01:00
Giga Chubinidze de706fc3fb Implement the SciNote Edit launching application modal [SCI-9841] 2023-12-15 01:55:26 +04:00
Ivan Kljun 455fdd2cd4 Show modal when no predefined app for opening asset locally [SCI-9862] 2023-12-14 16:19:15 +01:00
Gregor Lasnibat be2e7ed801
(fix) Text size on an archived task and 'Collapse all' button on results [SCI-9582] (#6817) 2023-12-14 16:11:49 +01:00
Alex Kriuchykhin 447d279a87
Fix activity filter matching by date [SCI-9890] (#6826) 2023-12-14 16:11:16 +01:00
ivanscinote 230500f60b
Change format of updated_at for asset to include time [SCI-9848] (#6823) 2023-12-14 16:07:15 +01:00
Gregor Lasnibat b0dbc95a43
Merge pull request #6799 from lasniscinote/gl_SCI_9789
(fix) CSS item card and manage column corrections needed [SCI-9789]
2023-12-14 14:30:52 +01:00
Gregor Lasnibat a7f26efaac (fix) CSS item card and manage column corrections needed [SCI-9789] 2023-12-14 14:25:31 +01:00
Soufiane d6a4160652
Fix smart annotation in item card text columns for users without edit permissions [SCI-9888] (#6824) 2023-12-14 13:43:56 +01: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
Oleksii Kriuchykhin 2baeabc752 Merge branch 'features/bugfixes-and-improvements' into develop 2023-12-14 11:23:13 +01:00
Ivan Kljun f1dd767f35 Implement 'Open locally' button and dropdown for thumbnail [SCI-9838] 2023-12-14 11:11:12 +01:00
Giga Chubinidze 7de19c31ec Implement the Open Locally button on file previews [SCI-9757] 2023-12-13 23:54:41 +04:00
Alex Kriuchykhin ef7b836a5f
Update default sortable columns config for linked repository [SCI-9854] (#6819) 2023-12-13 16:18:56 +01:00
Martin Artnik 9b97e397ed Merge branch 'develop' into features/asset-sync 2023-12-13 16:05:18 +01:00
Oleksii Kriuchykhin 970dc7185b Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-13 16:01:09 +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
wandji 03e1efe98e
Reloacate external_id for linked inventories [SCI-9849] (#6803) 2023-12-13 15:13:15 +01:00
Martin Artnik 788f01aeae Fix due date reminder spam for locked tasks [SCI-9885] 2023-12-13 13:30:23 +01:00
Martin Artnik 88ec956ac1 Fix docx report notifications [SCI-9874] 2023-12-12 15:31:02 +01:00
Martin Artnik 8750fe4ceb Fix in-app notification scope [SCI-9896] 2023-12-12 15:24:53 +01:00
Martin Artnik e99e5c46c6 Fix activities for access permissions [SCI-9863] 2023-12-12 14:32:26 +01:00
Martin Artnik 543ac1a404
Merge pull request #6808 from artoscinote/ma_SCI_9863
Always save notifications to database, but filter them [SCI-9869]
2023-12-12 14:09:23 +01:00
Martin Artnik 0344860827 Add reminder job interval option 2023-12-12 14:08:42 +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 442b41fafe
Merge pull request #6806 from aignatov-bio/ai-sci-9872-fix-stock-notification-on-snapshot
Fix stock notifications on snapshots [SCI-9872]
2023-12-12 12:43:17 +01:00
Martin Artnik 9ddec2144e
Merge pull request #6805 from artoscinote/ma_SCI_9863
Fix project assignment activity & notification recipients [SCI-9863]
2023-12-12 12:42:39 +01:00
Martin Artnik 221e7d7fb3
Merge pull request #6804 from artoscinote/ma_SCI_9856
Fix report notification breadcrumbs [SCI-9856]
2023-12-12 12:42:26 +01:00
Anton 8748051a0f Fix stock notifications on snapshots [SCI-9872] 2023-12-12 12:32:00 +01:00
Martin Artnik c599c939b8 Fix project assignment activity & notification recipients [SCI-9863] 2023-12-12 12:18:12 +01:00
Martin Artnik ce3618003b Fix report notification breadcrumbs [SCI-9856] 2023-12-12 12:11:52 +01:00
Martin Artnik ea4eb6f785
Merge pull request #6802 from aignatov-bio/ai-sci-9868-fix-user-deletion
Fix user deletion [SCI-9868]
2023-12-12 11:11:02 +01:00
Anton 6c9d128b97 Fix user deletion [SCI-9868] 2023-12-12 11:08:31 +01:00
Martin Artnik 39d9e46396 Send notifications in the backgrond by default [SCI-9870] 2023-12-12 10:52:17 +01:00
Martin Artnik c3e9e0122b
Merge pull request #6796 from ivanscinote/SCI-9825-ik
Implement dynamic subject class handling in generalnotification [SCI-9825]
2023-12-12 10:00:21 +01:00
Anton 6165be921f Fix stock modal and notification counter [SCI-9864][SCI-9866] 2023-12-12 09:57:06 +01:00
wandji a9cec25eee
Add warning notification for inventory item relationships [SCI-9831] (#6786) 2023-12-11 17:05:54 +01:00
Alex Kriuchykhin 5c852a1aa4 Trigger file text extraction on file update in an inventory [SCI-9842] (#6782) 2023-12-11 15:46:03 +01:00
Ivan Kljun 0f12be6a26 Implement dynamic subject class handling in generalnotification [SCI-9825] 2023-12-11 15:41:24 +01:00
Martin Artnik 7ba4efe30c Fix recipients for my_module designation notifications [SCI-9863] 2023-12-11 14:32:37 +01:00
Martin Artnik c0bc77024b Fix notification messages [SCI-9843] 2023-12-11 14:32:22 +01:00
Soufiane 00092b8059
Implement unlinking on inventory unsharing [SCI-9714] (#6736) 2023-12-11 13:52:50 +01:00
Martin Artnik 91533a25ac
Merge pull request #6792 from ivanscinote/SCI-9825-ik
Make Date/Date&Time and Low Stock notifications work when deleting Repository/row record [SCI-9825]
2023-12-11 13:40:26 +01:00
Martin Artnik 8423f4f38f
Merge pull request #6794 from G-Chubinidze/gc_SCI_9843
Incomplete/missing text in notification emails [SCI-9843]
2023-12-11 13:39:15 +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
Giga Chubinidze 49a99ee243 updated notification title function 2023-12-11 16:18:08 +04:00
Ivan Kljun 41c5ecf1d8 Make Date/Date&Time and Low Stock notifications work when deleting Repository/row record [SCI-9825] 2023-12-11 11:55:02 +01:00
Anton 36ec0607ee Fix team notifications link [SCI-9861] 2023-12-11 11:27:58 +01:00
wandji dceb92021a
Connect add relationship modal to backend [SCI-9711] (#6749) 2023-12-11 10:43:47 +01:00
Martin Artnik 58acbcaecf
Merge pull request #6785 from artoscinote/ma_SCI_9856
Implement delivery notifications, fix specs [SCI-9856]
2023-12-11 09:56:43 +01:00
Martin Artnik 99fe879057
Merge pull request #6790 from G-Chubinidze/gc_SCI_9843
Incomplete/missing text in notification emails [SCI-9843]
2023-12-11 09:52:48 +01:00
Giga Chubinidze 69ca8c5022 Incomplete/missing text in notification emails [SCI-9843] 2023-12-11 11:52:28 +04:00
Martin Artnik af7bae48a0 Implement delivery notifications, fix specs [SCI-9856] 2023-12-08 13:57:43 +01:00
Martin Artnik ff117b8358
Merge pull request #6784 from G-Chubinidze/gc_SCI_9829
Smart annotation is not saved on checklist item [SCI-9829]
2023-12-08 13:34:43 +01:00
Giga Chubinidze 3dd3b00b06 preventing esc and enter from interfering 2023-12-08 16:20:02 +04:00
Alex Kriuchykhin f0f7f28227
Trigger file text extraction on file update in an inventory [SCI-9842] (#6782) 2023-12-08 11:29:11 +01:00
wandji 6f27b4c450
Call project project user assignment job with perform now [SCi-9750] (#6766)
* Add polling to update project user assignments list [SCi-9750]

* Call project project user assignment job with perform now [SCI-9750]

* Call UserAssignments::PropagateAssignmentJob directly from destroy action SCI-[9750]
2023-12-08 10:27:50 +01:00
Martin Artnik 279c63bc58
Merge pull request #6780 from artoscinote/ma_SCI_9775
Fix repository date notification job [SCI-9775]
2023-12-08 09:52:18 +01:00
Martin Artnik 37cb6a4f69 Fix repository date notification job [SCI-9775] 2023-12-07 18:13:21 +01:00
Martin Artnik a76ba226f9
Merge pull request #6779 from ivanscinote/SCI-9847-ik
Create notification recipient class for change_users_ro le_on_team_activity [SCI-9847]
2023-12-07 16:59:32 +01:00
wandji 98b8c25c59
Set remote true for webhooks create form [SCI-9743] (#6777) 2023-12-07 15:24:03 +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
Martin Artnik 8e84a83ce6
Merge pull request #6773 from ivanscinote/SCI-9623-ik
Fix prepend_title_page method in pdf_job [SCI-9623]
2023-12-07 10:27:48 +01:00
Ivan Kljun 1d5e072f0b Fix prepend_title_page method in pdf_job [SCI-9623] 2023-12-07 10:23:56 +01:00
Martin Artnik 4bcf41399d
Merge pull request #6772 from G-Chubinidze/gc_SCI_9829
Smart annotation is not saved on checklist item [SCI-9829]
2023-12-07 08:45:21 +01:00
Giga Chubinidze 18380402fc Smart annotation is not saved on checklist item [SCI-9829] 2023-12-07 11:35:02 +04:00
Martin Artnik 152522341c
Merge pull request #6770 from ivanscinote/SCI-9561-implement-repository-date-reminder-notification
Fix translation for Date/Date&Time [SCI-9561]
2023-12-06 14:59:11 +01:00
Ivan Kljun 55ee531e23 Fix translation for Date/Date&Time [SCI-9561] 2023-12-06 11:42:40 +01:00
Martin Artnik 7c73f284b4 Merge branch 'features/notification-revamp' into develop 2023-12-06 11:36:32 +01:00
Martin Artnik 66feec3074 Merge branch 'develop' into features/asset-sync 2023-12-06 11:23:31 +01:00
Oleksii Kriuchykhin d1e7ab5efb Merge branch 'develop' into features/inventory-items-relationships 2023-12-06 11:11:30 +01:00
Oleksii Kriuchykhin bd89a0c9bf Merge branch 'develop' into features/bugfixes-and-improvements 2023-12-06 11:09:34 +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
Soufiane 8e25b95e83
Respect the order of the item relationship column when exporting inventory [SCI-9673] (#6706) 2023-12-06 10:24:07 +01:00
Martin Artnik 469f581e20
Merge pull request #6769 from G-Chubinidze/gc_SCI_9788
Redundant notifications [SCI-9788]
2023-12-06 09:30:17 +01:00
G-Chubinidze e1ff625351
Merge branch 'features/asset-sync' into gc_SCI_9710 2023-12-06 11:48:18 +04:00
Giga Chubinidze a25113275a added access permission blocks 2023-12-06 11:02:25 +04:00
Martin Artnik 31e55488a7
Merge pull request #6750 from G-Chubinidze/gc_SCI_9788
Redundant notifications [SCI-9788]
2023-12-05 14:57:01 +01:00
Ivan Kljun 2dfd270df2 Add conflict check for WOPI lock AssetSyncController [SCI-9758] 2023-12-05 14:47:46 +01:00
Oleksii Kriuchykhin feeb350114 Merge branch 'develop' into features/linked-inventories 2023-12-05 14:12:42 +01:00
Ivan Kljun 937e3247db Remove icon from app notifications [SCI-9768] 2023-12-05 12:52:40 +01:00
Martin Artnik 235d94e1cf Implement SciNote edit button with checks and info [SCI-9756] 2023-12-05 12:35:55 +01:00
wandji 4df097b251
Init provisioning polling after successful cloning tasks [SCI-9796] (#6758) 2023-12-05 10:15:11 +01:00
Martin Artnik 254550ef7f
Merge pull request #6755 from ivanscinote/SCI-9775-ik
Fix translations for notifications (Due date, Date/Date&Time, Low stock) [SCI-9775]
2023-12-05 09:29:38 +01:00
Giga Chubinidze 70ed2cb868 logic cleanup 2023-12-05 12:06:58 +04:00
Giga Chubinidze 33527d14c8 [CAPA] Unable to view assigned persons within a task [SCI-9811] 2023-12-05 12:05:35 +04:00
Alex Kriuchykhin 44a8fc06b3
Escape special regexp symbols in clonable name generation [SCI-9819] (#6756) 2023-12-04 16:21:24 +01:00
wandji 1d52e20f4e
Fix issue showing item card reminder when threshold equals stock value [SCI-9828] (#6753) 2023-12-04 16:21:08 +01:00
Ivan Kljun dde7c512a9 Fix translations for notif (Due date, Date/Date&Time, Low stock) [SCI-9775] 2023-12-04 14:13:16 +01:00
Anton d125eae4bb Fix smart annotation on steps [SCI-9799] 2023-12-04 11:17:06 +01:00
aignatov-bio b7177a8592
Merge pull request #6751 from aignatov-bio/ai-sci-fix-emojies-in-item-card
Increase delay for status replace [SCI-9820]
2023-12-04 10:47:21 +01:00
Anton f70ade23b9 Increase delay for status replace [SCI-9820] 2023-12-04 10:14:16 +01:00
Martin Artnik 4a22bc9ee8
Merge branch 'develop' into gl_SCI_9789 2023-12-04 09:50:32 +01:00
Giga Chubinidze 121cbe7471 Redundant notifications [SCI-9788] 2023-12-04 11:29:17 +04:00
Gregor Lasnibat c1e3c2b6c6 (fix) Update of item table not done, stock modal entry [SCI-9789] 2023-12-01 16:44:13 +01:00
Gregor Lasnibat 9656b6c19a (fix) Red dot reminder is not upadated on item card [SCI-9818] 2023-12-01 16:27:03 +01:00
Martin Artnik b1b8059e41
Merge pull request #6745 from ivanscinote/SCI-9561-implement-repository-date-reminder-notification
Add job for RepositoryDateValue, fix translation [SCI-9561]
2023-12-01 15:49:57 +01:00
Martin Artnik df66fd292b
Merge pull request #6738 from G-Chubinidze/gc_SCI_9766
Notification breadcrumb to Experiment page is not working [SCI-9766]
2023-12-01 15:46:18 +01:00
Ivan Kljun a5f711aa46 Add job for RepositoryDateValue, fix translation [SCI-5961] 2023-12-01 15:04:24 +01:00
Anton 4248bfa253 Fix emojies in item card 2023-12-01 11:53:42 +01:00
Martin Artnik 385d9463ad
Merge pull request #6740 from lasniscinote/gl_SCI_9805
(fix) Lost (A) in front of archived item on item card [SCI-9805]
2023-12-01 09:33:59 +01:00
Martin Artnik 15ddaa88a5
Merge pull request #6739 from lasniscinote/gl_SCI_9789
(fix) Update of item table not done, stock modal entry [SCI-9789]
2023-12-01 09:33:36 +01:00
Gregor Lasnibat 5305ca6f1b (fix) Lost (A) in front of archived item on item card [SCI-9805] 2023-11-30 16:28:59 +01:00
ajugo ebf6d1aee6
Merge pull request #6711 from wandji20/wb-SCI-9716
Add relationship to project exports [SCI-9716]
2023-11-30 15:55:39 +01:00
Gregor Lasnibat 90f62ae9c2 (fix) Update of item table not done, stock modal entry [SCI-9789] 2023-11-30 15:54:50 +01:00
Martin Artnik 9303266c53
Merge pull request #6735 from lasniscinote/gl_SCI_9805
(fix) Lost (A) in front of archived item on item card [SCI-9805]
2023-11-30 13:15:53 +01:00
Giga Chubinidze e509052140 Notification breadcrumb to Experiment page is not working [SCI-9766] 2023-11-30 13:54:40 +04:00
Gregor Lasnibat 92ad9becef (fix) Lost (A) in front of archived item on item card [SCI-9805] 2023-11-29 16:08:19 +01:00
Martin Artnik b7a67c2a60
Merge pull request #6734 from lasniscinote/gl_SCI_9789
(fix) Update of item table not done, stock modal entry [SCI-9789]
2023-11-29 16:00:23 +01:00
Martin Artnik a5bbc190f9 Merge branch 'develop' into features/inventory-items-relationships 2023-11-29 15:16:22 +01:00
Gregor Lasnibat 559461f2c6 (fix) Upadate of item table not done, stock modal entry [SCI-9789] 2023-11-29 14:54:30 +01:00
wandji20 13a675065d Fix bug in exports- [SCI-9716] 2023-11-29 11:21:34 +01:00
Martin Artnik a2f8fc5837 Fix notification mailer [SCI-9608] 2023-11-29 11:09:10 +01:00
Gregor Lasnibat 3f135a9e12 (fix) Hover and mouse pointer on item card is not correct [SCI-9791] 2023-11-29 10:59:24 +01:00
Martin Artnik ecf2814b68
Merge pull request #6731 from G-Chubinidze/gc_SCI_9189_v2
Handsontable fix browser-case [SCI-9189]
2023-11-29 09:32:31 +01:00
Giga Chubinidze bf26ed43df Modified designated recipients generation [SCI-9562] 2023-11-29 05:12:02 +04:00
Giga Chubinidze a8d76cea11 Handsontable fix browser-case [SCI-9189] 2023-11-29 04:32:16 +04:00
Martin Artnik fe34412f62
Merge pull request #6728 from artoscinote/ma_SCI_9189
Table and sticky toolbar fix [SCI-9189]
2023-11-28 15:16:54 +01:00
Martin Artnik 74ff724dd6
Merge pull request #6727 from artoscinote/ma_SCI_9790
Implement notification settings migration [SCI-9790]
2023-11-28 15:09:57 +01:00
Martin Artnik 1ff9c952d9 Table and sticky toolbar fix [SCI-9189] 2023-11-28 15:09:21 +01:00
Martin Artnik f5299ea6e9 Implement notification settings migration [SCI-9790] 2023-11-28 13:52:04 +01:00
sboursen-scinote b242a42da7 Fix activity for delete inventory item [SCI-9787] 2023-11-28 13:22:19 +01:00
wandji20 99bdae964a Fix Typo [SCI-9716] 2023-11-28 13:15:42 +01:00
Martin Artnik 25b59b3e4e
Merge pull request #6722 from lasniscinote/gl_SCI_9683
(update) Item card behavior in cases of error states [SCI-9683]
2023-11-28 13:10:59 +01:00
wandji20 ca85ea0eb4 Add relationship to project exports and fix vue 3 upgrade for item relationship modal [SCI-9716] 2023-11-28 12:58:55 +01:00
Gregor Lasnibat 3dd15ed1a5 Implement the 'Add relationship' modal, only front end [SCI-9671] 2023-11-28 12:44:57 +01:00
Anton 10f7157cc3 Fix focus on select dropdown 2023-11-28 10:44:48 +01:00
Martin Artnik f3ee9a854f Merge branch 'develop' into features/notification-revamp 2023-11-28 10:26:51 +01:00
Anton 8d0e13b8c3 Add datetime reminder to item card 2023-11-28 09:57:43 +01:00
Gregor Lasnibat 77c18747d2 (update) Item card behavior in cases of error states [SCI-9683] 2023-11-28 09:42:35 +01:00
Martin Artnik dd2b33ddaf
Merge pull request #6654 from ivanscinote/SCI-9636-IK
Add notification cleanup job [SCI-9636]
2023-11-27 17:48:27 +01:00
Martin Artnik 481abd0cc1 Add notification cleanup job [SCI-9636] 2023-11-27 17:44:12 +01:00
Martin Artnik c2170e0eaf
Merge pull request #6707 from okriuchykhin/ok_SCI_9765
Reload item sidebar even if same item is selected [SCI-9765]
2023-11-27 17:25:30 +01:00
Martin Artnik d9c7a47dfd
Merge pull request #6721 from lasniscinote/gl_SCI_9755
(fix) TypeErrors in 'Assign to task' dialog [SCI-9755]
2023-11-27 17:25:10 +01:00
Gregor Lasnibat 29e3517f51 Implement a link in the relationships column [SCI-9670] 2023-11-27 16:31:05 +01:00
Gregor Lasnibat e5cb70126b (fix) TypeErrors in 'Assign to task' dialog [SCI-9755] 2023-11-27 16:19:36 +01:00
Gregor Lasnibat b6752b6851 (fix) Update CSS according to Figma design (pair-programming/UX) [SCI-9694] 2023-11-27 14:43:49 +01:00
Giga Chubinidze b85284c548 fix after conflict fix 2023-11-27 17:14:50 +04:00
Martin Artnik 5aff062a76 Copy changes for report wizard [SCI-9693] 2023-11-27 12:56:33 +01:00
G-Chubinidze 006b0d32b3
Merge branch 'features/notification-revamp' into gc_SCI_9695 2023-11-27 15:05:45 +04:00
Giga Chubinidze ceb94f72c0 added always on subgroup 2023-11-27 15:01:23 +04:00
Anton f6783b219b Fix smart annotations [SCI-9605][SCI-9772] 2023-11-27 11:38:54 +01:00
Martin Artnik 1d1f638d78
Merge pull request #6715 from sboursen-scinote/sb_SCI-9690
Push items card inner navigator to the left [SCI-9690]
2023-11-27 10:53:23 +01:00
sboursen-scinote 05d3aa8289 Push items card inner navigator to the left [SCI-9690] 2023-11-27 10:51:35 +01:00
Martin Artnik 3cde57df48
Merge pull request #6714 from aignatov-bio/ai-sci-9741-fix-datetime-field
Fix view mode
2023-11-27 10:03:11 +01:00
Anton d8ea0d9e88 Fix view mode 2023-11-27 10:01:12 +01:00
Martin Artnik 30e507a4f3
Merge pull request #6705 from lasniscinote/gl_SCI_9785
(fix) Scrolling not working after opening notifications [SCI-9785]
2023-11-27 09:35:28 +01:00
Giga Chubinidze 28921bec47 Default Notifications and migration (notifications revamp) [SCI-9695] 2023-11-27 09:21:34 +04:00
Anton fe506edbd5 Item card datetime picker final version [SCI-9741] 2023-11-24 19:16:32 +01:00
Oleksii Kriuchykhin c047d44265 Relaod item sidebar even if same item is selected [SCI-9765] 2023-11-24 16:05:07 +01:00
Oleksii Kriuchykhin f6bd599a41 Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-24 15:58:16 +01:00
Gregor Lasnibat 5de17fbfb1 (fix) Scrolling not working after opening notifications [SCI-9785] 2023-11-24 15:45:00 +01:00
Martin Artnik 0c5171911e Add missing notification mailer files 2023-11-24 15:37:15 +01:00
Martin Artnik cc5aa5eaf5 Subtype fixes 2023-11-24 14:58:46 +01:00
Alex Kriuchykhin 9e9f8ab402
Add external_id field to repository list and checklist items [SCI-9454] (#6702) 2023-11-24 14:21:11 +01:00
Anton ccc435484d nitial version for datetime picker [SCI-9741] 2023-11-24 14:12:30 +01:00
Oleksii Kriuchykhin fa35de6a58 Merge branch 'develop' into features/inventory-items-relationships 2023-11-24 14:04:18 +01:00
Alex Kriuchykhin 39f4637351
Revert "Switch to using Vue3 date-picker in item card [SCI-9741] (#6697)" (#6700)
This reverts commit eaa0989c77.
2023-11-24 12:55:22 +01:00
Martin Artnik 3f338cafed Fix template v-for key position in notification_item.vue 2023-11-24 10:58:38 +01:00
Martin Artnik ea80fddfa4 Fix template v-for key position 2023-11-24 10:11:08 +01:00
Martin Artnik 2dce55541d Update user preferences with to Vue3 2023-11-24 09:48:21 +01:00
wandji 3b165ba92d
Read inventory item number column decimal value from backend [SCI-9764] (#6698) 2023-11-23 17:45:50 +01:00
Soufiane eaa0989c77
Switch to using Vue3 date-picker in item card [SCI-9741] (#6697) 2023-11-23 17:44:22 +01:00
wandji 2009d01532
Strip insignificant zero for ledger records in consumption export [SCI-9646] (#6693)
* Strip insignificant zero for ledger records when stock precision is zero [SCI-9646]

* Stip insignicant zeros for all stock ledger records in consumption exports [SCI-9646]
2023-11-23 17:35:51 +01:00
wandji 6c11c6641b
Fix double request for editing item card name [SCI-9771] (#6696)
* Fix double request for editing item card name [SCI-9771]

* Set repository cell to nil after deleting repository cell in row update service [SCI-9771]
2023-11-23 17:35:34 +01:00
Oleksii Kriuchykhin 9adad3139c Merge branch 'features/inventory-item-card-edit' into develop 2023-11-23 11:39:08 +01:00
ajugo 7b09c43c22
Merge pull request #6695 from rekonder/aj_SCI_9770
Fix manage edit card permission propagation [SCI-9770]
2023-11-23 11:33:50 +01:00
Soufiane ed49e8296b
Fix item card transition after switching to Vue3 [SCI-9589] (#6691) 2023-11-23 11:30:49 +01:00
Oleksii Kriuchykhin 9983d70eec Merge branch 'develop' into features/bugfixes-and-improvements 2023-11-23 11:11:46 +01:00
Andrej 7c5109fb12 Fix manage edit card permission propagation [SCI-9770] 2023-11-23 11:11:43 +01:00