Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

1234567

@@ -1 +1 @@
-{"access_token":"q51KZUeA6_-CCCH-Buy1mxFmRjcrCViHgk2mHHHqEDbjuA_pgCM1IyW1DASYvpzyB06xHiarujo3rz1Ucq3GRoXdgQ7hAoFCzkL_q3Z5vczLjwAjowAVwmulYE-cAij8ATUfADAWPQ","expires_in":7200,"got_token_at":1460601163}
+{"access_token":"x7GUTe-MLoVPMzId82-3VSdCsO6sq5cOJZCmIN-yUjDcohfI00t2lzPkNKdRhETLUBptZRQ--v-IBQTG-o5iRZZv-EelOBX7K96DcPMFt9rdzwNu7XerNnZw_ncGYncSLHXeACAQMC","expires_in":7200,"got_token_at":1461133885}

app/controllers/admin_controller.rb

@@ -595,11 +595,51 @@ class AdminController < ApplicationController
 
   #代码测试列表
   def code_work_tests
-    @code_work_tests = StudentWorkTest.find_by_sql("select status,results,created_at, student_work_id from student_work_tests order by id desc ")
+    #求出所有条数
-    #@code_work_tests = StudentWorkTest.find_by_sql("select a.status,a.results,a.created_at ,b.id as homeworkid,d.language from student_work_tests as  a , homework_commons as b ,student_works as c, homework_detail_programings as d where a.student_work_id = c.id and b.id = c.homework_common_id and c.homework_common_id = d.homework_common_id order by a.id desc ")
+    tCount = CodeTests.count()
-    #@code_work_tests = StudentWorkTest.order('created_at desc')
+
+    #设置个空的数组 以便paginateHelper来分页
+    @code_work_tests = []
+    if tCount >= 1
+      @code_work_tests[tCount-1] = {}
+    end
     @code_work_tests = paginateHelper @code_work_tests,30
     @page = (params['page'] || 1).to_i - 1
+
+    #取出需要的那一页数据
+    tStart = @page*30
+    @code_work_tests  = CodeTests.find_by_sql("select * from code_tests order by id desc limit #{tStart},30 ")
+
+    #取出各个作品是否是模拟答题的
+    is_test = {}
+    #作品是否存在
+    link_swork = {}
+    #作业是否存在
+    link_hwork = {}
+    @code_work_tests.each do |test|
+      #作品是否存在
+      if is_test[test['student_work_id']] != nil
+          test['link_swork'] = link_swork[test['student_work_id']]
+          test['is_test'] = is_test[test['student_work_id']]
+      else
+          work = StudentWork.where("id=?",test['student_work_id']).first
+          test['link_swork'] = !work.nil?
+          test['is_test'] = work.nil? ? false : work.is_test
+          #test['is_test'] = CodeTests.find_by_sql("select is_test from student_works where id = #{test['student_work_id']}").first['is_test']
+          is_test[test['student_work_id']] = test['is_test']
+          link_swork[test['student_work_id']] = test['link_swork']
+      end
+
+      #作业是否存在
+      if link_hwork[test['homework_id']] != nil
+        test['link_hwork'] = link_hwork[test['homework_id']]
+      else
+        hwork = HomeworkCommon.where("id=?",test['homework_id']).first
+        test['link_hwork'] = !hwork.nil?
+        link_hwork[test['homework_id']] = test['link_hwork']
+      end
+    end
+
     respond_to do |format|
       format.html
     end

app/controllers/student_work_controller.rb

@@ -100,8 +100,17 @@ class StudentWorkController < ApplicationController
           test = @homework.homework_tests[index - 1]
 
           #请求测试
-          result = test_realtime_ex(test, params[:src])
+          begin
+            result = test_realtime_ex(test, params[:src])
+          rescue Timeout::Error
+            tEndtime = Time.now
+            tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
+            logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
 
+            #status 0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+            CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>-3,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
+
+          end
           if result["status"].to_i != -2
             #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
             #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
@@ -116,11 +125,19 @@ class StudentWorkController < ApplicationController
           resultObj[:results] = result["results"].first  #本次测试结果
           resultObj[:error_msg] = result["error_msg"]   #编译错误时的信息
 
+          #该状态用于存入CodeTests
+          tmpstatus = -1
           if result["status"].to_i == -2 #编译错误
               resultObj[:results] = result["error_msg"]
               resultObj[:status] = -2
+              tmpstatus = -2
           elsif  result["results"][0]["status"].to_i == 2
               resultObj[:status] = 2
+              tmpstatus = 2
+          end
+
+          if result["status"] == 0
+            tmpstatus = 0
           end
 
           unless student_work.save
@@ -136,9 +153,6 @@ class StudentWorkController < ApplicationController
               end
 
               #每次从数据库取出上次的结果加上本次的结果再存入数据库
-              tEndtime = Time.now
-              tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-
               if result["status"].to_i != -2
                 result["results"].first['user_wait'] = tUsedtime
 
@@ -175,11 +189,19 @@ class StudentWorkController < ApplicationController
                   resultObj[:index] = student_work.student_work_tests.count
               end
 
+              #将每次用户等待时间都存起来以便管理界面显示用
               tEndtime = Time.now
               tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000
-
               logger.debug "program_test_ex user wait time = #{tUsedtime} 毫秒"
 
+              time_used = 0
+              if result["status"].to_i != -2
+                #至少一毫秒
+                time_used = result["results"].first['time_used'] == 0 ? 1:result["results"].first['time_used']
+              end
+              #0:答案正确 -3http超时 -2:编译错误 -1:答案错误 2:程序运行超时
+              CodeTests.create(:homework_id=>@homework.id,:language=>@homework.homework_detail_programing.language,:status=>tmpstatus,:time_used=>time_used,:wait_time=>tUsedtime,:student_work_id=>student_work.id)
+
               #渲染返回结果
               render :json => resultObj
           end
@@ -223,6 +245,7 @@ class StudentWorkController < ApplicationController
     JSON.parse(res.body)
   end
 
+  #点击代码查重按钮
   def work_canrepeat
     @homework_id = params[:homework]
     @course_id = params[:course_id]
@@ -280,13 +303,14 @@ class StudentWorkController < ApplicationController
     render :json => resultObj
   end
 
+  #上次代码查重时间
   def last_codecomparetime
     resultObj = {status: 0}
     @homework = HomeworkCommon.find params[:homework]
 
     #转换一下
     if @homework.simi_time != nil
-        resultObj[:comparetime] = Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M")
+        resultObj[:comparetime] = Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M:%S")
     else
       resultObj[:comparetime] = 0
     end
@@ -1277,7 +1301,6 @@ class StudentWorkController < ApplicationController
       request["Content-Type"] = "application/json"
       client.request(request)
     end
-
     JSON.parse(res.body)
   end
 

