2520 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zanz2	3074acbc0d	Made javascript code nicer	2017-09-26 13:31:24 +02:00
Zanz2	055746bfd9	Rubocop beautified code v2	2017-09-26 13:21:48 +02:00
Zanz2	ad1847256c	Rubocop beautified code	2017-09-26 13:20:55 +02:00
Zanz2	8d961c934a	Rubocop refactored part of the controller code	2017-09-26 13:17:00 +02:00
Zanz2	2bfe8f0b95	Testing why rubocop gives errors	2017-09-25 15:27:24 +02:00
Zanz2	79e065a811	Fixed a mistake in the fix that made it not render the preview	2017-09-25 14:39:43 +02:00
Zanz2	292c1e3c31	Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first	2017-09-25 14:14:27 +02:00
Zanz2	11b2ef3112	Made code nicer, hopefully not unintentionally breaking something	2017-09-25 13:53:32 +02:00
Luka Murn	4f8f248cd2	Merge pull request #798 from Ducz0r/lm-opensci-26-fix ... Fix missing value in delayed_uploader_tutorial	2017-09-22 17:12:21 +02:00
Luka Murn	05e627e976	Fix missing value in delayed_uploader_tutorial ... Closes OPENSCI-26.	2017-09-22 17:10:53 +02:00
Zanz2	549346bb0a	Deleted a warning that was out of place	2017-09-22 16:13:06 +02:00
Zanz2	dd4d4072e8	Made code more aesthetic	2017-09-22 16:02:56 +02:00
Zanz2	6ebdea5dce	Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)	2017-09-22 15:12:29 +02:00
Zanz2	4051c0b06b	Deleted old unused files i spotted on github	2017-09-22 13:28:38 +02:00
Zanz2	6a07aa28e4	Accidentally removed this line after reviewing git changes, adding it back	2017-09-22 13:11:49 +02:00
Zanz2	deef790951	added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions	2017-09-22 11:56:50 +02:00
Zanz2	1dbb03e22d	Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer	2017-09-21 16:05:33 +02:00
Zanz2	df8cbc2741	vastly improved protocol preview styling to look more like documentation specifications	2017-09-21 13:46:52 +02:00
Zanz2	8da72eb64a	made code look nicer	2017-09-21 09:29:13 +02:00
Zanz2	f48833c47a	added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();	2017-09-21 08:40:05 +02:00
Zanz2	d59234a1e3	minor changes, working on refresh after submit	2017-09-20 16:04:52 +02:00
Zanz2	72c707ae88	protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit	2017-09-20 15:31:10 +02:00
Zanz2	7b85d74a23	added jquery code to reset file selector selected file after it is canceled in the preview modal	2017-09-20 09:32:31 +02:00
Zanz2	3812b2e64b	Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore	2017-09-20 08:58:00 +02:00
Zanz2	ea8f3e822d	Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone	2017-09-20 08:38:34 +02:00
Zanz2	ed64ce814a	i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript	2017-09-19 16:07:54 +02:00
Zanz2	7aba782639	optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show	2017-09-19 15:02:16 +02:00
Zanz2	f861b1fc52	Configured the controller,the main task ahead is to figure out how to import all of the data i have available	2017-09-15 15:52:55 +02:00
Zanz2	d85e02730d	Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc	2017-09-15 12:19:58 +02:00
Zanz2	175aa16a7d	Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this	2017-09-14 15:52:44 +02:00
Zanz2	5d6cc341ed	added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done	2017-09-14 14:42:04 +02:00
Zanz2	d6d1f9d490	changed second modal preview styling to fit its specifications	2017-09-14 11:46:41 +02:00
Zanz2	29b9d50363	Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer	2017-09-14 11:30:53 +02:00
Zanz2	9fc91aac32	added protocols io upload preview modal	2017-09-13 16:04:16 +02:00
Zanz2	b7432b336a	added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller	2017-09-13 15:15:08 +02:00
Žan Žagar	706031dacb	added model and controler, model should go to services while the controller should go to protocols controller	2017-09-12 15:25:22 +02:00
Žan Žagar	fdbae19156	changed .json to .txt for clarity	2017-09-12 09:33:18 +02:00
Žan Žagar	2a7a2b8fa1	Changed some minor button text and fixed a local error	2017-09-12 09:26:22 +02:00
Žan Žagar	62350d0d42	Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later	2017-09-11 16:03:33 +02:00
Žan Žagar	9b640c5df8	Dropdown menu works, need to add backend code for the second button	2017-09-11 15:28:48 +02:00
Žan Žagar	0f4dadefa9	prvi (star gumb) v dropdownu sedaj deluje	2017-09-11 15:23:09 +02:00
Žan Žagar	f668f60237	dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni	2017-09-11 15:22:22 +02:00
Žan Žagar	2c0a458aaf	dodav moj alternativni text za importanje (text na gumbu), za rails translate (t)	2017-09-11 15:21:35 +02:00
Žan Žagar	31e8c107fd	dodav na pravi branch te file	2017-09-11 14:35:00 +02:00
Jure Grabnar	b4a13dffe3	init commit, dodav na protocols index gumb z dropdown	2017-09-11 13:07:22 +02:00
mlorb	03743a21f6	Merge pull request #786 from mlorb/ml-sci-1587 ... Fix bugs with importing samples [SCI-1587]	2017-09-08 09:19:35 +02:00
Mojca Lorber	a0f7030a70	fix bug with tinyMCE text validaton	2017-09-07 14:54:12 +02:00
Mojca Lorber	0e14420193	fix bugs with importing samples	2017-09-06 14:41:14 +02:00
Luka Murn	67017d383c	Merge pull request #761 from Ducz0r/lm-add-versions-rake-file ... Add versions Rake	2017-08-23 08:36:45 +02:00
Luka Murn	5ee7fd895c	Moved the arrays into json	2017-08-23 08:35:48 +02:00