Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings

Browse Source 
Conflicts:
	app/views/trainings/enroll.html.erb
dev_trainings
caishi 6 years ago
parent b5730f6dcd f939186ca3
commit fa2adad9ab
3 changed files with 167 additions and 148 deletions
Show Stats Download Patch File Download Diff File

46
app/controllers/trainings_controller.rb
Unescape View File

@ -8,6 +8,9 @@ class TrainingsController < ApplicationController
# ROOT_URL = ENV["wechat_url"] || "#{Setting.protocol}://#{Setting.host_name}"
#
# before_filter :authenticate, except: [:auth, :auth_callback, :pay_callback]
#
before_filter :find_tag_id
before_filter :find_training, only: [:show, :test]
before_filter :valid_training, only: [:pay, :result, :pay_js]
@ -15,18 +18,18 @@ class TrainingsController < ApplicationController
layout 'base_trainings'
TAG_ID = 'bigdata_hnjcxy_2019'
# TAG_ID = 'bigdata_hnjcxy_2019'
def show
@training = current_training
url = nil
if @training && !@training.pay?
url = enroll_training_path(id: TAG_ID)
url = enroll_training_path(id: @tag_id)
elsif @training && @training.pay?
url = result_training_path(id: TAG_ID)
url = result_training_path(id: @tag_id)
else
url = enroll_training_path(id: TAG_ID)
url = enroll_training_path(id: @tag_id)
end
redirect_to url
@ -34,6 +37,7 @@ class TrainingsController < ApplicationController
def enroll
@training = current_training || Training.new
@training_title = @training_type == 3 ? "信息技术新工科产学研联盟师资培训班" : "工程教育认证"
end
@ -45,7 +49,7 @@ class TrainingsController < ApplicationController
# 防止重复支付，对于已支付过的，不应该再到这个页来
if @training.payed?
redirect_to result_training_path(id: TAG_ID)
redirect_to result_training_path(id: @tag_id)
return
end
@ -100,11 +104,15 @@ class TrainingsController < ApplicationController
def create
@training = current_training || Training.new(params)
@training.training_type = Training::Training_Type
@training.training_type = @training_type
if @training_type == 3
@training.research_field = params[:research_field].reject(&:blank?).uniq.join(",")
end
@training.openid = session[:wechat_open_id]
@training.save!
redirect_to pay_training_path(id: TAG_ID)
redirect_to enroll_training_path(id: @tag_id)
# redirect_to pay_training_path(id: @tag_id)
end
@ -116,7 +124,7 @@ class TrainingsController < ApplicationController
end
@training.update_attributes(params)
redirect_to pay_training_path(id: TAG_ID)
redirect_to pay_training_path(id: @tag_id)
end
@ -168,7 +176,7 @@ class TrainingsController < ApplicationController
if params[:js] == 'true'
_pay_js(training_info.fee)
else
redirect_to url = result_training_path(id: TAG_ID)
redirect_to url = result_training_path(id: @tag_id)
end
end
@ -232,11 +240,11 @@ class TrainingsController < ApplicationController
url = ''
if !@training
url = training_path(id: TAG_ID)
url = training_path(id: @tag_id)
elsif !@training.pay?
url = enroll_training_path(id: TAG_ID)
url = enroll_training_path(id: @tag_id)
else
url = result_training_path(id: TAG_ID)
url = result_training_path(id: @tag_id)
end
redirect_to url
@ -262,8 +270,15 @@ class TrainingsController < ApplicationController
end
end
def find_tag_id
@tag_id = params[:id]
Rails.logger.info("##########TAG_ID:#{@tag_id}")
@training_type = @tag_id == "aeee0601_2019" ? 3 : @tag_id == "ceeaa06_2019" ? 4 : 0
render_404 if @training_type == 0
end
def find_training
if params[:id] == TAG_ID
if params[:id] == @tag_id
@training = current_training
else
render_404
@ -271,12 +286,13 @@ class TrainingsController < ApplicationController
end
def current_training
Training.where(openid: session[:wechat_open_id], training_type: Training::Training_Type).first
Rails.logger.info("##########openid:#{session[:wechat_open_id]}, training_type: #{@training_type}")
Training.where(openid: session[:wechat_open_id], training_type: @training_type).first
end
def valid_training
unless current_training
redirect_to training_path(id: TAG_ID)
redirect_to training_path(id: @tag_id)
end
end