app/helpers/application_helper.rb

@@ -3061,3 +3061,18 @@ def host_with_protocol
   return Setting.protocol + "://" + Setting.host_name
 end
 
+def strip_html(text,len=0,endss="...")
+  ss = ""
+  if text.length>0
+    ss=text.gsub(/<\/?.*?>/, '').strip
+
+    if len > 0 && ss.length > len
+      ss = ss[0, len] + endss
+    elsif len > 0 && ss.length <= len
+      ss = ss
+      #ss = truncate(ss, :length => len)
+    end
+  end
+  return ss
+end
+

app/models/blog_comment.rb

@@ -81,10 +81,12 @@ class BlogComment < ActiveRecord::Base
     ws = WechatService.new
     if self.parent_id.nil?
       self.author.watcher_users.each do |watcher|
-        ws.message_update_template watcher.id, "#{l(:label_new_blog_template)}", self.author.try(:realname) + " 发表了博客：" + self.title.html_safe, format_time(self.created_at)
+        content = strip_html self.author.try(:realname) + " 发表了博客：" + self.title.html_safe, 200
+        ws.message_update_template watcher.id, "blog_comment", self.id, "#{l(:label_new_blog_template)}", content, format_time(self.created_at)
       end
     else
-      ws.comment_template self.parent.author_id, "#{l(:label_blog_comment_template)}", self.author.try(:realname), format_time(self.created_at), self.content.html_safe
+      content = strip_html self.content.html_safe, 200
+      ws.comment_template self.parent.author_id, "blog_comment", self.parent_id, "#{l(:label_blog_comment_template)}", self.author.try(:realname), format_time(self.created_at), content
     end
   end
 end

app/models/code_tests.rb

@@ -0,0 +1,3 @@
+class CodeTests < ActiveRecord::Base
+  attr_accessible :homework_id, :language, :status, :time_used, :wait_time, :student_work_id
+end

app/models/comment.rb

@@ -45,12 +45,14 @@ class Comment < ActiveRecord::Base
     if self.commented.course
       if self.author_id != self.commented.author_id
         self.course_messages << CourseMessage.new(:user_id => self.commented.author_id, :course_id => self.commented.course.id, :viewed => false)
-        ws.comment_template self.commented.author_id, "#{l(:label_notice_comment_template)}", self.author.try(:realname), format_time(self.created_on), self.comments.html_safe
+        content = strip_html self.comments.html_safe, 200
+        ws.comment_template self.commented.author_id, "course_notice", self.id, "#{l(:label_notice_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
       end
     else  # 项目相关
       if self.author_id != self.commented.author_id
         self.forge_messages << ForgeMessage.new(:user_id => self.commented.author_id, :project_id => self.commented.project.id, :viewed => false)
-        ws.comment_template self.commented.author_id, "#{l(:label_news_comment_template)}", self.author.try(:realname), format_time(self.created_on), self.comments.html_safe
+        #content = strip_html self.comments.html_safe, 200
+        #ws.comment_template self.commented.author_id, "blog_comment", self.id, "#{l(:label_news_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
       end
     end
   end

app/models/homework_common.rb

@@ -60,7 +60,7 @@ class HomeworkCommon < ActiveRecord::Base
           # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
           ws = WechatService.new
-          ws.homework_template(m.user_id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+          ws.homework_template(m.user_id, "homework", self.id, "#{l(:label_new_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
           # end
         end
       end
@@ -107,7 +107,7 @@ class HomeworkCommon < ActiveRecord::Base
   def wechat_message
     self.course.members.each do |member|
       ws = WechatService.new
-      ws.homework_template(member.user_id, "#{l(:label_update_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
+      ws.homework_template(member.user_id, "homework", self.id, "#{l(:label_update_homework_template)}", self.course.name, self.name.html_safe, self.end_time.to_s + " 23:59:59")
     end
   end
 

app/models/issue.rb

@@ -160,7 +160,8 @@ class Issue < ActiveRecord::Base
     unless self.author_id == self.assigned_to_id
       self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
       ws = WechatService.new
-      ws.message_update_template self.assigned_to_id, "#{l(:label_new_issue_template)}", self.author.try(:realname) + " 给您指派了缺陷：" + self.subject.html_safe, format_time(self.created_on)
+      content = strip_html self.author.try(:realname) + " 给您指派了缺陷：" + self.subject.html_safe, 200
+      ws.message_update_template self.assigned_to_id, "issues", self.id, "#{l(:label_new_issue_template)}", content, format_time(self.created_on)
     end
     if self.tracker_id == 5
       self.project.members.each do |m|

app/models/journal.rb

@@ -240,6 +240,7 @@ class Journal < ActiveRecord::Base
   #缺陷回复微信模板消息
   def issue_wechat_message
     ws = WechatService.new
-    ws.comment_template self.issue.author_id, "#{l(:label_issue_comment_template)}", self.user.try(:realname), format_time(self.created_on), self.notes.html_safe
+    content = strip_html self.notes.html_safe, 200
+    ws.comment_template self.issue.author_id, "issues", self.journalized_id, "#{l(:label_issue_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
   end
 end

app/models/journals_for_message.rb

@@ -257,7 +257,9 @@ class JournalsForMessage < ActiveRecord::Base
     end
     if self.jour_type == 'HomeworkCommon'
       ws = WechatService.new
-      ws.comment_template self.jour.user_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), self.notes.html_safe
+      #content = truncate(strip_tags(self.notes.to_s), length: 200)
+      content = strip_html self.notes.html_safe, 200
+      ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
     end
   end
 
@@ -271,7 +273,8 @@ class JournalsForMessage < ActiveRecord::Base
       if self.reply_id == 0
         if self.user_id != self.jour_id  # 过滤自己给自己的留言消息
           receivers << self.jour
-          ws.message_update_template self.jour_id, "#{l(:label_new_journals_template)}", self.notes.html_safe, format_time(self.created_on)
+          content = strip_html self.notes, 200
+          ws.message_update_template self.jour_id, "journal_for_message", self.id, "#{l(:label_new_journals_template)}", content, format_time(self.created_on)
         end
       else # 留言回复
         reply_to = User.find(self.reply_id)
@@ -281,7 +284,8 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
           receivers << self.parent.jour
         end
-        ws.comment_template self.reply_id, "#{l(:label_journals_comment_template)}", self.user.try(:realname), format_time(self.created_on), self.notes.html_safe
+        content = strip_html self.notes, 200
+        ws.comment_template self.reply_id, "journal_for_message", self.parent.id, "#{l(:label_journals_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
       end
       receivers.each do |r|
         self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)

app/models/message.rb

@@ -264,14 +264,16 @@ class Message < ActiveRecord::Base
         self.course.members.each do |m|
           if self.author.allowed_to?(:as_teacher, self.course) &&  m.user_id != self.author_id   # 老师 自己的帖子不给自己发送消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-            ws.topic_publish_template m.user_id, "#{l(:label_course_topic_template)}", self.subject, self.author.try(:realname), format_time(self.created_on)
+            content = strip_html self.subject, 200
+            ws.topic_publish_template m.user_id, "course_discussion", self.id, "#{l(:label_course_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
           end
         end
       else    # 回帖
         self.course.members.each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.board.course_id, :viewed => false)
