Commit graph

715 commits

Author SHA1 Message Date
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
Anton d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Oleksii Kriuchykhin 4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Anton d34608d22c Fix layout on task activties page [SCI-9261] 2023-09-13 14:08:39 +02:00
Alex Kriuchykhin a07174ed78
Fix disabling buttons on submit for remote forms [SCI-9241] (#6184) 2023-09-11 15:22:25 +02:00
Anton 3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Anton 7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Martin Artnik 914697d4bf Fix status flow modal to work across multiple pages [SCI-9212] 2023-09-05 15:54:53 +02:00
Anton b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Anton 6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
artoscinote 953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Ivan Kljun 90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Alex Kriuchykhin ac159c29ed
Fix task card due date setup modal [SCI-9139] (#6080) 2023-08-25 13:08:50 +02:00
Alex Kriuchykhin 2a228d3350
Remove obsolete JS code inclusion from protocol_status_bar [SCI-9134] (#6072) 2023-08-24 15:13:52 +02:00
Anton f964a7461d Move status block to secondary navigation [SCI-9027] 2023-08-23 14:03:41 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031)
* Fix css UI issues for shareable links task sharing [SCI-9080]
2023-08-21 16:07:38 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote 3f754710ac
Merge pull request #6021 from ivanscinote/SCI-9007-update-colors
Add .btn-not-started to task status flow modal [SCI-9007]
2023-08-18 17:37:48 +02:00
Ivan Kljun f71c54dd74 Add .btn-not-started to task status flow modal [SCI-9007] 2023-08-18 17:21:26 +02:00
artoscinote 664819a7fc
Merge pull request #6008 from ivanscinote/SCI-9007-update-colors
Update status and shared buttons design to Amanda [SCI-9007]
2023-08-18 10:12:26 +02:00
Ivan Kljun 400c1cb303 Update status and shared buttons design to Amanda [SCI-9007] 2023-08-17 15:18:46 +02:00
Anton 16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
sboursen-scinote dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
Soufiane aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Martin Artnik f1173661f5 Fix forms [SCI-9004] 2023-08-09 15:47:33 +02:00
Anton f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +02:00
Anton eac87c1804 Merge branch 'develop' into features/september-release 2023-08-08 11:06:27 +02:00
ajugo c63b7d7a64
Merge pull request #5927 from sboursen-scinote/sb_SCI-8982
Fix task details CSS [SCI-8982]
2023-08-07 16:41:46 +02:00
Martin Artnik fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
Alex Kriuchykhin 4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +02:00
sboursen-scinote 04fdf0cfee Fix task details CSS [SCI-8982] 2023-08-07 15:53:09 +02:00
Anton 7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Anton 89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +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
sboursen-scinote c27c7245bc Fix various CSS issues [SCI-8940]
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
2023-08-04 09:11:53 +02:00
Oleksii Kriuchykhin b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Giga Chubinidze 4cd1f59d7b CSS - mixed issues [SCI-8849] 2023-07-31 08:47:43 +04:00
Martin Artnik 3c58b8473d Fix icon in stock consume modal [SCI-8915] 2023-07-25 09:56:55 +02:00
Oleksii Kriuchykhin de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
Martin Artnik 91153b156a Fix incorrect icons [SCI-8915] 2023-07-24 14:18:24 +02:00
Andrej 3ed91daf4f Fix opening tabs on tasks for archived tasks [SCI-8887] 2023-07-19 13:47:03 +02:00
Andrej f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
ajugo c1db4529e9
Fix consume modal display on full table view on task [SCI-8868] (#5798) 2023-07-19 10:32:36 +02:00
ajugo f84de45cfe
Fix opening of activites for archived my_module [SCI-8887] (#5804) 2023-07-19 09:42:23 +02:00
Anton 1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
ajugo 2f5015e2a2
Fix error at adding consumption to assigned item to task [SCI-8868] (#5789) 2023-07-17 15:42:40 +02:00
Oleksii Kriuchykhin a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Anton 8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +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
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
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
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59: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
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
Martin Artnik 9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Anton 8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
Anton 73880619d6 UI css fixes [SCI-8662] 2023-06-20 13:41:42 +02:00
Anton 4e972de096 UI CSS fixes 2023-06-19 15:58:17 +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
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
Giga Chubinidze 44a5a1f3b2 Search field on assign/assigned item to task [SCI-8673] 2023-06-19 10:21:04 +04: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
Alex Kriuchykhin 2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
artoscinote c35d3213da
Merge branch 'develop' into gc_SCI_8406 2023-06-16 09:49:19 +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
Anton c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +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 27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
Giga Chubinidze 95437c69a4 included name 2023-06-08 12:54:01 +04:00
Giga Chubinidze aa5caf3cc3 refactor 2023-06-08 11:54:59 +04:00
Giga Chubinidze ecf38de4d3 lone operator 2023-06-08 11:08:44 +04:00
Giga Chubinidze 06e31679fe "i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218] 2023-06-08 11:07:01 +04:00
Giga Chubinidze a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Anton 0924ae1046 Fix results css [SCI-8618] 2023-06-06 12:36:57 +02:00
ajugo f38577eb79
Add missing archived icon to the PET [SCI-8563] (#5541) 2023-06-02 10:34:11 +02:00
artoscinote 98a27b083a
Merge pull request #5344 from sboursen-scinote/sb_SCI-8347
FIle/step dropdown is out of task border [SCI-8347]
2023-05-30 13:46:10 +02:00
Giga Chubinidze 5e11e3a874 fixed mymodule breadcrumb 2023-05-26 03:45:16 +04:00
Anton 007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
Soufiane c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-24 10:35:58 +02:00
sboursen-scinote 1f83679e5e Merge branch 'develop' into sb_SCI-8347
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-23 23:08:20 +02:00
Anton 753372f9e4 Fix navigator button style [SCI-8477] 2023-05-18 13:43:26 +02:00
Anton a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
Anton 9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane c28f86d46d
Refactor inline events [SCI-8434] (#5403)
Refactor inline events in task results [SCI-8434]
2023-05-16 09:34:36 +02:00
Anton 8be2a02d9b Fix my module layout 2023-05-15 15:38:44 +02:00
Anton e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
Anton 1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00