diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 37539b09c..5ff3498e0 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -43,9 +43,10 @@ class ManagementsController < ApplicationController # 实训适用课程 def applicable_course - @majorcourse=MajorCourse.where("0=0") + @courselist = CourseList.find_by_sql("SELECT id, name as name FROM `course_lists` where id in (SELECT id FROM `major_courses`);") end + # 单位部门列表 def departments @menu_type = 6 diff --git a/app/helpers/managements_helper.rb b/app/helpers/managements_helper.rb index c1dac27f6..811e2a78c 100644 --- a/app/helpers/managements_helper.rb +++ b/app/helpers/managements_helper.rb @@ -1,20 +1,29 @@ -module ManagementsHelper - - def trial_authorization_status status - case status - when "0", nil - 0 - when "1" - 1 - when "2" - 2 - else - [1,2] - end - end - - def query_user_status_num status - user = (status == 0) ? user = User.all : User.where(:status => status) - return user.count - end -end +module ManagementsHelper + + def trial_authorization_status status + case status + when "0", nil + 0 + when "1" + 1 + when "2" + 2 + else + [1,2] + end + end + + def query_user_status_num status + user = (status == 0) ? user = User.all : User.where(:status => status) + return user.count + end + + def course_list_major_time id + Major.where(:id => id).first.try(:name) + end + + # params[:id]: course_list_id + def get_course_list_major id + ShixunMajorCourse.where(:course_list_id => id) + end +end diff --git a/app/models/shixun_major_course.rb b/app/models/shixun_major_course.rb index 7d288ecf0..83305a09b 100644 --- a/app/models/shixun_major_course.rb +++ b/app/models/shixun_major_course.rb @@ -1,6 +1,6 @@ -class ShixunMajorCourse < ActiveRecord::Base - belongs_to :shixun - belongs_to :major - belongs_to :course_list - #attr_accessible :course_list -end +class ShixunMajorCourse < ActiveRecord::Base + belongs_to :shixun + belongs_to :major + belongs_to :course_list + #attr_accessible :course_list +end diff --git a/app/views/managements/_applicable_course_list.html.erb b/app/views/managements/_applicable_course_list.html.erb index b69b84f6e..0bb2206a8 100644 --- a/app/views/managements/_applicable_course_list.html.erb +++ b/app/views/managements/_applicable_course_list.html.erb @@ -9,13 +9,26 @@ - <% @majorcourse.each_with_index do |majorcourse,index|%> - - <%= majorcourse.course_list_id%> - - - - + <% @courselist.each_with_index do |courselist,index|%> + + <%= index + 1 %> + + <%= courselist.name %> + + + <% get_course_list_major(courselist.id).each do |smc| %> + <%= course_list_major_time(smc.major_id) %> + <%= format_time smc.created_at %> + <% end %> + + + <%# get_course_list_major(courselist.id).each do |smc| %> + <%#= course_list_major_time(smc.major_id) %> + <%#= format_time smc.created_at %> + <%# end %> + + + <% end %> diff --git a/app/views/managements/_classroom_classment_list.html.erb b/app/views/managements/_classroom_classment_list.html.erb index 88c237bfb..68f789e50 100644 --- a/app/views/managements/_classroom_classment_list.html.erb +++ b/app/views/managements/_classroom_classment_list.html.erb @@ -32,8 +32,8 @@ <%= link_to course.teacher.show_name, user_path(course.teacher) %> <%= format_time(course.updatetime) %> - - + + <% end %> diff --git a/app/views/managements/_classroom_list.html.erb b/app/views/managements/_classroom_list.html.erb index 57467d02f..de34f4b14 100644 --- a/app/views/managements/_classroom_list.html.erb +++ b/app/views/managements/_classroom_list.html.erb @@ -24,8 +24,8 @@ <%= link_to syllabus.user.show_name, user_path(syllabus.user) %> <%= format_time syllabus.created_at %> - - + + <% end %> diff --git a/app/views/managements/classroom.html.erb b/app/views/managements/classroom.html.erb index 9d53671f2..45858896c 100644 --- a/app/views/managements/classroom.html.erb +++ b/app/views/managements/classroom.html.erb @@ -15,8 +15,8 @@ - - + + 搜索 diff --git a/app/views/managements/classroom_classment.html.erb b/app/views/managements/classroom_classment.html.erb index 1793a5420..fda65b3df 100644 --- a/app/views/managements/classroom_classment.html.erb +++ b/app/views/managements/classroom_classment.html.erb @@ -19,8 +19,8 @@ 搜索 清除 - - + + <% end%> diff --git a/app/views/managements/identity_authentication.html.erb b/app/views/managements/identity_authentication.html.erb index 2bacddd95..d96fba6ab 100644 --- a/app/views/managements/identity_authentication.html.erb +++ b/app/views/managements/identity_authentication.html.erb @@ -1,17 +1,17 @@
- - - - - - - - - - - +
+ + +
- +
diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb index cab1cb861..735571ed6 100644 --- a/app/views/school/upload_logo.html.erb +++ b/app/views/school/upload_logo.html.erb @@ -15,13 +15,13 @@ function showPreview(source) { <%#= text_field_tag 'school'%>
- <%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar")%> - 上传图片 + <%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar ml25")%> + 上传图片 <%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%>
学校名称：
学校省份： - @@ -43,7 +43,7 @@ function showPreview(source) { - +