Commit graph

221 commits

Author SHA1 Message Date
Giga Chubinidze
85709d7b43 Fix setting of ASSET_SYNC_URL on the fronted [SCI-9665] 2023-11-16 12:28:31 +04:00
Martin Artnik
57d5d03718 Merge branch 'develop' into features/asset-sync 2023-11-14 09:41:42 +01:00
Anton
f92f0790ed Fix resizeable navigator 2023-11-08 19:32:43 +01:00
Anton
ee857feece Merge branch 'develop' into features/datetime-picker 2023-11-08 14:19:15 +01:00
Gregor Lasnibat
fa5f44678b Fix multiple files disappearing when deleting one [SCI-9644] 2023-11-08 14:03:31 +01:00
Martin Artnik
4f9def96ca Fix handontable interactions [SCI-9655] 2023-11-08 12:26:11 +01:00
Soufiane
c56de4d5ed
Show leave page alert only if Hot cell is in edit mode [SCI-9641] (#6580) 2023-11-06 16:56:13 +01:00
Gregor Lasnibat
0c605ab63a
Previous name stays and multiple tabs open when creating Office files one after another [SCI-9516] (#6577)
* Fixed multiple subsequent MSOffice files being created [SCI-9516]

* Added clearing input when initialized [SCI-9516]
2023-11-03 14:15:26 +01:00
Martin Artnik
93861a1b22
Merge pull request #6382 from G-Chubinidze/gc_SCI_9433
Missing file preview [SCI-9433]
2023-11-03 11:16:30 +01:00
Soufiane
c1beaf0acd
Save Hot table content when cell is changed [SCI-9641] (#6573)
- Changing selected cell using Tab/Enter/Click/arrow keys saves table data.
- Show warning message when unloading the window is data is not yet saved.
2023-11-03 10:35:15 +01:00
Gregor Lasnibat
31814b7d32
Fixed multiple subsequent MSOffice files being created [SCI-9516] (#6572) 2023-11-03 10:33:40 +01:00
Martin Artnik
3a3d62a1be Merge branch 'develop' into features/asset-sync 2023-11-02 11:28:17 +01:00
Anton
fee2fad533 Update vue draggable [SCI-9637] 2023-11-02 10:38:33 +01:00
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
Martin Artnik
5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Martin Artnik
5fb1a00a21
Revert "Break after first image [SCI-9588]" 2023-10-26 14:58:27 +02:00
Anton
c90aa8ee62 Break after first image [SCI-9588] 2023-10-26 14:33:44 +02:00
Anton
a4e48c798d Fix web insert image [SCI-9127] 2023-10-26 14:24:45 +02:00
Anton
fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
Anton
261f853b03 Fix image ratio 2023-10-26 13:24:29 +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
Ivan Kljun
2031286261 Implement file-checkout localhost call [SCI-9466] 2023-10-25 09:30:42 +02:00
Giga Chubinidze
8041389e2a CAPA - Large handson table on bottom of page 2023-10-24 11:12:07 +04: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
Anton
e1d4e5269a Fix thee dots alignment [SCI-9535] 2023-10-19 11:45:01 +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
Giga Chubinidze
8e9d35d6b4 added prism highlighting 2023-10-13 03:53:45 +04:00
Martin Artnik
120f710bb4 Fix checklists for users with check permissions [SCI-9507] 2023-10-11 11:33:04 +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
7f8e515e88 Update table metadata when it's created [SCI-9501] 2023-10-10 16:09:47 +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
Anton
c39ba5afe6 Css fixes 2023-10-09 11:29:28 +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
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
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
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
Anton
f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +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
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
Giga Chubinidze
5bae359b91 Thumbnail previews on attachments that cannot generate a preview. 2023-09-25 06:30:34 +04: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
Giga Chubinidze
eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Anton
6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +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
Anton
b0dc63ebb5 Replace flyouts menu in protocol in results [SCI-9265] 2023-09-15 12:39:56 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +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
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
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
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Anton
982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +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
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
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
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
Anton
1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Martin Artnik
1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
2023-09-06 14:31:05 +02:00
Giga Chubinidze
76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
aignatov-bio
b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework
Rework inline edit vue component UI [SCI-9016]
2023-09-06 10:49:18 +02:00
Anton
48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Martin Artnik
94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio
7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
Ivan Kljun
86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
Anton
86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Ivan Kljun
40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
artoscinote
dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186
Button translation in the "Move to different result" Modal [sci-9186]
2023-09-01 11:40:57 +02:00
artoscinote
7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
2023-09-01 11:40:34 +02:00
Giga Chubinidze
b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote
51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081
Placeholder text (titles, description field) [SCI-9081]
2023-09-01 11:02:06 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Giga Chubinidze
6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze
100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
Anton
d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
G-Chubinidze
7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104)
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
2023-08-30 15:42:55 +02:00
G-Chubinidze
bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087)
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
2023-08-28 10:36:40 +02:00
Giga Chubinidze
0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
Giga Chubinidze
6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
Anton
e66968357a Fix hound 2023-08-25 09:46:53 +02:00
Anton
f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
aignatov-bio
c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Giga Chubinidze
c699095d1a Add thumbnail asset preview to list view assets [SCI-9014] 2023-08-22 05:55:20 +04:00
Anton
16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Anton
f6191dbb67 Add elements and attachments to new result [SCI-8953] 2023-08-11 11:03:26 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +02:00
artoscinote
f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu
Refactor insert menu [SCI-8905]
2023-08-01 10:13:23 +02:00
Anton
2b83243aa8 Refactor insert menu [SCI-8905] 2023-07-26 16:28:32 +02:00
Anton
f4d8983040 Update attachments section [SCI-8879] 2023-07-25 15:10:09 +02:00
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Anton
2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00