From 8358140c87d14a232aad9d97cc1c28ac7c9df750 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Jan 2016 17:02:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E7=89=88=E6=9C=AC=E5=AD=97=E4=BD=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3a0808bdd..9f516ae1a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -51,7 +51,7 @@ module ApplicationHelper
 
   def link_to_user_version(version, options = {})
     return '' unless version && version.is_a?(Version)
-    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => " f16 fb c_dblue "
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue"
   end
 
   # 判断课程是否为精品课程

From 265359cd74c7253e22379ca7e11fd9de25d1bef8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Jan 2016 18:17:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_homework_type_notice.html.erb      |  13 +++
 app/views/users/_user_group_attr.html.erb     |   2 +-
 .../users/_user_homework_attachment.html.erb  |  10 +-
 app/views/users/_user_homework_form.html.erb  |  14 ++-
 .../users/_user_journalsformessage.html.erb   |   2 +-
 public/images/hwork_icon.png                  | Bin 10436 -> 10537 bytes
 public/javascripts/homework.js                | 104 +++++++++++++++---
 public/stylesheets/new_user.css               |   4 +
 public/stylesheets/public.css                 |   4 +
 9 files changed, 127 insertions(+), 26 deletions(-)
 create mode 100644 app/views/users/_homework_type_notice.html.erb

diff --git a/app/views/users/_homework_type_notice.html.erb b/app/views/users/_homework_type_notice.html.erb
new file mode 100644
index 000000000..4dda65e49
--- /dev/null
+++ b/app/views/users/_homework_type_notice.html.erb
@@ -0,0 +1,13 @@
+<a href="javascript:void(0);" class="CloseBtn" title="关闭弹框"></a>
+<div class="ni_con">
+  <p id="switch_homework_type_notice" class="fontGrey">
+  </p>
+  <div class="ni_btn">
+    <a href="javascript:" class="tijiao" id="switch_type" style="margin-bottom: 20px;" >
+      继&nbsp;&nbsp;续
+    </a>
+    <a href="javascript:" class="tijiao" id="cancel_switch" style="margin-bottom: 20px;">
+      取&nbsp;&nbsp;消
+    </a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index a815d85e7..48c303a29 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -16,7 +16,7 @@
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>
 </div>
 <div class="courseSendSubmit">
-  <a href="javascript:void(0);" class="group_btn sendSourceText">确定</a>
+  <a href="javascript:void(0);" class="group_save_btn sendSourceText">确定</a>
 </div>
 <div class="courseSendCancel">
   <a href="javascript:void(0);" class="sendSourceText linkGrey6" id="cancel_group">取消</a>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 5f4cb4a8e..673cee0e1 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -72,11 +72,15 @@
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
   <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
   <% if defined?(has_program) && has_program %>
-    <a href="javascript:void(0);" class="ProBtn fl mt3" title="请设置编程语言和输入测试集">编程</a>
-    <span class="fl C_lgrey mt3 program_detail_info mr15"></span>
+    <div id="program_setting" class="fl">
+        <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>
+        <span class="fl C_lgrey mt3 program_detail_info mr15"></span>
+    </div>
   <% end %>
   <% if defined?(has_group) && has_group %>
-    <a href="javascript:void(0);" class="groupBtn fl mt3" title="请设置分组作业的相关参数">分组</a>
+    <div id="group_setting" class="fl">
+        <a href="javascript:void(0);" class="groupBtn fl mt3" title="请设置分组作业的相关参数">分组</a>
+    </div>
   <% end %>
 </div>
 
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 4082854da..cc7e4bb8e 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -9,9 +9,11 @@
         } else {
             $("#anonymous_comment").attr('checked',false);
         }
-        $("#BluePopupBox a.BlueCirBtn").click();
+        <% if edit_mode && homework.is_program_homework? %>
+            $("#BluePopupBox a.BlueCirBtn").click();
+        <% end %>
         <% if edit_mode && homework.is_group_homework? %>
