spen
/
seminar
1
0
Fork 6
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Add hidden class when sign_up_not_yet.' (#20) from 123/seminar:master into master 

Reviewed-on: https://gitlab.tp.rulingcom.com/spen/seminar/pulls/20
This commit is contained in:
chiu 2024-04-15 16:13:37 +00:00
parent aadc929ae0 5a31d2c709
commit d62248c9e0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/seminars_controller.rb
View File

@ -334,6 +334,7 @@ class SeminarsController < ApplicationController
seminar_url = (@prefix_url ? @prefix_url : OrbitHelper.url_to_show(seminar.to_param))
if !registration_is_open
sign_up = t('seminar.sign_up_not_open')
sign_up_not_yet = true
elsif sign_up_not_yet
sign_up = t('seminar.sign_up_not_yet')
elsif sign_up_overdue
@ -360,7 +361,7 @@ class SeminarsController < ApplicationController
'sign_up' => sign_up,
'contribute_action' => contribute_action,
'time_now' => time_now,
'sign_up_overdue' => sign_up_overdue,
'sign_up_not_yet' => sign_up_not_yet,
'contribute_time_range' => SeminarMain.time_range(seminar.contribute_start_date, seminar.contribute_end_date),
'sign_up_time_range' => SeminarMain.time_range(seminar.signup_start_date, seminar.signup_end_date),
'seminar_time_range' => SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date)

4
app/views/seminars/show_data.html.erb
View File

@ -10,7 +10,7 @@
@seminar_time_range = data["seminar_time_range"]
@contribute_time_range = data["contribute_time_range"]
@contribute_action = data["contribute_action"]
@sign_up_overdue = data["sign_up_overdue"]
@sign_up_not_yet = data["sign_up_not_yet"]
%>
@ -50,7 +50,7 @@
<td class="seminarive-title-value"><%= @contribute_time_range %></td>
</tr>
<% end %>
<tr <%= 'class="hidden"'.html_safe if @sign_up_overdue && @contribute_action.blank? %>>
<tr <%= 'class="hidden"'.html_safe if @sign_up_not_yet && @contribute_action.blank? %>>
<th class="seminarive-title-field"><%= t('seminar.signup') %></th>
<td class="seminarive-title-value"><%= @sign_up %><br /><%= @contribute_action %></td>
</tr>