Modify views for booths

This commit is contained in:
nasia 2017-06-18 23:33:54 +03:00
parent 318c0d15a4
commit 98e0a25606
10 changed files with 220 additions and 88 deletions

View file

@ -3,19 +3,80 @@ module Admin
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource :booth, through: :conference
def index
@booths = @conference.booths
end
def show; end
def new; end
def new
@booth = Booth.new(conference: @conference)
end
def create; end
def create
@booth = @conference.booths.build(booth_params)
def update; end
if @booth.save
redirect_to admin_conference_booths_path,
notice: "Booth successfully created."
else
flash[:error] = "Creating booth failed. #{@booth.errors.full_messages.join('. ')}."
render :new
end
end
def edit; end
def update
@booth = @conference.booths
@booth.assign_attributes(booth_params)
if @booth.update_attributes(booth_params)
redirect_to admin_conference_booths_path,
notice: "Successfully updated booth for #{@booth.title}."
else
flash[:error] = "An error prohibited the Booth for #{@booth.title} "\
"#{@booth.errors.full_messages.join('. ')}."
render :edit
end
end
def destroy; end
def accept
update_state(:accept, 'Booth accepted!')
end
def to_accept
update_state(:to_accept, 'Booth to accept')
end
def reject
update_state(:rejected, 'Booth rejected')
end
def reset
update_state(:reset, 'Booth is submitted')
end
private
def update_state(transition, notice)
alert = @booth.update_state(transition, notice)
if alert.blank?
flash[:notice] = notice
redirect_back_or_to(admin_conference_booths_path(conference_id: @conference.short_title)) && return
else
flash[:error] = alert
return redirect_back_or_to(admin_conference_booths_path(conference_id: @conference.short_title)) && return
end
end
def booth_params
params.require(:booth).permit(:title, :description, :reasoning, :state, :logo_link, :conference_id)
end
end
end

View file

@ -1,4 +1,6 @@
class Booth < ActiveRecord::Base
include ActiveRecord::Transitions
belongs_to :conference
has_many :booth_requests
has_many :users, through: :booth_requests
@ -13,4 +15,35 @@ class Booth < ActiveRecord::Base
:logo_link,
:conference_id,
presence: true
state_machine initial: :submitted do
state :submitted
state :withdrawn
state :to_accept
state :accepted
state :rejected
event :restart do
transitions to: :submitted, from: [:withdrawn]
end
event :withdrawn do
transitions to: :withdrawn, from: [:submitted, :to_accept, :accepted]
end
event :to_accept do
transitions to: :to_accept, from: [:submitted, :rejected, :accepted]
end
event :accept do
transitions to: :accepted, from: [:submitted, :to_accept]
end
event :reject do
transitions to: :rejected, from: [:submitted]
end
event :reset do
transitions to: :submitted, from: [:to_accept]
end
end
def transition_possible?(transition)
self.class.state_machine.events_for(current_state).include?(transition)
end
end

View file

@ -7,4 +7,6 @@ class BoothRequest < ActiveRecord::Base
:role,
presence: true
ROLES = [%w[Submitter submitter], %w[Responsible responsible], %w[Secondary secondary]]
end

View file

@ -0,0 +1,25 @@
- if booth.transition_possible? :accept
%li= link_to 'Accept booth',
accept_admin_conference_booth_path(@conference.short_title, booth),
method: :patch, id: "accept_booth_#{booth.id}"
- if booth.transition_possible? :reject
%li= link_to 'Reject booth',
reject_admin_conference_booth_path(@conference.short_title, booth),
method: :patch, confirm: 'Are you sure?', id: "reject_booth_#{booth.id}"
- if booth.transition_possible? :restart
%li= link_to 'Start review',
restart_admin_conference_booth_path(@conference.short_title, booth),
method: :patch, id: "restart_booth_#{booth.id}"
- if booth.transition_possible? :to_accept
%li= link_to 'To accept booth',
to_accept_admin_conference_booth_path(@conference.short_title, booth),
method: :patch, id: "to_accept_booth_#{booth.id}"
- if booth.transition_possible? :cancel
%li= link_to 'Cancel booth',
cancel_admin_conference_booth_path(@conference.short_title, booth),
method: :patch, id: "cancel_booth_#{booth.id}"

