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

Fix bug.

This commit is contained in:
BoHung Chiu 2023-01-06 15:30:03 +08:00
parent f4b1e7abd6
commit 9aecf5963c
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_forms_controller.rb
View File

@ -305,7 +305,7 @@ class ApplicationFormsController < ApplicationController
application_form = ApplicationFormMain.find_by(uid: params[:uid].to_s)
if application_form.application_form_start_date <= time_now && ( application_form.application_form_end_date.nil? || application_form.application_form_end_date+1 >= time_now )
if (application_form.application_form_start_date.nil? || application_form.application_form_start_date <= time_now) && ( application_form.application_form_end_date.nil? || application_form.application_form_end_date+1 >= time_now )
sign_up = ('<a href="'+ OrbitHelper.url_to_show(application_form.to_param) + '">' + t('application_form.signup') + '</a>').html_safe
elsif application_form.registration_status.blank?
sign_up = t('application_form.sign_up_not_open')

28
app/views/application_forms/show.html.erb
View File

@ -13,11 +13,7 @@
%>
<% if @application_form.application_form_start_date < @time_now and ( @application_form.application_form_end_date.nil? or @application_form.application_form_end_date+1.days > @time_now ) %>
<%#= stylesheet_link_tag "lib/main-forms" %>
<%= stylesheet_link_tag "basic/bootstrap-datetimepicker" %>
<%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
<%= javascript_include_tag "lib/datetimepicker/date.time.picker.js" %>
<%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
<%#= stylesheet_link_tag "lib/main-forms" %>
<% notice = flash["notice"] || params[:notice] %>
<% flash.each do |key, msg| %>
<% next if key.to_s == "notice" %>
@ -367,17 +363,17 @@
elem = $(this),
value = $(this).val() || null;
var checkAvailability = function(){
$.ajax({
url : "<%= "#{prefix_url}?method=check_availability&no=#{@application_form.id}" %>",
data : {"type" : type, "value" : value},
dataType : "json",
type : "get",
success : function(data){
if( data.success == true ){
}else{
}
}
})
// $.ajax({
// url : "/xhr/application_forms/check_availability",
// data : {"type" : type, "value" : value},
// dataType : "json",
// type : "get",
// success : function(data){
// if( data.success == true ){
// }else{
// }
// }
// })
}
if( value ){

2
app/views/application_forms/show_privacy.html.erb
View File

@ -19,7 +19,7 @@
<div class="highlight application_form_privacy">
<%= @application_form_agreement.content.html_safe %>
<%= @application_form_agreement.content.to_s.html_safe %>
</div>

4
application_form.gemspec
View File

File diff suppressed because one or more lines are too long

1
config/routes.rb
View File

@ -70,6 +70,7 @@ Rails.application.routes.draw do
post 'del_file', to: 'application_forms#del_file'
end
end
get '/xhr/application_forms/check_availability', to: 'application_forms#check_availability'
get '/xhr/application_forms/agree_link' , to: 'application_forms#agree_link'
end