Commit graph

932 commits

Author SHA1 Message Date
Martin Artnik
595bca7e5b Fix editable name for locked checklists [SCI-9488] 2023-10-06 15:46:07 +02:00
Martin Artnik
a8c08aea95
Merge pull request #6374 from artoscinote/ma_SCI_9486
Fix checklist item reordering [SCI-9486]
2023-10-06 14:38:17 +02:00
Martin Artnik
d358dd2140 Fix checklist item reordering [SCI-9486] 2023-10-06 14:32:39 +02:00
Martin Artnik
a24c379e4a Highlight attachment order in dropdown [SCI-9467] 2023-10-06 13:46:25 +02:00
Martin Artnik
19c44c50ff
Merge pull request #6363 from artoscinote/ma_SCI_9410
Fix attachment issues [SCI-9410]
2023-10-05 16:42:10 +02:00
Martin Artnik
5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Alex Kriuchykhin
587e07a9f1
Merge pull request #6350 from lasniscinote/gl_SCI_9419
Fixed a list-item bug where view_mode was active [SCI-9419]
2023-10-05 15:31:17 +02:00
Martin Artnik
eee6da4abd
Merge pull request #6322 from G-Chubinidze/gc_SCI_9401
CSS: Blank name error message on table [sci-9401]
2023-10-05 11:04:20 +02:00
Giga Chubinidze
2c3d5c4fd5 changed styling to tw class / optimized inline editing height 2023-10-05 13:01:34 +04:00
Andrej
0889c40d46 Fix icons and OVE view for attachments [SCI-9445] 2023-10-04 16:18:03 +02:00
Martin Artnik
6b8382c564 Fix unwanted checklist name locking [SCI-9408] 2023-10-04 13:15:41 +02:00
Martin Artnik
6f45980648
Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues
Fix UI for consumption/edit stock/assign to task modals [SCI-9407]
2023-10-04 12:51:59 +02:00
Martin Artnik
b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
2023-10-04 12:51:20 +02:00
Martin Artnik
93bbd32cb8
Merge pull request #6343 from artoscinote/ma_SCI_9428
Fix dropdown issues [SCI-9428]
2023-10-04 12:49:56 +02:00
Martin Artnik
4ea040cde7 Fix z-index issue with stackable headers [SCI-9428] 2023-10-04 12:48:31 +02:00
Gregor Lasnibat
56d393d16a Fixed a list-item bug where view_mode was active [SCI-9419] 2023-10-04 11:30:34 +02:00
ivanscinote
a4d0d71f18
Merge branch 'develop' into SCI-9407-css-consumption-modals-assign-to-task-modal-issues 2023-10-04 11:00:33 +02:00
Martin Artnik
1f5ecfba33
Merge pull request #6344 from G-Chubinidze/gc_SCI_9447
Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]
2023-10-04 09:25:01 +02:00
Giga Chubinidze
b4247391a5 CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438] 2023-10-04 05:36:03 +04:00
Giga Chubinidze
615d6ebbfa Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447] 2023-10-04 04:56:17 +04:00
Martin Artnik
14a693b697 Highlight selected sort in results sort dropdown [SCI-9428] 2023-10-03 16:19:27 +02:00
Martin Artnik
1acf67db5a Fix dropdown opening direction [SCI-9428] 2023-10-03 16:07:05 +02:00
Alex Kriuchykhin
112e642a21
Merge pull request #6340 from lasniscinote/gl_SCI_9419
Fixed Protocol templates missing additional options for steps [SCI-9419]
2023-10-03 15:29:10 +02:00
Gregor Lasnibat
87714b4dd9 Fixed breaking QR code generation [SCI-9354] 2023-10-03 15:11:40 +02:00
Gregor Lasnibat
6724a31256 Fixed Protocol templates missing additional options for steps [SCI-9419] 2023-10-03 15:03:37 +02:00
Alex Kriuchykhin
a000f0e67e
Merge pull request #6303 from wandji20/wb-SCI-9157
Add export button to item card [SCI-9157]
2023-10-03 12:52:03 +02:00
Alex Kriuchykhin
8cc72cb05e
Merge pull request #6334 from wandji20/wb-SCI-9359
Update OVE package and fix bug opening github issue link [SCI-9359]
2023-10-03 12:51:15 +02:00
wandji20
285276a59a Rename item card export label [SCI-9157] 2023-10-03 10:54:45 +01:00
wandji20
2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Ivan Kljun
667025b7c6 Fix UI for consumption/edit stock/assign to task modals [SCI-9407] 2023-10-03 11:12:03 +02:00
wandji20
4f5ecf66f4 Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-03 09:54:54 +01:00
Martin Artnik
b4ce0dda60
Merge pull request #6316 from artoscinote/ma_SCI_9400
Add back version modal link [SCI-9400]
2023-10-03 10:54:47 +02:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Alex Kriuchykhin
42b145648f
Merge pull request #6276 from wandji20/wb-SCI-9359
Update OVE package and fix bug opening github issue link [SCI-9359]
2023-10-03 10:18:11 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej
1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
wandji20
7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
Gregor Lasnibat
a5ad6d375e Fixed repositoryItemSidebar wrapper covering up content when closed [SCI-9354] 2023-10-02 17:00:47 +02:00
Martin Artnik
a2870dd9d1 Add back version modal link [SCI-9400] 2023-10-02 14:31:28 +02:00
Alex Kriuchykhin
20be895938
Merge pull request #6325 from rekonder/aj_SCI_9275
Fix closing of the dropdown menu for protocol parser import [SCI-9275]
2023-10-02 13:58:50 +02:00
Alex Kriuchykhin
c4f646ef78
Merge pull request #6324 from rekonder/aj_SCI_9409
Fix marvinjs loading and speedup creating of the wopi files [SCI-9409]
2023-10-02 13:58:30 +02:00
Andrej
4cf6d225ca Fix closing of the dropdown menu for protocol parser improt [SCI-9275] 2023-10-02 08:57:26 +02:00
Andrej
e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Giga Chubinidze
b2bc968a4f CSS: Blank name error message on table [sci-9401] 2023-10-02 07:41:31 +04:00
Martin Artnik
4f2f5d156b Fix linked protocol info button position [SCI-9328] 2023-09-29 11:45:04 +02:00
Martin Artnik
82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Gregor Lasnibat
f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354]
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
2023-09-28 13:21:20 +02:00
Alex Kriuchykhin
ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp
Add assigned tasks block to the item card [SCI-9155]
2023-09-27 15:03:20 +02:00
Martin Artnik
3ce0779663
Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues
Fix results sticky toolbar [SCI-9344]
2023-09-27 14:03:12 +02:00
Martin Artnik
923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
2023-09-27 12:41:34 +02:00
Martin Artnik
187c8b12f9
Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results
Add hidden element to support legacy code for MarvinJS at results [SCI-9346]
2023-09-27 10:43:25 +02:00
Alex Kriuchykhin
9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
Anton
f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20
213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01:00
Ivan Kljun
1373994559 Fix results sticky toolbar [SCI-9344] 2023-09-26 12:20:49 +02:00
Andrej
9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Ivan Kljun
f16354e498 Add hidden element to support legacy code for MarvinJS at results [SCI-9346] 2023-09-26 10:09:45 +02:00
Anton
2b9ae65a51 Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379] 2023-09-25 15:04:41 +02:00
Anton
2b676f249b Css Fixes 2023-09-25 14:15:08 +02:00
Gregor Lasnibat
4e6646e3f9 Added a missing RepositoryTimeValue component [SCI-9153-v2]
PR fix [SCI-9153-v2]

