Annotate

ZeusWPI · Feb 9, 2015 · 0b77a48 · 0b77a48
1 parent 266694d
commit 0b77a48
Show file tree

Hide file tree

Showing 19 changed files with 87 additions and 87 deletions.
diff --git a/app/models/access_level.rb b/app/models/access_level.rb
@@ -4,7 +4,7 @@
 # Table name: access_levels
 #
 #  id          :integer          not null, primary key
-#  name        :string(255)
+#  name        :string
 #  event_id    :integer
 #  created_at  :datetime
 #  updated_at  :datetime
@@ -52,7 +52,7 @@ def name_with_price
   end
 
   def tickets_left
-    self.capacity - self.tickets.count if self.capacity.presence
+    self.capacity - self.tickets.active.count if self.capacity.presence
   end
 
   def price

diff --git a/app/models/club.rb b/app/models/club.rb
@@ -3,9 +3,9 @@
 # Table name: clubs
 #
 #  id            :integer          not null, primary key
-#  full_name     :string(255)
-#  internal_name :string(255)
-#  display_name  :string(255)
+#  full_name     :string
+#  internal_name :string
+#  display_name  :string
 #  created_at    :datetime
 #  updated_at    :datetime
 #

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -3,25 +3,25 @@
 # Table name: events
 #
 #  id                      :integer          not null, primary key
-#  name                    :string(255)
+#  name                    :string
 #  start_date              :datetime
 #  end_date                :datetime
-#  location                :string(255)
-#  website                 :string(255)
+#  location                :string
+#  website                 :string
 #  description             :text
 #  created_at              :datetime
 #  updated_at              :datetime
 #  registration_open_date  :datetime
 #  registration_close_date :datetime
-#  bank_number             :string(255)
+#  bank_number             :string
 #  show_ticket_count       :boolean          default("t")
-#  contact_email           :string(255)
-#  export_file_name        :string(255)
-#  export_content_type     :string(255)
+#  contact_email           :string
+#  export_file_name        :string
+#  export_content_type     :string
 #  export_file_size        :integer
 #  export_updated_at       :datetime
 #  show_statistics         :boolean
-#  export_status           :string(255)
+#  export_status           :string
 #  club_id                 :integer
 #  registration_open       :boolean          default("t")
 #

diff --git a/app/models/partner.rb b/app/models/partner.rb
@@ -3,20 +3,20 @@
 # Table name: partners
 #
 #  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  email                  :string(255)
-#  authentication_token   :string(255)
+#  name                   :string
+#  email                  :string
+#  authentication_token   :string
 #  created_at             :datetime
 #  updated_at             :datetime
-#  encrypted_password     :string(255)      default(""), not null
-#  reset_password_token   :string(255)
+#  encrypted_password     :string           default(""), not null
+#  reset_password_token   :string
 #  reset_password_sent_at :datetime
 #  remember_created_at    :datetime
 #  sign_in_count          :integer          default("0"), not null
 #  current_sign_in_at     :datetime
 #  last_sign_in_at        :datetime
-#  current_sign_in_ip     :string(255)
-#  last_sign_in_ip        :string(255)
+#  current_sign_in_ip     :string
+#  last_sign_in_ip        :string
 #  event_id               :integer
 #  access_level_id        :integer
 #  confirmed              :boolean

diff --git a/app/models/promo.rb b/app/models/promo.rb
@@ -4,7 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  event_id     :integer
-#  code         :string(255)
+#  code         :string
 #  limit        :integer
 #  created_at   :datetime
 #  updated_at   :datetime

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -3,20 +3,20 @@
 # Table name: users
 #
 #  id                  :integer          not null, primary key
-#  username            :string(255)      default(""), not null
+#  username            :string           default(""), not null
 #  remember_created_at :datetime
 #  sign_in_count       :integer          default("0"), not null
 #  current_sign_in_at  :datetime
 #  last_sign_in_at     :datetime
-#  current_sign_in_ip  :string(255)
-#  last_sign_in_ip     :string(255)
+#  current_sign_in_ip  :string
+#  last_sign_in_ip     :string
 #  created_at          :datetime
 #  updated_at          :datetime
-#  cas_givenname       :string(255)
-#  cas_surname         :string(255)
-#  cas_ugentStudentID  :string(255)
-#  cas_mail            :string(255)
-#  cas_uid             :string(255)
+#  cas_givenname       :string
+#  cas_surname         :string
+#  cas_ugentStudentID  :string
+#  cas_mail            :string
+#  cas_uid             :string
 #  admin               :boolean
 #
 

diff --git a/app/views/access_levels/_access_level.html.erb b/app/views/access_levels/_access_level.html.erb
@@ -1,7 +1,7 @@
 <tr id="<%= dom_id(access_level) %>">
   <td><%= access_level.name %></td>
   <td>