-            $("#GroupPopupBox a.group_btn").click();
+            $("#GroupPopupBox a.group_save_btn").click();
         <% end %>
       });
       function checked_val() {
@@ -141,4 +143,10 @@
 
 <div class="BluePopupBox" style="display:none;" id="GroupPopupBox">
   <%= render :partial => 'users/user_group_attr', :locals => {:edit_mode => edit_mode, :homework=>homework}%>
-</div>
\ No newline at end of file
+</div>
+
+<% unless edit_mode %>
+    <div class="BluePopupBox" style="display:none;" id="NoticePopupBox">
+      <%= render :partial => 'users/homework_type_notice', :locals => {:edit_mode => edit_mode, :homework=>homework}%>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index d7247621a..b377f445c 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -42,7 +42,7 @@
       <% if activity.user == User.current || User.current.admin?%>
           <div class="homepagePostSetting">
             <ul>
-              <li class="homepagePostSettingIcon">
+              <li class="<%= activity.private == 1 ? 'whiteSettingIcon' : 'homepagePostSettingIcon' %>">
                 <ul class="homepagePostSettiongText">
                   <li>
                     <%= link_to(l(:label_bid_respond_delete),
diff --git a/public/images/hwork_icon.png b/public/images/hwork_icon.png
index 8ae87460fd13f21c15c187d31792b29d6d0ae6dd..f531c3d4c4c2881b535f5eabf341d5c071102b70 100644
GIT binary patch
delta 9339
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
z%0D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
Ml2ef_l{WGJe@gv?-2eap

delta 9295
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

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index bd2b967e4..f652d0ce8 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -106,7 +106,46 @@ $(function(){
     $('a.pic_date').on('click', function(){
         $(this).parent().prev().first().focus();
     })
-    
+
+    $("#NoticePopupBox").dialog({
+        modal: true,
+        autoOpen: false,
+        dialogClass: 'BluePopupBox',
+        minWidth: 500
+    });
+    $('#NoticePopupBox').parent().resizable("disable");
+    $('#NoticePopupBox').parent().removeClass("ui-state-disabled");
+    $('#NoticePopupBox').parent().css("border","3px solid #269ac9").css("padding","10px");
+    $('a#switch_type').live('click', function(){
+        if($("input[name=homework_type]").val() == "3"){
+            $("#NoticePopupBox" ).dialog("close");
+            $("input[name=homework_type]").val(1);
+            $('span.group_detail_info').text('');
+            $("#group_setting a").removeClass("fontBlue2");
+            $("#BluePopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.CloseBtn").on('click', function(){
+                $("#BluePopupBox" ).dialog("close");
+            });
+            $('#textarea_input_test').focus();
+        } else if($("input[name=homework_type]").val() == "2") {
+            $("#NoticePopupBox" ).dialog("close");
+            $("input[name=homework_type]").val(1);
+            $('span.program_detail_info').text("");
+            $("span.program_detail_info").removeClass("fontBlue2");
+            $("#program_setting a").removeClass("fontBlue2");
+            $("#GroupPopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.popClose").on('click', function(){
+                $("#GroupPopupBox" ).dialog("close");
+            });
+            $("#cancel_group").on('click', function(){
+                $("#GroupPopupBox" ).dialog("close");
+            });
+            $('#min_num').focus();
+        }
+    });
+
 
     $("#BluePopupBox").dialog({
             modal: true,
@@ -120,12 +159,25 @@ $(function(){
     $('#BluePopupBox').parent().css("position","fixed");
 
     $('a.ProBtn').live('click', function(){
-        $("#BluePopupBox").dialog("open");
-        $(".ui-dialog-titlebar").hide();
-        $("a.CloseBtn").on('click', function(){
-            $("#BluePopupBox" ).dialog("close");
-        });
-        $('#textarea_input_test').focus();
+        if($("input[name=homework_type]").val() == "3"){
+            $("#NoticePopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.CloseBtn").on('click', function(){
+                $("#NoticePopupBox" ).dialog("close");
+            });
+            $("#cancel_switch").on('click', function(){
+                $("#NoticePopupBox" ).dialog("close");
+            });
+            $("#switch_homework_type_notice").text("您的作业类型将改为“分组作业”，并且您的编程设置将被清除。请问是否继续？");
+        }
+        else {
+            $("#BluePopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.CloseBtn").on('click', function(){
+                $("#BluePopupBox" ).dialog("close");
+            });
+            $('#textarea_input_test').focus();
+        }
     });
 
     var saveProgramAnswers = function() {
@@ -162,7 +214,9 @@ $(function(){
 
         if (valid) {
             $("input[name=homework_type]").val(2);
-            $('span.program_detail_info').text('('+language+'，'+test_numbers/2+'组测试)');
+            $('span.program_detail_info').text('('+language+'语言，'+test_numbers/2+'组测试)');
+            $("span.program_detail_info").addClass("fontBlue2");
+            $("#program_setting a").addClass("fontBlue2");
             //保存js值
             var data = {
                 language_type: $('select.language_type').val(),
@@ -213,15 +267,28 @@ $(function(){
     $('#GroupPopupBox').parent().css("border","3px solid #269ac9").css("padding","10px");
 
     $('a.groupBtn').live('click', function(){
-        $("#GroupPopupBox").dialog("open");
-        $(".ui-dialog-titlebar").hide();
-        $("a.popClose").on('click', function(){
-            $("#GroupPopupBox" ).dialog("close");
-        });
-        $("#cancel_group").on('click', function(){
-            $("#GroupPopupBox" ).dialog("close");
-        });
-        $('#min_num').focus();
+        if($("input[name=homework_type]").val() == "2"){
+            $("#NoticePopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.CloseBtn").on('click', function(){
+                $("#NoticePopupBox" ).dialog("close");
+            });
+            $("#cancel_switch").on('click', function(){
+                $("#NoticePopupBox" ).dialog("close");
+            });
+            $("#switch_homework_type_notice").text("您的作业类型将改为“编程作业”，并且您的分组设置将被清除。请问是否继续？");
+        }
+        else {
+            $("#GroupPopupBox").dialog("open");
+            $(".ui-dialog-titlebar").hide();
+            $("a.popClose").on('click', function () {
+                $("#GroupPopupBox").dialog("close");
+            });
+            $("#cancel_group").on('click', function () {
+                $("#GroupPopupBox").dialog("close");
+            });
+            $('#min_num').focus();
+        }
     });
 
     var saveGroupAttr = function() {
@@ -245,6 +312,7 @@ $(function(){
         if (valid) {
             $("input[name=homework_type]").val(3);
             $('span.group_detail_info').text('分组人数：'+min+'-'+max+' 人');
+            $("#group_setting a").addClass("fontBlue2");
             //保存js值
             var data = {
                 base_on_project: base_on_project,
@@ -259,7 +327,7 @@ $(function(){
         return valid;
     };
 
-    $("#GroupPopupBox a.group_btn").live('click', function(){
+    $("#GroupPopupBox a.group_save_btn").live('click', function(){
         if(saveGroupAttr()){
             if($( "#GroupPopupBox" ).dialog( "isOpen" )){
                 $("#GroupPopupBox").dialog( "close" );
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d31c1ee0c..62987c167 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -195,6 +195,7 @@ a.c_green{ color:#28be6c;}
 .fontBlue {color:#3498db;}
 a.underline {text-decoration:underline;}
 a.fontBlue {color:#297fb8;}
+.fontBlue2 {color:#269ac9 !important;}
 a.fontGrey {color:#cecece;}
 a.fontGrey2 {color:#888888;}
 a.linkOrange {color:#ff7143;}
@@ -1456,3 +1457,6 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
 .popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
 .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;}
+
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index be9d51799..0eb1cf112 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -225,6 +225,7 @@ a.c_green{ color:#28be6c;}
 .fontGrey3 {color:#484848;}
 .fontGrey4{color:#999999;}
 .fontBlue {color:#3498db;}
+.fontBlue2 {color:#269ac9 !important;}
 a.underline {text-decoration:underline;}
 a.fontBlue {color:#297fb8;}
 a.fontGrey {color:#cecece;}
@@ -1040,3 +1041,6 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectContent {color:#888888; line-height:18px; font-size:12px;}
 .popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
 .subjectContent p,.subjectContent div,.subjectContent em, .subjectContent span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important; color:#888888 !important; font-size:12px !important;}
+
+.whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
+.whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}

From 82fb50ccd207d03c990d1f20fecbabe058dde3e8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Jan 2016 19:22:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/member.rb                                     | 9 +++++++--
 app/views/courses/_show_member_score.html.erb            | 2 +-
 app/views/homework_common/_homework_search_form.html.erb | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/models/member.rb b/app/models/member.rb
index ed7ee81e6..413fedc07 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("IF(final_score is null,null,final_score - absence_penalty - late_penalty) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,12 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").sum(:final_score).try(:round, 2).to_f
+    sql_select = "SELECT (SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))) as score
+          FROM student_works,homework_commons
+          WHERE student_works.homework_common_id = homework_commons.id
+          AND homework_commons.course_id = #{self.course_id}
+          AND student_works.user_id = #{self.user_id}"
+    score = StudentWork.find_by_sql(sql_select)
   end
 
   protected
diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb
index 2d08e853e..612f408d7 100644
--- a/app/views/courses/_show_member_score.html.erb
+++ b/app/views/courses/_show_member_score.html.erb
@@ -28,7 +28,7 @@
               </span>
             </li>
        <% end %>
-      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= @member_score.student_work_score_sum %></span></li>
+      <li><span class="c_blue03 w280">作业积分（总分）</span><span class="c_red w70"><%= (@member_score.student_work_score_sum).first.score %></span></li>
     </ul>
 
   </div>
diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb
index aa3eef59e..f71cec9a5 100644
--- a/app/views/homework_common/_homework_search_form.html.erb
+++ b/app/views/homework_common/_homework_search_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
               :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
-    <input type="text" name="search" placeholder="输入作业关键词进行搜索" class="searchResource" />
+    <input type="text" name="search" placeholder="输入作业名称进行搜索" class="searchResource" />
     <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
     <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
 <% end %>
\ No newline at end of file

From 1b5cdbe62861f3023ad9a7cdf7046580a7dd4fd2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Jan 2016 19:41:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E7=9A=84=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E2=80=9D=E8=BF=94=E5=9B=9E403=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E2=80=9C=E4=BD=9C=E4=B8=9A=E2=80=9D=E4=B9=9F?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E8=BF=94=E5=9B=9E403?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 398b385a4..a891d3354 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -344,7 +344,7 @@ class HomeworkCommonController < ApplicationController
 
   #当前用户是不是课程的成员
   def member_of_course
-    render_403 unless @course.is_public || User.current.member_of_course?(@course) || User.current.admin?
+    render_403 unless @course.is_public==1 || User.current.member_of_course?(@course) || User.current.admin?
   end
 
   def get_assigned_homeworks(student_works, n, index)