Commit graph

161 commits

Author SHA1 Message Date
Urban Rotnik 2bb4f558b7 View rendering simplified, small improvements 2019-06-17 12:24:09 +02:00
Urban Rotnik 807104035c Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated 2019-06-17 12:24:09 +02:00
Urban Rotnik 6a4deb0201 Add ProtocolIntermediateObject 2019-06-17 12:24:09 +02:00
Urban Rotnik aadf2eecb4 Basic data normalizer for ProtocolIO 2019-06-17 12:24:08 +02:00
Urban Rotnik ec49388283 Add protocol base normalizer class 2019-06-17 12:24:08 +02:00
Jure Grabnar c1cee07a63 Extract API client constants to constants.rb 2019-06-17 12:24:08 +02:00
Jure Grabnar a15b1f6dfa Add logging for ApiClient and fix hound formatting 2019-06-17 12:24:08 +02:00
Jure Grabnar 5685709f48 Implement API client for protocols.io
Closes SCI-3357
2019-06-17 12:24:07 +02:00
aignatov-bio 68937dd192
Fix RTE import for protocol repository (#1833) 2019-06-14 16:20:27 +02:00
Oleksii Kriuchykhin 8920d38a02 Make repositories more extendable [SCI-3528] 2019-06-06 17:28:59 +02:00
Oleksii Kriuchykhin 6917ea56e8 Fix import of ELN protocols [SCI-3506] 2019-05-29 15:41:54 +02:00
aignatov-bio 3633274c8f
Fix import for eln (#1741) 2019-05-13 10:22:30 +02:00
Anton Ignatov 7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
Jure Grabnar b37349624a
Merge pull request #1714 from biosistemika/jg_sci_3380
Add editnew action for editing new office files [SCI-3380]
2019-04-30 09:57:07 +02:00
Jure Grabnar ed003aca13 Add editnew action for editing new office files
Closes SCI-3380
2019-04-30 08:19:52 +02:00
Anton Ignatov 7d60eb5572 Fix migration issues 2019-04-23 11:11:22 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Oleksii Kriuchykhin e7151e6e6b Disable inventory import activity logging [SCI-3290] 2019-04-03 22:42:33 +02:00
Alex Kriuchykhin d8ce4d4a91
Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
2019-04-03 21:14:36 +02:00
Oleksii Kriuchykhin 14978f7c1f Fix activity creation for editing wopi file in protocol repository [SCI-3281] 2019-04-03 19:51:54 +02:00
Jure Grabnar f00f4d39af Refactor step activities using position_plus_one
Closes SCI-3273
2019-04-03 13:10:45 +02:00
Jure Grabnar a2623b5124 Fix non-existant current_team in WOPI create_activity
Closes SCI-3279
2019-04-02 14:20:01 +02:00
mlorb b24a07f1c8
Merge pull request #1616 from mlorb/ml-sci-3237
Change activities for task protocols [SCI-3237]
2019-04-01 14:32:16 +02:00
Jure Grabnar 6533368763 Add activity for importing inv items 2019-03-29 15:41:34 +01:00
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Miha Mencin 4c3c0ef908 removing activity creation from demo project 2019-03-25 15:45:10 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Mojca Lorber e34ddeaefd Remove activities from demo project 2019-03-20 13:25:59 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Miha Mencin 6deaff6382 fixing hound errors 2019-03-04 18:36:32 +01:00
Miha Mencin fa7bba9de7 scheduling creation of demo project at the sign in time
remove wrong schema, fix comment, add migration
2019-03-04 18:26:15 +01:00
Miha Mencin 4f9daa9590 SCI-3112 Change the the comments in demo project generator 2019-02-28 11:39:44 +01:00
Miha Mencin 088a860683
Merge pull request #1539 from biosistemika/features/templates
Features/templates
2019-02-28 10:23:13 +01:00
Miha Mencin d03ef2cd2a
Merge branch 'master' into features/templates 2019-02-28 09:41:20 +01:00
Jure Grabnar 93490a1f47 Add missing created_at and fix typo
Closes SCI-3100, SCI-3098
2019-02-28 07:29:25 +01:00
Jure Grabnar 0fbbe8b5de Add result comments to demo project
Closes [SCI-3100].
2019-02-27 20:32:28 +01:00
Jure Grabnar 0699204d3b Add changes for parallel exec discussed with Miha 2019-02-27 15:22:19 +01:00
Jure Grabnar 30bc536d07 Fix smart annotations in demo project
Closes SCI-3097, SCI-3102.
2019-02-26 14:36:48 +01:00
Jure Grabnar 2464a45f83 Fix ordering for another step in demo project
Closes SCI-3098.
2019-02-26 08:34:50 +01:00
Jure Grabnar c409c39e60 Fix demo project's checklist item ordering
Closes SCI-3099.
2019-02-26 08:26:02 +01:00
Jure Grabnar b6dd783114 Improve generation of a demo project
Closes SCI-3096
2019-02-26 08:06:07 +01:00
Urban Rotnik c8ab9f8ff8 Fix tests 2019-02-26 08:04:05 +01:00
Jure Grabnar d7e91676c3 Rename initial experiment back to the old one 2019-02-24 08:13:57 +01:00
Jure Grabnar f98d6fbd4d Remove archived task in Demo project
Closes SCI-3082.
2019-02-22 11:58:32 +01:00
Jure Grabnar ffe0493013 Rename Demo project and create rake task to create it on existing users
Closes SCI-3080.
2019-02-21 23:31:55 +01:00
Mojca Lorber 16f99afbc0 Minor fixes 2019-02-13 12:20:14 +01:00
Mojca Lorber 227aeb284c change mydemo projects data 2019-02-05 11:15:16 +01:00