Merge branch 'develop' into hjq_new_course

app/controllers/student_work_controller.rb

@@ -683,7 +683,7 @@ class StudentWorkController < ApplicationController
     if !params[:name].nil?
       condition = "%#{params[:name].strip}%".gsub(" ","")
     end
-    @project_ids = Project.where("user_id = #{User.current.id} and name like '#{condition}'")
+    @project_ids = Project.visible.where("user_id = #{User.current.id} and name like '#{condition}'")
     @first = params[:first].to_i
     respond_to do |format|
       format.js

app/views/layouts/_project_info.html.erb

@@ -3,10 +3,17 @@
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <div class="pr_info_logo fl mr10 mb5">
+  <% if @course.id == 370 %>
+    <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />
+  <% end %>
 <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
 <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
 </div>
-<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %></div>
+<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %>
+  <% if @course.id == 370 %>
+    <img src="/images/course/medal.png" alt="精品课程" style="vertical-align:bottom;" class="ml5" />
+  <% end %>
+</div>
 <div class="pr_info_id fl f14">
 ID:<%= @course.id%>
 </div>

app/views/organizations/_org_course_homework.html.erb

@@ -173,7 +173,7 @@
                 <% time=project.updated_on %>
                 <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                 <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                <p><%=time_from_now time %></p>
+                <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
                 <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
                   项目名称：<%=project.name %><br />
                   创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

app/views/organizations/_project_create.html.erb

@@ -23,7 +23,7 @@
         创建时间：<%= format_time(project.created_on) %>
       </div>
       <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='ProjectCreateInfo' and forge_act_id =#{project.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">

app/views/projects/_project_create.html.erb

@@ -18,9 +18,13 @@
       <div class="homepagePostTitle break_word" >
         <%= link_to project.name, project_path(project.id,:host=>Setting.host_course), :class => "postGrey" %>
       </div>
-      <div class="homepagePostDate">
+      <div class="homepagePostDate fl">
         创建时间：<%= format_time(project.created_on) %>
       </div>
+      <div class="homepagePostDate fl ml15">
+        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='ProjectCreateInfo' and forge_act_id =#{project.id}").first.updated_at) %>
+      </div>
+      <div class="cl"></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">

app/views/users/_course_homework.html.erb

@@ -173,7 +173,7 @@
             <% time=project.updated_on %>
             <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
             <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-            <p><%=time_from_now time %></p>
+            <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
             <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=activity.id %>">
               项目名称：<%=project.name %><br />
               创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

app/views/users/_project_create.html.erb

@@ -23,7 +23,7 @@
         创建时间：<%= format_time(project.created_on) %>
       </div>
       <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
+        更新时间：<%= format_time(ForgeActivity.where("forge_act_type='ProjectCreateInfo' and forge_act_id =#{project.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">

app/views/users/_user_homework_detail.html.erb

@@ -174,7 +174,7 @@
                   <% time=project.updated_on %>
                   <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                   <p><span class="captainName" title="<%=(User.find project.user_id).show_name %>"><%=(User.find project.user_id).show_name %></span><span style="vertical-align: top;">(组长)</span></p>
-                  <p><%=time_from_now time %></p>
+                  <p><%=time_from_now time %>&nbsp;&nbsp;<%= project.commits_count %>提交</p>
                   <div class="relatePInfo" id="relatePInfo_<%=project.id %>_<%=homework_common.id %>">
                     项目名称：<%=project.name %><br />
                     创建者：<%=(User.find project.user_id).show_name %>(组长)<br />

db/migrate/20151231012634_add_last_term_to_course.rb

@@ -1,17 +0,0 @@
-class AddLastTermToCourse < ActiveRecord::Migration
-  def change
-    add_column :courses, :end_time, :integer
-    add_column :courses, :end_term, :string
-
-    count = Course.all.count / 30 + 2
-    transaction do
-      for i in 1 ... count do
-        Course.page(i).per(30).each do |course|
-          course.end_time = course.time
-          course.end_term = course.term
-          course.save
-        end
-      end
-    end
-  end
-end

db/migrate/20160113090435_update_forge_and_user_activity.rb

@@ -0,0 +1,42 @@
+class UpdateForgeAndUserActivity < ActiveRecord::Migration
+  def up
+    user_count = UserActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... user_count do i
+      UserActivity.page(i).per(30).each do |user_act|
+        if user_act.act_type == 'Issue'
+          if user_act.act
+            if user_act.act.journals.count > 0
+              user_act.updated_at = user_act.act.journals.maximum("created_on")
+              user_act.save
+            end
+          else
+            user_act.destroy
+          end
+        end
+      end
+      end
+    end
+
+    for_count = ForgeActivity.all.count / 30 + 2
+    transaction do
+      for i in 1 ... for_count do i
+      ForgeActivity.page(i).per(30).each do |for_act|
+        if for_act.forge_act_type == 'Issue'
+          if for_act.forge_act
+            if for_act.forge_act.journals.count > 0
+              for_act.updated_at = for_act.forge_act.journals.maximum("created_on")
+              for_act.save
+            end
+          else
+            for_act.destroy
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end

public/stylesheets/courses.css

@@ -1255,3 +1255,4 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
 
 .fn {font-weight:normal}
+.boutiqueP {position:absolute; left:0px; top:0px;}