<%
- attribute_field.af_count ? @af_counter = attribute_field_counter + attribute_field.af_count : @af_counter = attribute_field_counter
+ @af_counter = attribute_field_counter
%>
@@ -18,27 +18,27 @@
- <%= text_field "#{@field_name}[seminar_signup_fields][#{@af_counter}]","key",:value=>attribute_field.key, :data=>{:type=>"key"} %>
+ <%= text_field "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}]","key",:value=>attribute_field.key, :data=>{:type=>"key"} %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][title_translations]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][title_translations]"}%>
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][typeA][placeholder]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeA][placeholder]"}%>
<% end if show_seminar_type_panel(attribute_field,"typeA") != 'typeA hide' %>
<%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_field,"typeB")}" do %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_signup_fields][#{@af_counter}][typeB][initial]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeB][initial]"}%>
<% if attribute_field.self_defined_markup_options?%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields][#{@af_counter}][attribute][seminar][statuses]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][attribute][seminar][statuses]"} %>
<%else #normal list%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields][#{@af_counter}][typeB][option_list]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeB][option_list]"} %>
<% end #of self_defined_markup_options?%>
<% end if show_seminar_type_panel(attribute_field,"typeB") != 'typeB hide' %>
@@ -84,17 +84,17 @@
- <%= select "#{@field_name}[seminar_signup_fields][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
+ <%= select "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
@@ -102,10 +102,10 @@
@@ -116,18 +116,18 @@
<%
- attribute_submission_field.af_count ? @af_counter = attribute_submission_field_counter + attribute_submission_field.af_count : @af_counter = attribute_submission_field_counter
+ @af_counter = attribute_submission_field_counter
%>
@@ -18,27 +18,27 @@
- <%= text_field "#{@field_name}[seminar_submission_fields][#{@af_counter}]","key",:value=>attribute_submission_field.key, :data=>{:type=>"key"} %>
+ <%= text_field "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}]","key",:value=>attribute_submission_field.key, :data=>{:type=>"key"} %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][title_translations]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][title_translations]"}%>
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][typeA][placeholder]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_submission_field["typeA"]["placeholder"],:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeA][placeholder]"}%>
<% end if show_seminar_type_panel(attribute_submission_field,"typeA") != 'typeA hide' %>
<%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeB")}" do %>
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_submission_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_submission_fields][#{@af_counter}][typeB][initial]"}%>
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_submission_field["typeB"]["initial"],:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeB][initial]"}%>
<% if attribute_submission_field.self_defined_markup_options?%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields][#{@af_counter}][attribute][seminar][statuses]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][attribute][seminar][statuses]"} %>
<%else #normal list%>
- <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields][#{@af_counter}][typeB][option_list]"} %>
+ <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_submission_field["option_list"],:field_name=> "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeB][option_list]"} %>
<% end #of self_defined_markup_options?%>
<% end if show_seminar_type_panel(attribute_submission_field,"typeB") != 'typeB hide' %>
@@ -84,17 +84,17 @@
- <%= select "#{@field_name}[seminar_submission_fields][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_submission_field["typeC"]["format"] %>
+ <%= select "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_submission_field["typeC"]["format"] %>
@@ -102,10 +102,10 @@
@@ -116,16 +116,16 @@
diff --git a/app/views/admin/seminars/_get_display_fields.html.erb b/app/views/admin/seminars/_get_display_fields.html.erb
index 54e84db..14e98f8 100644
--- a/app/views/admin/seminars/_get_display_fields.html.erb
+++ b/app/views/admin/seminars/_get_display_fields.html.erb
@@ -32,10 +32,11 @@
<% @seminar.seminar_signup_field_customs.each do |field_set| %>
<% s = field_set.seminar_signup_field %>
<% next if (s.nil? || s.key.blank?) %>
- <% default_hidden << "seminar_signup_field_custom.#{s.key}" if (field_set.hidden) %>
+ <% default_hidden << "seminar_signup_fields.#{s.key}" if (field_set.hidden) %>
<% end %>
<% end %>
<% @seminar.seminar_signup_fields.each do |s| %>
+ <% next if s.title.blank? %>
<% default_hidden << "seminar_signup_fields.#{s.key}" %>
<% @field_names << "seminar_signup_fields.#{s.key}" %>
<% @field_name_translations << s.title %>
@@ -110,16 +111,18 @@
<% @field_name_translations << t(th) %>
<% end %>
<% end %>
- <% seminar_signup_field_customs = SeminarSignupFieldCustom.all.map{|field_set| SeminarSignupField.where(id: field_set.seminar_signup_field_id).first}.select{|s| !s.nil?}.uniq{|s| s.key } %>
+ <% seminar_signup_fields = SeminarSignupField.where(:key.nin=>["", nil]).uniq{|s| s.key} %>
+ <% seminar_signup_field_customs = SeminarSignupFieldCustom.where(:seminar_signup_field_id.in=> seminar_signup_fields.map(&:id)).to_a %>
<% if seminar_signup_field_customs.count != 0 %>
- <% seminar_signup_field_customs.each do |s| %>
+ <% seminar_signup_field_customs.each do |field_set| %>
<% s = field_set.seminar_signup_field %>
- <% next if (s.nil? || s.key.blank?) %>
- <% default_hidden << "seminar_signup_field_custom.#{s.key}" if (field_set.hidden) %>
+ <% next if s.title.blank? %>
+ <% default_hidden << "seminar_signup_fields.#{s.key}" if (field_set.hidden) %>
<% end %>
<% end %>
- <% seminar_signup_fields = SeminarSignupField.all.uniq{|s| s.key} %>
<% seminar_signup_fields.each do |s| %>
+ <% next if s.title.blank? %>
+ <% default_hidden << "seminar_signup_fields.#{s.key}" %>
<% @field_names << "seminar_signup_fields.#{s.key}" %>
<% @field_name_translations << s.title %>
<% end %>
@@ -138,8 +141,9 @@
<% default_show << "seminar_signup_contributes.description" if show3 %>
<% @field_names << 'seminar_signup_contributes.description' %>
<% @field_name_translations << t('seminar_signup.description') %>
- <% seminar_submission_fields = SeminarSignupField.all.uniq{|s| s.key} %>
+ <% seminar_submission_fields = SeminarSubmissionField.where(:key.nin=>["", nil]).uniq{|s| s.key} %>
<% seminar_submission_fields.each do |s| %>
+ <% next if s.title.blank? %>
<% @field_names << "seminar_submission_fields.#{s.key}" %>
<% @field_name_translations << s.title %>
<% end %>
diff --git a/app/views/admin/seminars/_support_member_form_js.erb b/app/views/admin/seminars/_support_member_form_js.erb
index 6205f84..12dabb9 100644
--- a/app/views/admin/seminars/_support_member_form_js.erb
+++ b/app/views/admin/seminars/_support_member_form_js.erb
@@ -6,7 +6,7 @@
Delete
Reply
-
+
Field ${attributesHeaderLength}
diff --git a/app/views/seminars/index.html.erb b/app/views/seminars/index.html.erb
index 9b70e05..a64cdf1 100644
--- a/app/views/seminars/index.html.erb
+++ b/app/views/seminars/index.html.erb
@@ -23,25 +23,29 @@
<%
@seminars.each do |seminar|
-
- if !seminar.registration_status.blank? and (seminar.signup_start_date <= @time_now rescue false) and ( seminar.signup_end_date.nil? or seminar.signup_end_date+1 >= @time_now )
- sign_up = ('' + t('seminar.signup') + '').html_safe
- elsif seminar.registration_status.blank?
- sign_up = t('seminar.sign_up_not_open')
- elsif (seminar.signup_start_date > @time_now rescue false)
- sign_up = t('seminar.sign_up_not_yet')
- else
- sign_up = t('seminar.sign_up_overdue')
- end
+ registration_is_open = seminar.registration_status.present?
+ sign_up_not_yet = seminar.signup_start_date && @time_now && seminar.signup_start_date > @time_now
+ sign_up_overdue = seminar.signup_end_date && @time_now && (seminar.signup_end_date + 1.day <= @time_now)
+ signup_is_full = seminar.signup_is_full?
+ seminar_url = OrbitHelper.url_to_show(seminar.to_param)
+ if !registration_is_open
+ sign_up = t('seminar.sign_up_not_open')
+ elsif sign_up_not_yet
+ sign_up = t('seminar.sign_up_not_yet')
+ elsif sign_up_overdue
+ sign_up = t('seminar.sign_up_overdue')
+ elsif signup_is_full
+ sign_up = t('seminar.sign_up_is_full')
+ else
+ sign_up_text = t('seminar.signup')
+ sign_up = link_to(sign_up_text, seminar.get_frontend_url(seminar_url), :target=>'_blank', :title=>sign_up_text)
+ end
+ seminar_title = seminar.title
%>
| <%= seminar.category.title %> |
- <% if (seminar.enable_custom_template rescue false) %>
- <%= ('' + seminar.title + '').html_safe %>
- <% else %>
- <%= ('' + seminar.title + '').html_safe %>
- <% end %>
+ <%= link_to(seminar_title, seminar.get_frontend_url(seminar_url, :show_data), :target=>'_blank', :title=>seminar_title) %>
|
<%= SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date) %> |
<%= seminar.act_place %> |
@@ -49,15 +53,13 @@
<%= sign_up %>
<%=
- if !seminar.registration_status.blank? and seminar.registration_status.include?('C') and (seminar.contribute_start_date <= @time_now rescue false) and ( seminar.contribute_end_date.nil? or (seminar.contribute_end_date+1 >= @time_now rescue false) )
- if !session[:seminar_signup_id].blank?
- if session[:seminar_main_id] == seminar.id
- ('' + t('seminar_signup.uploads') + '').html_safe
- else
- ('' + t('seminar_signup.con_login') + '').html_safe
- end
+ if registration_is_open && seminar.registration_status.include?('C') && (seminar.contribute_start_date.nil? || seminar.contribute_start_date <= @time_now rescue false) && ( seminar.contribute_end_date.nil? || (seminar.contribute_end_date+1.day >= @time_now rescue false) )
+ if session[:seminar_signup_id].present? && session[:seminar_main_id] == seminar.id
+ button_text = t('seminar_signup.uploads')
+ link_to(button_text, seminar.get_frontend_url(seminar_url, :con_upload), :title=>button_text)
else
- ('' + t('seminar_signup.con_login') + '').html_safe
+ button_text = t('seminar_signup.con_login')
+ link_to(button_text, seminar.get_frontend_url(seminar_url, :con_login), :title=>button_text)
end
end
%>
diff --git a/app/views/seminars/show.html.erb b/app/views/seminars/show.html.erb
index 4107704..b77212b 100644
--- a/app/views/seminars/show.html.erb
+++ b/app/views/seminars/show.html.erb
@@ -9,9 +9,28 @@
else
prefix_url = OrbitHelper.url_to_show(@seminar.to_param)
end
+ registration_is_open = @seminar.registration_status.present?
+ sign_up_not_yet = @seminar.signup_start_date && @time_now && @seminar.signup_start_date > @time_now
+ sign_up_overdue = @seminar.signup_end_date && @time_now && (@seminar.signup_end_date + 1.day <= @time_now)
+ signup_is_full = @seminar.signup_is_full?
%>
-<% if !@seminar.registration_status.blank? and @seminar.signup_start_date < @time_now and ( @seminar.signup_end_date.nil? or @seminar.signup_end_date+1 > @time_now ) %>
-
+<% if !registration_is_open %>
+
+<%= t('seminar.sign_up_not_open') %>
+
+<% elsif sign_up_not_yet %>
+
+<%= t('seminar.sign_up_not_yet') %>
+
+<% elsif sign_up_overdue %>
+
+<%= t('seminar.sign_up_overdue') %>
+
+<% elsif signup_is_full %>
+
+<%= t('seminar.sign_up_is_full') %>
+
+<% else %>
<%#= stylesheet_link_tag "lib/main-forms" %>
<%= stylesheet_link_tag "basic/bootstrap-datetimepicker" %>
<%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
@@ -322,16 +341,4 @@ alert("1ssss2");
})();
-<% elsif @seminar.registration_status.blank? %>
-
-<%= t('seminar.sign_up_not_open') %>
-
-<% elsif @seminar.signup_start_date > @time_now %>
-
-<%= t('seminar.sign_up_not_yet') %>
-
-<% else %>
-
-<%= t('seminar.sign_up_overdue') %>
-
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd200be..c316bfa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -27,6 +27,7 @@ en:
abstract_number: Abstract number
presentation_type: Presentation
seminar:
+ signup_limit: Signup Limit
participant_list: Participant list
back: Back
please_login_first: "Please login first!"
@@ -85,6 +86,7 @@ en:
dashboard: Dashboard
display_field: Display field
note: Note
+ email_exist: "Email exist!"
email_signup_success: Signup success
email_submission_success: Submission registration success
email_add_file_success: Add file success
@@ -153,6 +155,8 @@ en:
sign_up_not_yet: Does Not Yet Allow Sign Up #報名時間未開始
sign_up_not_open: Does Not Open Sign Up #未開放報名
sign_up_overdue: Sign Up Overdue #報名時間已過
+ sign_up_is_full: "Sign up is FULL!"
+ sign_up_failed: "Sign up failed!"
contribute_file_count: Count of Contribute Files #投稿檔案數
frontend:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index bbb5d8d..a31cc88 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -28,6 +28,7 @@ zh_tw:
abstract_number: 摘要編號
presentation_type: 發表方式
seminar:
+ signup_limit: 報名限制人數
participant_list: 參加者名單
back: 回上一頁
please_login_first: "請先登入!"
@@ -86,6 +87,7 @@ zh_tw:
dashboard: 儀錶板
display_field: 顯示的欄位
note: 附註
+ email_exist: "email已存在!"
email_signup_success: 報名成功
email_submission_success: 投稿註冊成功
email_add_file_success: 新增上傳成功
@@ -154,6 +156,8 @@ zh_tw:
sign_up_not_yet: 報名時間未開始
sign_up_not_open: 未開放報名
sign_up_overdue: 報名時間已過
+ sign_up_is_full: "報名已額滿!"
+ sign_up_failed: "報名失敗"
contribute_file_count: 投稿檔案數
frontend:
diff --git a/config/routes.rb b/config/routes.rb
index 78e33d2..3a242de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,8 @@
Rails.application.routes.draw do
+ OrbitHelper::SharedMutex.synchronize do
+ OrbitHelper::SharedHash['seminar'][:counter] = SeminarMain.where(:signup_limit.ne => nil).map{|v| [v.id, v.seminar_signups.count]}.to_h
+ OrbitHelper::SharedHash['seminar'][:limit] = SeminarMain.where(:signup_limit.ne => nil).map{|v| [v.id, v.signup_limit]}.to_h
+ end
Thread.new do
if Page.fields.include?('all_pageids')
s = Site.first
diff --git a/seminar.gemspec b/seminar.gemspec
index ad6ef40..bd040b5 100644
--- a/seminar.gemspec
+++ b/seminar.gemspec
@@ -93,4 +93,7 @@ Gem::Specification.new do |s|
s.test_files = Dir["test/**/*"]
s.add_dependency "custom_announcement"
s.add_dependency "custom_gallery"
+ s.metadata = {
+ "global_hash" => "{counter: {}, limit: {}}"
+ }
end