PR fix 02 [SCI-9153-v2]
2023-09-25 14:02:05 +02:00
Andrej
4e6ccce9dd Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 11:49:51 +02:00
Andrej
e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
wandji
7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji
5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284)
This reverts commit 7430f2240d.
2023-09-25 10:46:19 +02:00
Martin Artnik
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
aignatov-bio
647d94bebc
Merge pull request #6279 from aignatov-bio/ai-sci-9343-improve-flyouts
Fixes for new flyout [SCI-9343]
2023-09-25 10:15:11 +02:00
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Martin Artnik
3f23d10462
Merge pull request #6281 from G-Chubinidze/gc_SCI_9326
Thumbnail previews on attachments that cannot generate a preview. [SCI-9326]
2023-09-25 09:05:38 +02:00
Andrej
2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Giga Chubinidze
5bae359b91 Thumbnail previews on attachments that cannot generate a preview. 2023-09-25 06:30:34 +04:00
Anton
5b434c4e4c Fixes for new flyout [SCI-9343] 2023-09-23 19:15:35 +02:00
wandji
767c98c101
Add barcode and print label to item card [SCI-9156] (#6269)
* Add barcode and print label to item card [SCI-9156]

* Rename wrong label [SCI-9156]
2023-09-22 16:17:42 +02:00
Alex Kriuchykhin
50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
2023-09-22 14:14:38 +02:00
aignatov-bio
a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions
Refactor checklist [SCI-9340]
2023-09-22 12:09:41 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
wandji20
3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
2023-09-21 20:18:20 +02:00
Anton
97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
aignatov-bio
2ab4d2b8dc
Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen
Update protocol template screen [SCI-9319]
2023-09-21 10:39:16 +02:00
Anton
40144ea33f Update protocol template screen [SCI-9319] 2023-09-21 10:37:58 +02:00
aignatov-bio
ecd00a4f4f
Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css
Task details css fixes [SCI-9342]
2023-09-21 10:20:00 +02:00
Martin Artnik
2ad0d3a65f
Merge pull request #6260 from G-Chubinidze/gc_SCI_9289
Result comments issues [SCI-9289]
2023-09-21 10:01:30 +02:00
Martin Artnik
810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
CSS: Results revamp issues [SCI-9269]
2023-09-21 10:00:14 +02:00
Anton
ce2d91025c Task details css fixes [SCI-9342] 2023-09-21 09:48:46 +02:00
Giga Chubinidze
eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Giga Chubinidze
f0fdfe2ea3 Result comments issues 2023-09-21 06:21:50 +04:00
Alex Kriuchykhin
8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-20 19:36:12 +02:00
Andrej
b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Anton
dd17b46667 Fix inline editing 2023-09-19 13:56:07 +02:00
Oleksii Kriuchykhin
3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Anton
6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +02:00
Alex Kriuchykhin
ad4a4412f7
Merge pull request #6233 from rekonder/aj_SCI_9301
Move OVE trial period handling [SCI-9301]
2023-09-18 09:41:24 +02:00
Martin Artnik
fa53a0a049 Fix handson table rendering [SCI-9295] 2023-09-18 09:37:18 +02:00
Giga Chubinidze
73c1f67510 Missing modal when deleting an archived result [SCI-9291] 2023-09-18 01:28:22 +04:00
Andrej
9f672ecfe2 Move OVE trial period handling [SCI-9301] 2023-09-15 16:07:10 +02:00
Soufiane
0191b9e9ab
Fix wellplates reversed columns and rows headers [SCI-9071] (#6196)
- Fix well plates reversed columns and rows headers.
- Fix jumping when in edit mode.
- Fix disappearing columns after edit.
2023-09-15 14:52:36 +02:00
aignatov-bio
5258e55d00
Merge pull request #6230 from aignatov-bio/ai-sci-9265-update-flyouts-menu-task-results
Replace flyouts menu in protocol in results [SCI-9265]
2023-09-15 14:40:55 +02:00
Oleksii Kriuchykhin
36f4e22fa3 Merge branch 'develop' into features/october-release 2023-09-15 14:08:45 +02:00