-            ws.comment_template m.user_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), self.content.html_safe
+            content = strip_html self.content.html_safe, 200
+            ws.comment_template m.user_id, "course_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
           end
         end
       end
@@ -280,14 +282,16 @@ class Message < ActiveRecord::Base
         self.project.members.each do |m|
           if  m.user_id != self.author_id
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
-            ws.topic_publish_template m.user_id, "#{l(:label_project_topic_template)}", self.subject, self.author.try(:realname), format_time(self.created_on)
+            content = strip_html self.subject, 200
+            ws.topic_publish_template m.user_id, "project_discussion", self.id, "#{l(:label_project_topic_template)}", content, self.author.try(:realname), format_time(self.created_on)
           end
         end
       else    # 回帖
         self.project.members.each do |m|
           if m.user_id ==  Message.find(self.parent_id).author_id  && m.user_id != self.author_id  # 只针对主贴回复，回复自己的帖子不发消息
             self.forge_messages << ForgeMessage.new(:user_id => m.user_id, :project_id => self.board.project_id, :viewed => false)
-            ws.comment_template m.user_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), self.content.html_safe
+            content = strip_html self.content.html_safe, 200
+            ws.comment_template m.user_id, "project_discussion", self.parent_id, "#{l(:label_topic_comment_template)}", self.author.try(:realname), format_time(self.created_on), content
           end
         end
       end

app/models/news.rb

@@ -171,7 +171,8 @@ class News < ActiveRecord::Base
         if m.user_id != self.author_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
           ws = WechatService.new
-          ws.message_update_template m.user_id, "#{l(:label_new_notice_template)}", self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, format_time(self.created_on)
+          content = strip_html self.author.try(:realname) + " 发布了通知：" + self.title.html_safe, 200
+          ws.message_update_template m.user_id, "course_notice", self.id, "#{l(:label_new_notice_template)}", self.author.try(:realname) + " 发布了通知：" + content, format_time(self.created_on)
         end
       end
     else

app/models/student_work_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :results, :status, :src
+  attr_accessible :student_work_id, :results, :status, :src, :uwait_time
   belongs_to :student_work
 
   serialize :results, Array

app/services/wechat_service.rb

@@ -1,11 +1,11 @@
 #encoding: utf-8
 class WechatService
 
