Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/student_work_controller.rb

@@ -42,9 +42,6 @@ class StudentWorkController < ApplicationController
 
         end
       end
-
-   
-
     
     render :json => resultObj
   end
@@ -165,24 +162,23 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
-      stundet_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
-      stundet_work ||= StudentWork.new
-      stundet_work.name = params[:student_work][:name]
-      stundet_work.description = params[:student_work][:description]
-      stundet_work.project_id = params[:student_work][:project_id]
-      stundet_work.homework_common_id = @homework.id
-      stundet_work.user_id = User.current.id
-      stundet_work.save_attachments(params[:attachments])
+      student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
+      student_work ||= StudentWork.new
+      student_work.name = params[:student_work][:name]
+      student_work.description = params[:student_work][:description]
+      student_work.project_id = params[:student_work][:project_id]
+      student_work.homework_common_id = @homework.id
+      student_work.user_id = User.current.id
+      student_work.save_attachments(params[:attachments])
       if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
-        stundet_work.late_penalty = @homework.late_penalty
+        student_work.late_penalty = @homework.late_penalty
         else
-        stundet_work.late_penalty = 0
+        student_work.late_penalty = 0
       end
-      render_attachment_warning_if_needed(stundet_work)
-      if stundet_work.save
-        if @homework.homework_type == 2 && @homework.homework_detail_programing       #编程作业，学生提交作品后计算系统得分
-         
-        end
+      render_attachment_warning_if_needed(student_work)
+
+      if student_work.save
+
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -624,7 +620,7 @@ class StudentWorkController < ApplicationController
   end
 
   def find_or_save_student_work(is_test)
-    student_work = @homework.student_works.where(user_id: User.current.id).first
+    student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
     if student_work.nil?
       @homework.student_works.build(
         name: params[:title],
@@ -633,6 +629,7 @@ class StudentWorkController < ApplicationController
         is_test: is_test
         )
       unless @homework.save
+        logger.debug @homework.errors.full_messages
       else
         student_work = @homework.student_works.where(user_id: User.current.id).first
       end

app/controllers/users_controller.rb

@@ -300,6 +300,7 @@ class UsersController < ApplicationController
       @page = params[:page] ? params[:page].to_i + 1 : 0
       user_course_ids =  @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
       @homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
+      @is_teacher = User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)
       respond_to do |format|
         format.js
         format.html {render :layout => 'new_base_user'}
@@ -367,8 +368,15 @@ class UsersController < ApplicationController
   end
 
   def user_commit_homework
-    flash[:notice] = l(:notice_successful_create)
-    redirect_to student_work_index_url(:homework => params[:homework])
+    homework = HomeworkCommon.find(params[:homework])
+    student_work = homework.student_works.where(user_id: User.current.id).first
+    if student_work
+      student_work.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to student_work_index_url(:homework => params[:homework])
+    else 
+      render_403
+    end
   end
 
   def user_new_homework

app/helpers/application_helper.rb

@@ -2359,7 +2359,7 @@ module ApplicationHelper
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
         if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "修改作品",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
           link_to "作品已交",  student_work_index_path(:homework => homework.id),:class => 'c_blue',:title => "编程作业不可修改作品"
         else

app/models/homework_common.rb

@@ -56,6 +56,10 @@ class HomeworkCommon < ActiveRecord::Base
     Mailer.run.homework_added(self)
   end
 
+  def is_program_homework?
+    self.homework_type == 2 && self.homework_detail_programing
+  end
+
   delegate :language_name, :to => :homework_detail_programing
 
 end

app/models/student_work.rb

@@ -10,10 +10,32 @@ class StudentWork < ActiveRecord::Base
   has_many :student_work_tests, order: 'id desc'
 
   before_destroy :delete_praise
+  before_save :set_program_score, :set_src
 
   acts_as_attachable
 
   def delete_praise
     PraiseTread.where("praise_tread_object_id = #{self.id} AND praise_tread_object_type = 'StudentWork'").destroy_all
   end
