diff --git a/app/models/application_form_main.rb b/app/models/application_form_main.rb index 2ae9b62..48ef047 100644 --- a/app/models/application_form_main.rb +++ b/app/models/application_form_main.rb @@ -39,7 +39,19 @@ class ApplicationFormMain field :create_user_id field :update_user_id - field :reviewer_ids + + field :reveiwer_1st + field :reveiwer_1st_type + field :reviewer_1st_ids + + field :reveiwer_2nd + field :reveiwer_2nd_type + field :reviewer_2nd_ids + + field :reveiwer_3rd + field :reveiwer_3rd_type + field :reviewer_3rd_ids + field :reviewer_show_ids field :session_show_ids field :unassigned_application_form_signup_ids diff --git a/app/views/admin/application_forms/_form.html.erb b/app/views/admin/application_forms/_form.html.erb index 58c1e0f..c02539e 100644 --- a/app/views/admin/application_forms/_form.html.erb +++ b/app/views/admin/application_forms/_form.html.erb @@ -29,10 +29,8 @@
<%= t(:module) %>
@@ -81,92 +79,52 @@ <% end %> - - -
- - -
- -
- <% ['G','C'].each do |t| %> - - <% end %> -
-
- - -
- -
- <%= f.datetime_picker :signup_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
- -
- -
- <%= f.datetime_picker :signup_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
- - -
- -
- <%= f.datetime_picker :contribute_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
- -
- -
- <%= f.datetime_picker :contribute_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
- -
- -
- <%= f.text_field :contribute_file_count %> - (<%= t('application_form.blank_no_limit') %>) -
-
- -
- -
- <%= multi_helper.multiple_lang_tag(nil,'text_area','signup_note_translations',(@application_form.signup_note_translations rescue {}),{rows: 5, class: "input-block-level ckeditor"},'',{},true) %> -
-
- -
-
- -
- <% if !@member.nil? %> - <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_ids][]', email_members:@member, index: "2", select_name: 'reviewer_ids'} %> - <% else %> - <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_ids][]', email_members:[], index: "2", select_name: 'reviewer_ids'} %> - <% end %> -
+
+ +
+ <%= f.select :reviewer_1st_type,['defined_by_applicant','fixed'].map{|v| [t("application_form.#{v}"),v]} %> + <% if !@member_1st.nil? %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_1st_ids][]', email_members:@member_1st, index: "2", select_name: 'reviewer_1st_ids'} %> + <% else %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_1st_ids][]', email_members:[], index: "2", select_name: 'reviewer_1st_ids'} %> + <% end %>
-
- -
- <%= f.datetime_picker :review_start_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
-
- -
- <%= f.datetime_picker :review_end_date, :no_label => true, :format=>"yyyy/MM/dd", :new_record => new_record %> -
-
+
+ +
+ +
+ <%= f.select :reviewer_2nd_type,['defined_by_applicant','fixed'].map{|v| [t("application_form.#{v}"),v]} %> + <% if !@member_2nd.nil? %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_2nd_ids][]', email_members:@member_2nd, index: "3", select_name: 'reviewer_2nd_ids'} %> + <% else %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_2nd_ids][]', email_members:[], index: "3", select_name: 'reviewer_2nd_ids'} %> + <% end %> +
+
+ +
+ +
+ <%= f.select :reviewer_3rd_type,['defined_by_applicant','fixed'].map{|v| [t("application_form.#{v}"),v]} %> + <% if !@member_3rd.nil? %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_3rd_ids][]', email_members:@member_3rd, index: "4", select_name: 'reviewer_3rd_ids'} %> + <% else %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'application_form_main[reviewer_3rd_ids][]', email_members:[], index: "4", select_name: 'reviewer_3rd_ids'} %> + <% end %> +
+
@@ -207,63 +165,6 @@
- -
- - - - - - - - - - <% @submission_set.each_with_index do |attr_signup,submission_index| %> - - - - - - - - <% end %> - -
<%= t('application_form.field_name') %><%= t('application_form.name') %><%= t('application_form.placeholder') %><%= t('application_form.disable') %><%= t('application_form.hidden') %>
- <%= t("application_form_signup.#{attr_signup.field_name}") %> - - <%= show_set_field(attr_signup,'application_form_submission_field_sets',submission_index,'name') %> - - <%= show_set_field(attr_signup,'application_form_submission_field_sets',submission_index,'placeholder') %> - - - - <%= check_box_tag("application_form_main[application_form_submission_field_sets][#{submission_index}][disabled]", true ,attr_signup.disabled) %> - - - <%= check_box_tag("application_form_main[application_form_submission_field_sets][#{submission_index}][hidden]", true ,attr_signup.hidden) %> -
-
-
<%=t('application_form_signup.enable_summary_choice')%>
-
<%= f.check_box :enable_summary_choice %>
-
- <% hidden_style = (f.object.enable_summary_choice) ? "" : "style=display:none" %> -
> -
<%=t('application_form_signup.summary_choice_type')%>
-
<%= f.select :summary_chioice_type,f.object.class::ChoiceTypes.map{|c| [t("application_form_signup.#{c}"),c]} %>
-
-
> -
<%=t('application_form_signup.choices')%>
-
- <% f.object.summary_chioices.each do |choice| %> -
- X - <%= text_field_tag "application_form_main[summary_chioices][]",choice, {:id=>nil} %> -
- <% end %> - -
-
-
@@ -384,16 +285,6 @@ - -
- -
- <%= f.fields_for :speaker_translations do |f| %> - <%= f.text_field locale, class: "input-block-level", placeholder: t('application_form.speaker'), value: (@application_form.speaker_translations[locale] rescue nil) %> - <% end %> -
-
-
diff --git a/config/locales/en.yml b/config/locales/en.yml index b03ee8a..ff04743 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -74,7 +74,7 @@ en: are_you_want_to_remove: "Are you really want to remove?" add_assign_fields: Add assign fields assign_fields: Assign fields - organizer: Organizer + organizer: Process Owner reviewer_setting: Reviewer setting select_reviewer: Select reviewer enquiry_for_applicants_display_fields_setting: Enquiry for applicants display fields setting @@ -95,10 +95,10 @@ en: email_edit_file_content: Edit file success email_title: Title email_content: Content - email_signup: Signup - email_submission: Submission - email_edit_file: Edit file - email_add_file: Add file + email_signup: Application sent + email_submission: Process approved + email_edit_file: Application Approved + email_add_file: Denied auto_send_email_set: Auto send email setting click_to_contribute: Click here to contribute required: Required @@ -114,10 +114,14 @@ en: hidden: Hidden(admin) submission_set: Submission Set signup_set: Signup Set - reviewer: Reviewer #審查委員 + reviewer_1st: 1st Reviewer + reviewer_2nd: 2nd Reviewer + reviewer_3rd: 3rd Reviewer + defined_by_applicant: Defined by Applicant + fixed: Fixed review_end_date: Review End Date #審查結束日期 review_start_date: Review Start Date #審查開始日期 - review: Reveiw #審稿 + review: Approval blank_no_limit: Allow Blank Value #空白無限制 export_csv: Export CSV #匯出CSV recaptcha: Recaptcha #驗證碼 @@ -127,12 +131,12 @@ en: title: Form Title speaker: Speaker #主講者 content: Content #內容說明 - act_place: Application Forms Location #活動地點 + act_place: SOP Title registration_status: Attendee Role #報名身分 registration_status_C: Contributor #投稿者 registration_status_G: Attendee #Normal sign up #一般報名 - application_form_start_date: Application Forms Start Date #活動開始時間 - application_form_end_date: Application Forms End Date #活動結束時間 + application_form_start_date: Applicable Starting Time + application_form_end_date: Applicable End Time signup_start_date: Sign Up Start Date #報名開始時間 signup_end_date: Sign Up End Date #報名結束時間 contribute_start_date: Contribute Start Date #投稿開始時間 @@ -145,7 +149,7 @@ en: export: Export #匯出 set_application_form_items: Items #項目 set_application_form_submission_field: Set Submission Field - set_application_form_signup_field: Set Sign Up Field #圈選設定 + set_application_form_signup_field: Default fields set_application_form_item_content: Set Item Content #項目設定 set_application_form_agreements: Personal Data Usage Agreements #個資宣告設定 application_form_agreements_content: Content of Personal Data Usage Agreements #個資宣告內容 diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index e16455f..44c3f43 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -75,7 +75,7 @@ zh_tw: are_you_want_to_remove: 你確定要刪除? add_assign_fields: 新增分派欄位 assign_fields: 分派欄位 - organizer: 主辦人 + organizer: 流程負責人 reviewer_setting: 審查委員設定 select_reviewer: 選擇審查委員 enquiry_for_applicants_display_fields_setting: 查詢報名人顯示欄位設定 @@ -96,10 +96,10 @@ zh_tw: email_edit_file_content: 編輯上傳成功 email_title: 主旨 email_content: 內文 - email_signup: 報名 - email_submission: 投稿 - email_edit_file: 編輯上傳 - email_add_file: 新增上傳 + email_signup: 申請送出 + email_submission: 階段通過 + email_edit_file: 申請通過 + email_add_file: 不通過 auto_send_email_set: 自動發信設定 click_to_contribute: 按此登入投稿 required: '必填, necessary' @@ -115,10 +115,14 @@ zh_tw: hidden: 隱藏(後台) submission_set: 投稿欄位設定 signup_set: 報名欄位設定 - reviewer: 審查委員 + reviewer_1st: 一階審核 + reviewer_2nd: 二階審核 + reviewer_3rd: 三階審核 + defined_by_applicant: 申請人自填 + fixed: 固定人員 review_end_date: 審查結束日期 review_start_date: 審查開始日期 - review: 審稿 + review: 審核 blank_no_limit: 空白無限制 export_csv: 匯出CSV recaptcha: 驗證碼 @@ -128,12 +132,12 @@ zh_tw: title: 表單名稱 speaker: 主講者 content: 內容說明 - act_place: 活動地點 + act_place: 所屬流程 registration_status: 報名身分 registration_status_C: 投稿者 registration_status_G: 一般報名 - application_form_start_date: 活動開始時間 - application_form_end_date: 活動結束時間 + application_form_start_date: 適用開始時間 + application_form_end_date: 適用結束時間 signup_start_date: 報名開始時間 signup_end_date: 報名結束時間 contribute_start_date: 投稿開始時間 @@ -146,7 +150,7 @@ zh_tw: export: 匯出 set_application_form_items: 項目 set_application_form_submission_field: 上傳介面欄位設定 - set_application_form_signup_field: 報名欄位設定 + set_application_form_signup_field: 預設填寫欄位 set_application_form_item_content: 項目設定 set_application_form_agreements: 個資宣告設定 application_form_agreements_content: 個資宣告內容