chiu
/
recruitment_mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: rename event_date fields to recruitment_date across recruitment_mod

This commit is contained in:
rulingcom 2026-07-24 17:39:10 +08:00
parent e5dda1c9be
commit dd2420b52d
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/admin/recruitment_controller.rb
View File

@ -31,16 +31,16 @@ class Admin::RecruitmentController < OrbitAdminController
def edit_sort def edit_sort
@setting = @recruitment_setting @setting = @recruitment_setting
@recruitment = Recruitment.where(is_top: true).order_by({is_top: -1,sort_number: 1,postdate: -1, _id: -1}) @recruitment = Recruitment.where(is_top: true).order_by({is_top: -1,sort_number: 1,postdate: -1, _id: -1})
@table_fields = ['recruitment.table.sort_number','recruitment.table.title','recruitment.event_date','recruitment.start_date'] @table_fields = ['recruitment.table.sort_number','recruitment.table.title','recruitment.recruitment_date','recruitment.start_date']
end end
def index def index
Recruitment.remove_expired_status Recruitment.remove_expired_status
@tags = @module_app.tags @tags = @module_app.tags
@table_fields = [:status, :category, :title, "recruitment.event_date", "recruitment.start_date", "recruitment.end_date", :last_modified] @table_fields = [:status, :category, :title, "recruitment.recruitment_date", "recruitment.start_date", "recruitment.end_date", :last_modified]
@current_user = current_user @current_user = current_user
if params[:sort].blank? if params[:sort].blank?
params[:sort] = 'event_date' params[:sort] = 'recruitment_date'
params[:order] = 'desc' params[:order] = 'desc'
end end
if RecruitmentSetting.first.is_display_edit_only && !current_user.is_admin? && !current_user.is_manager?(@module_app) if RecruitmentSetting.first.is_display_edit_only && !current_user.is_admin? && !current_user.is_manager?(@module_app)
@ -586,7 +586,7 @@ class Admin::RecruitmentController < OrbitAdminController
def update_is_postdate_sort_first(setting) def update_is_postdate_sort_first(setting)
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
OrbitHelper::SharedHash['recruitment_mod'][:is_postdate_sort_first] = setting.is_postdate_sort_first OrbitHelper::SharedHash['recruitment_mod'][:is_postdate_sort_first] = setting.is_postdate_sort_first
feeds_time_field = (RecruitmentHelper.is_postdate_sort_first ? ['postdate', 'event_date'] : ['event_date', 'postdate']) feeds_time_field = (RecruitmentHelper.is_postdate_sort_first ? ['postdate', 'recruitment_date'] : ['recruitment_date', 'postdate'])
@module_app.feeds_time_field = feeds_time_field @module_app.feeds_time_field = feeds_time_field
@module_app.save @module_app.save
if defined?(Feeds) if defined?(Feeds)

6
app/models/recruitment.rb
View File