View file

@ -1,28 +1,17 @@
= form_for @booth do |f|
- if @booth.errors.any?
#error_explanation
%h2= "#{pluralize(@booth.errors.count, "error")} prohibited this booth from being saved:"
%ul
- @booth.errors.full_messages.each do |msg|
%li= msg
.row
.col-md-12
.page-header
%title Request a Booth
.row
.col-md-8
= semantic_form_for(@booth, url: admin_conference_booths_path(@conference.short_title), html: {multipart: true}) do |f|
= f.input :title, as: :string, required: true
= f.input :description, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true
= f.input :reasoning, input_html: { rows: 5, data: { provide: 'markdown-editable' } }, required: true
= f.input :logo_link, as: :string, required: true
.field
= f.label :title
= f.text_field :title
.field
= f.label :conference_id
= f.number_field :conference_id
.field
= f.label :description
= f.text_area :description
.field
= f.label :state
= f.text_field :state
.field
= f.label :reasoning
= f.text_area :reasoning
.field
= f.label :logo_link
= f.text_field :logo_link
.actions
= f.submit 'Save'
%p.text-right
- if @booth.new_record?
= f.submit 'Create Booth Request', class: 'btn btn-success'
- else
= f.submit 'Update Booth Request', class: 'btn btn-success'

View file

@ -1,7 +1,3 @@
%h1 Editing booth
= render 'form'
= link_to 'Show', @booth
\|
= link_to 'Back', booths_path

View file

@ -1,29 +1,47 @@
%h1 Listing booths
%table
%tr
%th Title
%th Conference
%th Description
%th State
%th Reasoning
%th Logo link
%th
%th
%th
- @booths.each do |booth|
%tr
%td= booth.title
%td= booth.conference_id
%td= booth.description
%td= booth.state
%td= booth.reasoning
%td= booth.logo_link
%td= link_to 'Show', booth
%td= link_to 'Edit', edit_booth_path(booth)
%td= link_to 'Destroy', booth, :method => :delete, :data => { :confirm => 'Are you sure?' }
%br
= link_to 'New Booth', new_admin_conference_booth_path
.row
.col-md-12
.page-header
%h1
Booths
= "(#{@booths.length})" if @booths.any?
.pull-right
- if can? :create, Booth
=link_to 'Add Booth', new_admin_conference_booth_path(@conference.short_title), class: 'button btn btn-default btn-info'
%p.text-muted
All the booth requests
.row
.col-md-12
.margin-event-table
%table.table.table-striped.table-bordered.table-hover.datatable
%thead
%th
%b ID
%th
%b Title
%th
%b Submitter
%th
%b Responsible
%th
%b Secondary Responsible
%th
%b State
- @booths.each do |booth|
%tr
%td
= booth.id
%td
= link_to booth.title, admin_conference_booth_path(@conference.short_title, booth)
%td
a
%td
b
%td
c
%td
.btn-group
%button{ type: 'button', class: 'btn btn-link dropdown-toggle', 'data-toggle' => 'dropdown' }
= booth.state.humanize
%span.caret
%ul.dropdown-menu{ role: 'menu' }
= render 'change_state_dropdown', booth: booth

View file

@ -2,4 +2,4 @@
= render 'form'
= link_to 'Back', booths_path
= link_to 'Back', admin_conference_booths_path

View file

@ -1,24 +1,20 @@
%p#notice= notice
.row
.col-md-12
%h3
= @booth.title
.btn-group.pull-right
= link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
%p
%b Title:
= @booth.title
%p
%b Conference:
= @booth.conference_id
%p
%b Description:
= @booth.description
%p
%b State:
= @booth.state
%p
%b Reasoning:
= @booth.reasoning
%p
%b Logo link:
= @booth.logo_link
= link_to 'Edit', edit_booth_path(@booth)
\|
= link_to 'Back', booths_path
.row
.col-md-12
%table.table
%tr
%td.col-md-2
%b Description
%td
= @booth.description
%tr
%td.col-md-2
%b Reasoning
%td
= @booth.reasoning