Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

app/controllers/homework_common_controller.rb

@@ -190,7 +190,7 @@ class HomeworkCommonController < ApplicationController
         #   homework_bank.save
         #   homework.update_attributes(:homework_bank_id => homework_bank.id)
         # end
-        redirect_to setting_homework_common_path(homework, :is_new => 1)
+        redirect_to student_work_index_path(:homework => homework.id, :host=> Setting.host_course)
       end
     end
   end

app/controllers/managements_controller.rb

@@ -157,17 +157,17 @@ class ManagementsController < ApplicationController
     discipline_category_option = params[:discipline_category_id] if params[:discipline_category_id]
     first_level_discipline_option = params[:first_level_discipline_id] if params[:first_level_discipline_id]
     if major_level_option && major_level_option != '0'
-      @major = @major.where(:major_level=>major_level_option)
+      @major = @major.where(:major_level => major_level_option)
     end
     if discipline_category_option && discipline_category_option != '0'
-      @major=@major.where(:discipline_category_id=>discipline_category_option)
+      @major=@major.where(:discipline_category_id => discipline_category_option)
     end
     if first_level_discipline_option && first_level_discipline_option != '0'
-      @major=@major.where(:first_level_discipline_id=>first_level_discipline_option)
+      @major=@major.where(:first_level_discipline_id => first_level_discipline_option)
     end
 
     if params[:support_shixuns]
-      @major = @major.where(:support_shixuns => params[:support_shixuns].to_i)
+      @major = @major.where(:support_shixuns => params[:support_shixuns].to_i, :major_level => 2)
     end
 
     @major = @major.order("created_at #{@sx_order}")

app/helpers/student_work_helper.rb

@@ -124,7 +124,7 @@ module StudentWorkHelper
               elsif homework.end_time >= Time.now && work.user_id == User.current.id
                 link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'task-btn task-btn-blue fr'
               else
-                link_to "查看作品", student_work_path(work), :class => 'task-btn task-btn-blue fr', :title => "作业截止后不可修改作品"
+                link_to "查看作品", student_work_path(work), :class => 'task-btn task-btn-blue fr mt8 mr15', :title => "作业截止后不可修改作品"
               end
             end
           end

app/models/major.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# major_level 1 研究生 2 本科生 3 专科生
   class Major < ActiveRecord::Base
     belongs_to :first_level_discipline
     belongs_to :discipline_category

app/views/student_work/index.html.erb

@@ -37,29 +37,25 @@
 <div class="">
 <div class="edu-tab clearfix mb20 user_bg_shadow">
 <ul id="edu-tab-nav" class="border-bottom-orange">
-  <li id="edu-tab-nav-1" class="new-tab-nav background-orange" onclick="HoverLi(1);">
-    <a href="javascript:void(0);" class="tab_type">作业详情</a>
-  </li>
-  <li id="edu-tab-nav-2" class="new-tab-nav" onclick="HoverLi(2);">
+  <li id="edu-tab-nav-2" class="new-tab-nav background-orange" onclick="HoverLi(2);">
     <a href="javascript:void(0);" class="tab_type">作品列表</a>
   </li>
+  <li id="edu-tab-nav-1" class="new-tab-nav" onclick="HoverLi(1);">
+    <a href="javascript:void(0);" class="tab_type">作业问答</a>
+  </li>
   <% if @homework.homework_type!= 4 && (@is_teacher || (@homework.answer_public && @homework.homework_detail_manual.comment_status > 2)) %>
       <li id="edu-tab-nav-3" class="new-tab-nav" onclick="HoverLi(3);">
         <a href="javascript:void(0);" class="tab_type">参考答案</a>
       </li>
   <% end %>
-</ul>
-<div class="cl"></div>
-<div id="edu-tab-con-1">
-<div class="" style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
   <% if @is_teacher%>
-      <div class="fr edu-position edu-position-hidebox">
+      <div class="fr edu-position edu-position-hidebox mr15 mt8">
         <a href="javascript:void(0);" class="font-16"><i class="fa fa-bars"></i></a>
         <ul class="edu-position-hide undis" style="left:-85px;">
           <% if @homework.homework_type != 4 %>
-          <li>
-            <%= link_to l(:button_edit), edit_homework_common_path(@homework) %>
-          </li>
+              <li>
+                <%= link_to l(:button_edit), edit_homework_common_path(@homework) %>
+              </li>
           <% end %>
           <li>
             <%= link_to "设置", setting_homework_common_path(@homework) %>
@@ -97,10 +93,15 @@
   <% else %>
       <%= user_work_status @homework %>
       <% if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %>
-        <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %>
+          <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %>
       <% end %>
-      <%= link_to "查看设置", setting_homework_common_path(@homework), :class => 'edu-btn fr mr10' %>
+      <%= link_to "查看设置", setting_homework_common_path(@homework), :class => 'edu-btn fr mr10 mt8' %>
   <% end %>