+
+  def last_test
+    student_work_tests.order('id desc').first
+  end
+
+  private 
+  def set_program_score
+    if homework_common.is_program_homework?       #编程作业，学生提交作品后计算系统得分
+        #根据最后一次测试计算得分
+        unless last_test
+          self.system_score = 0
+        else
+          self.system_score = last_test.test_score
+        end
+    end
+
+  end
+  def set_src
+    self.description = last_test.src if last_test
+  end
+
 end

app/models/student_work_test.rb

@@ -34,10 +34,19 @@ class StudentWorkTest < ActiveRecord::Base
 
   def test_score
     if self.status.to_i == 0
-      format("%.1f",100.0 / self.student_work.homework_common.homework_tests.count)
-    else
+      100
+    elsif self.results.empty?
       0
+    else 
+      get_success_count * 100 / self.results.count
     end
   end
 
+  private
+  def get_success_count
+    self.results.inject(0) do |sum, result|
+      sum += (result["status"].to_i == 0 ? 1 : 0)
+    end || 0
+  end
+
 end

app/views/admin/latest_login_users.html.erb

@@ -70,18 +70,20 @@
                 <%=link_to(user.login, user_path(user)) %>
               </td>
               <td align="center">
-                <% case user.user_extensions.identity %>
-                <% when 0 %>
-                <%='老师' %>
-                <% when 1 %>
-                <%='学生' %>
-                <% when 2 %>
-                <%='企业' %>
-                <% when 3 %>
-                <%='开发者' %>
-                <% else %>
-                <%='未知身份' %>
-                <% end %>
+                <%if user.user_extensions%>
+                    <% case user.user_extensions.identity %>
+                    <% when 0 %>
+                        <%='老师' %>
+                    <% when 1 %>
+                        <%='学生' %>
+                    <% when 2 %>
+                        <%='企业' %>
+                    <% when 3 %>
+                        <%='开发者' %>
+                    <% else %>
+                        <%='未知身份' %>
+                    <% end %>
+                <% end%>
               </td>
             </tr>
         <% end %>

app/views/student_work/edit.html.erb

@@ -1,54 +1,62 @@
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">编辑作品</div>
+</div>
+<div class="cl"></div>
+
 <div class="HomeWork" id="RSide">
-  <div class="RightBanner">
-    <div class="NewsBannerName">编辑作品</div>
-  </div>
-  <div class="Newwork">
-    <div class="hwork_ctt">
-      <div class="hwork_dis" id="tbc_01">
-        <%= labelled_form_for @work,:html => { :multipart => true }  do |f|%>
-            <div class="N_con">
-              <p>
-                <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <input type="text" name="student_work[name]" id="student_work_name" class="bo  fl" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
-                <a href="javascript:void(0)" class="fl ml10 mt3"  onclick="show_project();" >项目信息
-                  <img class="ml5 " src="/images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
-                </a>
-              <div class="cl"></div>
-              <p id="student_work_name_span" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-
-              <p id="about_project" class="about_project" style="<%= @work.project.nil? ? '' : 'display:block;'%>">
-                <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"}  %>
-              </p>
-              <div class="cl"></div>
-
-              <p>
-                <label class="fl">
-                  <span class="c_red">*</span>
-                  &nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
-                </label>
-                <textarea  name="student_work[description]" placeholder="最多3000个汉字(或6000个英文字符)" id="student_work_description"  class="w620 hwork_txt"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
-              <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
-              </p>
-              <div class="cl"></div>
-              <p>
-                <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>
-              </p>
-              <div class="cl"></div>
-              <p class="ml80 ">
-                <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
-                <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
-              <div class="cl"></div>
-              </p>
-            </div><!---创建作业内容结束-->
-        <% end%>
 
+  <div class="HomeWorkBox">
+    <div class="">
+      <div class="homepagePostTitle fl">
+        <%= @homework.name%>（作业名称）
+      </div>
+      <span class="fr c_grey">
+        截止时间：<%= @homework.end_time%>
+      </span>
+      <div class="cl"></div>
+      <a href="javascript:void(0);" class="c_blue">
+        <%= link_to @homework.user.show_name, user_activities_path(@homework.user_id), :class => "c_blue"%>
+      </a>
+      <div class="cl"></div>
+      <div class="HomeWorkP">
+        <%= @homework.description.html_safe %>
       </div>
     </div>