-  def template_data(openid, template_id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+  def template_data(openid, template_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
     data = {
         touser:openid,
         template_id:template_id,
-        url:"https://www.trustie.net/",
+        url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
         topcolor:"#FF0000",
         data:{
             first: {
@@ -33,10 +33,10 @@ class WechatService
     data
   end
 
-  def homework_template(user_id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+  def homework_template(user_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
-      data = template_data uw.openid,"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI",first, key1, key2, key3, remark
+      data = template_data uw.openid,"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI", type, id, first, key1, key2, key3, remark
       begin
         req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
       rescue Exception => e
@@ -44,12 +44,13 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
-  def topic_publish_template(user_id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+  def topic_publish_template(user_id, type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
-      data = template_data uw.openid,"oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ",first, key1, key2, key3, remark
+      data = template_data uw.openid,"oKzFCdk7bsIHnGbscA__N8LPQrBkUShvpjV3-kuwWDQ", type, id,first, key1, key2, key3, remark
       Rails.logger.info "start send template message: #{data}"
       begin
         req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
@@ -58,12 +59,13 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
-  def comment_template(user_id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
+  def comment_template(user_id,type, id, first, key1, key2, key3, remark="具体内容请点击详情查看网站")
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
-      data = template_data uw.openid,"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",first, key1, key2, key3, remark
+      data = template_data uw.openid,"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c",type, id,first, key1, key2, key3, remark
       Rails.logger.info "start send template message: #{data}"
       begin
         req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
@@ -72,15 +74,16 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 
-  def message_update_template(user_id, first, key1, key2, remark="具体内容请点击详情查看网站")
+  def message_update_template(user_id, type, id, first, key1, key2, remark="具体内容请点击详情查看网站")
     uw = UserWechat.where(user_id: user_id).first
     unless uw.nil?
       data = {
           touser:uw.openid,
           template_id:"YTyNPZnQD8uZFBFq-Q6cCOWaq5LA9vL6RFlF2JuD5Cg",
-          url:"https://www.trustie.net/",
+          url:"https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect",
           topcolor:"#FF0000",
           data:{
               first: {
@@ -101,7 +104,6 @@ class WechatService
               }
           }
       }
-
       Rails.logger.info "start send template message: #{data}"
       begin
         req = Wechat.api.template_message_send Wechat::Message.to(uw.openid).template(data)
@@ -110,5 +112,6 @@ class WechatService
       end
       Rails.logger.info "send over. #{req}"
     end
+    Rails.logger.info "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=https://www.trustie.net/assets/wechat/app.html#/#{type}/#{id}?response_type=code&scope=snsapi_base&state=123#wechat_redirect"
   end
 end

app/views/admin/code_work_tests.html.erb

@@ -10,51 +10,59 @@
     <thead>
     <tr>
       <th style="width: 50px;">
-        作业id
+        <span style="float:left; margin-left:20px;">作业id</span>
-      </th>
-      <th style="width: 60px;">
-        平均等待时间
       </th>
       <th style="width: 50px;">
-        语言
+        <span style="float:left; margin-left:20px;">作品id</span>
       </th>
-      <th style="width: 120px;">
+      <th style="width: 60px;">
-        提交测试时间
+        用户等待时间
       </th>
       <th style="width: 50px;">
-        答题状态
+        <span style="float:left; margin-left:20px;">语言</span>
       </th>
-      <th style="width: 50px;">
+      <th style="width: 100px;">
-        测试集数
+        测试完成时间
       </th>
-      <th style="width: 50px;">
+      <th style="width: 60px;">
-        最小耗时
+        <span style="float:left; margin-left:20px;">答题状态</span>
       </th>
       <th style="width: 50px;">
-        最大耗时
+        <span style="float:left; margin-left:20px;">耗时</span>
       </th>
     </tr>
     </thead>
     <tbody>
     <% @code_work_tests.each do |test| %>
-        <% infos = StudentWorkTest.find_by_sql("select a.homework_common_id as homeworkid,b.language from student_works as a, homework_detail_programings as b where a.id = #{test.student_work_id} and a.homework_common_id = b.homework_common_id
+        <% if test['homework_id'] != nil %>
-  ").first %>
-        <% if infos != nil %>
             <tr class="<%= cycle("odd", "even") %>">
-              <td style="text-align: center; " title='<%=infos.homeworkid%>'>
+              <td style="text-align: center; " title='<%=test['homework_id']%>'>
-                <%=link_to(infos.homeworkid, student_work_index_path(:homework => infos.homeworkid))%>
+                <% if test['link_hwork'] %>
+                    <%=link_to(test['homework_id'], student_work_index_path(:homework => test['homework_id']))%>
+                <% else %>
+                    <%= test['homework_id'] %>
+                <% end %>
+              </td>
+              <td style="text-align: center; " title='<%=test['student_work_id']%>'>
+                <% if test['link_swork'] && test['link_hwork'] %>
+                    <% if !test['is_test'] %>
+                        <%=link_to(test['student_work_id'], student_work_index_path(:homework => test['homework_id'],:student_work_id=>test['student_work_id']))%>
+                    <% else %>
+                        <%=link_to(test['student_work_id'], new_user_commit_homework_users_path(homework_id: test['homework_id'], is_test: true))%>
+                    <% end %>
+                <% else %>
+                     <%= test['student_work_id'] %>
+                <% end %>
               </td>
               <td style="text-align: center;">
-                    <% if test.status != -2 && test.results.first['user_wait'] %>
+                    <% if test.wait_time != 0 %>
-                        <% wait_time = 0  %>
+                        <%=test.wait_time.to_s+"毫秒" %>
-                        <% test.results.each do |result|  wait_time = wait_time + result['user_wait']  end %>
-                        <%=(wait_time/test.results.count).to_s+"毫秒" %>
                     <% else %>
                         <%="未记录"%>
                     <% end %>
               </td>
               <td align="center">
-                <%=%W(C C++ Python Java).at(infos.language.to_i - 1)%>
+                <%=%W(C C++ Python Java).at(test['language'].to_i - 1)%>
               </td>
               <td align="center">
                 <%=Time.parse(test.created_at.to_s).strftime("%Y-%m-%d %H:%M:%S")%>
@@ -64,26 +72,17 @@
                     <%= "答题正确" %>
                 <% elsif test.status == -2 %>
                     <%= "编译错误" %>
-                <% elsif test.status == 2 || test.results.last['status'] == 2 %>
+                <% elsif test.status == 2 %>
-                    <%= "超时" %>
+                    <%= "代码超时" %>
+                <% elsif test.status == -3 %>
+                    <%= "请求超时" %>
                 <% else %>
                     <%= "答题错误" %>
                 <% end %>
               </td>
               <td class="center">
-                <% if test.status != -2 %>
+                <% if test.time_used > 0 %>
-                   <%=test.results.count%>
+                    <%=test.time_used.to_s+"毫秒"%>
-                <% end %>
-              </td>
-              <td class="center">
-                <% if test.status != -2 %>
-                    <%test.results = test.results.sort_by {|result| result['time_used'] }%>
-                    <%=test.results.first['time_used'] == 0 ? "1毫秒":test.results.first['time_used'].to_s+"毫秒"%>
-                <% end %>
-              </td>
-              <td class="center">
-                <% if test.status != -2 %>
-                    <%=test.results.last['time_used'] == 0 ? "1毫秒":test.results.last['time_used'].to_s+"毫秒"%>
                 <% end %>
               </td>
             </tr>

app/views/courses/code_repeat.html.erb

@@ -2,8 +2,8 @@
   <h2 class="conbox-h2">查重结果</h2>
   <div class="chabox">
     <ul class="chabox-header">
-      <li class="chabox-w-500" style = "width:438px" >被查作品</li>
+      <li class="chabox-w-500" style = "width:437px" >被查作品</li>
-      <li class="chabox-w-500" style = "width:560px" >疑被抄袭作品</li>
+      <li class="chabox-w-500" style = "width:561px" >疑被抄袭作品</li>
       <div class="cl"></div>
     </ul>
     <ul class="chabox-top">

app/views/layouts/new_base_user.html.erb

@@ -251,7 +251,7 @@
         %>
 
         <% if @user.projects.visible.count > 0
-             projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)
+             projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)
            else
              projects = []
            end

app/views/student_work/_programing_work_show.html.erb

@@ -69,7 +69,7 @@
                               <span class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"].force_encoding("UTF-8")%> </pre></span>
                               <span class="w60">正确输出：</span>
 
-                              <span  class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["output"]%></pre></span>
+                              <span  class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["output"].force_encoding("UTF-8")%></pre></span>
                               <span class="w50">耗时：</span>
                               <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>
                               <div class="cl"></div>

app/views/student_work/_student_work_list.html.erb

@@ -14,14 +14,14 @@
     <% end %>
   </span>
   <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
-      <div class="hworkSearchBox">
+      <div class="hworkSearchBox mr15">
         <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
         <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
       </div>
+      <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit fl mr20"}) unless course_group_list(@course).empty?  %>
       <%if @homework.homework_type == 2 && @is_teacher %>
-          <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fr',:remote => true %>
+          <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fl',:remote => true %>
       <% end %>
-      <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
   <% end%>
   <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" style="display: none">[ 显示作业信息 ]</a> </span>
 </div>
@@ -50,8 +50,12 @@
 <script type="text/javascript">
 
   $(function(){
-      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) %>
+      <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
-          <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
+          <% if @message_student_work_id %>
+            <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>
+          <% else %>
+            <% work= params[:show_work_id].nil? ? @homework.student_works.where("user_id = ?",User.current.id).first : StudentWork.find(params[:show_work_id]) %>
+          <% end %>
           <% unless work.nil? %>
               <% if @homework.homework_type == 2 %>
                   $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'programing_work_show',:locals => {:work =>work,:score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>");
@@ -89,146 +93,5 @@
           <% end %>
       <% end %>
   });
-  //代码查重
-  function code_repeat(){
-
-      var homework_id = <%=@homework.id%>;
-      var course_id = <%=@course.id%>;
-
-      console.log("course_id=",course_id);
-      console.log("homework_id=",homework_id);
-
-      if(<%= @stundet_works.count <=1 %>)
-      {
-          //弹框
-          $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>');
-          showModal('ajax-modal', '580px');
-          $('#ajax-modal').siblings().remove();
-          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-          $('#ajax-modal').parent().css("top","40%").css("left","50%");
-          $('#ajax-modal').parent().addClass("resourceUploadPopup");
-          $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-          function closeModal(){
-              hideModal($(".blue-border-box"));
-          }
-          return;
-      }
-
-      //先请求下上次查询的时间
-      $.post(
-              '/student_work/last_codecomparetime',
-              {homework: homework_id},
-              function(data,status){
-                  if (data.status == 0) {
-                      var homework_simi_time = data.comparetime;
-
-                      if (homework_simi_time == 0){
-                          //没进行过代码查重则直接查重
-                          test_repeat();
-                      }
-                      else{
-                          $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=> @course.id })%>');
-                          $('#compare-tips-1').html('您上次查重的时间为'+homework_simi_time);
-                          showModal('ajax-modal', '580px');
-                          $('#ajax-modal').siblings().remove();
-                          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                          $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                          $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                          $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-                          console.log(homework_simi_time);
-
-                          function closeModal(){
-                              hideModal($(".blue-border-box"));
-                          }
-                      }
-                  }
-              }
-      ).fail(function(xhr, status){
-//                  confirm("对不起,服务器繁忙请稍后再试!");
-                  $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>');
-                  showModal('ajax-modal', '580px');
-                  $('#ajax-modal').siblings().remove();
-                  $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                  $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                  $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                  $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-                  function closeModal(){
-                      hideModal($(".blue-border-box"));
-                  }
-                  return;
-              });
-
-      //请求查重
-      var test_repeat = function(){
-          $.post(
-                  '/student_work/code_repeattest',
-                  {homework: homework_id},
-                  function(data,status){
-                      console.log("result = ");
-                      console.log(data);
-
-                      if (data.status == 0) {
-                          $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course.id})%>');
-                          showModal('ajax-modal', '580px');
-                          $('#ajax-modal').siblings().remove();
-                          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                          $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                          $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                          $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-                          function closeModal(){
-                              hideModal($(".blue-border-box"));
-                          }
-                      }
-                      else if (data.status == -1){
-//                          confirm("对不起只支持java/c/c++的代码查重!");
-                          $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>');
-                          showModal('ajax-modal', '580px');
-                          $('#ajax-modal').siblings().remove();
-                          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                          $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                          $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                          $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-                          function closeModal(){
-                              hideModal($(".blue-border-box"));
-                          }
-
-                      }
-                      else if (data.status == -2){
-//                          confirm("对不起该作业的作品过少不能查重!");
-                          $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>');
-                          showModal('ajax-modal', '580px');
-                          $('#ajax-modal').siblings().remove();
-                          $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                          $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                          $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                          $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-                          function closeModal(){
-                              hideModal($(".blue-border-box"));
-                          }
-                      }
-                      return;
-                  }
-          ).fail(function(xhr, status){
-//                      confirm("对不起,服务器繁忙请稍后再试!");
-                      $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>');
-                      showModal('ajax-modal', '580px');
-                      $('#ajax-modal').siblings().remove();
-                      $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 560px;' class='resourceClose'></a>");
-                      $('#ajax-modal').parent().css("top","40%").css("left","50%");
-                      $('#ajax-modal').parent().addClass("resourceUploadPopup");
-                      $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-
-                      function closeModal(){
-                          hideModal($(".blue-border-box"));
-                      }
-                      return;
-                  });
-      };
-  }
 
 </script>

app/views/student_work/work_canrepeat.js.erb

@@ -81,7 +81,7 @@
         test_repeat();
    <% else%>
         $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>');
-        $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>');
+        $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H:%M:%S")%>');
         showModal('ajax-modal', '580px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");

app/views/users/new_user_commit_homework.html.erb

@@ -143,9 +143,9 @@
                       <span class="w60 c_red">测试错误！</span>
                     <% end %>
                     <span class="w60">您的输出：</span>
-                    <span class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"]%> </pre></span>
+                    <span class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"].force_encoding("UTF-8")%> </pre></span>
                     <span class="w60">正确输出：</span>
-                    <span  class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><%= x["output"] %></pre></span>
+                    <span  class="w180"><pre style="white-space: pre-wrap; margin-right: 15px;"><%= x["output"].force_encoding("UTF-8") %></pre></span>
 
                         <span class="w50">　耗时：</span>
                         <span class="w80"><pre><%=x["time_used"]==0?1:x["time_used"]%>毫秒</pre></span>

app/views/wechats/login.html.erb

@@ -17,7 +17,7 @@
         </div>
 
         <div class="weui_cell">
-          <div class="weui_cell_hd"><label class="weui_label">用户名</label></div>
+          <div class="weui_cell_hd"><label class="weui_label">密码</label></div>
           <div class="weui_cell_bd weui_cell_primary">
             <input class="weui_input" type="password" name="password" placeholder="请输密码"/>
           </div>

config/locales/zh.yml

@@ -2138,15 +2138,9 @@ zh:
   label_new_journals_template: 您有新留言了
   label_journals_comment_template: 您的留言有新回复了
   label_blog_comment_template: 您的博客有新回复了
-  label_new_blog_template: 您的课程有新作业了
+  label_new_blog_template: 有新博客了
   label_new_issue_template: 您有新缺陷了
   label_new_notice_template: 您的课程有新通知了
-  label_resource_name: 您的课程有新作业了
-  label_resource_name: 您的课程有新作业了
-  label_resource_name: 您的课程有新作业了
-  label_resource_name: 您的课程有新作业了
-  label_resource_name: 您的课程有新作业了
-  label_resource_name: 您的课程有新作业了
 #edit yk
   label_code_work_tests: 代码测试列表
 

db/migrate/20160418074429_delete_other_works.rb

@@ -0,0 +1,11 @@
+class DeleteOtherWorks < ActiveRecord::Migration
+  def up
+    works = StudentWork.where("homework_common_id = 3253 and user_id = 10740 and final_score = 0")
+    unless works.empty?
+      works.destroy_all
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20160419061745_create_code_tests.rb

@@ -0,0 +1,13 @@
+class CreateCodeTests < ActiveRecord::Migration
+  def change
+    create_table :code_tests do |t|
+      t.integer :homework_id
+      t.integer :wait_time, default: 0
+      t.integer :language
+      t.integer :status
+      t.integer :time_used, default: 0
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20160419074016_add_student_work_id_to_code_tests.rb

@@ -0,0 +1,5 @@
+class AddStudentWorkIdToCodeTests < ActiveRecord::Migration
+  def change
+    add_column :code_tests, :student_work_id, :integer,:default=>0
+  end
+end

db/migrate/20160421011543_alter_homework_end_time.rb

@@ -0,0 +1,21 @@
+class AlterHomeworkEndTime < ActiveRecord::Migration
+  def up
+    homeworks = HomeworkCommon.where("id in (3229, 3234, 3235, 3236)");
+    unless homeworks.empty? || homeworks.nil?
+      homeworks.each do |hw|
+        hw.end_time = hw.end_time + 4
+        hm = hw.homework_detail_manual
+        hm.comment_status = 1
+        hw.student_works.each do |stu|
+          stu.late_penalty = 0
+          stu.save
+        end
+        hm.save
+        hw.save
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,12 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160414055511) do
+ActiveRecord::Schema.define(:version => 20160421011543) do
+
+
+
+ActiveRecord::Schema.define(:version => 20160405021915) do
+ActiveRecord::Schema.define(:version => 20160419074016) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -334,6 +339,17 @@ ActiveRecord::Schema.define(:version => 20160414055511) do
     t.boolean  "diff_all"
   end
 
+  create_table "code_tests", :force => true do |t|
+    t.integer  "homework_id"
+    t.integer  "wait_time",       :default => 0
+    t.integer  "language"
+    t.integer  "status"
+    t.integer  "time_used",       :default => 0
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.integer  "student_work_id", :default => 0
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -1521,6 +1537,18 @@ ActiveRecord::Schema.define(:version => 20160414055511) do
     t.string   "topic_resource"
   end
 
+  create_table "rep_statics", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "commits_num"
+    t.string   "uname"
+    t.string   "email"
+    t.integer  "add"
+    t.integer  "del"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.integer  "changeset"
+  end
+
   create_table "repositories", :force => true do |t|
     t.integer "project_id",                  :default => 0,     :null => false
     t.string  "url",                         :default => "",    :null => false
@@ -1668,6 +1696,7 @@ ActiveRecord::Schema.define(:version => 20160414055511) do
     t.integer  "status",          :default => 9
     t.text     "results"
     t.text     "src"
+    t.integer  "uwait_time",      :default => 0
   end
 
   create_table "student_works", :force => true do |t|

public/app.html

@@ -14,6 +14,57 @@
   <script src="/javascripts/wechat/react.js"></script>
   <script src="/javascripts/wechat/JSXTransformer.js"></script>
   <script src="/javascripts/wechat/ReactRouter.js"></script>
+  <script>	//获取浏览器页面可见高度和宽度
+
+  var _PageHeight = document.documentElement.clientHeight,
+
+          _PageWidth = document.documentElement.clientWidth;
+
+  //计算loading框距离顶部和左部的距离（loading框的宽度为215px，高度为61px）
+
+  var _LoadingTop = _PageHeight > 61 ? (_PageHeight - 61) / 2 : 0,
+
+          _LoadingLeft = _PageWidth > 215 ? (_PageWidth - 215) / 2 : 0;
+
+  //在页面未加载完毕之前显示的loading Html自定义内容
+
+  var _LoadingHtml = '<div id="loadingDiv" style="position:absolute;left:0;width:100%;height:' + _PageHeight + 'px;top:0;background:#f3f8ff;opacity:0.8;filter:alpha(opacity=80);z-index:10000;"><div style="position: absolute; cursor1: wait; left: ' + _LoadingLeft + 'px; top:' + _LoadingTop + 'px; width: auto; height: 57px; line-height: 57px; padding-left: 50px; padding-right: 5px; background: #fff url(/Content/loading.gif) no-repeat scroll 5px 10px; border: 2px solid #95B8E7; color: #696969; font-family:\'Microsoft YaHei\';">页面加载中，请等待...</div></div>';
+
+  //呈现loading效果
+
+  document.write(_LoadingHtml);
+
+
+
+  //window.onload = function () {
+
+  //    var loadingMask = document.getElementById('loadingDiv');
+
+  //    loadingMask.parentNode.removeChild(loadingMask);
+
+  //};
+
+
+
+  //监听加载状态改变
+
+  document.onreadystatechange = completeLoading;
+
+
+
+  //加载状态为complete时移除loading效果
+
+  function completeLoading() {
+
+    if (document.readyState == "complete") {
+
+      var loadingMask = document.getElementById('loadingDiv');
+
+      loadingMask.parentNode.removeChild(loadingMask);
+
+    }
+
+  }</script>
 </head>
 <body>
 <div id="container"></div>

public/assets/wechat/activities.html

@@ -7,29 +7,32 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mb5">
-                <div class="post-title hidden">
+                  <a herf="javascript:void(0);">
-                  <a herf="javascript:void(0);" class="mr10">
                     <span ng-if="act.author.realname != ' '">{{act.author.realname}}</span>
                     <span ng-if="act.author.realname == ' '">{{act.author.nickname}}</span>
-                  </a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
+                  </a></div>
+                <div class="post-title hidden">
+                  <a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-content c-grey2 mt10">
+                <div class="post-title mt5 hidden"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   <span class="mr15">迟交扣分：{{act.homework_common_detail.late_penalty}}分</span> 匿评开启时间：{{act.homework_common_detail.evaluation_start}}<br />
                   <span class="mr15">缺评扣分：{{act.homework_common_detail.absence_penalty}}分/作品</span> 匿评关闭时间：{{act.homework_common_detail.evaluation_end}}
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                <span  class="c-grey f12 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/homework/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/homework/{{act.act_id}}" class="c-grey2">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
             </div>
           </div>
         </div>
@@ -38,23 +41,25 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
+                <div class="post-title hidden"><a herf="javascript:void(0);" class="f13 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
+                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/course_notice/{{act.act_id}}" class="c-grey2">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
             </div>
           </div>
         </div>
@@ -63,23 +68,25 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title fl mb10 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
+                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
+                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
                 <div class="post-content c-grey2 mt10">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/course_discussion/{{act.act_id}}" class="c-grey2">回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
             </div>
           </div>
         </div>
@@ -89,7 +96,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
                 <div class="post-title hidden mb5"><span class="c-grey3 f13 fb mr10">{{act.author.realname}}</span>创建了<span class="c-grey3 f13 fb ml10">{{act.course_project_name}}</span></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.latest_update}}</a></div>
                 <div class="cl"></div>
@@ -104,25 +111,27 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
+                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-content c-grey2 mt10">
+                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                   <span class="mr15">状态：{{act.issue_detail.issue_status}}</span> <span class="mr15">优先级：{{act.issue_detail.issue_priority}}</span> <br />
                   <span class="mr15">指派给：{{act.issue_detail.issue_assigned_to}}</span>  <span class="mr15">完成度：{{act.issue_detail.done_ratio}}%</span>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/issues/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/issues/{{act.act_id}}" class="c-grey2"> 回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
             </div>
           </div>
         </div>
@@ -132,23 +141,25 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-                <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>to<a herf="javascript:void(0);" class="ml10">{{act.course_project_name}}&nbsp;&nbsp;|&nbsp;&nbsp;{{act.activity_type_name}}</a></div>
+                <div class="post-title hidden"><a herf="javascript:void(0);" class="f12 c-grey2">{{act.course_project_name}}</a></div>
                 <div class="cl"></div>
-                <div class="post-content c-grey2 mt10">
+                <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+                <div class="post-content c-grey2">
                   <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
                 </div>
-                <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
                 <div class="cl"></div>
-                <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+                <span  class="c-grey f12 fl mr15">{{act.activity_type_name}}</span>
+                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
               </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/project_discussion/{{act.act_id}}" class="c-grey2"> 回复 ({{act.reply_count}}) </a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-              </div>
             </div>
           </div>
         </div>
@@ -157,7 +168,7 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
                 <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.author.realname}}</span>创建了<span class="c-grey3 f15 fb">{{act.course_project_name}}</span></div>
                 <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.latest_update}}</a></div>
                 <div class="cl"></div>
