diff --git a/app/models/act.rb b/app/models/act.rb index e169120..51d0a11 100644 --- a/app/models/act.rb +++ b/app/models/act.rb @@ -37,6 +37,23 @@ class Act field :has_emergency_contact_person, :type => Boolean, :default => false field :has_vegetarian, :type => Boolean, :default => false + field :enabled_name, :type => Boolean, :default => true + field :enabled_tel, :type => Boolean, :default => true + field :enabled_phone, :type => Boolean, :default => true + field :enabled_fax, :type => Boolean, :default => true + field :enabled_email, :type => Boolean, :default => true + + field :enabled_idno, :type => Boolean, :default => false + field :enabled_sex, :type => Boolean, :default => false + field :enabled_birthday, :type => Boolean, :default => false + field :enabled_note, :type => Boolean, :default => false + field :enabled_organization, :type => Boolean, :default => false + field :enabled_title, :type => Boolean, :default => false + field :enabled_address, :type => Boolean, :default => false + field :enabled_emergency_contact_number, :type => Boolean, :default => false + field :enabled_emergency_contact_person, :type => Boolean, :default => false + field :enabled_vegetarian, :type => Boolean, :default => false + has_many :act_links, :autosave => true, :dependent => :destroy has_many :act_files, :autosave => true, :dependent => :destroy has_many :act_signups, :autosave => true, :dependent => :destroy diff --git a/app/views/actives/show.html.erb b/app/views/actives/show.html.erb index fee3055..29ef690 100644 --- a/app/views/actives/show.html.erb +++ b/app/views/actives/show.html.erb @@ -36,8 +36,9 @@ <%= @act.title %> - + + <% if @act.enabled_name %>
@@ -48,8 +49,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_idno %>
@@ -60,9 +63,11 @@ <% end %>
- + <% end %> + + <% if @act.enabled_birthday %>
@@ -73,8 +78,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_sex %>
@@ -90,8 +97,10 @@
- + <% end %> + + <% if @act.enabled_tel %>
@@ -102,8 +111,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_phone %>
@@ -114,8 +125,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_fax %>
@@ -126,8 +139,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_email %>
@@ -138,8 +153,10 @@ <% end %>
- + <% end %> + + <% if @act.enabled_note %>
@@ -150,32 +167,38 @@ <% end %>
- + <% end %> + + <% if @act.enabled_organization %>
- <% if @act.has_fax %> + <% if @act.has_organization %> <%= f.text_field :organization, :class=>"input-medium form-control", :placeholder=> t('act_signup.organization'), :data => {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"} %> <% else %> <%= f.text_field :organization, :class=>"input-medium form-control", :placeholder=> t('act_signup.organization') %> <% end %>
- + <% end %> + + <% if @act.enabled_title %>
- <% if @act.has_fax %> + <% if @act.has_title %> <%= f.text_field :title, :class=>"input-medium form-control", :placeholder=> t('act_signup.title'), :data => {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"} %> <% else %> <%= f.text_field :title, :class=>"input-medium form-control", :placeholder=> t('act_signup.title') %> <% end %>
- + <% end %> + + <% if @act.enabled_address %>
@@ -186,32 +209,38 @@ <% end %>
- + <% end %> + + <% if @act.enabled_emergency_contact_person %>
- <% if @act.has_fax %> + <% if @act.has_emergency_contact_person %> <%= f.text_field :emergency_contact_person, :class=>"input-medium form-control", :placeholder=> t('act_signup.emergency_contact_person'), :data => {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"} %> <% else %> <%= f.text_field :emergency_contact_person, :class=>"input-medium form-control", :placeholder=> t('act_signup.emergency_contact_person') %> <% end %>
- + <% end %> + + <% if @act.enabled_emergency_contact_number %>
- <% if @act.has_fax %> + <% if @act.has_emergency_contact_number %> <%= f.text_field :emergency_contact_number, :class=>"input-medium form-control", :placeholder=> t('act_signup.emergency_contact_number'), :data => {"fv-validation" => "required;", "fv-messages" => "Cannot be empty.;"} %> <% else %> <%= f.text_field :emergency_contact_number, :class=>"input-medium form-control", :placeholder=> t('act_signup.emergency_contact_number') %> <% end %>
- + <% end %> + + <% if @act.enabled_vegetarian %>
@@ -227,6 +256,7 @@
+ <% end %>
diff --git a/app/views/admin/actives/_form.html.erb b/app/views/admin/actives/_form.html.erb index a903a12..f23272c 100644 --- a/app/views/admin/actives/_form.html.erb +++ b/app/views/admin/actives/_form.html.erb @@ -80,6 +80,13 @@
+ +
+
+
@@ -89,6 +96,13 @@
+ +
+
> +
@@ -98,6 +112,13 @@
+ +
+
> +
@@ -107,6 +128,13 @@
+ +
+
> +
@@ -116,6 +144,13 @@
+ +
+
> +
@@ -125,6 +160,13 @@
+ +
+
> +
@@ -134,6 +176,13 @@
+ +
+
> +
@@ -144,6 +193,13 @@
+ +
+
> +
@@ -153,6 +209,13 @@
+ +
+
> +
@@ -162,6 +225,13 @@
+ +
+
> +
@@ -171,6 +241,13 @@
+ +
+
> +
@@ -180,6 +257,13 @@
+ +
+
> +
@@ -189,6 +273,13 @@
+ +
+
> +
@@ -198,6 +289,13 @@
+ +
+
> +
@@ -207,6 +305,13 @@
+ +
+
> +
@@ -351,6 +456,14 @@ <% content_for :page_specific_javascript do %>