-  </div>
-</div><!--新建作业结束-->
-<div class="cl"></div>
+  </div><!----HomeWorkBox end-->
+  <div class="cl"></div>
+
+  <div class="HomeWorkCon mt15">
+    <%= labelled_form_for @work,:html => { :multipart => true }   do |f|%>
+        <div class=" c_red mb10">
+          提示：作品名称和描述中不要出现真实的姓名信息
+        </div>
+        <div class="cl"></div>
+
+        <div>
+          <input type="text" name="student_work[name]" id="student_work_name" placeholder="请简洁的概括作品的功能或特性" class="InputBox  W700" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
+          <div class="cl"></div>
+          <p id="student_work_name_span" class="c_red mb10"></p>
+        </div>
+        <div class="mt10">
+          <textarea  name="student_work[description]" id="student_work_description" placeholder="请介绍你的作品"  class="InputBox  W700 H150"  maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
+          <script>
+              var text = document.getElementById("student_work_description");
+              autoTextarea(text);// 调用
+          </script>
+          <div class="cl"></div>
+          <p id="student_work_description_textarea" class="c_red mb10"></p>
+        </div>
+
+        <div id="homework_attachments">
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @work, :has_program=>false} %>
+        </div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="edit_student_work(<%= @work.id%>);">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <%= link_to "取消",  student_work_index_path(:homework => @homework), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+    <% end%>
+  </div><!----HomeWorkCon end-->
 </div>

app/views/student_work/new.html.erb

@@ -1,8 +1,4 @@
-<% content_for :header_tags do %>
-   <%= javascript_include_tag 'homework','baiduTemplate' %>
-<% end %>
-
-<% if @homework.homework_type == 1 %>
+<!-- 此界面只用来新建匿评作业作品 -->
 <script type="text/javascript">
   <%if @homework.homework_type == 1 && @homework.homework_detail_manual.comment_status != 1%>
     $(function(){
@@ -17,191 +13,71 @@
     });
   <% end%>
 </script>
-    <div class="HomeWork" id="RSide">
-      <div class="RightBanner">
-        <div class="NewsBannerName">提交作品</div>
+
+<div class="homepageRightBanner mb10">
+  <div class="NewsBannerName">提交作品</div>
+</div>
+<div class="cl"></div>
+
+<div class="HomeWork" id="RSide">
+
+  <div class="HomeWorkBox">
+    <div class="">
+      <div class="homepagePostTitle fl">
+        <%= @homework.name%>（作业名称）
       </div>
-      <div class="Newwork">
-        <div class="hwork_ctt">
-          <div class="hwork_dis" id="tbc_01">
-            <%= form_for(@student_work,
-                         :html => { :multipart => true },
-                         :url => {:controller => 'student_work',
-                                  :action => 'create',
-                                  :homework => @homework.id
-                         }) do |f|%>
-                <div class="N_con">
-                  <% if @homework.homework_type == 1%>
-                      <div class=" c_red mb10 ml90">
-                        提示：匿评作业提交的作品，作品名称和描述中不能出现真实的姓名信息
-                      </div>
-                  <% end%>
-                  <p>
-                    <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                    <%= f.text_field "name", :required => true, :size => 60, :class => "bo  fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %>
-                    <% if @homework.homework_type != 2%>
-                        <a href="javascript:void(0)" class="fl ml10 mt3"  onclick=" $('#about_project').slideToggle();" >
-                          项目信息
-                          <img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15"  Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
-                        </a>
-                    <% end%>
-                    <div class="cl"></div>
-                    <p id="student_work_name_span" class="c_red ml90 mb10"></p>
-                    </p>
-                    <div class="cl"></div>
-                    <p id="about_project" class="about_project" >
-                      <label class="fl">&nbsp;&nbsp;&nbsp;选择项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                      <%= f.select :project_id,options_for_select(user_projects_option), {},{:class => "bo02 mb10"}  %>
-                    </p>
-                    <div class="cl"></div>
-                    <p>
-                      <label class="fl">
-                        <span class="c_red">*</span>&nbsp;
-                        <%= @homework.homework_type == 2 ? "提交代码" : "作品描述"%>
-                        &nbsp;&nbsp;&nbsp;：
-                      </label>
-                      <% if @homework.homework_type == 2 && @homework.homework_detail_programing%>
-                          <%= f.text_area "description", :class => "w620 hwork_txt h400", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();", :value => @homework.homework_detail_programing.language == "1" ? c_stantard_code_student : c_stantard_code_student_%>
-                      <% else %>
-                          <%= f.text_area "description", :class => "w620 hwork_txt", :placeholder => "作品描述不能为空", :onkeyup => "regexStudentWorkDescription();"%>
-                      <% end%>
-                    <div class="cl"></div>
-                    <p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
-                    </p>
-                    <div class="cl"></div>
-                    <% if @homework.homework_type != 2%>
-                        <p>
-                          <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
-                          <%= render :partial => 'attachments/new_form' %>
-                        </p>
-                        <div class="cl"></div>
-                    <% end%>
-                    <p class="ml80 ">
-                      <a href="javascript:void(0)" class="blue_btn fl c_white mt10" onclick="new_student_work();">提交作品</a>
-                      <%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white mt10 ml10"%>
-                    <div class="cl"></div>
-                    </p>
-                    </div><!---创建作业内容结束-->
-            <% end%>
-          </div>
-        </div>
-      </div><!--新建作业结束-->
+      <span class="fr c_grey">
+        截止时间：<%= @homework.end_time%>
+      </span>
       <div class="cl"></div>