+</ul>
+<div class="cl"></div>
+<div id="edu-tab-con-1" class="undis">
+<div class="" style="padding:<%= @is_teacher ? '5px' : '15px' %> 15px;">
+
   <div class="cl"></div>
   <div class="upload_img list_style">
     <%= @homework.description.html_safe %>
@@ -191,7 +192,7 @@
   <%= render :partial => 'student_work_replies' %>
 </div>
 </div>
-<div id="edu-tab-con-2" class="undis">
+<div id="edu-tab-con-2">
   <div class="padding15">
     <div class="clearfix mb10">
       <% if @is_teacher %>
@@ -261,9 +262,9 @@
               <% else %>
                   <span class="edu-filter-btn edu-filter-btn-orange mb15">你未提交</span>
               <% end %>
-              <% if @homework.homework_detail_manual.comment_status < 3 %>
-                  <%= user_work_status @homework %>
-              <% end %>
+              <%# if @homework.homework_detail_manual.comment_status < 3 %>
+                  <%#= user_work_status @homework %>
+              <%# end %>
               <% if @homework.homework_type == 4 && !@homework.student_works.where(:user_id => User.current.id, :work_status => 0).blank? %>
                   <%= link_to "开始实战", shixun_path(@homework.homework_commons_shixuns.shixun),:class => 'task-btn task-btn-blue fr mr10',:target => "_blank" %>
               <% end %>

app/views/subjects/_subject_list.html.erb

@@ -34,10 +34,10 @@
         <%= subject.description.blank? ? "轻松学习#{subject.name}~" : subject.description %>
       </p>
       <p class="color-grey bor-bottom-greyE mb5 clearfix" style="text-align: center;">
-        <span class="pl10 pr5"><i class="fa fa-pause-circle color-light-green transform90" aria-hidden="true" data-tip-down="章节"></i><em class="ml10"><%= subject.stages.count %></em></span>
-        <span class="pl10 pr5"><i class="fa fa-gamepad color-light-green pr10" aria-hidden="true" data-tip-down="实训"></i><em><%= subject.stage_shixuns.count %></em></span>
-        <span class="pl10 pr5"><i class="fa fa-viacoin color-light-green pr10" aria-hidden="true" data-tip-down="总经验值"></i><em><%= subject.subject_score %></em></span>
-        <span class="pl10 pr5"><i class="fa fa-users color-light-green pr10" aria-hidden="true" data-tip-down="学习人数"></i><em><%= subject.subject_challenges %></em></span>
+        <span class="pl5 pr5"><i class="fa fa-pause-circle color-light-green transform90 pr5" aria-hidden="true" data-tip-down="章节"></i><em><%= subject.stages.count %></em></span>
+        <span class="pl5 pr5"><i class="fa fa-gamepad color-light-green pr5" aria-hidden="true" data-tip-down="实训"></i><em><%= subject.stage_shixuns.count %></em></span>
+        <span class="pl5 pr5"><i class="fa fa-viacoin color-light-green pr5" aria-hidden="true" data-tip-down="总经验值"></i><em><%= subject.subject_score %></em></span>
+        <span class="pl5 pr5"><i class="fa fa-users color-light-green pr5" aria-hidden="true" data-tip-down="学习人数"></i><em><%= subject.subject_challenges %></em></span>
       </p>
       <div class="clearfix mb10 df">
         <a href="javascript:void(0);"><%= image_tag(url_to_avatar(subject.user), :width =>"40", :height => "40", :class => "bor-radius-all mr10 fl mt8", :alt=>"头像") %></a>

db/migrate/20170825113413_modify_support_shixuns_for_major.rb

@@ -1,6 +1,7 @@
 class ModifySupportShixunsForMajor < ActiveRecord::Migration
   def up
     sql = "SELECT distinct(major_id) FROM `major_courses`"
+    Major.where("0=0").update_all(:support_shixuns, 0)
     MajorCourse.find_by_sql(sql).each do |mc|
       Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1)
     end

db/migrate/20170827023117_managements_zhuanye.rb

@@ -0,0 +1,12 @@
+class ManagementsZhuanye < ActiveRecord::Migration
+  def up
+    sql = "SELECT distinct(major_id) FROM `major_courses`"
+    Major.where("0=0").update_all(:support_shixuns => 0)
+    MajorCourse.find_by_sql(sql).each do |mc|
+      Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1)
+    end
+  end
+
+  def down
+  end
+end

public/stylesheets/css/edu-class.css

@@ -305,7 +305,7 @@ img.ui-datepicker-trigger {display:block;background:url(../images/public_icon.pn
 
 /* 班级 */
 .edu-position-hide{ position: absolute; top:15px; left:-20px;  box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); background:#fff;z-index:1001; padding:5px 0;}
-.edu-position-hide li a{ display:inline-block; height: 30px; width: 100px; line-height: 30px; text-align: center;  font-size:12px; }
+.edu-position-hide li a{ display:inline-block; height: 30px; width: 100px; line-height: 30px; text-align: center;  font-size:12px!important; }
 .edu-position-hide li a:hover{ background:#eee; color:#666;}
 .edu-position-hidebox{ }
 .edu-position-hidebox i{ color:#bcbcbc;}