Commit graph

11834 commits

Author SHA1 Message Date
Martin Artnik
2850135e96 Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
2023-10-24 13:14:23 +02:00
Martin Artnik
1d3c17206c
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
2023-10-23 13:59:37 +02:00
Martin Artnik
ebb2c7537b
Merge pull request #6517 from artoscinote/ma_SCI_9574
Fix user smart annotations [SCI-9574]
2023-10-23 13:37:49 +02:00
Martin Artnik
4f014394e2 Fix members filter [SCI-9585] 2023-10-23 13:31:27 +02:00
Martin Artnik
ee076c7f3b Fix user smart annotations [SCI-9574] 2023-10-23 11:50:24 +02:00
Giga Chubinidze
0d998b3947 Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533] 2023-10-23 08:26:38 +04:00
Gregor Lasnibat
0a3ba6a366 Fixed Item card smart annotation link [SCI-9583] 2023-10-22 08:56:51 +02:00
Martin Artnik
040379039f
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552
Report - Well plates columns fix [SCI-9552]
2023-10-20 10:16:11 +02:00
aignatov-bio
453bdf0082
Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Fix drag n drop on results
2023-10-20 09:43:49 +02:00
Gregor Lasnibat
6812bd135b
Fixed double PATCH request sent [SCI-9568] (#6512) 2023-10-20 09:37:09 +02:00
Giga Chubinidze
186eb1cc7e Report - Well plates columns fix [SCI-9552] 2023-10-20 02:27:06 +04:00
Anton
635a4b7fb3 Fix drag n drop on results 2023-10-19 17:41:13 +02:00
Alex Kriuchykhin
8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Alex Kriuchykhin
18c03eb836
Fix smart annotation links on the item card [SCI-9571] (#6501) 2023-10-19 16:35:15 +02:00
aignatov-bio
efaef6f182
Merge pull request #6507 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Add drag n drop to results [SCI-9576]
2023-10-19 16:03:02 +02:00
Gregor Lasnibat
8e7f216fb0
Fixed Item card file link [SCI-9479] (#6504) 2023-10-19 15:58:28 +02:00
Anton
3dd36e1dda Add drag n drop to results [SCI-9576] 2023-10-19 15:58:20 +02:00
wandji
db48eadd6a
Add reminder to stock column when value is negative [SCI-9564] (#6503) 2023-10-19 15:57:53 +02:00
wandji
f71cc4755c
Add title custom column names [SCI-9546] (#6502) 2023-10-19 15:56:11 +02:00
ajugo
b6a363cbb5
Add loader on tooltip preview on item cards [SCI-9554] (#6499) 2023-10-19 15:54:57 +02:00
Ivan Kljun
dcd1681fce Set navigator max-width to 400px and fix class for removing transitions [SCI-9318] 2023-10-19 15:39:56 +02:00
aignatov-bio
1155e208a3
Merge pull request #6497 from aignatov-bio/ai-sci-9535-fix-three-dots-alignment
Fix thee dots alignment [SCI-9535]
2023-10-19 14:31:57 +02:00
Gregor Lasnibat
2a8c25b2a9 Fixed Item card file link [SCI-9479] 2023-10-19 13:35:37 +02:00
Anton
e1d4e5269a Fix thee dots alignment [SCI-9535] 2023-10-19 11:45:01 +02:00
Martin Artnik
4e76fbe087
Merge pull request #6436 from okriuchykhin/ok_SCI_9372
Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372]
2023-10-19 11:44:02 +02:00
Gregor Lasnibat
6e6afaf223
Implemented custom scrollspy logic [SCI-9528] (#6495) 2023-10-19 11:36:12 +02:00
aignatov-bio
29ce96b67d
Merge pull request #6496 from aignatov-bio/ai-sci-9518-fix-bottom-toolbar-for-reports
Fix bottom toolbar for reports [SCI-9518]
2023-10-19 11:31:39 +02:00
aignatov-bio
1952f65c8f
Merge pull request #6479 from aignatov-bio/ai-sci-9508-placeholder-stays-when-dragging-file
Fix file drag and drop on step [SCI-9508]
2023-10-19 11:30:59 +02:00
wandji
72d1abf0be
Fix issues displaying checklist items on item card [SCI-9538] (#6493) 2023-10-19 11:24:03 +02:00
wandji
18f9d43a80
Fix issue with long column names in item card [SCI-9546] (#6488) 2023-10-19 11:23:36 +02:00
Gregor Lasnibat
1709abaa9e
Fixed Buttons on the right side of top toolbar are not responding [SCI-9550] (#6491) 2023-10-19 11:03:09 +02:00
wandji
782d10443d
Use default browser tooltip for shoing tooltips in items card [SCI-9537] (#6490) 2023-10-19 11:02:13 +02:00
Soufiane
e0a1a62bd5
Fix zebra print progress modal close button and padding [SCI-9536] (#6487) 2023-10-19 10:59:56 +02:00
Anton
4122876a90 Fix bottom toolbar for reports [SCI-9518] 2023-10-19 10:16:09 +02:00
Martin Artnik
1cf2e31e1f
Merge pull request #6489 from sboursen-scinote/sb_SCI-9549
Fix background blurring of stacked modals [SCI-9549]
2023-10-19 10:02:08 +02:00
ajugo
aed5418366
Fix closing item sidebar for printing label modal [SCI-9541] (#6486) 2023-10-19 09:48:20 +02:00
ivanscinote
8b5f610c07
Fix grid rows layout for experiment table view when no results found [SCI-9482] (#6434) 2023-10-19 09:47:44 +02:00
Soufiane
9de448141e
Fix text and number columns expend/collapse scroller issues [SCI-9545] (#6468) 2023-10-19 09:47:04 +02:00
Alex Kriuchykhin
54daf91701
Fix displaying of assign button on inventory item card [SCI-9559] (#6483) 2023-10-19 09:38:28 +02:00
sboursen-scinote
e0d1841b7b Fix blurring of stacked modals [SCI-9549] 2023-10-18 17:15:17 +02:00
Martin Artnik
73ec9848ea
Merge pull request #6470 from artoscinote/ma_SCI_9411
Fix MarvinJS loading race condition [SCI-9411]
2023-10-18 15:23:21 +02:00
Anton
ebf092d82d Fix item card status spacing [SCI-9558] 2023-10-18 15:07:24 +02:00
Martin Artnik
fb9204df64 Merge branch 'develop' into features/bugfixes-and-css 2023-10-18 14:51:35 +02:00
Anton
820d8294b9 Fix file drag and drop on step [SCI-9508] 2023-10-18 12:03:12 +02:00
Ivan Kljun
a93c35a3be Add a listener for when TinyMCE is opened and adjust headers [SCI-9449] 2023-10-18 10:53:58 +02:00
wandji
f83f5a8b58
Hide export button inntem card when item has no stock set [SCI-9509] (#6478) 2023-10-18 10:37:56 +02:00
ajugo
965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00
ajugo
191cfe45db
Fix repository item card CSS [SCI-9547] (#6477) 2023-10-18 10:06:21 +02:00
Alex Kriuchykhin
ba56876bda
Fix results API endpoint, return result elements in includes block instead of attributes [SCI-9553] (#6472) 2023-10-18 10:05:26 +02:00
Martin Artnik
88102673fe
Merge pull request #6475 from G-Chubinidze/gc_SCI_9236
Remove 'More [...]' button from the preview screens [SCI-9236]
2023-10-18 09:28:57 +02:00
Giga Chubinidze
c865fedb7f Remove 'More [...]' button from the preview screens [SCI-9236] 2023-10-18 10:37:33 +04:00
Soufiane
fc52b7bdab
Fix item card css issues [SCI-9536] (#6458) 2023-10-17 17:09:11 +02:00
Soufiane
e0dd8fb2fe
Hide assign item button when item is archived in item-card [SCI-9548] (#6471) 2023-10-17 17:05:17 +02:00
ajugo
195d56cfd7
Fix closing of item card sidebar on opening file preview [SCI-9541] (#6464) 2023-10-17 16:32:39 +02:00
Gregor Lasnibat
22c718d61c
Fixed protocol template table header covered by the list [SCI-9520] (#6457) 2023-10-17 16:32:02 +02:00
Martin Artnik
947d5e6744 Fix MarvinJS loading race condition [SCI-9411] 2023-10-17 15:15:11 +02:00
Alex Kriuchykhin
82077001b5
Fix project users management through the API for team owners [SCI-9483] (#6442) 2023-10-17 12:52:25 +02:00
Soufiane
4cd59b6a0d
Order assigned tasks by assignment date in item cards [SCI-9534] (#6463) 2023-10-17 12:52:02 +02:00
ajugo
9f1c668a10
Fix result assets download for shareable links [SCI-9542] (#6460) 2023-10-17 11:35:16 +02:00
Alex Kriuchykhin
80ccd0039c
Apply saved custom columns order to the inventory item card [SCI-9540] (#6462) 2023-10-16 16:38:43 +02:00
ajugo
8b890bc10e
Fix well plate creation on the result page [SCI-9543] (#6456) 2023-10-16 16:00:52 +02:00
ajugo
cede97d7d9
Fix closing items sidebar on opened modals [SCI-9541] (#6455) 2023-10-16 15:59:32 +02:00
wandji
550aa9df48
Update font size for stock edit modals [SCI-9451] (#6461) 2023-10-16 15:24:25 +02:00
Martin Artnik
606089a2c2
Merge pull request #6459 from G-Chubinidze/gc_SCI_9489_v2
Fix modal back arrow issue [SCI-9489]
2023-10-16 14:26:40 +02:00
Giga Chubinidze
b267c46865 Fix modal back arrow issue [SCI-9489] 2023-10-16 16:25:31 +04:00
Martin Artnik
fa4494d362
Merge pull request #6453 from lasniscinote/gl_SCI_9469
Missing inventory columns on item card [SCI-9469]
2023-10-16 13:04:16 +02:00
Gregor Lasnibat
3b4fbc944f Added archived columns [SCI-9469] 2023-10-16 13:02:28 +02:00
Martin Artnik
74c9993c8a
Merge pull request #6454 from lasniscinote/gl_SCI_9518
Fix Report table bottom toolbar moving [SCI-9518]
2023-10-16 12:11:13 +02:00
Martin Artnik
45699fdced
Merge pull request #6445 from sboursen-scinote/sb_SCI-9527
Fix item card scroller [SCI-9527]
2023-10-16 11:46:47 +02:00
Gregor Lasnibat
d580b9758c Fix Report table bottom toolbar moving [SCI-9518] 2023-10-16 11:41:59 +02:00
Martin Artnik
e5a7e2d4ba
Merge pull request #6412 from G-Chubinidze/gc_SCI_9429
Code sample in RTF on archived results is not highlighted with colors [SCI-9429]
2023-10-16 10:25:12 +02:00
Martin Artnik
88bdd36dd9
Merge pull request #6443 from artoscinote/ma_SCI_9496
Refactor select.vue to use the outside click directive [SCI-9496]
2023-10-16 10:24:25 +02:00
ajugo
67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +02:00
Gregor Lasnibat
57bfe0036b
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444) 2023-10-16 10:12:21 +02:00
Anton
cb954ed605 Fix comments in shareable tasks [SCI-9476] 2023-10-16 09:55:52 +02:00
Giga Chubinidze
66919361a6 Missing tooltips [SCI-9510] 2023-10-16 11:52:06 +04:00
sboursen-scinote
cfa8a12b6d Fix item card scroller [SCI-9527] 2023-10-14 13:03:49 +02:00
Martin Artnik
45e45d1543 Refactor select.vue to use the outside click directive [SCI-9496] 2023-10-13 16:12:01 +02:00
Soufiane
0a5686d9bc
Show task name in sticky header for Viewer users [SCI-9524] (#6432) 2023-10-13 16:10:07 +02:00
Gregor Lasnibat
86d337541a
Fixed creating MS office file with empty name freezes modal [SCI-9497] (#6440) 2023-10-13 16:09:16 +02:00
Martin Artnik
3021297f73
Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]" 2023-10-13 14:40:52 +02:00
Oleksii Kriuchykhin
984ad7757f Change the Wkhtmltopdf library to Grover for PDF generation [SCI-9372] 2023-10-13 13:38:41 +02:00
Gregor Lasnibat
8a30e70daa PR fix, removed optional chaining [SCI-9469] 2023-10-13 11:54:39 +02:00
ajugo
4e25b3921a
Remove duplicated show in repository_rows_controller (#6433) 2023-10-13 10:37:47 +02:00
Martin Artnik
9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +02:00
Martin Artnik
a83235b23c
Merge pull request #6417 from aignatov-bio/ai-sci-9476-update-shared-tasks
Update css for shared protocol [SCI-9476]
2023-10-13 10:30:48 +02:00
Martin Artnik
43522c54a0
Merge pull request #6424 from G-Chubinidze/gc_SCI_9489
CSS: Signatures modal issues [SCI-9489]
2023-10-13 10:28:58 +02:00
Gregor Lasnibat
b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +02:00
Giga Chubinidze
8e9d35d6b4 added prism highlighting 2023-10-13 03:53:45 +04:00
Martin Artnik
118a25e0ab
Merge pull request #6430 from ivanscinote/SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf
Refocus on tinymce editor after marvinjs img update [SCI-9515]
2023-10-12 16:45:36 +02:00
Ivan Kljun
d80d0af5b8 Refocus on tinymce editor after marvinjs img update [SCI-9515] 2023-10-12 16:35:36 +02:00
ajugo
c3ae813fb9
Remove link from assigned snapshot inventory row for simple view [SCI-9481] (#6405) 2023-10-12 16:30:58 +02:00
Soufiane
857bda6f69
Fix broken unit tests [SCI-8972] (#6342)
- Models tests
- Controllers tests
- Jobs tests
- Permissions tests
- Utilities tests
2023-10-12 16:16:43 +02:00
ajugo
04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
Oleksii Kriuchykhin
9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
ajugo
4b5c7362e5
Fix opening of the datetime picker direction [SCI-9146] (#6395) 2023-10-12 15:37:23 +02:00
ajugo
c55c9e2596
Fix button permission for the shareable link on task [SCI-9517] (#6427) 2023-10-12 15:36:00 +02:00
Gregor Lasnibat
27652fd1a0
Working on sticky header + navigation behaviour [SCI-9472] (#6428)
Working on highlighting ScrollSpy when scrolling. Decided on external library [SCI-9472]

Finished not sticky item header v.01 [SCI-9472]

PR fix01 [SCI-9472]
2023-10-12 15:35:30 +02:00
wandji
6ca66f3b96
Fix text size and close icon in protocol docx parser [SCI-9451] (#6423) 2023-10-12 15:32:42 +02:00
ivanscinote
a5ec4a6c95
Fix outside_click.js [SCI-9404] (#6398) 2023-10-12 15:27:36 +02:00
Gregor Lasnibat
60d79be220
Working on item card interactions, implemented close on click outside [SCI-9470] (#6401)
Fixed date format, checklist content, active/archived state [SCI-9470]

Fixed date formatting on BE [SCI-9470]
2023-10-12 15:26:41 +02:00
ajugo
e0148cca31
Fix image preview and status icon for items card [SCI-9480] (#6413) 2023-10-12 15:19:51 +02:00
wandji
45cfe77ef7
Add qr code and print label to item card [SCI-9471 (#6364)
* Add qr acode and print label to item card [SCI-9471

* Remove jQuery handler for setting barcode image src [SCI-9471]
2023-10-12 15:10:54 +02:00
Ivan Kljun
d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +02:00
ajugo
357eebee40
Fix stock export on task [SCI-9477] (#6400) 2023-10-12 14:43:17 +02:00
Giga Chubinidze
3502d96674 CSS: Signatures modal issues [SCI-9489] 2023-10-12 10:52:55 +04:00
Anton
84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Martin Artnik
120f710bb4 Fix checklists for users with check permissions [SCI-9507] 2023-10-11 11:33:04 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
2023-10-11 09:35:10 +02:00
Giga Chubinidze
de8366bb51 Code sample in RTF on archived results is not highlighted with colors [SCI-9429] 2023-10-11 03:22:11 +04:00
Alex Kriuchykhin
c446bed593
Merge pull request #6411 from okriuchykhin/ok_SCI_9503
Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503]
2023-10-10 17:56:13 +02:00
Oleksii Kriuchykhin
3d9e151fc0 Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503] 2023-10-10 17:54:45 +02:00
Martin Artnik
03e0bc9a02 Fix delete all steps modal [SCI-9502] 2023-10-10 17:08:46 +02:00
Alex Kriuchykhin
dfe3a5c54b
Merge pull request #6409 from okriuchykhin/ok_SCI_9461_v2
Fix file preview presence check in export all job [SCI-9461]
2023-10-10 16:52:46 +02:00
Oleksii Kriuchykhin
2481b0af35 Fix file preview presence check in export all job [SCI-9461] 2023-10-10 16:51:15 +02:00
Martin Artnik
09df0c3b1f Fix missing project in result level activities [SCI-9500] 2023-10-10 16:23:58 +02:00
Martin Artnik
7f8e515e88 Update table metadata when it's created [SCI-9501] 2023-10-10 16:09:47 +02:00
Alex Kriuchykhin
e131163f11
Merge pull request #6406 from okriuchykhin/ok_SCI_9461_v2
Fix file preview generation issues in export all [SCI-9461]
2023-10-10 15:33:26 +02:00
Oleksii Kriuchykhin
5c5319d80d Fix file preview generation issues in export all [SCI-9461] 2023-10-10 15:30:15 +02:00
Gregor Lasnibat
cac2b3c37e
Merge pull request #6394 from lasniscinote/gl_SCI_9474
Fixed no file preview on item card [SCI-9474]
2023-10-10 15:16:36 +02:00
Martin Artnik
b3c664664d Add project to result activities [SCI-9500] 2023-10-10 14:48:00 +02:00
Ivan Kljun
d68d7af529 Allow data attr in sanitize config [SCI-9464] 2023-10-10 14:33:55 +02:00
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik
3cf3d799f6
Merge pull request #6396 from artoscinote/ma_SCI_9492
Fix issues with project filters [SCI-9492]
2023-10-10 10:48:36 +02:00
Martin Artnik
5bd9834e91 Fix issues with project filters [SCI-9492] 2023-10-10 10:12:26 +02:00
Alex Kriuchykhin
472e573011
Merge pull request #6393 from okriuchykhin/ok_SCI_9494
Fix repository export job for snapshots [SCI-9494]
2023-10-10 09:12:49 +02:00
Gregor Lasnibat
1b85b251ba Fixed no file preview on item card [SCI-9474] 2023-10-09 17:10:41 +02:00
Oleksii Kriuchykhin
144c3ce12f Fix repository export job for snapshots [SCI-9494] 2023-10-09 15:40:19 +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
Giga Chubinidze
face69e960 changed controller action & javascript 2023-10-09 15:15:54 +04:00
Martin Artnik
b30d5577ac
Merge pull request #6391 from lasniscinote/gl_SCI_9487
Fixed checklist boxes getting bulletpoints [SCI-9487]
2023-10-09 12:49:51 +02:00
Gregor Lasnibat
30ded70f7b Fixed checklist boxes getting bulletpoints [SCI-9487] 2023-10-09 11:39:22 +02:00
Martin Artnik
7a01020a2d
Merge pull request #6389 from aignatov-bio/ai-sci-small-css-fixes
CSS fixes
2023-10-09 11:34:57 +02:00
Anton
c39ba5afe6 Css fixes 2023-10-09 11:29:28 +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
Martin Artnik
e6834d0b74
Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file
Fix pdf reports [SCI-9464]
2023-10-09 11:01:33 +02:00
Ivan Kljun
879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
Alex Kriuchykhin
8e420181ac
Merge pull request #6385 from okriuchykhin/ok_SCI_9461
Fix file preview generation in projects export jobs [SCI-9461]
2023-10-09 10:17:25 +02:00
Oleksii Kriuchykhin
b3759ff150 Fix file preview generation in projects export jobs [SCI-9461] 2023-10-09 09:52:31 +02:00
Martin Artnik
252479a748
Merge pull request #6380 from aignatov-bio/ai-sci-9448-fix-tinymce-header-bug
Fix tinymce header bug [SCI-9448]
2023-10-09 09:43:21 +02:00
Martin Artnik
1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS:  Various issues [SCI-9424]
2023-10-09 09:41:48 +02:00
Giga Chubinidze
9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Giga Chubinidze
1a6578b460 Missing file preview [SCI-9433] 2023-10-09 11:33:54 +04:00
Andrej
ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Anton
4db213b331 Fix tinymce header bug [SCI-9448] 2023-10-09 09:15:43 +02:00
Martin Artnik
60acd42614
Merge pull request #6378 from lasniscinote/gl_SCI_9435
Not responsive task page [SCI-9435]
2023-10-09 09:14:34 +02:00
Gregor Lasnibat
cce02b29ed Fixed overflowing text, breaking buttons in new line, figuring out how header stacking works (flickering bug) [SCI-9435]
Fixed header stack stuttering [SCI-9435]

PR fix 01 [SCI-9435]
2023-10-08 16:07:05 +02:00
Martin Artnik
595bca7e5b Fix editable name for locked checklists [SCI-9488] 2023-10-06 15:46:07 +02:00