fix for frontent with no date
This commit is contained in:
parent
2863cbb202
commit
104c15f046
|
@ -12,11 +12,11 @@ class ActivesController < ApplicationController
|
||||||
|
|
||||||
title = ('<a href="'+ OrbitHelper.url_to_show(a.to_param) + '?method=show_data" target="_blank">' + a.title + '</a>').html_safe
|
title = ('<a href="'+ OrbitHelper.url_to_show(a.to_param) + '?method=show_data" target="_blank">' + a.title + '</a>').html_safe
|
||||||
|
|
||||||
if !a.sign_up.blank? and a.sign_start_date <= time_now and ( a.sign_end_date >= time_now or a.sign_end_date.nil? )
|
if (!a.sign_up.blank? and a.sign_start_date <= time_now and ( a.sign_end_date >= time_now or a.sign_end_date.nil? ) rescue false)
|
||||||
sign_up = ('<a href="'+ OrbitHelper.url_to_show(a.to_param) + '" target="_blank">' + t('act.sign_up') + '</a>').html_safe
|
sign_up = ('<a href="'+ OrbitHelper.url_to_show(a.to_param) + '" target="_blank">' + t('act.sign_up') + '</a>').html_safe
|
||||||
elsif a.sign_up.blank?
|
elsif a.sign_up.blank?
|
||||||
sign_up = t('act.sign_up_not_open')
|
sign_up = t('act.sign_up_not_open')
|
||||||
elsif a.sign_start_date > time_now
|
elsif (a.sign_start_date > time_now rescue false)
|
||||||
sign_up = t('act.sign_up_not_yet')
|
sign_up = t('act.sign_up_not_yet')
|
||||||
else
|
else
|
||||||
sign_up = t('act.sign_up_overdue')
|
sign_up = t('act.sign_up_overdue')
|
||||||
|
@ -25,13 +25,13 @@ class ActivesController < ApplicationController
|
||||||
{
|
{
|
||||||
"title" => title,
|
"title" => title,
|
||||||
"category" => a.category.title,
|
"category" => a.category.title,
|
||||||
"sign_start_date" => a.sign_start_date.strftime('%Y-%m-%d %H:%M'),
|
"sign_start_date" => (a.sign_start_date.strftime('%Y-%m-%d %H:%M') rescue ""),
|
||||||
"sign_end_date" => (a.sign_end_date ? a.sign_end_date.strftime('%Y-%m-%d %H:%M') : t(:no_deadline)),
|
"sign_end_date" => ((a.sign_end_date ? a.sign_end_date.strftime('%Y-%m-%d %H:%M') : t(:no_deadline)) rescue ""),
|
||||||
"act_start_date" => a.act_start_date.strftime('%Y-%m-%d %H:%M'),
|
"act_start_date" => (a.act_start_date.strftime('%Y-%m-%d %H:%M') rescue ""),
|
||||||
"act_end_date" => (a.act_end_date ? a.act_end_date.strftime('%Y-%m-%d %H:%M') : t(:no_deadline)),
|
"act_end_date" => (a.act_end_date ? a.act_end_date.strftime('%Y-%m-%d %H:%M') : t(:no_deadline) rescue ""),
|
||||||
'sign_up_time_range' => Act.time_range(a.sign_start_date, a.sign_end_date),
|
'sign_up_time_range' => (Act.time_range(a.sign_start_date, a.sign_end_date) rescue ""),
|
||||||
'sign_up_time_range' => Act.time_range(a.sign_start_date, a.sign_end_date),
|
'sign_up_time_range' => (Act.time_range(a.sign_start_date, a.sign_end_date) rescue ""),
|
||||||
'act_time_range' => Act.time_range(a.act_start_date, a.act_end_date),
|
'act_time_range' => (Act.time_range(a.act_start_date, a.act_end_date) rescue ""),
|
||||||
'sign_up' => sign_up
|
'sign_up' => sign_up
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -73,11 +73,11 @@ class ActivesController < ApplicationController
|
||||||
|
|
||||||
act = Act.find_by(uid: params[:uid])
|
act = Act.find_by(uid: params[:uid])
|
||||||
|
|
||||||
if !act.sign_up.blank? and act.sign_start_date <= time_now and ( act.sign_end_date >= time_now or act.sign_end_date.nil? )
|
if (!act.sign_up.blank? and act.sign_start_date <= time_now and ( act.sign_end_date >= time_now or act.sign_end_date.nil? ) rescue false)
|
||||||
sign_up = ('<a href="'+ OrbitHelper.url_to_show(act.to_param) + '" target="_blank">' + t('act.sign_up') + '</a>').html_safe
|
sign_up = ('<a href="'+ OrbitHelper.url_to_show(act.to_param) + '" target="_blank">' + t('act.sign_up') + '</a>').html_safe
|
||||||
elsif act.sign_up.blank?
|
elsif act.sign_up.blank?
|
||||||
sign_up = t('act.sign_up_not_open')
|
sign_up = t('act.sign_up_not_open')
|
||||||
elsif act.sign_start_date > time_now
|
elsif (act.sign_start_date > time_now rescue false)
|
||||||
sign_up = t('act.sign_up_not_yet')
|
sign_up = t('act.sign_up_not_yet')
|
||||||
else
|
else
|
||||||
sign_up = t('act.sign_up_overdue')
|
sign_up = t('act.sign_up_overdue')
|
||||||
|
@ -87,8 +87,8 @@ class ActivesController < ApplicationController
|
||||||
'act' => act,
|
'act' => act,
|
||||||
'sign_up' => sign_up,
|
'sign_up' => sign_up,
|
||||||
'time_now' => time_now,
|
'time_now' => time_now,
|
||||||
'sign_up_time_range' => Act.time_range(act.sign_start_date, act.sign_end_date),
|
'sign_up_time_range' => (Act.time_range(act.sign_start_date, act.sign_end_date) rescue ""),
|
||||||
'act_time_range' => Act.time_range(act.act_start_date, act.act_end_date)
|
'act_time_range' => (Act.time_range(act.act_start_date, act.act_end_date) rescue "")
|
||||||
}
|
}
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,7 +17,7 @@ class Act
|
||||||
field :act_end_date , :type => DateTime, :default => Time.now
|
field :act_end_date , :type => DateTime, :default => Time.now
|
||||||
field :sign_start_date , :type => DateTime, :default => Time.now
|
field :sign_start_date , :type => DateTime, :default => Time.now
|
||||||
field :sign_end_date , :type => DateTime, :default => Time.now
|
field :sign_end_date , :type => DateTime, :default => Time.now
|
||||||
field :sign_up, :type => Boolean, :default => true
|
field :sign_up, :type => Boolean, :default => false
|
||||||
field :has_idno, :type => Boolean, :default => false
|
field :has_idno, :type => Boolean, :default => false
|
||||||
field :note, localize: true
|
field :note, localize: true
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
<%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
|
<%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
|
||||||
<%= javascript_include_tag "lib/file-type" %>
|
<%= javascript_include_tag "lib/file-type" %>
|
||||||
<%= javascript_include_tag "lib/module-area" %>
|
<%= javascript_include_tag "lib/module-area" %>
|
||||||
|
<%= javascript_include_tag "validator" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<!-- Input Area -->
|
<!-- Input Area -->
|
||||||
|
|
Loading…
Reference in New Issue