Fix indentation in events#show view that caused a condition to be skipped
This commit is contained in:
parent
f724e58800
commit
cbd69fab5a
|
@ -94,58 +94,59 @@
|
|||
|
||||
|
||||
- if @conference.has_vote_results? or @conference.has_voting_endpoint?
|
||||
.row
|
||||
.col-xs-12
|
||||
h2
|
||||
- if @conference.start_date.future?
|
||||
= t '.conflicts'
|
||||
- else
|
||||
= t '.top_conflicts'
|
||||
small< = t '.between_approved_events'
|
||||
.panel.panel-default
|
||||
table.table.table-striped.table-hover.record-table
|
||||
- if @conference.has_vote_results? and @conference.approved_events.count > 2
|
||||
thead
|
||||
tr
|
||||
th.text-right
|
||||
= t '.percent'
|
||||
th.main
|
||||
= Event.model_name.human.mb_chars.capitalize
|
||||
th
|
||||
tbody
|
||||
- if @conference.has_vote_results?
|
||||
- if @conference.approved_events.count > 2
|
||||
- if @conference.start_date.future?
|
||||
- conflict_counts = @event.conflict_counts.where(right_id: @conference.approved_events.pluck(:id)).includes(:right)
|
||||
- else
|
||||
- conflict_counts = @event.conflict_counts.where(right_id: @conference.approved_events.pluck(:id)).includes(:right).limit(5)
|
||||
- conflict_counts.each do |conflict_count|
|
||||
- conflict_percent = Rational(conflict_count.number_of_conflicts, @conference.number_of_ballots_cast)
|
||||
tr
|
||||
td.text-right
|
||||
.large
|
||||
span.label.label-success data-conflicts="#{conflict_count.number_of_conflicts}" data-most-conflicts="#{@conference.most_conflicts_between_approved_events}" data-least-conflicts="#{@conference.least_conflicts_between_approved_events}"
|
||||
= number_to_percentage(conflict_percent * 100, strip_insignificant_zeros: true, precision: 2)
|
||||
td
|
||||
h4 = conflict_count.right.title
|
||||
h5 = conflict_count.right.subtitle
|
||||
= links_to_event_participants_for(conflict_count.right)
|
||||
.row
|
||||
.col-xs-12
|
||||
h2
|
||||
- if @conference.start_date.future?
|
||||
= t '.conflicts'
|
||||
- else
|
||||
= t '.top_conflicts'
|
||||
small< = t '.between_approved_events'
|
||||
.panel.panel-default
|
||||
table.table.table-striped.table-hover.record-table
|
||||
- if @conference.has_vote_results? and @conference.approved_events.count > 2
|
||||
thead
|
||||
tr
|
||||
th.text-right
|
||||
= t '.percent'
|
||||
th.main
|
||||
= Event.model_name.human.mb_chars.capitalize
|
||||
th
|
||||
tbody
|
||||
- if @conference.has_vote_results?
|
||||
- if @conference.approved_events.count > 2
|
||||
- if @conference.start_date.future?
|
||||
- conflict_counts = @event.conflict_counts.where(right_id: @conference.approved_events.pluck(:id)).includes(:right)
|
||||
- else
|
||||
- conflict_counts = @event.conflict_counts.where(right_id: @conference.approved_events.pluck(:id)).includes(:right).limit(5)
|
||||
- conflict_counts.each do |conflict_count|
|
||||
- conflict_percent = Rational(conflict_count.number_of_conflicts, @conference.number_of_ballots_cast)
|
||||
tr
|
||||
td.text-right
|
||||
.large
|
||||
span.label.label-success data-conflicts="#{conflict_count.number_of_conflicts}" data-most-conflicts="#{@conference.most_conflicts_between_approved_events}" data-least-conflicts="#{@conference.least_conflicts_between_approved_events}"
|
||||
= number_to_percentage(conflict_percent * 100, strip_insignificant_zeros: true, precision: 2)
|
||||
td
|
||||
h4 = conflict_count.right.title
|
||||
h5 = conflict_count.right.subtitle
|
||||
= links_to_event_participants_for(conflict_count.right)
|
||||
|
||||
td.actions
|
||||
= action_buttons @conference, conflict_count.right, [:show]
|
||||
td.actions
|
||||
= action_buttons @conference, conflict_count.right, [:show]
|
||||
- else
|
||||
tr
|
||||
td colspan="20"
|
||||
= t '.no_approved_events'
|
||||
- else
|
||||
tr
|
||||
td colspan="20"
|
||||
= t '.no_approved_events'
|
||||
- else
|
||||
tr
|
||||
td colspan="20"
|
||||
= t 'management.conferences.vote_results.vote_data_never_updated'
|
||||
= t 'management.conferences.vote_results.vote_data_never_updated'
|
||||
= link_to update_vote_data_management_conference_path(@conference), method: :patch, class: ['btn', 'btn-primary'] do
|
||||
= icon :refresh, t('management.conferences.vote_results.fetch_vote_results')
|
||||
- if @conference.has_vote_results?
|
||||
.panel-footer.text-right
|
||||
.btn-group
|
||||
= link_to conflicts_management_conference_event_path(@event, conference_id: @conference.id), class: ['btn', 'btn-info'] do
|
||||
= icon :percent, t('.conflicts')
|
||||
= link_to update_vote_data_management_conference_path(@conference), method: :patch, class: ['btn', 'btn-primary'] do
|
||||
= icon :refresh, t('management.conferences.vote_results.fetch_vote_results')
|
||||
- if @conference.has_vote_results?
|
||||
.panel-footer.text-right
|
||||
.btn-group
|
||||
= link_to conflicts_management_conference_event_path(@event, conference_id: @conference.id), class: ['btn', 'btn-info'] do
|
||||
= icon :percent, t('.conflicts')
|
||||
= link_to update_vote_data_management_conference_path(@conference), method: :patch, class: ['btn', 'btn-primary'] do
|
||||
= icon :refresh, t('management.conferences.vote_results.fetch_vote_results')
|
||||
|
|
Loading…
Reference in New Issue