@@ -172,20 +183,23 @@
           <div class="post-container">
             <div class="post-wrapper">
               <div class="post-main">
-                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+                <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-                <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a> <span style="vertical-align:top;">给您留言了</span></div>
+                <div class="post-title mb5 hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a></div>
-                <div class="post-title hidden">{{act.latest_update}}</div>
+                <div class="post-title hidden"><span class="f12 c-grey">留言</span></div>
                 <div class="cl"></div>
-                <div class="post-content c-grey2 mt10">
+                <div class="cl"></div>
+                <div class="post-content c-grey2 mt5">
                   <p class="post-all-content" ng-bind-html="act.description|safeHtml"></p>
                 </div>
-                <a herf="javascript:void(0);" class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+                <a herf="javascript:void(0);" class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
+                <div class="cl"></div>
+                <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+                <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+                <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+                <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+                <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
                 <div class="cl"></div>
-              </div>
-              <div class="post-interactive">
-                <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/journal_for_message/{{act.act_id}}" class="c-grey2"> 回复 ({{act.reply_count}})</a></div>
-                <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-                <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
               </div>
             </div>
           </div>
@@ -196,23 +210,24 @@
         <div class="post-container">
           <div class="post-wrapper">
             <div class="post-main">
-              <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="45" height="45" class="border-radius" /></div>
+              <div class="post-avatar fl"><img ng-src="{{replaceUrl(act.author.img_url)}}" width="40" height="40" class="border-radius" /></div>
-              <div class="post-title hidden mb5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+              <div class="post-title hidden mb5"><a herf="javascript:void(0);">{{act.author.realname}}</a></div>
-              <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{act.author.realname}}</a>发表博客</div>
+              <div class="post-title hidden"><span class="f12 c-grey">博客</span></div>
               <div class="cl"></div>