@ -47,7 +47,7 @@ class Recruitment
end end
Week_day_trans = {:en=>["Sun","Mon","Tue","Wed","Thu","Fri","Sat"], Week_day_trans = {:en=>["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],
:zh_tw=>["(日)","(一)","(二)","(三)","(四)","(五)","(六)"]} :zh_tw=>["(日)","(一)","(二)","(三)","(四)","(五)","(六)"]}
field :event_date_use_default_setting, type: Boolean, default: true field :recruitment_date_use_default_setting, type: Boolean, default: true
field :including_day_of_the_week, type: Boolean, default: true field :including_day_of_the_week, type: Boolean, default: true
field :including_time, type: Boolean, default: true field :including_time, type: Boolean, default: true
field :hour_clock_24, type: Boolean, default: true field :hour_clock_24, type: Boolean, default: true
@ -78,8 +78,8 @@ class Recruitment
field :create_user_id field :create_user_id
field :update_user_id field :update_user_id
field :public, :type => Boolean, :default => true field :public, :type => Boolean, :default => true
field :event_date , :type => DateTime, :default => Time.now field :recruitment_date , :type => DateTime, :default => Time.now
field :event_end_date , :type => DateTime field :recruitment_end_date , :type => DateTime
field :postdate , :type => DateTime, :default => Time.now field :postdate , :type => DateTime, :default => Time.now
field :deadline , :type => DateTime field :deadline , :type => DateTime
field :rss2_sn field :rss2_sn

2
app/models/recruitment_custom_title.rb
View File

@ -3,7 +3,7 @@ class RecruitmentCustomTitle
include Mongoid::Timestamps include Mongoid::Timestamps
field :key field :key
field :title, type: String, localize: true field :title, type: String, localize: true
KEYS = ['category', 'title', 'event_date', 'education_requirement', 'experience_requirement', 'skills_requirement', 'language', 'salary_info', 'notes', 'contact_info'] KEYS = ['category', 'title', 'recruitment_date', 'education_requirement', 'experience_requirement', 'skills_requirement', 'language', 'salary_info', 'notes', 'contact_info']
def self.get_map def self.get_map
KEYS.map do |k| KEYS.map do |k|
s = self.where(key: k).first || self.create(key: k,title_translations: I18n.available_locales.map{|l| [l,I18n.with_locale(l){I18n.t("recruitment.#{k}")}]}.to_h) s = self.where(key: k).first || self.create(key: k,title_translations: I18n.available_locales.map{|l| [l,I18n.with_locale(l){I18n.t("recruitment.#{k}")}]}.to_h)

2
app/views/admin/recruitment/_edit_sort.html.erb
View File

@ -26,7 +26,7 @@
<%= ev.title.html_safe %> <%= ev.title.html_safe %>
</td> </td>
<td> <td>
<%= format_value ev.event_date %> <%= format_value ev.recruitment_date %>
</td> </td>
<td> <td>
<%= format_value ev.postdate %> <%= format_value ev.postdate %>

4
app/views/admin/recruitment/_export_excel.xlsx.axlsx
View File

@ -38,7 +38,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet|
end end
row2 << tags_str2 row2 << tags_str2
row << t("recruitment.event_date") row << t("recruitment.recruitment_date")
row1 << "datetime" row1 << "datetime"
row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20" row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20"
@ -212,7 +212,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet|
t << tags.to_a.index(tag) t << tags.to_a.index(tag)
end end
row << t.join(",") row << t.join(",")
row << (anns.event_date.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.recruitment_date.strftime("%Y/%m/%d %H:%M") rescue "")
row << (anns.postdate.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.postdate.strftime("%Y/%m/%d %H:%M") rescue "")
row << (anns.deadline.strftime("%Y/%m/%d %H:%M") rescue "") row << (anns.deadline.strftime("%Y/%m/%d %H:%M") rescue "")
row << (anns.is_top? ? 1 : 0) row << (anns.is_top? ? 1 : 0)

18
app/views/admin/recruitment/_form.html.erb
View File

@ -93,25 +93,25 @@
<!-- Date Time Picker --> <!-- Date Time Picker -->
<div class="control-group"> <div class="control-group">
<label class="control-label muted"><%= RecruitmentCustomTitle.get_trans('event_date') %></label> <label class="control-label muted"><%= t("recruitment.recruitment_date") %></label>
<div class="controls"> <div class="controls">
<%= f.datetime_picker :event_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %> <%= f.datetime_picker :recruitment_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label muted"><%= I18n.t("recruitment.recruitment_date_use_default_setting") %></label> <label class="control-label muted"><%= I18n.t("recruitment.recruitment_date_use_default_setting") %></label>
<div class="controls"> <div class="controls">
<%= f.check_box :event_date_use_default_setting, :id=>"event_date_use_default_setting" %> <%= f.check_box :recruitment_date_use_default_setting, :id=>"recruitment_date_use_default_setting" %>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label muted"><%= t("recruitment.event_end_date") %></label> <label class="control-label muted"><%= t("recruitment.recruitment_end_date") %></label>
<div class="controls"> <div class="controls">
<%= f.datetime_picker :event_end_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %> <%= f.datetime_picker :recruitment_end_date, :no_label => true, :new_record => @recruitment.new_record?, :data=>{"picker-type" => "range", "range" => "start"} %>
</div> </div>
</div> </div>
<fieldset id="event_date_setting" class="<%='hide' if f.object.event_date_use_default_setting %>"> <fieldset id="recruitment_date_setting" class="<%='hide' if f.object.recruitment_date_use_default_setting %>">
<legend><%=t("recruitment.event_date_setting")%></legend> <legend><%=t("recruitment.recruitment_date_setting")%></legend>
<div class="control-group"> <div class="control-group">
<label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label> <label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label>
<div class="controls"> <div class="controls">
@ -666,7 +666,7 @@
</script> </script>
<% end %> <% end %>
<script> <script>
$("#event_date_use_default_setting").click(function(){$("#event_date_setting").toggleClass("hide")}) $("#recruitment_date_use_default_setting").click(function(){$("#recruitment_date_setting").toggleClass("hide")})
$("#including_time").click(function(){$(".hour_clock_24_block").toggleClass("hide")}) $("#including_time").click(function(){$(".hour_clock_24_block").toggleClass("hide")})
$("#recruitment_display_img").click(function(){$("#image_display_setting").toggleClass("hide")}) $("#recruitment_display_img").click(function(){$("#image_display_setting").toggleClass("hide")})
function Appendzero(obj) function Appendzero(obj)
@ -679,7 +679,7 @@
if (location.pathname.substr(-3)=='new'){ if (location.pathname.substr(-3)=='new'){
var getDate = new Date(); var getDate = new Date();
var toDay = getDate.getFullYear()+"/"+ (Appendzero(getDate.getMonth()+1))+"/"+Appendzero(getDate.getDate())+" "+Appendzero(getDate.getHours())+":"+Appendzero(getDate.getMinutes()); var toDay = getDate.getFullYear()+"/"+ (Appendzero(getDate.getMonth()+1))+"/"+Appendzero(getDate.getDate())+" "+Appendzero(getDate.getHours())+":"+Appendzero(getDate.getMinutes());
$('input[name="recruitment[event_date]"]').val(toDay); $('input[name="recruitment[recruitment_date]"]').val(toDay);
$('input[name="recruitment[postdate]"]').val(toDay); $('input[name="recruitment[postdate]"]').val(toDay);
} }

2
app/views/admin/recruitment/_index.html.erb
View File

@ -55,7 +55,7 @@
</ul> </ul>
</div> </div>
</td> </td>
<td><%= format_value b.event_date %></td> <td><%= format_value b.recruitment_date %></td>
<td><%= format_value b.postdate %></td> <td><%= format_value b.postdate %></td>
<td class="<%= b.expired? ? "expired" : "" %>"><%= format_value b.deadline %></td> <td class="<%= b.expired? ? "expired" : "" %>"><%= format_value b.deadline %></td>
<td><%= b.update_user.user_name rescue ""%></td> <td><%= b.update_user.user_name rescue ""%></td>

2
app/views/admin/recruitment/excel_format.xlsx.axlsx
View File

@ -36,7 +36,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet|
end end
row2 << t row2 << t
row << t("recruitment.event_date") row << t("recruitment.recruitment_date")
row1 << "datetime" row1 << "datetime"
row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20" row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20"

4
app/views/admin/recruitment/settings.html.erb
View File

@ -143,8 +143,8 @@
<%= f.text_field :carousel_image_width %> <%= f.text_field :carousel_image_width %>
</div> </div>
</div> </div>
<fieldset id="event_date_setting"> <fieldset id="recruitment_date_setting">
<legend><%=t("recruitment.event_date_setting")%></legend> <legend><%=t("recruitment.recruitment_date_setting")%></legend>
<div class="control-group"> <div class="control-group">
<label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label> <label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label>
<div class="controls"> <div class="controls">

8
config/locales/zh_tw.yml
View File

@ -55,10 +55,10 @@ zh_tw:
text: 工作內容 text: 工作內容
unit: 公告單位 unit: 公告單位
employer: 徵求單位 employer: 徵求單位
recruitment_date: 事件日期 recruitment_date: 徵才開始日期
recruitment_end_date: 事件結束日期 recruitment_end_date: 徵才結束日期
start_date: 公告日期 start_date: 上架日期
end_date: 截止日期 end_date: 下架日期
add_to_calendar: 加入行事曆 add_to_calendar: 加入行事曆
blank_to_set: (留白則使用公告設定) blank_to_set: (留白則使用公告設定)
stime: 開始時間 stime: 開始時間