-    </div>
-
-<% else %>
-
-
-<!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
-<script id="t:result-list" type="text/html">
-    <div class="ProResultTop">
-      <p class="c_blue fl">第<!=index!>次测试</p><span class="fr c_grey"><!= time !></span>
+      <a href="javascript:void(0);" class="c_blue">
+        <%= link_to @homework.user.show_name, user_activities_path(@homework.user_id), :class => "c_blue"%>
+      </a>
       <div class="cl"></div>
-    </div>
-
-    <! if(status == -2){!>
-      <div class="ProResultCon "><!= error_msg !></div>
-    <!}else{!>
-      <div class="ProResultTable " >
-        <ul class="ProResultUl " >
-          <! for(var i =0; i <results.length; ++i){ !>
-            <li ><span class="w60 T_C">测试<!=i+1!></span>
-            <! if(results[i]["status"]!=0){ !>
-              <span class="w150 c_red">测试错误！</span>
-              <span class="w60">您的输出：</span>
-              <span class="W200"><!=results[i]["result"]!></span>
-              <span class="w60">正确输出：</span>
-              <span  class="W200"><!=results[i]["output"]!></span>
-              <div class="cl"></div>
-            </li>
-            <!}else{!>
-              <span class="w150 c_green">测试正确！</span>
-              <div class="cl"></div>
-            </li>
-            <!}!>
-          <!}!>
-       </ul>
+      <div class="HomeWorkP">
+        <%= @homework.description.html_safe %>
       </div>
-    <! } !>
+    </div>
+  </div><!----HomeWorkBox end-->
+  <div class="cl"></div>
 
-</script>
-<!-- 模板1结束 -->
-
-
-      <div class="HomeWork" id="RSide">
-        <div class="RightBanner">
-          <div class="NewsBannerName">提交作品</div>
+  <div class="HomeWorkCon mt15">
+    <%= form_for(@student_work,
+                 :html => { :multipart => true },
+                 :url => {:controller => 'student_work',
+                          :action => 'create',
+                          :homework => @homework.id
+                 }) do |f|%>
+        <div class=" c_red mb10">
+          提示：作品名称和描述中不要出现真实的姓名信息
         </div>
-        <div class="HomeWorkBox">
-          <div class="">
-              <div class="homepagePostTitle fl"><%= @homework.name %></div><span class="fr c_grey">截止时间：<%= @homework.end_time %></span>
-                <div class="cl"></div>
-                <a href="javascript:void(0);" class="c_blue"><%= @homework.user.show_name %></a>
-                <p class="HomeWorkP"><%= @homework.description %> <br />
-输入  2 1 1 4 4 2 3 6 5 <br />
-输出  15<br />
-                 </p>
-            </div>
-            <p class="c_grey mt15">注：迟交扣<span class="c_red">2</span>分，缺评一个作品扣<span class="c_red">2</span>分</p>
-        </div><!---HomeWorkBox end  -->
-        <div class="HomeWorkCon">
-        <%= form_for(@student_work,
-                   :html => { :multipart => true },
-                   :url => {:controller => 'student_work',
-                            :action => 'create',
-                            :student_work_id => @student_work.id,
-                            :homework => @homework.id
-                   },
-                   :method => :post) do |f|%>
+        <div class="cl"></div>
 
