scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
2268 commits 31 branches 181 tags 166 MiB
Commit graph

186 commits

Author SHA1 Message Date
Zmago Devetak
fcec42ae31 Merge pull request #645 from ZmagoD/zd_SCI_1278 
generates samples csv file in background job [fixes SCI-1278]
 2017-06-07 15:04:24 +02:00
ajugo
887d9a4f52 Samples - show all/show assigned [SCI-1277] (#644) 
* Samples - show all/show assigned [SCI-1277]

* Some fixes in code

* Some minor fixes in code

* Omit present

* Correct missed present

* Fixing hound warnings
 2017-06-06 12:46:56 +02:00
zmagod
b527afd12b generates samples csv file in background job [fixes SCI-1278] 2017-05-29 14:42:55 +02:00
ajugo
1abaefce4f At importing large sample file, error flash message appears [fixes SCI-903] (#625) 
* At importing large sample file, error flash message appears [fixes SCI-903]

* Changing double quotes to single

* Adding animatedSpinner
 2017-05-18 09:19:44 +02:00
Mojca Lorber
86bc6adc2a fix lost column updated name at sample page and bug with another user not able to view column dropdown 2017-05-11 11:16:12 +02:00
Mojca Lorber
ad9497a638 add information how many samples are selected 2017-05-04 16:30:29 +02:00
Matej Zrimšek
a5cffd06f3 Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719] 2017-04-25 16:03:50 +02:00
Zmago Devetak
91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
Luka Murn
becdd687a6 Only require jquery-ui-sortable on samples page 
(hopefully) closes SCI-794.
 2017-04-07 13:05:22 +02:00
zmagod
f16607579f refactor steps annotation 2017-04-06 13:03:13 +02:00
Mojca Lorber
5e62046627 remove ERROR from message 2017-04-05 14:40:55 +02:00
zmagod
9ce95470b3 fixes alert messages in samples [fixes SCI-1135] 2017-03-28 15:14:05 +02:00
mlorb
3beb179f87 Merge pull request #514 from biosistemika/ml_sci_1089 
Add error messages to sample group/type edit/delete actions [SCI-1089]
 2017-03-27 09:57:32 +02:00
Oleksii Kriuchykhin
c715902058 Move flash message creation JS code to helper method [SCI-1087] 2017-03-17 17:58:53 +01:00
Mojca Lorber
83fa8570d7 refactoring 2017-03-17 17:52:15 +01:00
Mojca Lorber
4792bd87b9 fix error message when editing custom column on locked task 2017-03-15 14:09:44 +01:00
Mojca Lorber
7a4e3201e7 add error messages to sample group/type edit/delete actions 2017-03-14 17:32:25 +01:00
Luka Murn
3599537e42 Fix sample type groups edit color script so it works properly now 
Closes SCI-1078.
 2017-03-01 09:09:44 +01:00
zmagod
151dc79a81 adds hook for lock task action 2017-02-21 16:25:50 +01:00
Oleksii Kriuchykhin
916ed2572a Fix smart annotation is missing at editing column with smart annotation [SCI-997] 2017-02-03 16:42:38 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Oleksii Kriuchykhin
ddd8bcf7b0 Prevent double initialization of popup [SCI-855] 2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
96a9857dec Add handling of popups in the end of the table [SCI-855] 2017-01-25 13:47:01 +01:00
Oleksii Kriuchykhin
fb49ce8be2 Improved tooltip handling in samples datatable [SCI-855] 2017-01-25 13:47:01 +01:00
zmagod
8c035a1981 renames organization in assets 2017-01-25 12:12:27 +01:00
Luka Murn
53699193a2 Merge branch 'smart-annotations' 
Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb
 2017-01-24 14:33:23 +01:00
Matej Zrimšek
b48e48e100 Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913] 2017-01-24 10:56:10 +01:00
Matej Zrimšek
2e041d9e81 Added smart annotations when adding new sample in samples table. [SCI-913] 2017-01-24 10:23:26 +01:00
Matej Zrimšek
5d65627808 Fixed sample editing in samples table. [SCI-914] 2017-01-20 11:10:17 +01:00
Mojca Lorber
3789769af3 add dynamic length for sample type/group field when adding new sample 2017-01-20 09:53:44 +01:00
Oleksii Kriuchykhin
12eb1df69f Remove previous fix for popups [SCI-855] 2017-01-18 10:59:00 +01:00
Luka Murn
a2935c6620 Add sample info modal popup to sample smart annotations 
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').

Closes SCI-892.
 2017-01-16 15:52:02 +01:00
mlorb
88cc87d168 Merge pull request #408 from mlorb/ml-sci-847-v2 
Adjust columns width in samples table header after selecting sample group [SCI-847]
 2017-01-16 10:52:00 +01:00
Mojca Lorber
9f1a49847e fix table header again 2017-01-13 18:54:43 +01:00
Mojca Lorber
5f7e0b2227 adjust columns width in samples table header after selecting sample group 2017-01-13 15:59:47 +01:00
Oleksii Kriuchykhin
a190ef36ff Extend comment to make more clear [SCI-855] 2017-01-13 12:43:43 +01:00
Oleksii Kriuchykhin
097209bd9d Fix compatibility of fixed samples table header and modal-tooltip [SCI-855] 2017-01-13 11:34:05 +01:00
zmagod
1840fdb7e5 cleanup js 2017-01-12 09:52:29 +01:00
zmagod
3a1ec0eb5e refactor [fixes SCI-834] [fixes SCI-837] [fixes SCI-823] [fixes SCI-835] [fixes SCI-836] [fixes SCI-824] 2017-01-11 14:56:47 +01:00
okriuchykhin
8d4b2d7373 Merge pull request #399 from okriuchykhin/ok_SCI_811_v2 
Fix changed sample type and sample group in sample edit [SCI-811]
 2017-01-11 11:37:38 +01:00
mlorb
b898c792c4 Merge pull request #395 from mlorb/ml_sci_847 
Adjust columns width in table header after selecting sample type/group [SCI-847]
 2017-01-11 10:43:12 +01:00
Oleksii Kriuchykhin
a3d9e25feb Fix changed sample type and sample group in sample edit [SCI-811] 2017-01-10 16:51:51 +01:00
zmagod
89e8946a47 expand smart annotation 2017-01-10 14:14:21 +01:00
Luka Murn
0cf5afa499 Merge pull request #376 from Ducz0r/lm-sci-813-fix 
Fix search on hidden columns in samples table [SCI-813]
 2017-01-10 11:27:56 +01:00
Luka Murn
05be1e862f Update filter after toggling visibility (if neccesary) 2017-01-10 11:26:12 +01:00
okriuchykhin
f8237e025a Merge pull request #394 from okriuchykhin/ok_SCI_853 
Fix non removable error messages in samples [SCI-853]
 2017-01-10 11:00:01 +01:00
Mojca Lorber
a0a7f35d44 adjust columns width in table header after selecting sample type/group 2017-01-09 15:00:07 +01:00
Oleksii Kriuchykhin
773b00933a Improve multiple messages handling in samples [SCI-853] 2017-01-09 13:55:50 +01:00
Oleksii Kriuchykhin
0fd7688427 Fix hiding of error messages in the samples datatable [SCI-853] 2017-01-09 13:34:23 +01:00
okriuchykhin
3f930ccfce Merge pull request #392 from okriuchykhin/ok_SCI_858 
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
 2017-01-09 12:49:38 +01:00