diff --git a/app/views/syllabuses/edit.html.erb b/app/views/syllabuses/edit.html.erb
index 53fbade02..62cd1e688 100644
--- a/app/views/syllabuses/edit.html.erb
+++ b/app/views/syllabuses/edit.html.erb
@@ -17,25 +17,61 @@
-
- <%= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
+
+ <%#= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属专业层级
-
- <%= select_tag :discipline_category_id,options_for_select(discipline_category_option(@syllabus.major_level),@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% DisciplineCategory.where(:major_level => @syllabus.major_level).each do |dis| %>
+
<%= dis.name %>
+ <% end %>
+
+
+ <%#= select_tag :discipline_category_id,options_for_select(discipline_category_option(@syllabus.major_level),@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属学科门类
-
- <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option(@syllabus.discipline_category_id),@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% FirstLevelDiscipline.where(:discipline_category_id => @syllabus.discipline_category_id).each do |fir_dis| %>
+
<%= fir_dis.name %>
+ <% end %>
+
+
+ <%#= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option(@syllabus.discipline_category_id),@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属一级学科
-
- <%= select_tag :major_id,options_for_select(syllabus_major_option(@syllabus.first_level_discipline_id),@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% Major.where(:first_level_discipline_id => @syllabus.first_level_discipline_id).each do |major| %>
+
<%= major.name %>
+ <% end %>
+
+
+ <%#= select_tag :major_id,options_for_select(syllabus_major_option(@syllabus.first_level_discipline_id),@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属专业
@@ -53,7 +89,18 @@
-
- <%= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+
专业选修课
+
学科必修课
+
公共必修课
+
实践选修课
+
实践必修课
+
+
+ <%#= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"} %>
-
diff --git a/app/views/syllabuses/new.html.erb b/app/views/syllabuses/new.html.erb
index 3fa39d91f..f8605e18f 100644
--- a/app/views/syllabuses/new.html.erb
+++ b/app/views/syllabuses/new.html.erb
@@ -18,33 +18,63 @@
-
- <%= select_tag :major_level,options_for_select(major_level_option,@syllabus.major_level), {:id=>"major_level", :class=>"fl task-height-40 task-form-80"} %>
-
-
+
请选择课程所属专业层级
-
- <%= select_tag :discipline_category_id,options_for_select(discipline_category_option,@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% DisciplineCategory.where(:major_level => 3).each do |dis| %>
+
<%= dis.name %>
+ <% end %>
+
+
+ <%#= select_tag :discipline_category_id,options_for_select(discipline_category_option,@syllabus.discipline_category_id), {:id=>"discipline_category_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属学科门类
-
- <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% FirstLevelDiscipline.where(:discipline_category_id => 27).each do |fir_dis| %>
+
<%= fir_dis.name %>
+ <% end %>
+
+
+ <%#= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option,@syllabus.first_level_discipline_id), {:id=>"first_level_discipline_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属一级学科
-
- <%= select_tag :major_id,options_for_select(syllabus_major_option,@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+ <% Major.where(:first_level_discipline_id => 213).each do |major| %>
+
<%= major.name %>
+ <% end %>
+
+
+ <%#= select_tag :major_id,options_for_select(syllabus_major_option,@syllabus.major_id), {:id=>"major_id", :class=>"fl task-height-40 task-form-80"} %>
请选择课程所属专业
@@ -62,7 +92,18 @@
-
- <%= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"} %>
+
+
+
+
+
专业选修课
+
学科必修课
+
公共必修课
+
实践选修课
+
实践必修课
+
+
+ <%#= select_tag :syllabus_type,options_for_select(syllabus_type_option,@syllabus.syllabus_type), {:id=>"syllabus_type", :class=>"fl task-height-40 task-form-80"} %>
-
diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js
index 0bfc2da66..7ea59866b 100644
--- a/public/javascripts/edu/application.js
+++ b/public/javascripts/edu/application.js
@@ -95,8 +95,8 @@ $(function(){
},function(){
$(this).find(".down-select").hide();
})
- $("[select-for] .down-select p").on("click",function(){
- $(this).parents().siblings("input").val($(this).html().trim());
+ $("[select-for] .down-select p").bind("click",function(){
+ $(this).parents().prev("input").val($(this).html().trim());
$(this).parents(".down-select").hide();
})
});
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 99c3f859a..cf57c69d0 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -1,16 +1,23 @@
$(function(){
- $("#major_level").on("change", function(){
+ $("#major_level_option p").bind("click", function(){
+ $("#major_level").val($(this).attr("data-major"));
$.ajax({
url: '/syllabuses/get_discipline_categories',
type: 'get',
- data: {major_level:$("#major_level").val()},
+ data: {major_level:$(this).attr("data-major")},
success: function(data){
if (data.result == 1){
- $("#discipline_category_id").html("");
- $("#first_level_discipline_id").html("");
- $("#major_id").html("");
+ $("#discipline_category_id").val(0);
+ $("#first_level_discipline_id").val(0);
+ $("#major_id").val(0);
+ $("#discipline_category_option").html("");
+ $("#discipline_category_option").prev().val("");
+ $("#first_level_discipline_option").html("");
+ $("#first_level_discipline_option").prev().val("");
+ $("#syllabus_major_option").html("");
+ $("#syllabus_major_option").prev().val("");
for(var i=0; i" + data.options[i][0] + "");
+ $("#discipline_category_option").append("
" + data.options[i][0] + "
");
}
$("#major_level_notice").hide();
}
@@ -21,17 +28,24 @@ $(function(){
});
});
- $("#discipline_category_id").on("change", function(){
+ $("#discipline_category_option").on("click", "p", function(){
+ $(this).parents().prev("input").val($(this).html().trim());
+ $(this).parents(".down-select").hide();
+ $("#discipline_category_id").val($(this).attr("data-discipline-category-id"));
$.ajax({
url: '/syllabuses/get_first_level_disciplines',
type: 'get',
- data: {discipline_category_id:$("#discipline_category_id").val()},
+ data: {discipline_category_id:$(this).attr("data-discipline-category-id")},
success: function(data){
if (data.result == 1){
- $("#first_level_discipline_id").html("");
- $("#major_id").html("");
+ $("#first_level_discipline_id").val(0);
+ $("#major_id").val(0);
+ $("#first_level_discipline_option").html("");
+ $("#first_level_discipline_option").prev().val("");
+ $("#syllabus_major_option").html("");
+ $("#syllabus_major_option").prev().val("");
for(var i=0; i" + data.options[i][0] + "");
+ $("#first_level_discipline_option").append("" + data.options[i][0] + "
");
}
$("#discipline_category_id_notice").hide();
}
@@ -42,16 +56,21 @@ $(function(){
});
});
- $("#first_level_discipline_id").on("change", function(){
+ $("#first_level_discipline_option").on("click", "p", function(){
+ $(this).parents().prev("input").val($(this).html().trim());
+ $(this).parents(".down-select").hide();
+ $("#first_level_discipline_id").val($(this).attr("data-first-level-discipline-id"));
$.ajax({
url: '/syllabuses/get_major',
type: 'get',
- data: {first_level_discipline_id:$("#first_level_discipline_id").val()},
+ data: {first_level_discipline_id:$(this).attr("data-first-level-discipline-id")},
success: function(data){
if (data.result == 1){
- $("#major_id").html("");
+ $("#major_id").val(0);
+ $("#syllabus_major_option").html("");
+ $("#syllabus_major_option").prev().val("");
for(var i=0; i" + data.options[i][0] + "");
+ $("#syllabus_major_option").append("" + data.options[i][0] + "
");
}
$("#first_level_discipline_id_notice").hide();
}
@@ -62,12 +81,19 @@ $(function(){
});
});
- $("#major_id").on("change", function() {
+ $("#syllabus_major_option").on("click", "p", function(){
+ $(this).parents().prev("input").val($(this).html().trim());
+ $(this).parents(".down-select").hide();
+ $("#major_id").val($(this).attr("data-major_id"));
if ($("#major_id").val() != "0") {
$("#major_id_notice").hide();
}
});
+ $("#syllabus_type_option p").bind("click", function(){
+ $("#syllabus_type").val($(this).attr("data-syllabus-type"));
+ })
+
$("#choose_course_group_submit").live('click', function(){
if($("#course_group_id").val() == '0'){
$("#choose_course_group_notice").show();