2
app/models/training.rb
Unescape View File

@ -3,7 +3,7 @@ class Training < ActiveRecord::Base
attr_accessible :address, :email, :name, :phone, :position, :school, :sex, :openid, :training_type,
:major, :student_id
# training_type 1 2018-培训会 2 警察学院大数据培训会
# training_type 1 2018-培训会 2 警察学院大数据培训会 3 大数据和人工智能 4 工程教育认证
has_one :training_payinfo

53
app/views/trainings/enroll.html.erb
Unescape View File

@ -1,5 +1,5 @@
<% if false %>
<div>
<div>
<p class="collegeInfo">湖南警察学院大数据培训缴费</p>
<%= form_for @training do |f| %>
<p class="subtitle">基本信息</p>
@ -12,7 +12,7 @@
<span class="left_tag fl">性别</span>
<label class="fr" id="sexl" style="margin-right: 24px;"><%= @training.sex == 1 ? '男' : '女' %></label>
<i class="iconfont icon-youjiantou rightArrow"></i>
<input type="hidden" id="sex" name="sex" value="<%= @training.sex ==1 ?1 : 2 %>">
<input type="hidden" id="sex" name="sex" value="<%= @training.sex == 1 ? 1 : 2 %>">
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">专业</span>
@ -64,13 +64,13 @@
<p style="height: 50px;"></p>
<a href="javascript:void(0)" class="EnrollNext" onclick="NextStep();">下一步</a>
<% end %>
</div>
</div>
<div class="sexDownNav downNav">
<div class="sexDownNav downNav">
<li>男</li>
<li>女</li>
</div>
<script>
</div>
<script>
$(function () {
var down = $('#userSex');
var downNav = $(".sexDownNav");
@ -80,7 +80,7 @@
$(down).find("#sexl").html($(this).html());
hideNav(downNav);
if ($(this).html()=='男'){
if ($(this).html() == '男') {
$('#sex').val("1");
} else {
$('#sex').val("2");
@ -121,10 +121,10 @@
}
</script>
</script>
<% end %>
<div>
<p class="collegeInfo">信息技术新工科产学研联盟师资研修</p>
<p class="collegeInfo"><%= @training_title %></p>
<%= form_for @training do |f| %>
<p class="subtitle">基本信息</p>
<li class="clearfix infoBar">
@ -136,13 +136,13 @@
<span class="left_tag fl">性别</span>
<label class="fr" id="sexl" style="margin-right: 24px;"><%= @training.sex == 1 ? '男' : '女' %></label>
<i class="iconfont icon-youjiantou rightArrow"></i>
<input type="hidden" id="sex" name="sex" value="<%= @training.sex ==1 ?1 : 2 %>">
<input type="hidden" id="sex" name="sex" value="<%= @training.sex == 1 ? 1 : 2 %>">
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">单位</span>
<input type="text" class="right_input" id="userUnit" placeholder="请输入单位名称或者学校"
name="major"
value="<%= @training.major %>"/>
name="school"
value="<%= @training.school %>"/>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">职称</span>
@ -156,9 +156,9 @@
<label for="Positional_2" style="top:0px">学生</label>
</span>
</span>
<!--<input type="text" class="right_input" id="userPositional" placeholder="请输入职称"-->
<!--name="student_id"-->
<!--value="<%#= @training.student_id %>"/>-->
<!--<input type="text" class="right_input" id="userPositional" placeholder="请输入职称"
name="technical_title"
value="<%#= @training.technical_title %>"/>-->
</li>
<p class="subtitle">培训类型</p>
<li class="clearfix infoBar">
@ -182,56 +182,59 @@
<label for="type_3" style="top:8px">&nbsp;</label>
</span>
</li>
<% if @training_type == 3 %>
<p class="subtitle">您的授课/研究领域（最少选1项）</p>
<li class="clearfix infoBar">
<span class="left_tag fl">机器学习/深度学习</span>
<span class="fr">
<input type="checkbox" name="study" value="1" id="check_1" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="机器学习/深度学习" <%= @training.research_field.split(",").include?("机器学习/深度学习") ? "checked" : "" %> id="check_1" class="magic-checkbox">
<label for="check_1" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">计算机结构与组成</span>
<span class="fr">
<input type="checkbox" name="study" value="2" id="check_2" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="计算机结构与组成" <%= @training.research_field.split(",").include?("计算机结构与组成") ? "checked" : "" %> id="check_2" class="magic-checkbox">
<label for="check_2" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">计算机系统</span>
<span class="fr">
<input type="checkbox" name="study" value="3" id="check_3" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="计算机系统" <%= @training.research_field.split(",").include?("计算机系统") ? "checked" : "" %> id="check_3" class="magic-checkbox">
<label for="check_3" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">计算机软件技术和应用</span>
<span class="fr">
<input type="checkbox" name="study" value="4" id="check_4" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="计算机软件技术和应用" <%= @training.research_field.split(",").include?("计算机软件技术和应用") ? "checked" : "" %> id="check_4" class="magic-checkbox">
<label for="check_4" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">计算机理论</span>
<span class="fr">
<input type="checkbox" name="study" value="5" id="check_5" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="计算机理论" <%= @training.research_field.split(",").include?("计算机理论") ? "checked" : "" %> id="check_5" class="magic-checkbox">
<label for="check_5" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">计算机应用与学科交叉</span>
<span class="fr">
<input type="checkbox" name="study" value="6" id="check_6" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="计算机应用与学科交叉" <%= @training.research_field.split(",").include?("计算机应用与学科交叉") ? "checked" : "" %> id="check_6" class="magic-checkbox">
<label for="check_6" style="top:8px">&nbsp;</label>
</span>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">其他</span>
<span class="fr">
<input type="checkbox" name="study" value="7" id="check_7" class="magic-checkbox">
<input type="checkbox" name="research_field[]" value="其他" <%= @training.research_field.split(",").include?("其他") ? "checked" : "" %> id="check_7" class="magic-checkbox">
<label for="check_7" style="top:8px">&nbsp;</label>
</span>
</li>
<% end %>
<p class="subtitle">通讯地址</p>
<li class="clearfix infoBar">
<!--<div class="clearfix" id="userArea" NavShow>-->
@ -239,7 +242,7 @@
<!--<input type="text" class="right_input" id="usertitle" placeholder="填写区域"/>-->
<!--<i class="iconfont icon-youjiantou rightArrow"></i>-->
<!--</div>-->
<textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%#= @training.address %></textarea>
<textarea class="DetailAddress" placeholder="请输入详细地址" name="address" id="DetailAdd" style="margin-top: 15px;"><%= @training.address %></textarea>
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">手机号码</span>
@ -249,7 +252,7 @@
</li>
<li class="clearfix infoBar">
<span class="left_tag fl">Email</span>
<input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%#= @training.email %>"/>
<input type="text" class="right_input" placeholder="请输入Email" id="userEmail" name="email" value="<%= @training.email %>"/>
</li>
<p style="height: 50px;"></p>
<a href="javascript:void(0)" class="EnrollNext" onclick="NextStep();">完成</a>
@ -270,7 +273,7 @@
$(down).find("#sexl").html($(this).html());
hideNav(downNav);
if ($(this).html()=='男'){
if ($(this).html() == '男') {
$('#sex').val("1");
} else {
$('#sex').val("2");

Write Preview
Loading…
Cancel
Save