From 397c4cc2a5944625f453b57217537eaf0b5dd08e Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 30 Jun 2016 16:08:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=96=B0=E5=8F=91=E9=80=81=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B92.=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E8=B5=84=E6=96=99=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B93.=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=A4=84=E5=A2=9E=E5=8A=A0=E7=9B=B4=E6=8E=A5=E5=8A=A0=E5=85=A5?= =?UTF-8?q?QQ=E7=BE=A4=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 3 +- app/controllers/my_controller.rb | 6 +- app/controllers/school_controller.rb | 51 +++ app/models/apply_add_schools.rb | 3 + app/views/layouts/_new_feedback.html.erb | 6 +- app/views/mailer/register.html.erb | 4 + app/views/my/_apply_add_school.html.erb | 337 ++++++++++++++++++ app/views/my/account.html.erb | 106 +++++- config/routes.rb | 3 +- ...160629030320_add_school_type_to_schools.rb | 5 + ...20160629081520_create_apply_add_schools.rb | 15 + db/schema.rb | 53 +-- public/images/icons_ziliao.png | Bin 0 -> 20180 bytes public/stylesheets/new_user.css | 97 ++++- public/stylesheets/users.css | 2 +- spec/factories/apply_add_schools.rb | 12 + spec/models/apply_add_schools_spec.rb | 5 + 17 files changed, 660 insertions(+), 48 deletions(-) create mode 100644 app/models/apply_add_schools.rb create mode 100644 app/views/my/_apply_add_school.html.erb create mode 100644 db/migrate/20160629030320_add_school_type_to_schools.rb create mode 100644 db/migrate/20160629081520_create_apply_add_schools.rb create mode 100644 public/images/icons_ziliao.png create mode 100644 spec/factories/apply_add_schools.rb create mode 100644 spec/models/apply_add_schools_spec.rb diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 8bf40d472..62b076754 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -243,7 +243,8 @@ class AccountController < ApplicationController user = User.find(params[:user]) if params[:user] token = Token.new(:user => user, :action => "register") if token.save - Mailer.run.register(token) + # Mailer.run.register(token) + Mailer.register(token).deliver else yield if block_given? status = 0 diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 0883b3799..32c605516 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -127,12 +127,14 @@ class MyController < ApplicationController end @user.safe_attributes = params[:user] + @user.lastname = params[:lastname] + @user.firstname = "" @user.pref.attributes = params[:pref] @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') #@user.login = params[:login] unless @user.user_extensions.nil? if @user.user_extensions.identity == 2 - @user.firstname = params[:enterprise_name] + # @user.firstname = params[:enterprise_name] end end @@ -144,7 +146,7 @@ class MyController < ApplicationController # end @se.school_id = params[:occupation] - @se.gender = params[:gender] + @se.gender = params[:sex] @se.location = params[:province] if params[:province] @se.location_city = params[:city] if params[:city] @se.identity = params[:identity].to_i if params[:identity] diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index e0aff6254..44f4378fe 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -150,4 +150,55 @@ class SchoolController < ApplicationController format.js end end + + #申请高校(单位) name:名称 province:省 city:市 address:地址 remarks:备注 + def apply_add_school + + data = {result:0,name:params[:name],school_id:0} + #0 成功 1参数错误 2名称已存在 + data[:result] = 0 + + #检验参数 + if params[:name] == "" || params[:province] == "" || params[:city] == "" || params[:address] == "" + data[:result] = 1 + else + school_id = School.find_by_sql("select id from schools where name='#{params[:name]}'").first + if school_id + data[:result] = 2 + else + school = School.new + school.name = params[:name].strip + school.pinyin = Pinyin.t(params[:name].strip, splitter: '') + school.save + + #status 0未处理 1通过 2拒绝 + applyschool = ApplyAddSchools.new + applyschool.school_id = school.id + applyschool.name = school.name + applyschool.province = params[:province] + applyschool.city = params[:city] + applyschool.address = params[:address] + applyschool.remarks = params[:remarks] + applyschool.save + + data[:school_id] = school.id + end + end + render :json =>data + end + + def search_repeat_schoolname + status = 0 + name = params[:name] + + if name + school_id = School.find_by_sql("select id from schools where name='#{name}'").first + + if school_id + status = 1 + end + end + + render :json =>status + end end diff --git a/app/models/apply_add_schools.rb b/app/models/apply_add_schools.rb new file mode 100644 index 000000000..2082c0012 --- /dev/null +++ b/app/models/apply_add_schools.rb @@ -0,0 +1,3 @@ +class ApplyAddSchools < ActiveRecord::Base + attr_accessible :address, :city, :name, :province, :remarks, :school_id, :status +end diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index ffec82bce..e2e935f57 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -16,7 +16,7 @@ <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> - + <%= l(:label_submit)%> <% end %> @@ -25,7 +25,9 @@ <%#= l(:label_technical_support) %> -

