From 8d72a9a5390fafcc0b6f593765f3750d26cddcee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 09:22:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AEbase?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 425b720d9..ddafdab52 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -49,16 +49,6 @@
         <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
       </p>
     </div>
-    <!--<div class="search fl">-->
-      <!--<%#= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>-->
-        <!--<%#= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>-->
-        <!--<a href="#" onclick="submitSerch('<%#= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >-->
-          <!--<%#= l(:label_search)%>-->
-        <!--</a>-->
-        <!--<div class="cl"></div>-->
-        <!--<span id="project_name_span" class="fl"></span>-->
-      <!--<%# end %>-->
-    <!--</div>-->
   </div><!--TopBar end-->
 
   <div id="content">

From 4c73e00eafde6ee333cf7e42e72e75ec943564a6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 09:43:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9f8d25c7e..9bc7b52ed 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -67,13 +67,14 @@ class StudentWorkController < ApplicationController
   end
 
   def index
-    # 消息状态更新
+    # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
       if User.current.id == homework_message.user_id
         homework_message.update_attributes(:viewed => true)
       end
     end
-
+    # 作品消息状态更新
+    
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages

From ae2aa2feddcfe8f1d1f0ea89c2a047d15198b936 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Sep 2015 14:14:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E9=80=BB=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9bc7b52ed..3ed5eb914 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -69,12 +69,21 @@ class StudentWorkController < ApplicationController
   def index
     # 作业消息状态更新
     @homework.course_messages.each do |homework_message|
-      if User.current.id == homework_message.user_id
-        homework_message.update_attributes(:viewed => true)
+      if User.current.id == homework_message.user_id && homework_message.viewed == 0
+        homework_message.update_attributes(:viewed => true) if homework_message.viewed == 0
       end
     end
-    # 作品消息状态更新
-    
+    # 作品打分消息状态更新
+    studentworks_scores = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "StudentWorksScore", 0)
+    studentworks_scores.each do |studentworks_score|
+      studentworks_score.update_attributes(:viewed => true) if studentworks_score.viewed == 0
+    end
+    # 作品评论消息状态更新
+    journals_for_teacher = CourseMessage.where("user_id =? and course_id =? and course_message_type =? and viewed =?", User.current.id, @homework.course, "JournalsForMessage", 0)
+    journals_for_teacher.each do |journal_for_teacher|
+      journal_for_teacher.update_attributes(:viewed => true)
+    end
+    # 作品留言
     # 消息end
     #设置作业对应的forge_messages表的viewed字段
     query_student_work = @homework.course_messages