-          <div class="mt15">
-            <span>请使用 <%= @homework.language_name %> 语言编写</span>
-            </div>
-          <div class="mt10">
-              <%= f.text_area :name, id: 'program-title', class:"InputBox  W700", placeholder:"请概括你的代码的功能" %>
-            </div>
-            <div class="mt10">
-            <%= f.text_area :description, id: 'program-src', class:"  W700 H150", placeholder:"请贴入你的代码", rows: 10 %>
-            </div>
-            <div class="mt10">
-              <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
-                <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
-                <div class="cl"></div>
-            </div>
-        <% end %>
-        </div><!----HomeWorkCon end-->
-      </div><!----HomeWork end-->
-      <div class="ProResult mt10">
-        <% @student_work.student_work_tests.each_with_index do |test, index| %>
-          <div class="ProResultTop">
-             <p class="c_blue fl">第<%= @student_work.student_work_tests.count - index%>次测试</p><span class="fr c_grey"><%= test.created_at.to_s(:db) %></span>
-               <div class="cl"></div>
-          </div>
-          <% if test.status.to_i == -2 %>
-            <div class="ProResultCon "><%= test.results.first %></div>
-          <% else %>
-            <div class="ProResultTable " >
-              <ul class="ProResultUl " >
-                <% test.results.each_with_index do |x, i| %>
-                  <li ><span class="w60 T_C">测试<%=i+1%></span>
-                  <% if x["status"].to_i != 0 %>
-                    <span class="w150 c_red">测试错误！</span>
-                    <span class="w60">您的输出：</span>
-                    <span class="W200"><%=x["result"]%></span>
-                    <span class="w60">正确输出：</span>
-                    <span  class="W200"><%=x["output"]%></span>
-                    <div class="cl"></div>
-                  </li>
-                  <% else %>
-                    <span class="w150 c_green">测试正确！</span>
-                    <div class="cl"></div>
-                  </li>
-                  <% end %>
-                <% end %>
-             </ul>
-            </div>
-          <% end %>
-        <% end %>
-      </div><!----ProResult end-->
+        <div>
+          <%= f.text_field "name", :required => true, :size => 60, :class => "InputBox  W700", :maxlength => 200, :placeholder => "请简洁的概括作品的功能或特性", :onkeyup => "regexStudentWorkName();" %>
+          <div class="cl"></div>
+          <p id="student_work_name_span" class="c_red mb10"></p>
+        </div>
+        <div class="mt10">
+          <%= f.text_area "description", :class => "InputBox  W700 H150", :placeholder => "请介绍你的作品", :onkeyup => "regexStudentWorkDescription();"%>
+          <script>
+              var text = document.getElementById("student_work_description");
+              autoTextarea(text);// 调用
+          </script>
+          <div class="cl"></div>
+          <p id="student_work_description_textarea" class="c_red mb10"></p>
+        </div>
 
-<% end %>
+        <div id="homework_attachments">
+          <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @student_work, :has_program=>false} %>
+        </div>
+
+        <div class="mt5">
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="new_student_work();">确定</a>
+          <span class="fr mr10 mt3">或</span>
+          <%= link_to "取消",  user_homeworks_user_path(User.current.id), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+    <% end%>
+  </div><!----HomeWorkCon end-->
+</div>

app/views/users/_user_homework_form.html.erb

@@ -45,7 +45,7 @@
 
 
     <div class="mt5">
-      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick=" submit_comm_homework('new_homework_common');">发送</a>
+      <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
       <span class="fr mr10 mt3">或</span>
       <a href="javascript:void(0);" class=" fr mr10 mt3" onclick="reset_homework();">取消</a>
       <div class="cl"></div>
