refactor: rename event_date fields to recruitment_date across recruitment_mod
This commit is contained in:
rulingcom
parent
e5dda1c9be
commit
dd2420b52d
|
|
@ -31,16 +31,16 @@ class Admin::RecruitmentController < OrbitAdminController
|
|||
def edit_sort
|
||||
@setting = @recruitment_setting
|
||||
@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
|
||||
|
||||
def index
|
||||
Recruitment.remove_expired_status
|
||||
@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
|
||||
if params[:sort].blank?
|
||||
params[:sort] = 'event_date'
|
||||
params[:sort] = 'recruitment_date'
|
||||
params[:order] = 'desc'
|
||||
end
|
||||
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)
|
||||
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
|
||||
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.save
|
||||
if defined?(Feeds)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class Recruitment
|
|||
end
|
||||
Week_day_trans = {:en=>["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],
|
||||
: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_time, type: Boolean, default: true
|
||||
field :hour_clock_24, type: Boolean, default: true
|
||||
|
|
@ -78,8 +78,8 @@ class Recruitment
|
|||
field :create_user_id
|
||||
field :update_user_id
|
||||
field :public, :type => Boolean, :default => true
|
||||
field :event_date , :type => DateTime, :default => Time.now
|
||||
field :event_end_date , :type => DateTime
|
||||
field :recruitment_date , :type => DateTime, :default => Time.now
|
||||
field :recruitment_end_date , :type => DateTime
|
||||
field :postdate , :type => DateTime, :default => Time.now
|
||||
field :deadline , :type => DateTime
|
||||
field :rss2_sn
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ class RecruitmentCustomTitle
|
|||
include Mongoid::Timestamps
|
||||
field :key
|
||||
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
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<%= ev.title.html_safe %>
|
||||
</td>
|
||||
<td>
|
||||
<%= format_value ev.event_date %>
|
||||
<%= format_value ev.recruitment_date %>
|
||||
</td>
|
||||
<td>
|
||||
<%= format_value ev.postdate %>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet|
|
|||
end
|
||||
row2 << tags_str2
|
||||
|
||||
row << t("recruitment.event_date")
|
||||
row << t("recruitment.recruitment_date")
|
||||
row1 << "datetime"
|
||||
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)
|
||||
end
|
||||
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.deadline.strftime("%Y/%m/%d %H:%M") rescue "")
|
||||
row << (anns.is_top? ? 1 : 0)
|
||||
|
|
|
|||
|
|
@ -93,25 +93,25 @@
|
|||
|
||||
<!-- Date Time Picker -->
|
||||
<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">
|
||||
<%= 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 class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t("recruitment.recruitment_date_use_default_setting") %></label>
|
||||
<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 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">
|
||||
<%= 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>
|
||||
<fieldset id="event_date_setting" class="<%='hide' if f.object.event_date_use_default_setting %>">
|
||||
<legend><%=t("recruitment.event_date_setting")%></legend>
|
||||
<fieldset id="recruitment_date_setting" class="<%='hide' if f.object.recruitment_date_use_default_setting %>">
|
||||
<legend><%=t("recruitment.recruitment_date_setting")%></legend>
|
||||
<div class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label>
|
||||
<div class="controls">
|
||||
|
|
@ -666,7 +666,7 @@
|
|||
</script>
|
||||
<% end %>
|
||||
<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")})
|
||||
$("#recruitment_display_img").click(function(){$("#image_display_setting").toggleClass("hide")})
|
||||
function Appendzero(obj)
|
||||
|
|
@ -679,7 +679,7 @@
|
|||
if (location.pathname.substr(-3)=='new'){
|
||||
var getDate = new Date();
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
</td>
|
||||
<td><%= format_value b.event_date %></td>
|
||||
<td><%= format_value b.recruitment_date %></td>
|
||||
<td><%= format_value b.postdate %></td>
|
||||
<td class="<%= b.expired? ? "expired" : "" %>"><%= format_value b.deadline %></td>
|
||||
<td><%= b.update_user.user_name rescue ""%></td>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ wb.add_worksheet(name: "RecruitmentModule") do |sheet|
|
|||
end
|
||||
row2 << t
|
||||
|
||||
row << t("recruitment.event_date")
|
||||
row << t("recruitment.recruitment_date")
|
||||
row1 << "datetime"
|
||||
row2 << "Format: YYYY/MM/DD HH:mm, Example: 2015/12/10 15:20"
|
||||
|
||||
|
|
|
|||
|
|
@ -143,8 +143,8 @@
|
|||
<%= f.text_field :carousel_image_width %>
|
||||
</div>
|
||||
</div>
|
||||
<fieldset id="event_date_setting">
|
||||
<legend><%=t("recruitment.event_date_setting")%></legend>
|
||||
<fieldset id="recruitment_date_setting">
|
||||
<legend><%=t("recruitment.recruitment_date_setting")%></legend>
|
||||
<div class="control-group">
|
||||
<label class="control-label muted"><%= I18n.t("recruitment.including_day_of_the_week") %></label>
|
||||
<div class="controls">
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ zh_tw:
|
|||
text: 工作內容
|
||||
unit: 公告單位
|
||||
employer: 徵求單位
|
||||
recruitment_date: 事件日期
|
||||
recruitment_end_date: 事件結束日期
|
||||
start_date: 公告日期
|
||||
end_date: 截止日期
|
||||
recruitment_date: 徵才開始日期
|
||||
recruitment_end_date: 徵才結束日期
|
||||
start_date: 上架日期
|
||||
end_date: 下架日期
|
||||
add_to_calendar: 加入行事曆
|
||||
blank_to_set: (留白則使用公告設定)
|
||||
stime: 開始時間
|
||||
|
|
|
|||
Loading…
Reference in New Issue