Merge branch 'develop' into szzh

Conflicts:
	app/views/my/account.html.erb

app/controllers/courses_controller.rb

@@ -604,7 +604,7 @@ class CoursesController < ApplicationController
 
   def toggleCourse
     @course_prefs = Course.find_by_extra(@course.extra)
-    unless (@course_prefs.student != User.current || User.current.admin?)
+    unless (User.current.allowed_to?(:as_teacher,@course_prefs) || User.current.admin?)
       render_403
     end
   end

app/controllers/homework_common_controller.rb

@@ -18,31 +18,31 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    # @homework_type = "1"
-    #
-    # @homework = HomeworkCommon.new
-    # @homework.safe_attributes = params[:homework_common]
-    # @homework.late_penalty = 0
-    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-    #
-    # if @homework_type == "1"
-    #   #匿评作业相关属性
-    #   @homework_detail_manual = HomeworkDetailManual.new
-    #   @homework_detail_manual.ta_proportion = 0.6
-    #   @homework_detail_manual.absence_penalty = 0
-    #   @homework_detail_manual.evaluation_num = 3
-    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    #   @homework.homework_detail_manual = @homework_detail_manual
-    # elsif @homework_type == "2"
-    #   #编程作业相关属性
-    #   @homework_detail_programing = HomeworkDetailPrograming.new
-    #   @homework.homework_detail_programing = @homework_detail_programing
-    # end
-    # respond_to do |format|
-    #   format.html
-    # end
+    @homework_type = "1"
+
+    @homework = HomeworkCommon.new
+    @homework.safe_attributes = params[:homework_common]
+    @homework.late_penalty = 0
+    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+
+    if @homework_type == "1"
+      #匿评作业相关属性
+      @homework_detail_manual = HomeworkDetailManual.new
+      @homework_detail_manual.ta_proportion = 0.6
+      @homework_detail_manual.absence_penalty = 0
+      @homework_detail_manual.evaluation_num = 3
+      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+      @homework.homework_detail_manual = @homework_detail_manual
+    elsif @homework_type == "2"
+      #编程作业相关属性
+      @homework_detail_programing = HomeworkDetailPrograming.new
+      @homework.homework_detail_programing = @homework_detail_programing
+    end
+    respond_to do |format|
+      format.html
+    end
   end
 
   #新建作业下一步

app/views/courses/_new_groups_name.html.erb

@@ -31,7 +31,7 @@
             <% if @canShowCode%>
                 <%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, :id => 'update_group_'+group.id.to_s) do %>
                     <span id="edit_group_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l">
-                      <input type="text" id="group_name_<%= group.id%>" name="group_name" size="20" class="isTxt w90 f_l"  maxlength="100" />
+                      <input type="text" id="group_name_<%= group.id%>" name="group_name" size="20" class="isTxt w90 f_l"  maxlength="20" />
                       <input type="button" class="submit f_l" onclick="edit_group('group_name_<%= group.id%>','<%= valid_ajax_course_path%>','<%= @course.id%>','<%= group.id%>');"/>
                     </span>
                 <% end %>
@@ -47,7 +47,7 @@
       <li >
         <span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l">
         <%= form_tag( addgroups_course_path(@course),  method: 'get',:remote=>true,:id => 'add_group_name') do %>
-              <input type="text" id="group_name" name="group_name" size="20" class="isTxt w90 f_l"  maxlength="100" />
+              <input type="text" id="group_name" name="group_name" size="20" class="isTxt w90 f_l"  maxlength="20" />
               <input type="button" class="submit f_l" onclick="add_group('<%= valid_ajax_course_path%>','<%= @course.id%>');"/>
        <% end %>
        </span>

app/views/homework_common/index.html.erb

@@ -71,18 +71,30 @@
               <% end%>
               </tbody>
             </table>
-        <% end%>
-        <div class="cl"></div>
+            <div class="cl"></div>
 
-        <div class="mt5">
-          <% unless homework.attachments.empty?%>
+            <div class="mt5">
+              <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
+              <div class="fl">
+                <% if homework.homework_detail_programing.language.to_i == 1%>
+                    C
+                <% elsif homework.homework_detail_programing.language.to_i == 2%>
+                    C++
+                <% end%>
+              </div>
+            </div>
+            <div class="cl"></div>
+        <% end%>
+
+        <% unless homework.attachments.empty?%>
+            <div class="mt5">
               <span class="tit_fb"  style="width: auto;"> 附件：</span>
               <div class="fl mb5">
                 <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework.attachments} %>
               </div>
-          <% end%>
-        </div>
-        <div class="cl"></div>
+            </div>
+            <div class="cl"></div>
+        <% end%>
 
         <div class="mt5">
           <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>

app/views/homework_common/new.html.erb

@@ -1,27 +1,17 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
   <h2 class="project_h2">
     <%= l(:label_course_homework_new)%>
   </h2>
 </div>
-<div class="hwork_new" id="hwork_new">
-  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
-      <input type="hidden" name="course" value="<%= @course.id%>">
-      <h3 class="c_blue f16 mb10">
-        请选择将要发布的作业类型
-      </h3>
-      <input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/>
-      <span class="ml5 fl">
-          人工评分的作业（支持匿名互评、灵活设置评分比例）
-      </span>
-      <div class="cl"></div>
-      <input type="radio" class="mb20 fl" name="homework_common_type" value="2" id="homework_detail_programing_radio"/>
-      <span class="ml5 fl">
-          自动评测的编程作业（支持C/C++程序的自动评分）
-      </span>
-      <div class="cl"></div>
-      <a href="javascript:void(0);" class=" orange_btn" onclick="$(this).parent().submit();">
-        下一步
-      </a>
+<div class="hwork_new">
+  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+      <%= hidden_field_tag "course",@course.id%>
+      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
+      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
+      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
   <% end%>
 </div><!--hwork_new end-->
 <div class="cl"></div>

app/views/layouts/_base_header.html.erb

@@ -34,7 +34,7 @@
 		</li>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
 			<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
-                       { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user },
+                       {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user},
                        {:class => 'my-message'} if User.current.logged?%>
 		</li>
 	</ul>

app/views/student_work/index.html.erb

@@ -139,6 +139,14 @@
         <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
             <table class="border_ce" cellpadding="0" cellspacing="0">
               <tbody>
+              <tr class="<%= cycle("", "b_grey") %>">
+                <td  class="td_tit">
+                  输入
+                </td>
+                <td  class="td_tit">
+                  输出
+                </td>
+              </tr>
               <% @homework.homework_tests.each do |test|%>
                   <tr class="<%= cycle("", "b_grey") %>">
                     <td  class="td_tit">
@@ -151,8 +159,20 @@
               <% end%>
               </tbody>
             </table>
+            <div class="cl"></div>
+
+            <div class="mt5">
+              <span class="tit_fb"  style="width: auto;"> 开发语言：</span>
+              <div class="fl">
+                <% if @homework.homework_detail_programing.language.to_i == 1%>
+                    C
+                <% elsif @homework.homework_detail_programing.language.to_i == 2%>
+                    C++
+                <% end%>
+              </div>
+            </div>
+            <div class="cl"></div>
         <% end%>
-        <div class="cl"></div>
 
         <div class="mt5">
           <% unless @homework.attachments.empty?%>