-    <%= access_level.tickets.size %>
+    <%= access_level.tickets.active.size %>
     <span class="label label-<%= color_for_tickets_left(access_level) %> pull-right"><%= "#{pluralize(access_level.tickets_left, "ticket")} left" if access_level.capacity.presence %></span>
   </td>
   <td>&euro; <%= number_with_precision access_level.price || "0", precision: 2  %></td>
@@ -12,7 +12,7 @@
   <td>
     <div class="nowrap">
       <%= link_to raw(visibility_icon(access_level)), toggle_visibility_event_access_level_path(access_level.event, access_level), class: 'btn btn-xs btn-default', remote: true %>
-      <% unless access_level.tickets.any? %>
+      <% unless access_level.tickets.active.any? %>
         <%= link_to raw('<i class="glyphicon glyphicon-edit"></i> Edit'), edit_event_access_level_path(access_level.event, access_level), class: 'btn btn-xs btn-default', remote: true %>
         <%= link_to raw('<i class="glyphicon glyphicon-trash"></i> Delete'), event_access_level_path(access_level.event, access_level), class: 'btn btn-xs btn-danger', data: {confirm: 'Are you sure?'}, remote: true, method: :delete %>
       <% end %>

diff --git a/test/fixtures/access_levels.yml b/test/fixtures/access_levels.yml
@@ -3,7 +3,7 @@
 # Table name: access_levels
 #
 #  id          :integer          not null, primary key
-#  name        :string(255)
+#  name        :string
 #  event_id    :integer
 #  created_at  :datetime
 #  updated_at  :datetime

diff --git a/test/fixtures/clubs.yml b/test/fixtures/clubs.yml
@@ -3,9 +3,9 @@
 # Table name: clubs
 #
 #  id            :integer          not null, primary key
-#  full_name     :string(255)
-#  internal_name :string(255)
-#  display_name  :string(255)
+#  full_name     :string
+#  internal_name :string
+#  display_name  :string
 #  created_at    :datetime
 #  updated_at    :datetime
 #

diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
@@ -3,25 +3,25 @@
 # Table name: events
 #
 #  id                      :integer          not null, primary key
-#  name                    :string(255)
+#  name                    :string
 #  start_date              :datetime
 #  end_date                :datetime
-#  location                :string(255)
-#  website                 :string(255)
+#  location                :string
+#  website                 :string
 #  description             :text
 #  created_at              :datetime
 #  updated_at              :datetime
 #  registration_open_date  :datetime
 #  registration_close_date :datetime
-#  bank_number             :string(255)
+#  bank_number             :string
 #  show_ticket_count       :boolean          default("t")
-#  contact_email           :string(255)
-#  export_file_name        :string(255)
-#  export_content_type     :string(255)
+#  contact_email           :string
+#  export_file_name        :string
+#  export_content_type     :string
 #  export_file_size        :integer
 #  export_updated_at       :datetime
 #  show_statistics         :boolean
-#  export_status           :string(255)
+#  export_status           :string
 #  club_id                 :integer
 #  registration_open       :boolean          default("t")
 #

diff --git a/test/fixtures/partners.yml b/test/fixtures/partners.yml
@@ -3,20 +3,20 @@
 # Table name: partners
 #
 #  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  email                  :string(255)
-#  authentication_token   :string(255)
+#  name                   :string
+#  email                  :string
+#  authentication_token   :string
 #  created_at             :datetime
 #  updated_at             :datetime
-#  encrypted_password     :string(255)      default(""), not null
-#  reset_password_token   :string(255)
+#  encrypted_password     :string           default(""), not null
+#  reset_password_token   :string
 #  reset_password_sent_at :datetime
 #  remember_created_at    :datetime
 #  sign_in_count          :integer          default("0"), not null
 #  current_sign_in_at     :datetime
 #  last_sign_in_at        :datetime
-#  current_sign_in_ip     :string(255)
-#  last_sign_in_ip        :string(255)
+#  current_sign_in_ip     :string
+#  last_sign_in_ip        :string
 #  event_id               :integer
 #  access_level_id        :integer
 #  confirmed              :boolean

diff --git a/test/fixtures/promos.yml b/test/fixtures/promos.yml
@@ -4,7 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  event_id     :integer
-#  code         :string(255)
+#  code         :string
 #  limit        :integer
 #  created_at   :datetime
 #  updated_at   :datetime

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
@@ -3,20 +3,20 @@
 # Table name: users
 #
 #  id                  :integer          not null, primary key
-#  username            :string(255)      default(""), not null
+#  username            :string           default(""), not null
 #  remember_created_at :datetime
 #  sign_in_count       :integer          default("0"), not null
 #  current_sign_in_at  :datetime
 #  last_sign_in_at     :datetime
