Commit graph

403 commits

Author SHA1 Message Date
artoscinote
4a65a9e55e
Merge pull request #4949 from sboursen-scinote/sb_SCI-7237
Improve the print functionality for protocol [SCI-7237]
2023-03-01 12:48:39 +01:00
ajugo
e317ca0134
Fix deleting draft for the first time [SCI-8022] (#5048) 2023-03-01 12:02:00 +01:00
Anton
beb5f67508 Fix version modal 2023-03-01 11:44:22 +01:00
sboursen-scinote
88610d6b38 Add a small code refactor [SCI-7996] 2023-02-28 16:11:11 +01:00
artoscinote
fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990
Fix protocol duplication in table [SCI-7990]
2023-02-28 14:28:08 +01:00
Martin Artnik
a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
Martin Artnik
b311f91bec Fix check for save as draft in version modal [SCI-7992] 2023-02-28 13:54:44 +01:00
Martin Artnik
7bf857a179 Fix permission checks for protocols [SCI-7992] 2023-02-28 13:48:29 +01:00
ajugo
0328a32e09
Update import/export for protocol templates [SCI-7986] (#5032) 2023-02-27 13:22:01 +01:00
Giga Chubinidze
59078e923b Show delete button only for drafts [SCI-7997] 2023-02-27 16:00:35 +04:00
sboursen-scinote
af48cede1f Update protocol repository default view styles [SCI-7996] 2023-02-27 09:58:28 +01:00
aignatov-bio
ced0da6dbc
Merge pull request #5026 from aignatov-bio/ai-sci-7989-fix-version-number-for-draft
Fix version number for draft [SCI-7989]
2023-02-24 17:52:37 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
ajugo
0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918)
Implement filters for protocol template datatable [SCI-7605]
2023-02-21 14:57:43 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
Anton
c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
Anton
a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
ajugo
7e48ce70c9
Add handson table metadata to print protocol [SCI-7914] (#4957) 2023-02-14 11:15:42 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
aignatov-bio
23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates
Add archive view for protocols template [SCI-7608]
2023-02-09 11:40:47 +01:00
Anton
1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
sboursen-scinote
befb2edfcf Strip trailling carriage and newlines in TinyMCE text [SCI-7237] 2023-02-07 15:44:53 +01:00
aignatov-bio
193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions
Add manage actions to version modal [SCI-7520]
2023-02-07 13:38:33 +01:00
ajugo
d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
aignatov-bio
8ad21fea35
Finalize access managment for protocol [SCI-7677] (#4853) 2023-01-31 10:34:32 +01:00
Anton
466c25175f Add manage actions to version modal [SCI-7520] 2023-01-26 12:39:11 +01:00
ajugo
93f6403ea2
Fix importing from local file [SCI-7594] (#4874) 2023-01-23 14:23:27 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
Martin Artnik
19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
ajugo
9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] (#4677) 2023-01-09 16:08:27 +01:00
Martin Artnik
4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Anton
ba98075690 Add protocols filters front end [SCI-7517] 2023-01-04 10:34:49 +01:00
aignatov-bio
9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen
CSS update for protocol import screen [SCI-7394]
2023-01-04 10:07:19 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
aignatov-bio
7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516
Add versions and access columns to protocols table, update protocol model [SCI-7516]
2022-12-21 13:03:38 +01:00
Oleksii Kriuchykhin
5fea4722ac Add versions and access columns to protocols table, update protocol model [SCI-7516] 2022-12-19 15:39:32 +01:00
ajugo
5ab804c35a
Implement general protocol repository toolbar [SCI-7557] (#4698)
* Implement general protocol repository toolbar [SCI-7557]

* Move protocolsio page [SCI-7557]
2022-12-19 13:18:24 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Martin Artnik
c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Anton
2a8aaed7d1 Add actions toolbar to protocol repository [SCI-7521] 2022-12-06 15:54:50 +01:00
Anton
fdeb22c6cd Update protocols layout [SCI-7515] 2022-12-05 14:02:13 +01:00
Anton
393bc03d47 CSS update for protocol import screen [SCI-7394] 2022-11-29 15:41:57 +01:00
Giga Chubinidze
43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
Andrej
745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Martin Artnik
b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Andrej
e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385)
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
ajugo
12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343)
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
2022-08-10 15:39:45 +02:00
Anton
6131b6c0b7 Add new templates section and navigation [SCI-7017] 2022-07-26 13:53:51 +02:00
artoscinote
39f5a017cf
Add print button to protocol in repository [SCI-6871] (#4246) 2022-07-15 10:10:18 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
Anton
bf13708e31 Fix load/save protocol to repository [SCI-6759] 2022-06-27 13:14:45 +02:00
artoscinote
934023e9d8
Update print template to fit with new steps [SCI-6871] (#4153) 2022-06-10 10:41:57 +02:00
artoscinote
5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142)
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
2022-06-10 10:18:55 +02:00
aignatov-bio
a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal
Remove protocol creation modal [SCI-6868]
2022-06-05 22:41:57 +02:00
Anton
3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Anton
61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
ajugo
f75265974e
Print protocol smart annotation and table improvements [SCI-6566] (#3925)
* Improve table printing in the print menu [SCI-6566]

* Open smart annotation in new tab for print view [SCI-6566]

* Unify naming of same parameter [SCI-6566]

* Fix typo [SCI-6566]

* Fix hound errors [SCI-6566]
2022-03-29 12:09:33 +02:00
ajugo
c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782)
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
2022-01-14 15:02:04 +01:00
artoscinote
3f7f576b29
Print protocol fixes [SCI-6318] (#3717)
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
2021-12-03 13:44:18 +01:00
artoscinote
9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
Oleksii Kriuchykhin
a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio
df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio
89ac76a766 Fix duplcated new step button [SCI-5474] 2021-02-26 12:29:31 +01:00
Mojca Lorber
62af5cc723 [SCI-5287] Show step collapse/expand on task 2020-12-22 15:50:27 +01:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
aignatov-bio
c212d514d5 Fix delete asset in protocol repository 2020-11-25 13:13:06 +01:00
Mojca Lorber
8ee8f7b4d2 Expose the new step button on task 2020-11-05 16:14:40 +01:00
aignatov-bio
bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
Update checkbox style at repository and protocol datatable [SCI-4579]
2020-10-27 10:22:56 +01:00
aignatov-bio
d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
2020-09-09 09:05:39 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
Mojca Lorber
24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Mojca Lorber
00b668a4ba Change title size to h1 2020-07-08 13:02:47 +02:00
Urban Rotnik
9d3874e343 Add margin to keywords container 2020-05-22 14:23:03 +02:00
Urban Rotnik
1c2883414b Bring newStep top button back 2020-05-22 12:29:14 +02:00
aignatov-bio
bd742d388d Small CSS improvments for mobile 2020-05-13 10:58:40 +02:00
aignatov-bio
4f941610b2 Small layout changes for protocol 2020-04-24 11:50:03 +02:00
aignatov-bio
da4b55ceea Fix protocol and report create modals after dashboard redirect 2020-03-19 19:43:20 +01:00
aignatov-bio
95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
Mojca Lorber
981f8678df Fix alerts style 2020-01-21 15:21:40 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
ef3814ccec Add new buttons to protocols, tasks, experiments, projects 2020-01-06 10:40:20 +01:00
aignatov-bio
56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
aignatov-bio
b9a34fa809 Fix placeholder for authors 2019-11-15 16:23:48 +01:00
aignatov-bio
a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00