Commit graph

10831 commits

Author SHA1 Message Date
Anton
5b989042f0 Fix checklist add item button position [SCI-8788] 2023-07-17 11:00:32 +02:00
ajugo
504a0bee62
Fix scroll for protocols.io [SCI-8825] (#5774) 2023-07-17 10:55:36 +02:00
Giga Chubinidze
6bc2efbcde CSS: Inventories filter input width [SCI-8791] 2023-07-17 11:50:52 +04:00
wandji20
3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736)
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
2023-07-14 12:31:54 +02:00
ivanscinote
527551068b
Fix smart annotations multiline display [SCI-8816] (#5747) 2023-07-14 12:31:33 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766)
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
ivanscinote
f21a4ec17b
Remove searchfield glitch at reports and label templates index page (#5769) 2023-07-14 12:30:58 +02:00
wandji
ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768)
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
2023-07-14 12:30:36 +02:00
Soufiane
5266fad02d
Fix bootstrap input-group style [SCI-8723] (#5770) 2023-07-14 08:37:29 +02:00
wandji20
a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01:00
aignatov-bio
9421ef3312
Merge pull request #5764 from aignatov-bio/ai-sci-8788-fix-styling-for-checklist-items
Fix css for protocol checklists [SCI-8788]
2023-07-13 15:09:57 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Anton
b623cf8d04 Fix canvas styling [SCI-8789] 2023-07-13 14:21:55 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Anton
4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Anton
25b11bfb24 Added error handling for protocol import [SCI-8735] 2023-07-13 11:51:35 +02:00
Alex Kriuchykhin
d419608f18
Connect protocol parsing service to rails backend [SCI-8817] (#5759) 2023-07-13 11:41:53 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane
6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758)
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
2023-07-12 15:42:34 +02:00
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes
Multiple CSS fixes [SCI-8762]
2023-07-12 14:34:59 +02:00
Soufiane
ebfa56fdc4
Upgrade the toggle button globally [SCI-8761] (#5756) 2023-07-12 12:49:33 +02:00
Anton
24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
G-Chubinidze
ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
Soufiane
2f669c93d5
Fix projects issues after rails upgrade [SCI-8827] (#5754) 2023-07-12 11:10:17 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-12 09:48:27 +02:00
ajugo
051e686787
Implement automatic check for new notifications [SCI-8654] (#5631) 2023-07-11 16:05:34 +02:00
ajugo
32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
Alex Kriuchykhin
b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
Anton
71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +02:00
aignatov-bio
388915b6d9
Fix big decimal number renderer in repository [SCI-8828] (#5746) 2023-07-11 13:24:07 +02:00
aignatov-bio
3de911d714
Merge pull request #5750 from aignatov-bio/ai-sci-8762-css-bugs
CSS fixes [SCI-8762]
2023-07-11 10:59:27 +02:00
ajugo
632716e2cd
Remove task manage permission [SCI-8528] (#5672) 2023-07-11 09:29:17 +02:00
artoscinote
4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683)
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
2023-07-11 09:27:15 +02:00
Soufiane
a1e32e0c3d
Profile - 2FA error page [SCI-8779] (#5734)
* Fix 2FA form submit [SCI-8779]
2023-07-11 09:22:42 +02:00
Soufiane
d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane
6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Soufiane
9034793d69
Implement the assigned items datatable for shareable links [SCI-8751] (#5721)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-11 08:16:29 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
G-Chubinidze
25aa644102
Removing Support button from the top navigation [SCI-8806] (#5744) 2023-07-10 14:03:47 +02:00
artoscinote
5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
Soufiane
e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane
eb4d0f2065
Revert changing .js.erb file [SCI-8810] (#5741) 2023-07-10 09:43:00 +02:00
Soufiane
b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Anton
2daa9126d1 Small fixes for css bundling [SCI-8773] 2023-07-07 11:44:42 +02:00
Alex Kriuchykhin
97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +02:00
Soufiane
8fb14645bf
Match protocol template print permissions to show [SCI-8803] (#5726) 2023-07-07 11:01:31 +02:00
wandji
322346c8e4
Fix dropdown issue for filters [SCI_8781] (#5731) 2023-07-07 10:58:43 +02:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723)
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
2023-07-06 16:05:03 +02:00
Soufiane
33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-06 15:10:26 +02:00
Soufiane
6049c7d8b9
Activities for shareable links [SCI-8652] (#5694)
Define new activities for task shareable links [SCI-8652]
2023-07-06 15:01:32 +02:00
Anton
f071e482d8 Migrate to css bundling [SCI-8773] 2023-07-06 13:26:41 +02:00
Anton
93a6a0bdc5 Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems 2023-07-06 11:15:48 +02:00
Anton
4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Martin Artnik
ed4af7ae26 Properly unload scroll listener when unloading a select [SCI-8802] 2023-07-06 10:31:26 +02:00
Soufiane
94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +02:00
ajugo
836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709)
Add permissions for shareable links and som fixes for controller [SCI-8747]
2023-07-05 16:21:26 +02:00
ivanscinote
71e5c81f8b
Unified paddings for collapsing content at printers pages [SCI-8787] (#5720)
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
2023-07-05 15:06:53 +02:00
ajugo
c8c0a147b5
Revert "Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)" (#5719)
This reverts commit dbb0e1a50a.
2023-07-05 14:20:22 +02:00
ivanscinote
dbb0e1a50a
Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
2023-07-05 14:19:23 +02:00
Soufiane
ea6a714dac
Disallow scripts loading over https [SCI-8634] (#5713)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-07-05 13:19:16 +02:00
Alex Kriuchykhin
5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
artoscinote
85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506
Make label print modal work globally [SCI-8506]
2023-07-05 09:53:56 +02:00
Giga Chubinidze
2bb27949fd TinyMCE list of smaller bugs and improvements [SCI-7976] 2023-07-05 11:52:05 +04:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
artoscinote
97bef6f8f4
Merge pull request #5675 from G-Chubinidze/gc_SCI_8536
Unify display of the Project/Experiment/Task name in the table views [SCI-8536]
2023-07-03 14:50:11 +02:00
artoscinote
fc7a04d0f9
Merge pull request #5649 from G-Chubinidze/gc_SCI_7524
Settings - My preferences - Date formats appear duplicated [SCO-7524]
2023-07-03 14:49:40 +02:00
artoscinote
7b1f444a11
Merge pull request #5689 from wandji20/wb-SCI-8741
Fix avatar image width in smart anotation pop op [SCI-8741]
2023-07-03 14:48:57 +02:00
artoscinote
1e8304d883
Merge pull request #5697 from wandji20/wb-SCI-8487
Add filter to remove archived inventories from report widget [SCI-8487]
2023-07-03 14:48:23 +02:00
artoscinote
c4acbf2815
Merge pull request #5692 from artoscinote/ma_SCI_8691
Add action toolbar to archived tasks card view [SCI-8691]
2023-07-03 14:47:47 +02:00
artoscinote
8f88d2d894
Merge pull request #5700 from G-Chubinidze/gc_SCI_8422
Label templates issues on edit template page [SCI-8422]
2023-07-03 14:47:00 +02:00
artoscinote
1c337b7dd6
Merge pull request #5704 from artoscinote/ma_SCI_8774
Fix result table editing [SCI-8774]
2023-07-03 13:32:35 +02:00
Martin Artnik
308079319c Fix result table editing [SCI-8774] 2023-07-03 13:28:34 +02:00
ajugo
6dc4b646c5
Add handling for deleted ActiveStorage files [SCI-8264] (#5624)
Add handling for deleted ActiveStorage files [SCI-8264]
2023-07-03 13:13:19 +02:00
Anton
b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Martin Artnik
c7d992ab83 Fixes for saving of result table metadata [SCI-8774] 2023-07-03 12:35:29 +02:00
Giga Chubinidze
b1490c81a0 changed timeout to nexttick 2023-07-03 13:50:44 +04:00
Giga Chubinidze
4bc25ac00f Label templates issues on edit template page [SCI-8422] 2023-07-03 10:56:20 +04:00
artoscinote
940ca1f096
Merge pull request #5685 from G-Chubinidze/gc_SCI_8693
Parsing (import) protocols - Notifications update [SCI-8693]
2023-06-30 14:54:14 +02:00
Martin Artnik
0f3b524492 Fix and amend result table metadata saving [SCI-8774] 2023-06-30 14:11:03 +02:00
wandji20
eb017ff564 Add filter to remove archived inventories from report widget [SCI-8487] 2023-06-30 02:22:57 +01:00
Anton
3e3374c83d Fix service module 2023-06-29 14:38:13 +02:00
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 13:38:59 +02:00
Soufiane
1a9ef4a1d5
Update the Tasks screens for the Shareable-links feature [SCI-8649] (#5679)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 11:17:41 +02:00
Martin Artnik
02a9813fb8 Show checkboxes for tasks in archived experiments [SCI-8692] 2023-06-28 15:57:15 +02:00
Martin Artnik
1d6f3cedc7 Add action toolbar to archived tasks card view [SCI-8691] 2023-06-28 15:39:03 +02:00
wandji20
5fe2bd56b6 Fix avatar image width in smart anotation pop op [SCI-8741] 2023-06-28 11:57:19 +01:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Oleksii Kriuchykhin
e5fe82a297 Fix file name of inventory export, add archived columns to exports [SCI-8760] 2023-06-28 10:22:26 +02:00
Giga Chubinidze
a2aab6cbeb Parsing (import) protocols - Notifications update [SCI-8693] 2023-06-28 09:05:11 +04:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Martin Artnik
39aedd86e0 Fix project sort initialization [SCI-8756] 2023-06-27 15:18:12 +02:00
aignatov-bio
272baeb93e
Merge pull request #5680 from aignatov-bio/ai-sci-8742-small-css-fixes
Small css fixes [SCI-8742]
2023-06-27 12:00:37 +02:00
Anton
e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
Andrej
35ebbadae9 Fix adding tags to the task at creation [SCI-8745] 2023-06-27 10:52:03 +02:00
ajugo
8d29e606d0
Fix filtering of the member on project page [SCI-8743] (#5676) 2023-06-27 10:17:17 +02:00
Giga Chubinidze
d3678aeb55 Unify display of the Project/Experiment/Task name in the table views [SCI-8536] 2023-06-26 21:52:27 +04:00
artoscinote
5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726
[SCI-8164][SCI-8726]
2023-06-26 15:43:29 +02:00
sboursen-scinote
706c2e492b Fix CSS and icon inconsistencies [SCI-8164][SCI-8726]
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-26 15:22:36 +02:00
artoscinote
fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476
Breadcrumbs on label/protocol template page [SCI-8476]
2023-06-26 13:00:19 +02:00
artoscinote
ec3e8a20cc
Merge pull request #5671 from sboursen-scinote/sb_SCI-8729
Archived view broken after folder [SCI-8729]
2023-06-26 11:55:08 +02:00
ajugo
13f0b26875
Fix uploading of old protocol tables [SCI-8736] (#5673) 2023-06-26 11:54:54 +02:00
artoscinote
8bf8b9cc72
Merge pull request #5670 from artoscinote/ma_SCI_8694
Fix boostrap datepicker to work with new font [SCI-8694]
2023-06-26 11:44:01 +02:00
artoscinote
9242b99c8f
Merge pull request #5669 from artoscinote/ma_SCI_8731
CSS fixes [SCI-8731]
2023-06-26 11:43:38 +02:00
artoscinote
b6b61dfdf8
Merge pull request #5668 from artoscinote/ma_SCI_8734
Fix repository export [SCI-8734]
2023-06-26 11:43:14 +02:00
sboursen-scinote
49ac9a20d8 Fix folders style in table archived view [SCI-8729]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-24 13:20:46 +02:00
Martin Artnik
9ea927e5b9 Fix boostrap datepicker to work with new font [SCI-8694] 2023-06-23 15:36:14 +02:00
Martin Artnik
5e7d3f1564 CSS fixes [SCI-8731] 2023-06-23 15:01:04 +02:00
Martin Artnik
5609184c0f Fix repository export modal [SCI-8734] 2023-06-23 12:41:37 +02:00
Soufiane
fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-23 12:10:58 +02:00
Giga Chubinidze
ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
Martin Artnik
d1302d322b Fix zip export [SCI-8734] 2023-06-23 11:18:16 +02:00
artoscinote
b520f8a04b
Merge pull request #5655 from aignatov-bio/ai-sci-8704-fix-avatar-popup
Add left padding to smart annotation popup [SCI-8704]
2023-06-23 10:51:37 +02:00
artoscinote
3ff8b44115
Merge pull request #5662 from rekonder/aj_SCI_8728
Fix default role assigning on projects create through the dashboard [SCI-8728]
2023-06-23 10:04:44 +02:00
artoscinote
3658a224b2
Merge pull request #5650 from okriuchykhin/ok_SCI_8718
Limit execution time of file text extraction jobs to 5 minutes [SCI-8718]
2023-06-23 09:55:52 +02:00
artoscinote
496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719
Remove breadcrumbs project table and fix project filtering [SCI-8719]
2023-06-23 09:54:00 +02:00
artoscinote
f1876b4f59
Merge pull request #5661 from okriuchykhin/ok_SCI_8710
Fix breadcrumbs for archived view mode [SCI-8710]
2023-06-23 09:50:03 +02:00
Giga Chubinidze
828e566698 changed logic to accomodate templates unique design 2023-06-23 11:26:53 +04:00
Andrej
0ea3a10d26 Fix default role assigning on projects create through the dashboard [SCI-8728] 2023-06-22 16:40:50 +02:00
Oleksii Kriuchykhin
e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Soufiane
c71d8df470
Add support to characters in smartAnnotation [SCI-8656] (#5617)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 15:40:39 +02:00
Martin Artnik
9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Soufiane
b4d4043271
Prevent over submitting on new task click [SCI-8460] (#5659)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 14:49:53 +02:00
artoscinote
c7d5bba855
Merge pull request #5657 from artoscinote/ma_SCI_8711
Fix sticky header z-index [SCI-8711]
2023-06-22 14:33:38 +02:00
artoscinote
b78105c546
Fix column width limiting [SCI-7961] (#5656) 2023-06-22 14:33:16 +02:00
Martin Artnik
370cf4b345 Fix sticky header z-index [SCI-8711] 2023-06-22 14:06:38 +02:00
Soufiane
9c2c767f9f
Fix Drag me Canvas button [SCI-8720] (#5652)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-22 13:45:44 +02:00
Andrej
3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Anton
2254fcdab0 Add left padding to smart annotation popup [SCI-8704] 2023-06-22 13:36:05 +02:00
Anton
8fa10b35ab Fix protocol template title colors 2023-06-22 13:21:03 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Oleksii Kriuchykhin
f44e339c7f Limit execution time of file text extraction jobs to 5 minutes [SCI-8718] 2023-06-22 11:39:10 +02:00
ajugo
e82338be70
Fix zoom on pdf preview [SCI-8697] (#5647) 2023-06-22 10:41:35 +02:00
aignatov-bio
0a4eb1989a
Merge pull request #5646 from aignatov-bio/ai-sci-8709-fix-audit-trails
Fix pagination position [SCI-8709]
2023-06-22 10:41:22 +02:00
G-Chubinidze
dfdab6e051
CSS: Issues with the projects page [SCI-8507] (#5648)
* CSS: Issues with the projects page [SCI-8504]

* css fix

* added empty cells for folder row
2023-06-22 10:38:36 +02:00
Giga Chubinidze
e77e2813bd Settings - My preferences - Date formats appear duplicated [SCO-7524] 2023-06-22 11:09:27 +04:00
aignatov-bio
469c35ed72
Merge pull request #5643 from aignatov-bio/ai-sci-8704-fix-long-user-name-in-smart-annotation
Fix long user name in smart annotation [SCI-8704]
2023-06-21 16:54:13 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Anton
5fc5f30a69 Fix pagination position [SCI-8709] 2023-06-21 14:32:25 +02:00
artoscinote
a2dd887dc2
Unify user list style in protocols table [SCI-8696] (#5644) 2023-06-21 13:24:40 +02:00
Anton
8c385e911f Fix long user name in smart annotation [SCI-8704] 2023-06-21 12:53:18 +02:00
artoscinote
de10f32b0f
Add tailwind styles to sign in halt layout [SCI-8689] (#5642) 2023-06-21 12:41:31 +02:00
artoscinote
248790360a
Project filter fixes [SCI-8695] (#5640) 2023-06-21 12:30:49 +02:00
aignatov-bio
e520540f99
Merge pull request #5641 from aignatov-bio/ai-sci-ui-css-fixes
UI CSS Fixes
2023-06-21 12:04:12 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
G-Chubinidze
67d0444b31
CSS: Issues with the projects page [SCI-8507] (#5630)
* CSS: Issues with the projects page [SCI-8504]

* css fix
2023-06-21 11:00:16 +02:00
Soufiane
8b8fd1db42
Fix wicked_pdf asset pipeline [SCI-8684] (#5629)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-21 10:42:27 +02:00
G-Chubinidze
d686d746cb
updated breadcrumb logic for templates (#5609) 2023-06-21 10:27:21 +02:00
G-Chubinidze
a88adf7630
changed tooltips (#5639) 2023-06-21 10:00:46 +02:00
Soufiane
f3dcef44ac
Show checkmark on selected user role only [SCI-8699] (#5636)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-21 08:12:31 +02:00
aignatov-bio
55e75ffa91
Merge pull request #5635 from aignatov-bio/ai-sci-8662-ui-css-fixes
UI css fixes [SCI-8662]
2023-06-21 08:06:52 +02:00
artoscinote
02c93211ea
Fix column resizing issues [SCI-7961] (#5638) 2023-06-20 16:44:12 +02:00
aignatov-bio
0543a9a0c4
Merge pull request #5637 from aignatov-bio/ai-sci-8660-ui-css-fixes
Fix UI css fixes [SCI-8660]
2023-06-20 16:36:45 +02:00
Anton
f675034b7f Fix UI css fixes [SCI-8660] 2023-06-20 15:53:33 +02:00
Soufiane
8e6854309e
Fix broken inventory page [SCI-8690] (#5633)
- Stretch the datatable body to take all of the available space.
- Reload the datatable upon item assignment to task.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-20 14:29:35 +02:00
Anton
73880619d6 UI css fixes [SCI-8662] 2023-06-20 13:41:42 +02:00
artoscinote
ad26237d02
Implement column resizing [SCI-7961] (#5596)
* Patch datatables to support ColReorder + ColResize [SCI-7961]

* Implement repository column resizing [SCI-7961]

* Fix colResize and colReorder interactions [SCI-7961]

* Add styling improvements for column interactions [SCI-7961]

* Update grip icons [SCI-7961]

* Tweaks and fixes [SCI-7961]
2023-06-20 12:52:02 +02:00
artoscinote
4fe0ad026d
Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634) 2023-06-20 12:50:36 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316
Add office file to task step - reload file does not work for empty file [SCI-8316]
2023-06-20 11:12:28 +02:00
aignatov-bio
be42f6b0da
Revert "Fix logo size [SCI-8329]" 2023-06-20 10:22:39 +02:00
aignatov-bio
a3aeac1c1d
Merge pull request #5628 from aignatov-bio/ai-sci-ui-css-fixes
UI CSS fixes
2023-06-19 16:00:40 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
artoscinote
979e5c5810
Merge pull request #5627 from artoscinote/ma_SCI_8683
Fix bottom toolbar position update [SCI-8683]
2023-06-19 15:56:01 +02:00
Soufiane
72266fc636
Inventory export FE [SCI-6546] (#5622)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix text grammar in repositories export modal [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Use I18n pluralization [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 14:16:55 +02:00
Martin Artnik
6913874257 Fix bottom toolbar position update [SCI-8683] 2023-06-19 14:10:55 +02:00
aignatov-bio
245a58b5c1
Merge pull request #5626 from aignatov-bio/ai-sci-8659-fix-filters-save-button
Revert save filter and clear reminders button [SCI-8659]
2023-06-19 12:51:24 +02:00
Anton
1c1c42c88a Revert save filter and clear reminders button 2023-06-19 12:48:40 +02:00
artoscinote
32b5caf2cc
Merge pull request #5625 from sboursen-scinote/sb_SCI-8675
Missing breadcrumbs for Fluics page [SCI-8675]
2023-06-19 12:37:25 +02:00
artoscinote
62daa073ae
Merge pull request #5611 from G-Chubinidze/gc_SCI_8526
Double scroller on assign item to task from inventory table [SCI-8526]
2023-06-19 12:36:54 +02:00
Giga Chubinidze
374a474336 removed timeouts 2023-06-19 14:34:54 +04:00
sboursen-scinote
ef16771f00 Add breadcrumbs to Fluics page [SCI-8675]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 12:20:53 +02:00
ajugo
76b6d92d6e
Fix task duplication on experiment table page [SCI-8676] (#5618) 2023-06-19 11:20:56 +02:00
aignatov-bio
411e62b2bd
Merge pull request #5623 from aignatov-bio/ai-sci-8329-fix-logo-size
Fix logo size [SCI-8329]
2023-06-19 10:50:09 +02:00
artoscinote
36ae7e6ebd
Merge pull request #5621 from G-Chubinidze/gc_SCI_8673
Search field on assign/assigned item to task [SCI-8673]
2023-06-19 10:44:52 +02:00
Anton
58c17b1b00 Fix logo size [SCI-8329] 2023-06-19 10:44:13 +02:00
artoscinote
84cefeef40
Merge pull request #5620 from G-Chubinidze/gc_SCI_8645
Buttons title (tooltip on hover) - top action toolbar [SCI-8645]
2023-06-19 10:43:59 +02:00
artoscinote
8ba08c3797
Merge pull request #5619 from G-Chubinidze/gc_SCI_8406
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
2023-06-19 10:43:00 +02:00
Giga Chubinidze
44a5a1f3b2 Search field on assign/assigned item to task [SCI-8673] 2023-06-19 10:21:04 +04:00
G-Chubinidze
7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze
aa6cc57160 (A) label (instead of icons) in front of titles of archived elements 2023-06-19 10:14:13 +04:00
Giga Chubinidze
96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
Martin Artnik
5f3b009bfc Add support for boostrap modals to action toolbar [SCI-8681] 2023-06-16 15:14:58 +02:00
Martin Artnik
e44b3bb568 Fix bottom action toolbar responsiveness [SCI-8682] 2023-06-16 14:17:46 +02:00
Soufiane
966b92e8d2
Activities update for grant project access to all team members [SCI-8383] (#5598)
* Create new activities for granting/revoking access to all team members on projects [SCI-8383]
2023-06-16 13:08:02 +02:00
aignatov-bio
e4076c931a
Merge pull request #5614 from aignatov-bio/ai-sci-8658-css-fixes
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
2023-06-16 12:57:17 +02:00
aignatov-bio
45764498ed
Merge pull request #5612 from sboursen-scinote/sb_SCI-8641
Stretched image on the empty dashboard screen [SCI-8641]
2023-06-16 12:39:58 +02:00
Anton
289c92cb00 UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662] 2023-06-16 12:38:09 +02:00
artoscinote
91ee51105c
Merge pull request #5574 from G-Chubinidze/gc_SCI-8218
"i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218]
2023-06-16 11:34:59 +02:00
Giga Chubinidze
f05ddac07d fixed syntax error 2023-06-16 13:32:39 +04:00
Giga Chubinidze
67b7c8fe07 updated logic 2023-06-16 12:49:05 +04:00
Soufiane
b254f5614b
Inventory export FE [SCI-6546] (#5608)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
2023-06-16 10:48:39 +02:00
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
artoscinote
f3b4ea039a
Merge pull request #5613 from sboursen-scinote/sb_SCI-8555
View mode of smart annotation is not correct [SCI-8555]
2023-06-16 09:58:04 +02:00
artoscinote
c35d3213da
Merge branch 'develop' into gc_SCI_8406 2023-06-16 09:49:19 +02:00
sboursen-scinote
e99310f829 Fix smart-annotation view mode prefix [SCI-8555]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-16 09:36:26 +02:00
sboursen-scinote
a1b62b22b1 Fix image size and position in no-teams-jumbotron [SCI-8641]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-16 08:39:26 +02:00
Giga Chubinidze
f8f03e6b51 Double scroller on assign item to task from inventory table [SCI-8526] 2023-06-16 06:50:38 +04:00
Giga Chubinidze
3c2b96a795 (A) label (instead of icons) in front of titles of archived elements [SCI-8406] 2023-06-16 06:05:15 +04:00
Martin Artnik
7b0921ea65 Remove non-existant font.css include [SCI-8646] 2023-06-15 15:38:22 +02:00
ajugo
89f1efc64e
Update shared status in inventory datatable [SCI-8655] (#5604) 2023-06-15 15:32:01 +02:00
artoscinote
0680379dd6
Merge pull request #5599 from G-Chubinidze/gc_SCI_8630
Buttons title (tooltip on hover) - top navigation [SCI-8630]
2023-06-15 15:18:52 +02:00
artoscinote
11048be09b
Merge pull request #5603 from artoscinote/ma_SCI_8646
Bundle Inter font for proper font weights [SCI-8646]
2023-06-15 15:17:49 +02:00
aignatov-bio
2c7828a227
Merge pull request #5605 from aignatov-bio/ai-sci-8671-css-fixes
PET css fixes [SCI-8660]
2023-06-15 15:16:50 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Soufiane
34b7999e43
Revert disabling of the name input [SCI-8460] (#5602)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-15 14:26:25 +02:00
Martin Artnik
657934f9bf Bundle Inter font for proper font weights [SCI-8646] 2023-06-15 14:23:01 +02:00
aignatov-bio
20a411c777
Merge pull request #5600 from scinote-eln/features/ui-revamp
Features/UI revamp
2023-06-15 11:51:44 +02:00
ajugo
2afe589657
Remove double load of current task on dashboard page [SCI-8642] (#5597) 2023-06-15 09:41:46 +02:00
Giga Chubinidze
69c7176976 Buttons title (tooltip on hover) - top navigation [SCI-8630] 2023-06-15 04:59:34 +04:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
aignatov-bio
90f66afddf
Merge pull request #5595 from aignatov-bio/ai-sci-8541-update-buttom-action-toolbar
Update bottom action toolbar css [SCI-8541]
2023-06-14 15:13:31 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
G-Chubinidze
0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
Giga Chubinidze
41d42d47bd update addon controller 2023-06-14 05:15:18 +04:00
Giga Chubinidze
88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane
23e248ca02
Changed wording for activities [SCI-8243] (#5356)
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
2023-06-13 16:55:40 +02:00
artoscinote
820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476
Breadcrumbs on label/protocol template page [SCI-8476]
2023-06-13 14:49:14 +02:00
Alex Kriuchykhin
976c29c136
Add CSP nonce to JQuery bundle inclusion [SCI-8609] (#5588) 2023-06-13 14:47:28 +02:00
Anton
86e980f773 Updated top navigation [SCI-8540] 2023-06-13 14:12:41 +02:00
Anton
b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
G-Chubinidze
9315190ffe
Merge branch 'develop' into gc_SCI_8406 2023-06-13 12:13:22 +04:00
Giga Chubinidze
673718f1db Breadcrumbs on label/protocol template page [SCI-8476] 2023-06-13 11:25:14 +04:00
Soufiane
606bdb118b
Prevent submitting forms multiple times [SCI-8560] (#5584)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-13 08:29:26 +02:00
Anton
4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +02:00
artoscinote
91aab57914
Merge pull request #5580 from sboursen-scinote/sb_SCI-8545
Improvement of dropdown in Assign to task modal [SCI-8545]
2023-06-12 14:38:16 +02:00
Anton
16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575)
Disable project links if team admin is missing read permission [SCI-8381]
2023-06-12 12:55:32 +02:00
Anton
5f55070fec Navigator ui revamp [SCI-8539][SCI-8467] 2023-06-12 11:53:24 +02:00
artoscinote
e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366
New icons implementation [SCI-8366]
2023-06-12 11:25:36 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
sboursen-scinote
43bf1cf0eb Add loading state to select_search [SCI-8545]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-12 10:49:31 +02:00
Alex Kriuchykhin
f0c2624179
Implement inventories export backend logic [SCI-8444] (#5578) 2023-06-12 10:29:17 +02:00
artoscinote
0e14b7de8a
Merge pull request #5544 from sboursen-scinote/sb_SCI-8498
Activity from dropdown disappeared [SCI-8498]
2023-06-09 13:19:52 +02:00
artoscinote
75a70ec080
Merge pull request #5576 from sboursen-scinote/sb_SCI-8532
Automatically close the Assign from inventory window on task screen [SCI-8532]
2023-06-09 10:29:32 +02:00
artoscinote
db0363416c
Merge pull request #5577 from sboursen-scinote/sb_SCI-8626
Error at selecting one ZPL label template [SCI-8626]
2023-06-09 10:29:24 +02:00
sboursen-scinote
ad78759393 Handle no action buttons in the toolbar edge case [SCI-8626]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-09 10:11:31 +02:00
Soufiane
77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554)
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
2023-06-09 09:24:32 +02:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik
9ece0e5865 Remove addon css [SCI-8366] 2023-06-08 17:36:43 +02:00
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
sboursen-scinote
154910602f Close the Assign from inventory window on success [SCI-8532]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-08 15:33:43 +02:00
Giga Chubinidze
95437c69a4 included name 2023-06-08 12:54:01 +04:00