@@ -89,7 +89,7 @@
                   </select>
             </div>
             <div class="mt10">
-              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
+              <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" id="textarea_input_test"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出"></textarea>
               <a href="javascript:void(0);" class=" fl icon_add" title="增加测试组"></a>
                 <div class="cl"></div>
             </div>

app/views/users/_user_homework_list.html.erb

@@ -35,8 +35,8 @@
             <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
             <div class="cl"></div>
           </div>
-          <%# if is_teacher%>
-          <% if false%>
+          <% if is_teacher%>
+          <%# if false%>
               <div class="homepagePostSetting">
                 <ul>
                   <li class="homepagePostSettingIcon">

app/views/users/user_homeworks.html.erb

@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 
-<% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
+<% if @is_teacher%>
     <!-- 老师身份才可以发布作业 -->
     <div class="HomeWork mb10">
       <% homework = HomeworkCommon.new %>

db/schema.rb

@@ -236,13 +236,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
-  create_table "code_review_user_settings", :force => true do |t|
-    t.integer  "user_id",           :default => 0, :null => false
-    t.integer  "mail_notification", :default => 0, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -1163,18 +1156,18 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                                                   :null => false
-    t.text     "content",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",                          :default => 0
+    t.integer  "replies_count",      :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",                                   :default => false
-    t.boolean  "sticky",                                 :default => false
-    t.boolean  "is_quote",                               :default => false
-    t.datetime "created_at",                                                :null => false
-    t.datetime "updated_at",                                                :null => false
-    t.integer  "viewed_count_crawl",                     :default => 0
-    t.integer  "viewed_count_local",                     :default => 0
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1199,19 +1192,6 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
-  create_table "rich_rich_files", :force => true do |t|
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
-    t.string   "rich_file_file_name"
-    t.string   "rich_file_content_type"
-    t.integer  "rich_file_file_size"
-    t.datetime "rich_file_updated_at"
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.text     "uri_cache"
-    t.string   "simplified_type",        :default => "file"
-  end
-
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1263,11 +1243,10 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.integer  "project_id"
     t.integer  "user_id"
-    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1430,8 +1409,8 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1499,6 +1478,9 @@ ActiveRecord::Schema.define(:version => 20150907152238) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|

public/javascripts/homework.js

