Merge branch 'educoder' into dev_aliyun

app/views/colleges/_student_shixun.html.erb

@@ -28,7 +28,7 @@
 <script>
     $(function(){
         //初始化最热评测柱状图
-      $.get('<%= student_hot_evaluations_college_path(@school) %>', function(data){
+      $.get('<%= student_hot_evaluations_college_path(@department.try(:identifier) || @school) %>', function(data){
         InitHotEvaluating(data.names.reverse(), data.values.reverse());
       })
     });

app/views/colleges/statistics.html.erb

@@ -50,7 +50,7 @@
 
   <div class="white-panel mb20 pl0 clearfix">
     <li class="active" index="1"><a href="javascript:void(0);">课堂</a></li>
-    <li index="2"><a href="<%= student_shixun_college_path(@school) %>" data-remote="true">学生实训</a></li>
+    <li index="2"><a href="<%= student_shixun_college_path(@department.try(:identifier) || @school) %>" data-remote="true">学生实训</a></li>
     <!--<li><a href="<%#= engineering_capability_college_path(@department) %>" data-remote="true">工程能力</a></li>-->
 <!--    <li index="4"><a href="<%#= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>-->
   </div>
@@ -139,15 +139,15 @@
             })
         });
 
-        $.get('<%= shixun_time_college_path(@department.identifier) %>', function(data){
+        $.get('<%= shixun_time_college_path(@department.try(:identifier) || @school) %>', function(data){
           $('.shixun-time').html("<span data-tip-down=\"所有学员的实训耗时之和\">" + data.shixun_time + "</span>天");
         });
-        $.get('<%= shixun_report_count_college_path(@department.identifier) %>', function(data){
+        $.get('<%= shixun_report_count_college_path(@department.try(:identifier) || @school) %>', function(data){
           $('.shixun-report-count').html("<span>" + data.shixun_report_count + "</span>个");
         });
 
         // 教师排名
-        $.ajax({ url: '<%= teachers_college_path(@department.identifier) %>', method: 'GET', dataType: 'script' })
+        $.ajax({ url: '<%= teachers_college_path(@department.try(:identifier) || @school) %>', method: 'GET', dataType: 'script' })
 
         $(".count_student_test a").click(function(){
             $(".count_student_test a").removeClass("active");
@@ -155,7 +155,7 @@
         });
 
         //初始化饼状图
-        $.get('<%= shixun_chart_data_college_path(@department.identifier) %>', function(data){
+        $.get('<%= shixun_chart_data_college_path(@department.try(:identifier) || @school) %>', function(data){
           $('.pie-chart-loading').hide();
           if (data.names.length > 0) {
             $('.online_status .edu-tab-con-box').hide();
@@ -166,7 +166,7 @@
           }
         });
 
-        $.get('<%= course_statistics_college_path(@department.identifier) %>');
+        $.get('<%= course_statistics_college_path(@department.try(:identifier) || @school) %>');
     });
     function InitPieChart(names, data){
         var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6', '#F3857B', '#B97BF3','#4DE8B4','#F37BDB','#566EFF','#FF961A'];

app/views/layouts/_logined_header.html.erb

@@ -63,7 +63,6 @@ display: none; right:110px;">
     <li><%= link_to '我的实训项目', user_path(User.current, :type => 'a_shixun') %></li>
     <li><%= link_to '我的实践课程', user_path(User.current, :type => 'a_path') %></li>
     <li><%= link_to '我的开发项目', user_path(User.current, :type => 'a_project') %></li>
-    <li><%= link_to '我的众包', user_path(User.current, :type => 'a_package') %></li>
     <% if User.current.partner.present? %>
       <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
     <% end %>