-#  current_sign_in_ip  :string(255)
-#  last_sign_in_ip     :string(255)
+#  current_sign_in_ip  :string
+#  last_sign_in_ip     :string
 #  created_at          :datetime
 #  updated_at          :datetime
-#  cas_givenname       :string(255)
-#  cas_surname         :string(255)
-#  cas_ugentStudentID  :string(255)
-#  cas_mail            :string(255)
-#  cas_uid             :string(255)
+#  cas_givenname       :string
+#  cas_surname         :string
+#  cas_ugentStudentID  :string
+#  cas_mail            :string
+#  cas_uid             :string
 #  admin               :boolean
 #
 

diff --git a/test/models/access_level_test.rb b/test/models/access_level_test.rb
@@ -3,7 +3,7 @@
 # Table name: access_levels
 #
 #  id          :integer          not null, primary key
-#  name        :string(255)
+#  name        :string
 #  event_id    :integer
 #  created_at  :datetime
 #  updated_at  :datetime

diff --git a/test/models/club_test.rb b/test/models/club_test.rb
@@ -3,9 +3,9 @@
 # Table name: clubs
 #
 #  id            :integer          not null, primary key
-#  full_name     :string(255)
-#  internal_name :string(255)
-#  display_name  :string(255)
+#  full_name     :string
+#  internal_name :string
+#  display_name  :string
 #  created_at    :datetime
 #  updated_at    :datetime
 #

diff --git a/test/models/event_test.rb b/test/models/event_test.rb
@@ -3,25 +3,25 @@
 # Table name: events
 #
 #  id                      :integer          not null, primary key
-#  name                    :string(255)
+#  name                    :string
 #  start_date              :datetime
 #  end_date                :datetime
-#  location                :string(255)
-#  website                 :string(255)
+#  location                :string
+#  website                 :string
 #  description             :text
 #  created_at              :datetime
 #  updated_at              :datetime
 #  registration_open_date  :datetime
 #  registration_close_date :datetime
-#  bank_number             :string(255)
+#  bank_number             :string
 #  show_ticket_count       :boolean          default("t")
-#  contact_email           :string(255)
-#  export_file_name        :string(255)
-#  export_content_type     :string(255)
+#  contact_email           :string
+#  export_file_name        :string
+#  export_content_type     :string
 #  export_file_size        :integer
 #  export_updated_at       :datetime
 #  show_statistics         :boolean
-#  export_status           :string(255)
+#  export_status           :string
 #  club_id                 :integer
 #  registration_open       :boolean          default("t")
 #

diff --git a/test/models/partner_test.rb b/test/models/partner_test.rb
@@ -3,20 +3,20 @@
 # Table name: partners
 #
 #  id                     :integer          not null, primary key
-#  name                   :string(255)
-#  email                  :string(255)
-#  authentication_token   :string(255)
+#  name                   :string
+#  email                  :string
+#  authentication_token   :string
 #  created_at             :datetime
 #  updated_at             :datetime
-#  encrypted_password     :string(255)      default(""), not null
-#  reset_password_token   :string(255)
+#  encrypted_password     :string           default(""), not null
+#  reset_password_token   :string
 #  reset_password_sent_at :datetime
 #  remember_created_at    :datetime
 #  sign_in_count          :integer          default("0"), not null
 #  current_sign_in_at     :datetime
 #  last_sign_in_at        :datetime
-#  current_sign_in_ip     :string(255)
-#  last_sign_in_ip        :string(255)
+#  current_sign_in_ip     :string
+#  last_sign_in_ip        :string
 #  event_id               :integer
 #  access_level_id        :integer
 #  confirmed              :boolean

diff --git a/test/models/promo_test.rb b/test/models/promo_test.rb
@@ -4,7 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  event_id     :integer
-#  code         :string(255)
+#  code         :string
 #  limit        :integer
 #  created_at   :datetime
 #  updated_at   :datetime

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -3,20 +3,20 @@
 # Table name: users
 #
 #  id                  :integer          not null, primary key
-#  username            :string(255)      default(""), not null
+#  username            :string           default(""), not null
 #  remember_created_at :datetime
 #  sign_in_count       :integer          default("0"), not null
 #  current_sign_in_at  :datetime
 #  last_sign_in_at     :datetime
-#  current_sign_in_ip  :string(255)
-#  last_sign_in_ip     :string(255)
+#  current_sign_in_ip  :string
+#  last_sign_in_ip     :string
 #  created_at          :datetime
 #  updated_at          :datetime
-#  cas_givenname       :string(255)
-#  cas_surname         :string(255)
-#  cas_ugentStudentID  :string(255)
-#  cas_mail            :string(255)
-#  cas_uid             :string(255)
+#  cas_givenname       :string
+#  cas_surname         :string
+#  cas_ugentStudentID  :string
+#  cas_mail            :string
+#  cas_uid             :string
 #  admin               :boolean
 #