@@ -99,30 +99,7 @@ $(function(){
     $('#program-src').focus(function(){
         $(this).css('height', '100px');
     });
-    var isProgramHomework = function(){
-        return !$(".advanced_option").is(":hidden");
-    }
-
-    var submit_comm_homework = function(id){
-        var valid = true;
-        if (isProgramHomework()) {
-            $.each($('.advanced_option textarea.InputBox'), function(i, val){
-                if ($(val).val().length<=0) {
-                    $(val).focus();
-                    valid = false;
-                    return false;
-                }
-            });
-            if (valid) {
-                $('input[name=homework_type]').val(2);
-            };
-        }
-        if (valid) {
-            submit_homework(id);    
-        }
-    }
-    window.submit_comm_homework = submit_comm_homework;
-
+    
     var datepickerOptions={dateFormat:'yy-mm-dd',firstDay:0,showWeek:true,showOtherMonths:true,selectOtherMonths:true};
 
     $('input.date-input').datepicker(datepickerOptions);
@@ -143,6 +120,7 @@ $(function(){
         $("a.CloseBtn").on('click', function(){
             $("#BluePopupBox" ).dialog("close");
         });
+        $('#textarea_input_test').focus();
 
         $("#BluePopupBox a.BlueCirBtn").on('click', function(){
             var test_numbers = 0;
@@ -180,8 +158,7 @@ $(function(){
                 var html=bt('t:program-input-list',data);
                 $("input[name=homework_type]").after(html);
                 $("#BluePopupBox" ).dialog( "close" );    
-            };
-
+            }
         });
     });
 

public/javascripts/new_user.js

@@ -177,4 +177,75 @@ function regexStudentWorkDescription()
         $("#student_work_description_textarea").text("");
         return true;
     }
-}
+}
+
+//textarea自适应高度 纯js写的 有浏览器判断
+/**
+ * 文本框根据输入内容自适应高度
+ * @param                {HTMLElement}        输入框元素
+ * @param                {Number}                设置光标与输入框保持的距离(默认0)
+ * @param                {Number}                设置最大高度(可选)
+ */
+var autoTextarea = function (elem, extra, maxHeight) {
+    extra = extra || 0;
+    var isFirefox = !!document.getBoxObjectFor || 'mozInnerScreenX' in window,
+        isOpera = !!window.opera && !!window.opera.toString().indexOf('Opera'),
+        addEvent = function (type, callback) {
+            elem.addEventListener ?
+                elem.addEventListener(type, callback, false) :
+                elem.attachEvent('on' + type, callback);
+        },
+        getStyle = elem.currentStyle ? function (name) {
+            var val = elem.currentStyle[name];
+
+            if (name === 'height' && val.search(/px/i) !== 1) {
+                var rect = elem.getBoundingClientRect();
+                return rect.bottom - rect.top -
+                    parseFloat(getStyle('paddingTop')) -
+                    parseFloat(getStyle('paddingBottom')) + 'px';
+            };
+
+            return val;
+        } : function (name) {
+            return getComputedStyle(elem, null)[name];
+        },
+        minHeight = parseFloat(getStyle('height'));
+
+
+    elem.style.resize = 'none';
+
+    var change = function () {
+        var scrollTop, height,
+            padding = 0,
+            style = elem.style;
+
+        if (elem._length === elem.value.length) return;
+        elem._length = elem.value.length;
+
+        if (!isFirefox && !isOpera) {
+            padding = parseInt(getStyle('paddingTop')) + parseInt(getStyle('paddingBottom'));
+        };
+        scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
+
+        elem.style.height = minHeight + 'px';
+        if (elem.scrollHeight > minHeight) {
+            if (maxHeight && elem.scrollHeight > maxHeight) {
+                height = maxHeight - padding;
+                style.overflowY = 'auto';
+            } else {
+                height = elem.scrollHeight - padding;
+                style.overflowY = 'hidden';
+            };
+            style.height = height + extra + 'px';
+            scrollTop += parseInt(style.height) - elem.currHeight;
+            document.body.scrollTop = scrollTop;
+            document.documentElement.scrollTop = scrollTop;
+            elem.currHeight = parseInt(style.height);
+        };
+    };
+
+    addEvent('propertychange', change);
+    addEvent('input', change);
+    addEvent('focus', change);
+    change();
+};

public/stylesheets/new_user.css

@@ -497,8 +497,8 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
-.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
-.homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;}
+.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon2.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
+.homepageMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
 .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
@@ -895,6 +895,8 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .HomeWorkBox{ background:#f6f6f6; padding:10px; margin:10px 0;}
 .c_grey{ color:#888888;}
 .HomeWorkP{ width:690px; font-size:14px;}
+.HomeWorkP p{background-color: transparent !important;}
+.HomeWorkP div{background-color: transparent !important;}
 .H150{ height:150px;}
 .ProResult{width:748px; background-color:#fff;  border:1px solid #dddddd;border-bottom:none; }
 .ProResultTop{ height:38px; line-height:38px; border-bottom:1px solid #dddddd; background:#f2f2f2; padding:0 10px;}
@@ -903,10 +905,11 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .W200{ width:200px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
-.SearchIcon{background:url(../images/homepage_icon.png) 676px -393px no-repeat; }
-.SearchIcon:hover{background:url(../images/homepage_icon.png) 676px -419px no-repeat; }
-a.link_file{ background:url(../images/course/pic_file.png) 0 2px no-repeat; padding-left:20px; }
-a:hover.link_file{ background:url(../images/course/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+.SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }
+.SearchIcon:hover{background:url(../images/homepage_icon2.png) 676px -419px no-repeat; }
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
 a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;}
 .ProResultUl span { display:block; float:left;}
@@ -1001,7 +1004,7 @@ blockquote {
 }
 
 /* 创建作品 work */
-.Newwork{ width:668px; height:418px;}
+.Newwork{ width:668px;}
 .N_top{ float:right; margin-left:390px; }
 .N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; }
 .N_con p{ }