From 1f47eb5ea87cf162e24a5ef812a84f9ce3b46c3f Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 29 Jul 2016 21:19:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/school_controller.rb | 57 +++++++++ app/views/admin/applied_schools.html.erb | 51 +++++++- app/views/admin/has_applied_schools.html.erb | 2 +- config/routes.rb | 3 + public/javascripts/application.js | 121 +++++++++++++++++++ 5 files changed, 230 insertions(+), 4 deletions(-) diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index ec585e2b2..264f0ae1f 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -210,4 +210,61 @@ class SchoolController < ApplicationController render :json =>status end + + def edit_apply_name + name = params[:name] || "" + status = -1 + + if name != "" + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + + applyschool.name = name.strip + + if applyschool.school + applyschool.school.name = name + applyschool.school.pinyin = Pinyin.t(name.strip, splitter: '') + applyschool.school.save! + end + applyschool.save! + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:address=>name} + end + + def edit_apply_address + address = params[:address] || "" + + status = -1 + + if address != "" + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + applyschool.address = address + applyschool.save! + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:address=>address} + end + + def edit_apply_province + province = params[:province] || "" + city = params[:city] || "" + status = -1 + + if(province != "") &&(city != "") + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + applyschool.province = province + applyschool.city = city + + if applyschool.school + applyschool.school.province = province + applyschool.school.save! + end + applyschool.save! + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:province=>province,:city=>city} + end end diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb index 32e67914f..319051d78 100644 --- a/app/views/admin/applied_schools.html.erb +++ b/app/views/admin/applied_schools.html.erb @@ -53,8 +53,9 @@ <%= apply.id %> - - <%= apply.name %> + + <%= apply.name %> + <% user = User.where("id=?", apply.user_id).first %> @@ -63,10 +64,51 @@ <% end %> + <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city) %> + + + - <%= apply.address %> + <%= apply.address %> + <% count = UserExtensions.where("school_id = #{apply.school_id}").count %> @@ -82,6 +124,9 @@ + <% unless apply.remarks.blank? %> diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb index 11361dbac..2f6fc1f23 100644 --- a/app/views/admin/has_applied_schools.html.erb +++ b/app/views/admin/has_applied_schools.html.erb @@ -53,7 +53,7 @@ <%= apply.id %> - + <% unless apply.school_id.nil? %> <% school_name = School.where("id=?", apply.school_id).first %> <%= school_name.name %> diff --git a/config/routes.rb b/config/routes.rb index b07600400..77e6c2791 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -226,6 +226,9 @@ RedmineApp::Application.routes.draw do member do get 'upload_logo' post 'upload' + get 'edit_apply_name' + get 'edit_apply_address' + get 'edit_apply_province' end end diff --git a/public/javascripts/application.js b/public/javascripts/application.js index b7468366a..c31bc0f3e 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1880,3 +1880,124 @@ function updateCourseName(){ } } } + +function edit_school_name(url,id){ + if($("#school_name_edit_"+id).val() == ""){ + $("#apply_title_"+id).show(); + $("#school_name_edit_"+id).hide(); + return; + } + $.get( + url, + {id: id ,name: $("#school_name_edit_"+id).val() }, + function (data) { + if(data.status == 0){ + $("#apply_title_"+data.id).show(); + $("#school_name_edit_"+data.id).hide(); + $("#apply_title_"+data.id).text(data.name); + } + else{ + $("#apply_title_"+data.id).show(); + $("#school_name_edit_"+data.id).hide(); + } + + } + ); +} + +function show_edit_school_name(id){ + $("#apply_title_"+id).hide(); + $("#school_name_edit_"+id).val($("#apply_title_"+id).text()); + $("#school_name_edit_"+id).show(); + $("#school_name_edit_"+id).focus(); + + +} + +function edit_school_address(url,id){ + if($("#school_address_edit_"+id).val() == ""){ + $("#apply_address_"+id).show(); + $("#school_address_edit_"+id).hide(); + return; + } + $.get( + url, + {id: id ,address: $("#school_address_edit_"+id).val() }, + function (data) { + if(data.status == 0){ + $("#apply_address_"+data.id).show(); + $("#school_address_edit_"+data.id).hide(); + $("#apply_address_"+data.id).text(data.address); + } + else{ + $("#apply_address_"+data.id).show(); + $("#school_address_edit_"+data.id).hide(); + } + + + } + ); +} + +function show_edit_school_address(id){ + $("#apply_address_"+id).hide(); + $("#school_address_edit_"+id).val($("#apply_address_"+id).text()); + $("#school_address_edit_"+id).show(); + $("#school_address_edit_"+id).focus(); +} + +function edit_school_province(url,id){ + + var province = $("#school_province_edit_"+id).val(); + var city = $("#schoolCity_"+id).val(); + + if((province == "")||(city == "")){ + $("#apply_province_"+id).show(); + $("#school_province_edit_"+id).hide(); + $("#schoolCity_"+id).hide(); + return; + } + + $.get( + url, + {id: id ,province: province,city:city }, + function (data) { + if(data.status == 0){ + $("#apply_province_"+data.id).show(); + $("#school_province_edit_"+data.id).hide(); + $("#schoolCity_"+data.id).hide(); + init_province_and_city(document.getElementById('school_province_edit_'+data.id), data.province, document.getElementById('schoolCity_'+data.id), data.city); + $("#apply_province_"+data.id).text(data.province+data.city); + + } + else{ + $("#apply_province_"+data.id).show(); + $("#school_province_edit_"+data.id).hide(); + $("#schoolCity_"+data.id).hide(); + } + + } + ); +} + +function init_province_and_city(pField, province, cField, city) { + for (var i = 0; i < pField.options.length; i++) { + if (pField.options[i].value == province) { + pField.selectedIndex = i; + } + } + showcity(province, cField); + for (var i = 0; i < cField.options.length; i++) { + if (cField.options[i].value == city) { + cField.selectedIndex = i; + } + } +} + +function show_edit_school_province(id){ + $("#apply_province_"+id).hide(); + $("#school_province_edit_"+id).show(); + $("#schoolCity_"+id).show(); + +} + From 17044629869e944de71a7cd9c7f9309e8cf99775 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 29 Jul 2016 21:45:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=8D=95=E4=BD=8D=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/school_controller.rb | 2 +- app/views/admin/applied_schools.html.erb | 2 +- app/views/admin/has_applied_schools.html.erb | 56 +++++++++++++++++--- 3 files changed, 51 insertions(+), 9 deletions(-) diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index 264f0ae1f..4553d6ea9 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -229,7 +229,7 @@ class SchoolController < ApplicationController status = 0 end - render :json=>{:status=>status,:id=>params[:id],:address=>name} + render :json=>{:status=>status,:id=>params[:id],:name=>name} end def edit_apply_address diff --git a/app/views/admin/applied_schools.html.erb b/app/views/admin/applied_schools.html.erb index 319051d78..61db6769f 100644 --- a/app/views/admin/applied_schools.html.erb +++ b/app/views/admin/applied_schools.html.erb @@ -54,7 +54,7 @@ <%= apply.id %> - <%= apply.name %> + <%= apply.name %> diff --git a/app/views/admin/has_applied_schools.html.erb b/app/views/admin/has_applied_schools.html.erb index 2f6fc1f23..cbb0e70e5 100644 --- a/app/views/admin/has_applied_schools.html.erb +++ b/app/views/admin/has_applied_schools.html.erb @@ -53,10 +53,11 @@ <%= apply.id %> - + <% unless apply.school_id.nil? %> <% school_name = School.where("id=?", apply.school_id).first %> - <%= school_name.name %> + <%= school_name %> + <% end %> @@ -66,13 +67,51 @@ <% end %> - <% unless apply.school_id.nil? %> - <% school_province = School.where("id=?", apply.school_id).first %> - <%= school_province.province %> - <% end %> + + <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city) %> + + + - <%= apply.address %> + <%= apply.address %> + <%= apply.name %> @@ -84,6 +123,9 @@ <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'applied' },:method => :delete, :confirm => l(:text_are_you_sure) ) %> + <% unless apply.remarks.blank? %>