-              <div class="post-content c-grey2 mt10">
+              <div class="post-title hidden mt5"><span class="c-grey3 f15 fb">{{act.subject|safeHtml}}</span></div>
+              <div class="post-content c-grey2">
                 <div class="post-all-content" ng-bind-html="act.description|safeHtml"></div>
               </div>
-              <a herf="javascript:void(0);"  class="link-blue f13 fl mt5 post-more undis underline" text-auto-height>点击展开</a>
+              <a herf="javascript:void(0);"  class="c-grey2 f13 fr mt5 mb10 post-more undis" text-auto-height>点击展开</a>
               <div class="cl"></div>
-              <span  class="c-grey f13 mt10 fl">{{act.latest_update}}</span>
+              <span  class="c-grey f13 fl">{{act.latest_update}}</span>
+              <a href="javascript:void(0);" ng-if="!act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span></a>
+              <a href="javascript:void(0);" ng-if="act.reply_count" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2 fr f12 w36"><span class="reply-icon"></span>{{act.reply_count}}</a>
+              <div class="c-grey fr f12 mr15 w36" ng-if="!act.praise_count" ng-click="addPraise(act);"><span class="praise-icon"></span></div>
+              <div class="c-grey fr f12 mr15 w36" ng-if="act.praise_count && !act.has_praise" ng-click="addPraise(act);"><span class="praise-icon"></span>{{act.praise_count}}</div>
+              <div class="c-grey fr f12 mr15 w36" ng-if="act.has_praise" ng-click="decreasePraise(act);"><span class="praised-icon"></span>{{act.praise_count}}</div>
               <div class="cl"></div>
             </div>
