From a8c8dc3cc6a913967f0b2dc29997afc08430b89a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 16 Dec 2015 17:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_relate_project.html.erb     |  2 +-
 app/views/users/_course_homework.html.erb     | 24 +++++++++++------
 .../users/_user_homework_detail.html.erb      | 26 ++++++++++++++-----
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/app/views/student_work/_relate_project.html.erb b/app/views/student_work/_relate_project.html.erb
index 43f59c9c9..9a1fcead5 100644
--- a/app/views/student_work/_relate_project.html.erb
+++ b/app/views/student_work/_relate_project.html.erb
@@ -4,7 +4,7 @@
   <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
       <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
       <div class="cl"></div>
-      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未参与任何项目，请先加入项目再关联。</p>
+      <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>
       <ul id="search_project_list" class="maxHeight100"></ul>
       <p id="notes" class="c_red"></p>
       <div class="courseSendSubmit mt10"><a href="javascript:void(0);" class="sendSourceText" onclick="clickOK();">确定</a></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index fe02d9882..8112bc521 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -13,7 +13,7 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden fl m_w505"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
       <% if activity.homework_detail_manual%>
@@ -56,7 +56,7 @@
             <% works = cur_user_works_for_homework activity %>
             <% if works.nil? && projects.nil? %>
                 <div class="homepagePostSubmit">
-                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
                   <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
                 </div>
             <% elsif works.nil? %>
@@ -81,7 +81,6 @@
               <%= activity.language_name%>
             </div>
         <% end %>
-
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
@@ -93,17 +92,26 @@
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
+      <div class="mt5">
+        <div class="homepagePostDeadline">
+          匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        </div>
+        <div class="homepagePostDeadline ml15">
+          匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        </div>
+      </div>
+      <div class="cl"></div>
       <div>
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
         <div class="cl"></div>
       </div>
-      <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %>
+      <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
       <div class="mt10">
+        <% projects = activity.student_work_projects.where("is_leader = 1") %>
         <div class="fl mr5 fontGrey3">
-          <!--<img src="/images/course/proRelated.png" width="25" height="25" class="borderRadius mt7 ml7" title="已关联项目" />-->
-          已关联项目：
+          已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
         </div>
-        <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
+        <% projects.each do |pro| %>
             <% project = Project.find pro.project_id %>
             <script type="text/javascript">
                 $(document).ready(function(){
@@ -122,7 +130,7 @@
               <% end %>
               <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
                 项目名称：<%=project.name %><br />
-                创建者：<%=(User.find project.user_id).show_name %><br />
+                创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
                 <% time=project.updated_on %>
                 <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                 更新时间：<%=time_from_now time %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 536a9deb6..97e9652da 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -10,7 +10,7 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w505 fl">
+          <span class="homepagePostTitle hidden fl m_w505">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
@@ -45,8 +45,10 @@
           <% end%>
       <% end%>
       <div class="cl"></div>
-      <% if homework_common.homework_type == 3%>
+      <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%>
           <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <% elsif homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 0%>
+          <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
       <div class="homepagePostSubmitContainer">
         <% if homework_common.homework_type == 3 && !is_teacher && homework_common.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(homework_common.course) %>
@@ -54,7 +56,7 @@
             <% works = cur_user_works_for_homework homework_common %>
             <% if works.nil? && projects.nil? %>
                 <div class="homepagePostSubmit">
-                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请选择分组作业关联的项目' %>
+                  <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => homework_common.id,:is_in_course=>is_in_course,:user_activity_id=>-1,:course_activity=>-1),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %>
                   <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %>
                 </div>
             <% elsif works.nil? %>
@@ -95,16 +97,26 @@
       <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
+      <div class="mt5">
+        <div class="homepagePostDeadline">
+          匿评开启时间：<%= homework_common.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        </div>
+        <div class="homepagePostDeadline ml15">
+          匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        </div>
+      </div>
+      <div class="cl"></div>
       <div>
         <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
         <div class="cl"></div>
       </div>
-      <% if homework_common.homework_type == 3 && !homework_common.student_work_projects.empty?  && homework_common.homework_detail_group.base_on_project == 1 %>
+      <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
           <div class="mt10">
+            <% projects = homework_common.student_work_projects.where("is_leader = 1") %>
             <div class="fl mr5 fontGrey3">
-              已关联项目：
+              已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
             </div>
-            <% homework_common.student_work_projects.where("is_leader = 1").each do |pro| %>
+            <% projects.each do |pro| %>
                 <% project = Project.find pro.project_id %>
                 <script type="text/javascript">
                     $(document).ready(function(){
@@ -123,7 +135,7 @@
                   <% end %>
                   <div class="relatePInfo" id="relatePInfo_<%=project.id %>">
                     项目名称：<%=project.name %><br />
-                    创建者：<%=(User.find project.user_id).show_name %><br />
+                    创建者：<%=(User.find project.user_id).show_name %>(组长)<br />
                     <% time=project.updated_on %>
                     <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %>
                     更新时间：<%=time_from_now time %>