scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-23 07:58:49 +08:00
Code Issues Projects Releases Packages Wiki Activity
15498 commits 41 branches 184 tags 168 MiB
Commit graph

1594 commits

Author SHA1 Message Date
ajugo
7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +02:00
Anton
0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize 
Features/navigator resize
 2023-10-25 14:05:14 +02:00
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Soufiane
9809f696a2
FIX: Clearing inventory item filter fails with 500 or breaks UI [SCI-9345] (#6358) 2023-10-24 16:05:35 +02:00
Soufiane
809aaa8aa3
Implement field editing for the new item card [SCI-9412] (#6421) 
- Created new checklist component.
- updated the functionality of the select-search component.
- Name field.
- Text fields.
- Numeric fields.
- List fields.
- Status fields.
- Checklist fields.
 2023-10-24 15:49:37 +02:00
Anton
1dd178fb4d Update vue packs to vue3 [SCI-8847] 2023-10-24 13:16:22 +02:00
Martin Artnik
0e3c7eaf26 Fix issue with text value rendering [SCI-9583] 2023-10-24 13:15:17 +02:00
Giga Chubinidze
8041389e2a CAPA - Large handson table on bottom of page 2023-10-24 11:12:07 +04:00
wandji
cedb0cc023
Add edit feature for item card date fields [SCI-9416] (#6431) 2023-10-23 20:57:12 +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
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
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
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
Anton
4122876a90 Fix bottom toolbar for reports [SCI-9518] 2023-10-19 10:16:09 +02:00
ajugo
aed5418366
Fix closing item sidebar for printing label modal [SCI-9541] (#6486) 2023-10-19 09:48:20 +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
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
191cfe45db
Fix repository item card CSS [SCI-9547] (#6477) 2023-10-18 10:06:21 +02: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
Anton
db3f217bba Implement acitvity notifications 
[SCI-9512]
 2023-10-17 14:59:50 +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
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
Gregor Lasnibat
57bfe0036b
Fix Rename the buttons Show/Hide in multiline text fields [SCI-9439] (#6444) 2023-10-16 10:12:21 +02:00
Giga Chubinidze
66919361a6 Missing tooltips [SCI-9510] 2023-10-16 11:52:06 +04:00
Anton
225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02: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
8a30e70daa PR fix, removed optional chaining [SCI-9469] 2023-10-13 11:54:39 +02:00
Martin Artnik
9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +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
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
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
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
Martin Artnik
03e0bc9a02 Fix delete all steps modal [SCI-9502] 2023-10-10 17:08:46 +02:00
Martin Artnik
7f8e515e88 Update table metadata when it's created [SCI-9501] 2023-10-10 16:09:47 +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
Andrej
79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Gregor Lasnibat
1b85b251ba Fixed no file preview on item card [SCI-9474] 2023-10-09 17:10:41 +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
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
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
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
29147e8bc4 Fix TinyMCE sticky header in protocol templates [SCI-9467] 2023-10-06 13:41:04 +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
Gregor Lasnibat
80de7483eb Prepare a modal displaying relationships for a specific item [SCI-9357] 2023-10-03 09:33:39 +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
Alex Kriuchykhin
2303b72f78
Merge pull request #6246 from lasniscinote/gl_SCI_9306 
Fix ESLint config/install v.01 [SCI-9306]
 2023-09-19 10:40:08 +02:00
Gregor Lasnibat
7a6b4ed359 Fix ESLint config/install v.01 [SCI-9306] 
Added yarn.lock [SCI-9306]
 2023-09-19 09:27:29 +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
wandji20
de4cb662a6 Update translation name for item_card [SCI-9151] 2023-09-15 12:30:02 +01:00
Anton
b0dc63ebb5 Replace flyouts menu in protocol in results [SCI-9265] 2023-09-15 12:39:56 +02:00
wandji20
0b0eddd62b Add default columns to inventory item card [SCI-9151] 2023-09-15 11:39:42 +01:00
Martin Artnik
160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Andrej
b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Martin Artnik
31c0ddba7e
Merge pull request #6214 from artoscinote/ma_SCI_9286 
Add new step buttons for protocol template, remove bottom new result button [SCI-9286]
 2023-09-14 12:26:16 +02:00
Martin Artnik
fd6ae82874
Merge pull request #6218 from artoscinote/ma_SCI_9295 
Fix handson table rendering [SCI-9295]
 2023-09-14 12:26:05 +02:00
Anton
4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Martin Artnik
c3aab9c3a9 Fix handson table rendering [SCI-9295] 2023-09-14 10:52:08 +02:00
Alex Kriuchykhin
40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration 
Features/ove integration
 2023-09-13 17:05:48 +02:00
wandji
c2d6b4d960
Add option to disable save button when OVE editor is in readonly mode [SCI-9110] (#6111) 
* Add option to disable save button when OVE editor is in readonly mode [SCI-9110]
 2023-09-13 16:53:16 +02:00
Gregor Lasnibat
cf641201ac New item card custom columns [SCI-9153] 2023-09-13 16:13:22 +02:00
ajugo
efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203) 2023-09-13 15:02:30 +02:00
Martin Artnik
a0fca943aa Add new step buttons for protocol template, remove bottom new result button [SCI-9286] 2023-09-13 14:57:03 +02:00
wandji
642e3b5ff4
Add link to knowledge base [SCI-9231] (#6190) 
* Add link to knowledge base [SCI-9231]

* Remove custom OVE help link [SCI-9231]
 2023-09-13 14:45:28 +02:00
aignatov-bio
110e2ced6c
Merge pull request #6213 from aignatov-bio/ai-sci-9296-fix-restore-archive-action 
Fix archive/restore results [SCI-9296]
 2023-09-13 14:37:09 +02:00
aignatov-bio
f5b08ffb33
Merge pull request #6212 from aignatov-bio/ai-sci-9260-fix-new-office-in-results 
Fix office creation on results [SCI-9260]
 2023-09-13 14:36:23 +02:00
aignatov-bio
0e290fa2dc
Merge pull request #6211 from aignatov-bio/ai-sci-9271-fix-checklist-rearange 
Fix checklist rearrange [SCI-9271]
 2023-09-13 14:35:54 +02:00
Anton
a8c660394f Fix archive/restore results [SCI-9296] 2023-09-13 14:34:49 +02:00
Anton
d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Anton
718013439d Fix checklist rearrange [SCI-9271] 2023-09-13 14:13:34 +02:00
Anton
3268a95ecf Fix text field width and table header [SCI-9149] 2023-09-13 14:03:49 +02:00
aignatov-bio
ef3c916c00
Merge pull request #6205 from aignatov-bio/ai-sci-9262-add-three-dots-menu-for-elements 
Add flyout menu to step/results elements [SCI-9262]
 2023-09-13 13:49:33 +02:00
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Martin Artnik
6a8f8cb419
Merge pull request #6194 from artoscinote/ma_SCI_9279 
Fix z-index issues with share modal [SCI-9279]
 2023-09-13 10:11:38 +02:00
Martin Artnik
c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285 
Fix result pagination, fix new step/result buttons [SCI-9285]
 2023-09-13 10:00:01 +02:00
aignatov-bio
637093f69e
Merge pull request #6188 from aignatov-bio/ai-sci-9254-fix-inline-edit 
Fix inline edit [SCI-9254]
 2023-09-13 09:59:50 +02:00
Gregor Lasnibat
6709d5ee73 Finished v.01 of inventory item card (RepositoryItemSidebar) [SCI-9091] 2023-09-13 08:34:07 +02:00
Martin Artnik
6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Martin Artnik
b78ed02bf4 Fix z-index issues with share modal [SCI-9279] 2023-09-12 14:11:34 +02:00
G-Chubinidze
067d0ca51e
Merge branch 'features/september-release' into gc_SCI_9105 2023-09-12 02:19:02 +04:00
Giga Chubinidze
46af9af0a9 Implement results expand/collapse, and expand/collapse all [SCI-9105] 2023-09-12 02:11:58 +04:00
Anton
982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
Anton
67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
aignatov-bio
daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results 
CSS fixed for task protocol
 2023-09-11 15:57:36 +02:00
Anton
3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Martin Artnik
8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267 
Fix attachment sorting in results [SCI-9267]
 2023-09-11 10:01:26 +02:00
Martin Artnik
266c78deb1
Merge pull request #6179 from artoscinote/ma_SCI_9278 
Disable move button in move content modal if there's no target selected [SCI-9278]
 2023-09-11 09:59:47 +02:00
wandji
a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176) 
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
 2023-09-11 09:50:05 +02:00
Martin Artnik
f0c77b4e7d Disable move button in move content modal if there's no target selected [SCI-9278] 2023-09-08 16:26:29 +02:00
Martin Artnik
ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Anton
7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Gregor Lasnibat
5ad6b27f9c
Merge pull request #6169 from lasniscinote/gl_SCI_9256 
Fix styles for input in OVE/Marvin editor [SCI-9256]
 2023-09-08 10:19:59 +02:00
wandji
8e4dbbac58
Remove name when loading ove file [SCI-9169] (#6165) 2023-09-07 17:19:09 +02:00
Gregor Lasnibat
93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +02:00
aignatov-bio
92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
Anton
53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
Anton
8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik
70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209 
Fix attachment deletion and image errors [SCI-9209]
 2023-09-07 10:37:41 +02:00
Anton
7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00