bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Don Aug 6 22:03:02 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-06 22:03:02 +02:00
parent 0c0e7ba051
commit bdb0025a8c
5 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/survey/question.rb
View File

@@ -4,7 +4,7 @@ class Survey::Question < ActiveRecord::Base
has_many :choices, dependent: :destroy has_many :choices, dependent: :destroy
has_many :answers, through: :choices has_many :answers, through: :choices
include IsCommentable include IsCommentable
FLAG_ICONS={"delete" => "fa fa-trash"} FLAG_ICONS={"delete" => "fa fa-trash", "template"=> "ffi1-cleaning1"}
FLAG_CONFIRM={} FLAG_CONFIRM={}
scope :templates, ->{ where(flag_template:true)} scope :templates, ->{ where(flag_template:true)}
acts_as_flagable acts_as_flagable

2
app/views/flags/_flag.js.erb
View File

@@ -1 +1 @@
$('#<%=@obj.flaglinkid(params[:flag]) %>').replaceWith("<%= escape_javascript( render(partial: "flags/flaglink", format: "html", locals: {flag: params[:flag]}) )%>"); $('#<%=@obj.flaglinkid(params[:flag]) %>').replaceWith("<%= escape_javascript( flag_link(@obj,flag)) %>");

2
app/views/flags/_flaglink.html.erb
View File

@@ -1,2 +0,0 @@
<% fi = {"badquality"=>"fa fa-flag", "delete"=>"fa fa-trash"} %>
<%= flag_link(@obj,flag, ff_icon(fi[flag])) %>

20
app/views/survey/questions/_answeredquestion.html.erb
View File

@@ -1,6 +1,6 @@
<div id="container_question_<%= answeredquestion.id %>" style="min-width: 310px; max-width: 800px; height: <%= (100+answeredquestion.choices.count * 90).to_s%>px; margin: 0 auto" class="contentbox"> <div id="container_question_<%= answeredquestion.id %>" style="min-width: 310px; max-width: 800px; height: <%= (100+answeredquestion.choices.count * 90).to_s %>px; margin: 0 auto" class="contentbox">
<div style="background:red"><b><%= answeredquestion.title%></b> <div style="background:red">
<b><%= answeredquestion.title%></b>
<ul> <ul>
<% answeredquestion.choices.each do |c| %> <% answeredquestion.choices.each do |c| %>
<li> <li>
@@ -8,11 +8,9 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div>
<script>
</div> $(function () {
<script>
$(function () {
$('#container_question_<%= answeredquestion.id %>').highcharts({ $('#container_question_<%= answeredquestion.id %>').highcharts({
chart: { chart: {
type: 'bar' type: 'bar'
@@ -57,12 +55,12 @@ $(function () {
enabled: false enabled: false
}, },
series: [{ series: [{
name: '<%= answeredquestion.title%>', name: '<%= answeredquestion.title %>',
data: [<%= raw(answeredquestion.choices.map{|c| c.answers.count.to_s}.join(",")) %>] data: [<%= raw(answeredquestion.choices.map{|c| c.answers.count.to_s}.join(",")) %>]
}] }]
}); });
}); });
</script> </script>
</div> </div>

7
app/views/survey/questions/_question.html.erb
View File

@@ -1,12 +1,15 @@
<% if current_user.nil? %> <% if current_user.nil? %>
<%= div_tag_for(question) do%> <%= div_tag_for(question) do%>
<%= render partial: "survey/questions/answeredquestion", object: question %> <%= render partial: "survey/questions/answeredquestion", object: question %>
<% end %> <% end %>
<% else %> <% else %>
<div class="contentbox" id ="<%= divid_for(question) %>" style=""> <div class="contentbox" id ="<%= divid_for(question) %>" style="">
<div > <div >
<b><%= question.title%></b> <%=question.text%><%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true%> <b><%= question.title%></b>
<%= question.text %>
<%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %>
<%= flag_link(question, "delete")%> <%= flag_link(question, "delete")%>
<%= flag_link(question, "template")%>
<ul class="choice-list"> <ul class="choice-list">
<% question.choices.each do |c| %> <% question.choices.each do |c| %>