Oleksii Kriuchykhin
7f713b4293
Add smart annotations in sample info modal [SCI-960]
2017-05-17 13:06:21 +02:00
Oleksii Kriuchykhin
bb8c7c342c
Add additional info to samples info modal [SCI-960]
2017-05-11 22:20:06 +02: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
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
Oleksii Kriuchykhin
bc8db28746
Fixes wrong samples info modals being shown in samples datatable [SCI-858]
2017-01-09 09:38:42 +01:00
Mojca Lorber
3b0185a45b
change title of modal
2016-10-03 16:33:58 +02:00
Mojca Lorber
5b32be2137
adding subtitle in modal
2016-10-03 09:28:58 +02:00
Mojca Lorber
efa7a1d7b5
add sample information in pop-up
2016-09-28 15:46:41 +02:00
Mojca Lorber
c2b742374f
adding popup sample info
2016-09-23 17:45:02 +02:00
