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

Gemfile

@@ -15,7 +15,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'nokogiri'
 end
 
-gem 'simple_xlsx_reader'
+#gem 'simple_xlsx_reader'
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'
 gem 'gitlab', path: 'lib/gitlab-cli'

app/controllers/managements_controller.rb

@@ -226,7 +226,7 @@ class ManagementsController < ApplicationController
   def leave_message
     @menu_type = 8
     @sub_type = 1
-    @jour = JournalsForMessage.where(:jour_type => 'HomeworkCommon')
+    @jour = JournalsForMessage.where(:jour_type => 'HomeworkCommon').order("created_on desc")
     @jour_count =   @jour.count
     limit = 20
     @is_remote = true
@@ -243,7 +243,7 @@ class ManagementsController < ApplicationController
   def messages_list
     @menu_type = 8
     @sub_type = 3
-    @memo = Memo.where("0=0")
+    @memo = Memo.where("0=0").order("created_at desc")
     @memo_count = @memo.count
     limit = 20
     @is_remote = true

app/views/managements/_leave_message_list.html.erb

@@ -4,7 +4,7 @@
     <th width="9%">序号</th>
     <th width="12%">来源(课程或用户ID)</th>
     <th width="15%">留言人</th>
-    <th width="18%">留言时间</th>
+    <th width="18%">留言时间<i class="fa fa-long-arrow-down color-light-green ml5" ></i></th>
     <th width="30%" class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">留言内容</th>
     <th>回复数</th>
   </tr>

app/views/managements/_message_list.html.erb

@@ -4,7 +4,7 @@
     <th width="9%">序号</th>
     <th width="12%">来源(贴吧ID)</th>
     <th width="15%">作者</th>
-    <th width="18%">时间</th>
+    <th width="18%">时间<i class="fa fa-long-arrow-down %> color-light-green ml5" ></i></th>
     <th width="30%" class="edu-txt-left" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">标题</th>
     <th>回复数</th>
   </tr>

app/views/managements/_shixun_feedback_list.html.erb

@@ -4,7 +4,7 @@
   <th width="25%" style="text-align: left">实训名称</th>
   <th width="40%" style="text-align: left">评论内容</th>
   <th width="10%">评论者</th>
-  <th width="10%">评论时间</th>
+  <th width="10%">评论时间<i class="fa fa-long-arrow-down color-light-green ml5" ></i></th>
   <th width="10%"></th>
   <!--<i class="fa <%#= @sx_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up" %> color-light-green ml5" title="功能完善中，敬请期待"></i>-->
   </thead>

app/views/repositories/commits.html.erb

@@ -1,4 +1,4 @@
-<div class="new_roadmap_conbox mb10 mt15">
+<div class="new_roadmap_conbox box_bg_shandow mb10 mt15">
   <div class=" clear">
     <ul class="reply-container-branch fl"  >
       <%= render :partial => 'shixun_navigation' %>

app/views/repositories/shixun_commit_diff.html.erb

@@ -1,4 +1,4 @@
-<div class="container-big mt20 mb20" style="width: 100%;">
+<div class="container-big box_bg_shandow mt20 mb20" style="width: 100%;">
   <div class="new_roadmap_conbox mb10" >
     <div class="new_roadmap_info_top clear  ">
       <%=link_to "<span class='new_roadmap_icons_back mr5'></span>返回提交历史".html_safe,

app/views/student_work/_shixun_work_show.html.erb

@@ -23,7 +23,7 @@
       </ul>
       <ul class="fl edu-txt-w240">
         <li>通关情况：<%= had_passed_changllenge_num(@shixun, @work.user).to_s+" / "+@shixun.challenges.count.to_s %></li>
-        <li>&nbsp;&nbsp;&nbsp;&nbsp;总耗时：<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %></li>
+        <li>&nbsp;&nbsp;总耗时：<%=had_passed_changllenge_num(@shixun, @work.user) > 0 ? game_spend_time(@myshixun.total_spend_time) : '- -' %></li>
       </ul>
     </div>
     <div class="edu-h200-auto" style="max-height:250px;">

db/migrate/20170922114504_add_score_default_value_for_challenge.rb

@@ -0,0 +1,10 @@
+class AddScoreDefaultValueForChallenge < ActiveRecord::Migration
+  def up
+    challenges = Challenge.where(:score => nil)
+    challenges.update_all(:score => 100)
+    change_column :challenges, :score, :integer, :default => 100
+  end
+
+  def down
+  end
+end