请加入师姐师兄答疑群

QQ群号：173184401

+ + + Trustie师姐师兄答疑群
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb index 282deca90..5b4e8262b 100644 --- a/app/views/mailer/register.html.erb +++ b/app/views/mailer/register.html.erb @@ -1,2 +1,6 @@

<%= l(:mail_body_register) %>
<%= link_to h(@url), @url %>

+

如果点击链接无效请复制该链接到浏览器中打开

+
+

感谢您的使用！

+

Trustie团队

diff --git a/app/views/my/_apply_add_school.html.erb b/app/views/my/_apply_add_school.html.erb new file mode 100644 index 000000000..1449fa1f1 --- /dev/null +++ b/app/views/my/_apply_add_school.html.erb @@ -0,0 +1,337 @@ +

添加新的高校（单位）

+
+ + + diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index f28ad1ca2..589541c39 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -20,8 +20,8 @@
  • *  职业 : 
  • *  姓名 : 
  • 组织名 : *
    • -
  • 性别 : 
    • -
  • 单位名称 : 
    • +
  • *  性别 : 
    • +
  • *  单位名称 : 
  • 地区 : 
  • 邮件通知 : 
    • @@ -64,19 +64,51 @@ -
  • <%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %> +
  • <%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %> -
  • <%= text_field_tag :enterprise_name,@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
  • - - + <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %> + + <% else %> + + <% end %> +
    • -
  • - -

    您输入的名称尚不存在，申请添加

    +
  • + <% if User.current.user_extensions.nil? %> + + +

    + + +

    + + <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %> + + +

    + + +

    + + <% elsif User.current.user_extensions.school.nil? %> + + +

    + + +

    + + <% else %> + + +

    + + +

    + + <% end %>
  • @@ -412,6 +444,7 @@ $("*[nh_required='1']",$(this)).attr("required",true); $(this).show() }); + $("#identity_hint").hide(); } function init_identity_and_title(pField, identity, cField, title, language) { for (var i = 0; i < pField.options.length; i++) { @@ -516,6 +549,14 @@ $("input[name='occupation']").val(data); $("#search_school_result_list").hide(); $("#hint").hide(); + $("#errortip").hide(); + + } + + function apply_add_school(){ + var htmlvalue = "<%= escape_javascript( render :partial => 'my/apply_add_school' )%>"; + pop_up_box(htmlvalue,580,20,48); + } function add_school(name){ $.ajax({ @@ -602,16 +643,19 @@ $("#search_school_result_list").show(); if($(e.target).val().trim() != '') { str = e.target.value.length > 8 ? e.target.value.substr(0, 6)+"..." : e.target.value; - $("#hint").html('找到了' + count + '个包含"' + str + '"的高校'); + $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）'); $("#hint").show(); + $("#errortip").hide(); }else{ $("#hint").hide(); + $("#errortip").hide(); } }else{ $("#search_school_result_list").html(''); str = e.target.value.length > 4 ? e.target.value.substr(0, 4)+"..." : e.target.value; - $("#hint").html('没有找到包含"'+str+'"的高校，创建高校'); + $("#hint").html('您输入的名称尚不存在，申请添加'); $("#hint").show(); + $("#errortip").show(); } } }); @@ -621,6 +665,7 @@ { $("#search_school_result_list").hide(); $("#hint").hide(); + $("#errortip").hide(); } }); $("input[name='province']").on('focus', function (e) { @@ -648,16 +693,19 @@ $("#search_school_result_list").show(); if($(e.target).val().trim() != '') { str = e.target.value.length > 8 ? e.target.value.substr(0, 6)+"..." : e.target.value; - $("#hint").html('找到了' + count + '个包含"' + str + '"的高校'); + $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）'); $("#hint").show(); + $("#errortip").hide(); }else{ $("#hint").hide(); + $("#errortip").hide(); } }else{ $("#search_school_result_list").html(''); str = e.target.value.length > 4 ? e.target.value.substr(0, 4)+"..." : e.target.value; - $("#hint").html('没有找到包含"'+str+'"的高校，创建高校'); + $("#hint").html('您输入的名称尚不存在，申请添加'); $("#hint").show(); + $("#errortip").show(); } } }); @@ -685,19 +733,41 @@ <% if( !@act.nil? && @act == 'password') %> $("#users_tb_2").click(); <% end %> - $('#my_account_form_link').click(function(e){ + + $('#my_account_form_link').on("click",(function(e){ + //$('#my_account_form_link').click(function(e){ if($("#userIdentity").val() == -1 ) { $("#identity_hint").html('请选择身份').show(); e.stopImmediatePropagation(); return; } if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){ //学校名字和id不对的话 - $("#hint").html('学校必须是从下拉列表中选择的,不能手动修改').show(); + $("#hint").html('单位名称必须是从下拉列表中选择的,不能手动修改').show(); e.stopImmediatePropagation(); return; } + + //姓名不能为空 + if( $("#lastname").val() == '' ){ + $("#lastname").focus(); + e.stopImmediatePropagation(); + return; + } + + if( $("input[name='province']").val().trim() == '' ){ //学校名字必须填写 + $("#hint").html('高校（单位）名称不能为空').show(); + e.stopImmediatePropagation(); + return; + } + + if($("#no").is(":visible") == true && $("#no").val() == ""){ + $("#no").focus(); + e.stopImmediatePropagation(); + return; + } + $('#my_account_form_btn').click(); - }); + })); $('#my_password_form_link').click(function(){ $('#my_password_form_btn').click(); }); diff --git a/config/routes.rb b/config/routes.rb index 14ee3f0b8..d56f75ced 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -213,7 +213,8 @@ RedmineApp::Application.routes.draw do resources :school, :except => [:show] do collection do - + get 'apply_add_school' + get 'search_repeat_schoolname' end member do diff --git a/db/migrate/20160629030320_add_school_type_to_schools.rb b/db/migrate/20160629030320_add_school_type_to_schools.rb new file mode 100644 index 000000000..ad23ae555 --- /dev/null +++ b/db/migrate/20160629030320_add_school_type_to_schools.rb @@ -0,0 +1,5 @@ +class AddSchoolTypeToSchools < ActiveRecord::Migration + def change + add_column :schools, :school_type, :integer, :default => false + end +end diff --git a/db/migrate/20160629081520_create_apply_add_schools.rb b/db/migrate/20160629081520_create_apply_add_schools.rb new file mode 100644 index 000000000..3d47f55a1 --- /dev/null +++ b/db/migrate/20160629081520_create_apply_add_schools.rb @@ -0,0 +1,15 @@ +class CreateApplyAddSchools < ActiveRecord::Migration + def change + create_table :apply_add_schools do |t| + t.string :name + t.string :province + t.string :city + t.string :address + t.string :remarks + t.integer :school_id + t.integer :status, :default => false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 148a6e21b..615a9001e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160624032138) do +ActiveRecord::Schema.define(:version => 20160629081520) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -57,6 +57,18 @@ ActiveRecord::Schema.define(:version => 20160624032138) do t.integer "user_id", :null => false end + create_table "apply_add_schools", :force => true do |t| + t.string "name" + t.string "province" + t.string "city" + t.string "address" + t.string "remarks" + t.integer "school_id" + t.integer "status", :default => 0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "apply_homeworks", :force => true do |t| t.integer "status" t.integer "user_id" @@ -1125,23 +1137,6 @@ ActiveRecord::Schema.define(:version => 20160624032138) do t.integer "viewed_count", :default => 0 end - create_table "mess", :id => false, :force => true do |t| - t.string "课程名" - t.integer "课程ID", :default => 0, :null => false - t.string "教师姓", :default => "", :null => false - t.string "教师名", :limit => 30, :default => "", :null => false - t.string "主贴名", :default => "", :null => false - t.integer "主贴或回帖ID", :default => 0, :null => false - t.integer "回帖对应主贴ID" - t.integer "帖子点赞数" - t.integer "主贴回复数", :default => 0, :null => false - t.text "主贴或回帖内容" - t.datetime "发帖时间", :null => false - t.integer "发帖或回帖用户ID", :default => 0, :null => false - t.string "发帖或回帖用户姓", :default => "", :null => false - t.string "发帖或回帖用户名", :limit => 30, :default => "", :null => false - end - create_table "message_alls", :force => true do |t| t.integer "user_id" t.integer "message_id" @@ -1539,6 +1534,18 @@ ActiveRecord::Schema.define(:version => 20160624032138) do add_index "projects_trackers", ["project_id", "tracker_id"], :name => "projects_trackers_unique", :unique => true add_index "projects_trackers", ["project_id"], :name => "projects_trackers_project_id" + create_table "quality_analyses", :force => true do |t| + t.integer "project_id" + t.string "author_login" + t.string "rep_identifier" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sonar_version", :default => 0 + t.string "path" + t.string "branch" + t.string "language" + end + create_table "queries", :force => true do |t| t.integer "project_id" t.string "name", :default => "", :null => false @@ -1637,10 +1644,11 @@ ActiveRecord::Schema.define(:version => 20160624032138) do create_table "schools", :force => true do |t| t.string "name" t.string "province" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "logo_link" t.string "pinyin" + t.integer "school_type", :default => 0 end create_table "secdomains", :force => true do |t| @@ -1765,6 +1773,7 @@ ActiveRecord::Schema.define(:version => 20160624032138) do t.integer "status", :default => 9 t.text "results" t.text "src" + t.integer "uwait_time", :default => 0 end create_table "student_works", :force => true do |t| @@ -1783,8 +1792,8 @@ ActiveRecord::Schema.define(:version => 20160624032138) do t.integer "absence_penalty", :default => 0 t.float "system_score", :default => 0.0 t.boolean "is_test", :default => false - t.integer "simi_id" - t.integer "simi_value" + t.integer "simi_id", :default => 0 + t.integer "simi_value", :default => 0 t.float "work_score" end diff --git a/public/images/icons_ziliao.png b/public/images/icons_ziliao.png new file mode 100644 index 0000000000000000000000000000000000000000..dc72e7361419bdefbc5a26b37d2cafee3e921e6c GIT binary patch literal 20180 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 'ApplyAddSchools' do + name "MyString" +province "MyString" +city "MyString" +address "MyString" +remarks "MyString" +school_id 1 +status 1 + end + +end diff --git a/spec/models/apply_add_schools_spec.rb b/spec/models/apply_add_schools_spec.rb new file mode 100644 index 000000000..de1b7c05a --- /dev/null +++ b/spec/models/apply_add_schools_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ApplyAddSchools, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end