Merge 3d9ac5a85f into 08e5f10559

app/controllers/booths_controller.rb

@@ -0,0 +1,83 @@
+class BoothsController < ApplicationController
+  before_action :set_booth, only: [:show, :edit, :update, :destroy]
+
+  # GET /booths
+  # GET /booths.json
+  def index
+    @booths = Booth.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @booths }
+    end
+  end
+
+  # GET /booths/1
+  # GET /booths/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @booth }
+    end
+  end
+
+  # GET /booths/new
+  def new
+    @booth = Booth.new
+  end
+
+  # GET /booths/1/edit
+  def edit
+  end
+
+  # POST /booths
+  # POST /booths.json
+  def create
+    @booth = Booth.new(booth_params)
+
+    respond_to do |format|
+      if @booth.save
+        format.html { redirect_to @booth, notice: 'Booth was successfully created.' }
+        format.json { render json: @booth, status: :created }
+      else
+        format.html { render action: 'new' }
+        format.json { render json: @booth.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /booths/1
+  # PATCH/PUT /booths/1.json
+  def update
+    respond_to do |format|
+      if @booth.update(booth_params)
+        format.html { redirect_to @booth, notice: 'Booth was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: 'edit' }
+        format.json { render json: @booth.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /booths/1
+  # DELETE /booths/1.json
+  def destroy
+    @booth.destroy
+    respond_to do |format|
+      format.html { redirect_to booths_url }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_booth
+      @booth = Booth.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def booth_params
+      params.require(:booth).permit(:title, :conference_id, :description, :state, :reasoning, :logo_link)
+    end
+end

app/models/booth.rb

@@ -0,0 +1,7 @@
+class Booth < ActiveRecord::Base
+  belongs_to :conference
+  has_many :booth_requests
+  has_many :users, through: :booth_requests
+
+  validate :title, presence: true
+end

app/models/booth_request.rb

@@ -0,0 +1,4 @@
+class BoothRequest < ActiveRecord::Base
+  belongs_to :booth
+  belongs_to :user
+end

app/models/conference.rb

@@ -22,6 +22,7 @@ class Conference < ActiveRecord::Base
   has_many :supporters, through: :ticket_purchases, source: :user
   has_many :tickets, dependent: :destroy
   has_many :resources, dependent: :destroy
+  has_many :booths,  dependent: :destroy  
 
   has_many :lodgings, dependent: :destroy
   has_many :registrations, dependent: :destroy

app/models/user.rb

@@ -50,11 +50,13 @@ class User < ActiveRecord::Base
   has_many :votes, dependent: :destroy
   has_many :voted_events, through: :votes, source: :events
   has_many :subscriptions, dependent: :destroy
+  has_many :booth_requests
+  has_many :booths, through: :users_booths
   accepts_nested_attributes_for :roles
 
   scope :admin, -> { where(is_admin: true) }
   scope :active, -> { where(is_disabled: false) }
-
+  
   validates :email, presence: true
 
   validates :username,

app/views/booths/_form.html.haml

@@ -0,0 +1,28 @@
+= 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
+
+  .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'

app/views/booths/edit.html.haml

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

app/views/booths/index.html.haml

@@ -0,0 +1,29 @@
+%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_booth_path

app/views/booths/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New booth
+
+= render 'form'
+
+= link_to 'Back', booths_path

app/views/booths/show.html.haml

@@ -0,0 +1,24 @@
+%p#notice= notice
+
+%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

db/migrate/20170516190048_create_booths.rb

@@ -0,0 +1,14 @@
+class CreateBooths < ActiveRecord::Migration
+  def change
+    create_table :booths do |t|
+      t.string :title
+      t.text :description
+      t.text :reasoning
+      t.string :state
+      t.string :logo_link
+      t.integer :conference_id
+
+      t.timestamps null: false
+    end
+  end
+end

db/migrate/20170530112510_create_booth_requests.rb

@@ -0,0 +1,11 @@
+class CreateBoothRequests < ActiveRecord::Migration
+  def change
+    create_table :booth_requests do |t|
+      t.references :booth, index: true, foreign_key: true
+      t.references :user, index: true, foreign_key: true
+      t.string :role
+
+      t.timestamps null: false
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170302145716) do
+ActiveRecord::Schema.define(version: 20170530112510) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.uuid     "visit_id",   limit: 16
@@ -31,6 +31,28 @@ ActiveRecord::Schema.define(version: 20170302145716) do
     t.datetime "updated_at"
   end
 
+  create_table "booth_requests", force: :cascade do |t|
+    t.integer  "booth_id"
+    t.integer  "user_id"
+    t.string   "role"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "booth_requests", ["booth_id"], name: "index_booth_requests_on_booth_id"
+  add_index "booth_requests", ["user_id"], name: "index_booth_requests_on_user_id"
+
+  create_table "booths", force: :cascade do |t|
+    t.string   "title"
+    t.text     "description"
+    t.text     "reasoning"
+    t.string   "state"
+    t.string   "logo_link"
+    t.integer  "conference_id"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
   create_table "campaigns", force: :cascade do |t|
     t.integer  "conference_id"
     t.string   "name"
@@ -447,6 +469,7 @@ ActiveRecord::Schema.define(version: 20170302145716) do
     t.integer  "quantity",      default: 1
     t.integer  "user_id"
     t.integer  "payment_id"
+    t.integer  "week"
   end
 
   create_table "tickets", force: :cascade do |t|

test/factories/booth_requests.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :booth_request do
+    booth nil
+    user nil
+    role "MyString"
+  end
+end

test/models/booth_request_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class BoothRequestTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end