-            <div class="post-interactive">
-              <div class="post-interactive-column"><a href="javascript:void(0);" ng-href="#/blog_comment/{{act.act_id}}" class="c-grey2"> 回复 ({{act.reply_count}})</a></div>
-              <div class="post-interactive-column c-grey" ng-if="!act.has_praise" ng-click="addPraise(act);">赞 ({{act.praise_count}})</div>
-              <div class="post-interactive-column c-grey" ng-if="act.has_praise" ng-click="decreasePraise(act);">已赞 ({{act.praise_count}})</div>
-            </div>
           </div>
         </div>
       </div>

public/assets/wechat/app.html

@@ -13,7 +13,13 @@
 
 </head>
 <body>
-<div ng-view></div>
+<div ng-view>
+    <div class="loading-modal loading-bg" ng-if="loading">
+        <div class="loading-box">
+            <img src="/images/wechat/loading.gif" alt=""/><span>加载中...</span>
+        </div>
+    </div>
+</div>
 
 
 <script src="http://apps.bdimg.com/libs/angular.js/1.4.6/angular.js"></script>

public/javascripts/wechat/app.js

@@ -3,7 +3,7 @@ var apiUrl = '/api/v1/';
 var debug = false; //调试标志,如果在本地请置为true
 
 if(debug===true){
-    apiUrl = 'http://localhost:3000/api/v1/';
+    apiUrl = 'https://www.trustie.net/api/v1/';
 }
 
 app.factory('auth', function($http,$routeParams, $cookies, $q){
@@ -377,7 +377,7 @@ app.directive('textAutoHeight', function($timeout){
         link: function(scope, element, attr){
             scope.text = '点击展开';
             $timeout(function(){
-                var e = element.parent().children().eq(4);
+                var e = element.parent().children().eq(5);
                 var height = e[0].scrollHeight;
                 var offsetHeight = e[0].offsetHeight;
                 if(height>90){
@@ -399,7 +399,7 @@ app.directive('textAutoHeight', function($timeout){
     }
 });
 
-app.config(['$routeProvider',function ($routeProvider) {
+app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProvider) {
     $routeProvider
         .when('/activities', {
             templateUrl: 'activities.html',
@@ -436,4 +436,22 @@ app.config(['$routeProvider',function ($routeProvider) {
         .otherwise({
             redirectTo: '/activities'
         });
+        $httpProvider.interceptors.push('timestampMarker');
+}]);
+
+//loading
+app.factory('timestampMarker', ["$rootScope", function ($rootScope) {
+    var timestampMarker = {
+        request: function (config) {
+            $rootScope.loading = true;
+            config.requestTimestamp = new Date().getTime();
+            return config;
+        },
+        response: function (response) {
+            // $rootScope.loading = false;
+            response.config.responseTimestamp = new Date().getTime();
+            return response;
+        }
+    };
+    return timestampMarker;
 }]);

public/stylesheets/application.css

@@ -2847,29 +2847,4 @@ img.school_avatar {
 }
 
 .admin_message_warn{font-size: 12px;color: red;}
-a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;}
+a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;}
-
-/*20160401袁可------------------ 查重结果样式*/
-.conbox{ width:1000px; margin:0 auto; border:3px solid #f0f0f0; background:#fff;}
-.conbox-h2{ font-size:16px; padding:10px 0; padding-left:25px;}
-.chabox{ width:1000px;}
-.chabox ul li{ float:left; width:82px; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
-.chabox ul li.chabox-w-401{ width:151px;  display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
-.chabox ul li.chabox-r-line{ border-right:1px solid #D1D1D1;}
-.chabox-top{ width:1000px; }
-.chabox-top li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; background:#E4E4E4; color:#000;}
-.chabox-con li{font-size:12px;  line-height:35px; height:35px; color:#888; border-bottom:1px solid #DFDFDF;}
-a.cha-btn{ display:block; width:50px; height:20px; line-height:20px; margin:0 auto; border:1px solid #269ac9; color:#269ac9;-webkit-border-radius: 3px;border-radius:3px; margin-top:8px;}
-a:hover.cha-btn{ background:#269ac9; color:#fff;}
-.chabox-header li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; border-top:1px solid #E4E4E4; border-right:1px solid #E4E4E4; color:#000;}
-.chabox ul li.chabox-w-500{ width:499px;}
-.chabox ul li.chabox-w-40{ width:39px; border-right:1px solid #D1D1D1;}
-.chabox ul li.chabox-txt-left{ text-align:left;text-indent:1em; }
-
-.contrast-box{ width:1200px;box-shadow: 0 0 5px #6B6B6B; background:#fff; margin:0 auto; }
-.contrast-con{ width:599px;  border-right:1px solid #D1D1D1; float:left;}
-.contrast-con h3{font-size:14px; font-weight:bold; line-height:40px;   height:40px; background:#E4E4E4; color:#000; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
-.contrast-txt{   padding:10px;}
-.showCodeC{ width:580px; float:left;}
-
-.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}

public/stylesheets/nyan.css

@@ -1452,3 +1452,28 @@ ul.contest-notification-list li span{
     color: #136b3b !important;
     font-weight:normal !important;
 }
+
+/*20160401袁可------------------ 查重结果样式*/
+.conbox{ width:1000px; margin:0 auto; border:3px solid #f0f0f0; background:#fff;}
+.conbox-h2{ font-size:16px; padding:10px 0; padding-left:25px;}
+.chabox{ width:1000px;}
+.chabox ul li{ float:left; width:82px; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.chabox ul li.chabox-w-401{ width:151px;  display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.chabox ul li.chabox-r-line{ border-right:1px solid #D1D1D1;}
+.chabox-top{ width:1000px; }
+.chabox-top li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; background:#E4E4E4; color:#000;}
+.chabox-con li{font-size:12px;  line-height:35px; height:35px; color:#888; border-bottom:1px solid #DFDFDF;}
+a.cha-btn{ display:block; width:50px; height:20px; line-height:20px; margin:0 auto; border:1px solid #269ac9; color:#269ac9;-webkit-border-radius: 3px;border-radius:3px; margin-top:8px;}
+a:hover.cha-btn{ background:#269ac9; color:#fff;}
+.chabox-header li{ font-size:14px; font-weight:bold; line-height:40px; height:40px; border-top:1px solid #E4E4E4; border-right:1px solid #E4E4E4; color:#000;}
+.chabox ul li.chabox-w-500{ width:499px;}
+.chabox ul li.chabox-w-40{ width:39px; border-right:1px solid #D1D1D1;}
+.chabox ul li.chabox-txt-left{ text-align:left;text-indent:1em; }
+
+.contrast-box{ width:1200px;box-shadow: 0 0 5px #6B6B6B; background:#fff; margin:0 auto; }
+.contrast-con{ width:599px;  border-right:1px solid #D1D1D1; float:left;}
+.contrast-con h3{font-size:14px; font-weight:bold; line-height:40px;   height:40px; background:#E4E4E4; color:#000; text-align:center; display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
+.contrast-txt{   padding:10px;}
+.showCodeC{ width:580px; float:left;}
+
+.resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000;}

public/stylesheets/weui/weixin.css

@@ -4,6 +4,7 @@
 /*基本样式*/
 body,table,input,textarea,select,button { font-family: "微软雅黑","宋体";}
 h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
+.f12 {font-size:12px;}
 .f13 {font-size:13px;}
 .f15 {font-size:15px;}
 .fb {font-weight:bold;}
@@ -29,6 +30,7 @@ a:hover,a:active{cursor:pointer;}
 a.link-blue {color:#269ac9;}
 a.underline {text-decoration:underline;}
 .border-radius {border-radius:5px;}
+.w36 {width:36px;}
 .max-width-60 {max-width:60px;}
 .max-width-130 {max-width:130px;}
 .hidden {overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
@@ -39,15 +41,16 @@ a.underline {text-decoration:underline;}
 
 /*动态样式*/
 .post-container {width:100%;}
-.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px  rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:15px auto;}
+.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px  rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:10px auto;}
 .post-main {padding:10px; color:#9a9a9a;}
-.post-avatar {width:45px; height:45px; margin-right:10px;}
+.post-avatar {width:40px; height:40px; margin-right:5px;}
 .post-title {font-size:13px; text-align:left;}
 .post-detail-info {font-size:13px; text-align:left; color:#9a9a9a;}
 .fl {float:left;}
 .fr {float:right;}
 .cl {clear:both; overflow:hidden;}
 .post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content img {max-width:100%;}
 .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
 .post-interactive-column,
 .post-interactive-reply,
@@ -60,7 +63,17 @@ a.underline {text-decoration:underline;}
 .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;}
 .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;}
 .post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;}
+.post-reply-content img {max-width:100%;}
 .post-reply-date, .post-reply-trigger {font-size:13px;}
 .post-input-container {padding-right:2px;}
 .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;}
-.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
+.post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;}
+.reply-icon {background:url(/images/wechat/wechat_icon.png) -100px 1px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+.praise-icon {background:url(/images/wechat/wechat_icon.png) -100px -38px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+.praised-icon {background:url(/images/wechat/wechat_icon.png) -100px -76px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+
+/* loading 弹框*/
+.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
+.loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;}
+.loading-box img {margin-top: 3px; text-align: center;}
+.loading-box span {display: block;}

spec/factories/code_tests.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :code_test, :class => 'CodeTests' do
+    homework_id 1
+wait_time 1
+language 1
+status 1
+time_used "MyString"
+  end
+
+end

spec/models/code_tests_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CodeTests, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end