From 97f9d4fa60ea0ea1934fc7c988e2797a3bf69e20 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 10 Sep 2015 10:26:16 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=99=E5=B8=88?= =?UTF-8?q?=E8=8A=82=E7=A5=9D=E7=A6=8F=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 + app/views/users/show.html.erb | 66 +++++++++++------------ public/images/TeachersDay.jpg | Bin 0 -> 34823 bytes public/stylesheets/new_user.css | 5 +- 4 files changed, 38 insertions(+), 35 deletions(-) create mode 100644 public/images/TeachersDay.jpg diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index ae8fd774e..3ab40d101 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -27,6 +27,8 @@
+
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 13f2518e1..aab715b16 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,41 +1,41 @@ -
+
最新动态
    -
  • -
      -
    • -
        -
      • 课程动态
        • -
      • <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> -
        • -
      • <%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%> - -
      • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%> -
      • <%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> - - -
      -
      • -
    • -
        -
      • 项目动态
        • -
      • <%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> -
      • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> - -
      -
      • -
    • -
        -
      • 更多
        • -
      • <%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%> -
      • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%> -
      -
      • +
    • +
        +
      • +
          +
        • 课程动态
          • +
        • <%= link_to "作业动态", {:controller => "users", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> +
          • +
        • <%= link_to "通知动态", {:controller => "users", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%> + +
        • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%> +
        • <%= link_to "问卷动态", {:controller => "users", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> + + +
        +
        • +
      • +
          +
        • 项目动态
          • +
        • <%= link_to "问题动态", {:controller => "users", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%> +
        • <%= link_to "论坛动态", {:controller => "users", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%> + +
        +
        • +
      • +
          +
        • 更多
          • +
        • <%= link_to "我的动态", {:controller => "users", :action => "show", :type => "current_user"}, :class =>"homepagePostTypeAll postTypeGrey"%> +
        • <%= link_to "全部动态", {:controller => "users", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
      -
+ + +
<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> diff --git a/public/images/TeachersDay.jpg b/public/images/TeachersDay.jpg new file mode 100644 index 0000000000000000000000000000000000000000..036a6f7299e301b3b7796e7ab8aa0d2ca336204a GIT binary patch literal 34823 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 fgDea#T+l&eXQ5rOxxqsjjQ&)sXx literal 0 HcmV?d00001 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 0515da364..b6e1919f2 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -465,8 +465,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- /*.navHomepageProfile ul li ul {display:none;} .navHomepageProfile ul li:hover ul {display:block;}*/ .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;} -.homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;} -.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;} +.homepageRight {width:750px; float:left; margin-top:10px; margin-bottom:10px;} +.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px; padding:15px;} .homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;} .homepagePortraitImage:hover {border:1px solid #269ac9;} .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;} @@ -505,6 +505,7 @@ 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;} .homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;} +.homepageRightBannerImg{width:1000px; margin:0px auto; height: 60px; margin-top: 10px; background:url(../images/TeachersDay.jpg)} .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} From fce5405c419d717a200c72e7e381350164876fc7 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 10 Sep 2015 14:44:25 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 ++-- public/stylesheets/new_user.css | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 4af5742a9..949fb7f83 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -5,7 +5,7 @@

- +

@@ -34,7 +34,7 @@
- <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w720",:value => "请选择发布作业的课程"} %> + <%= select_tag :course_id, options_for_select(get_as_teacher_courses(User.current), homework.course_id), {:class => "InputBox w709",:value => "请选择发布作业的课程"} %>

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index b6e1919f2..a37123d76 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -856,6 +856,8 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;} .w708{width: 708px;} .w712{width:712px;max-width:712px;min-width: 712px;} .w720{width:721px;} +.w709{width: 709px;} +.w701{width: 701px;} a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;} a.FilesBtn{ background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} From 93b179c95893952342fbf9f4fe81f14d15fde491 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 10 Sep 2015 17:11:16 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 251 ++++++++---------- app/controllers/users_controller.rb | 13 + app/views/homework_common/edit.html.erb | 43 ++- app/views/users/_user_homework_form.html.erb | 16 +- public/stylesheets/new_user.css | 1 + 5 files changed, 158 insertions(+), 166 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 2e9925916..862e6c80e 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController require 'json' require "base64" layout "base_courses" + include StudentWorkHelper before_filter :find_course, :only => [:index,:new,:create,:next_step] before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy] before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment] @@ -18,151 +19,125 @@ class HomeworkCommonController < ApplicationController end end + #新建作业，在个人作业列表创建作业 def new - @homework_type = "1" - - @homework = HomeworkCommon.new - @homework.safe_attributes = params[:homework_common] - @homework.late_penalty = 2 - @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 = 2 - @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 - - #新建作业下一步 - def next_step - @homework_type = params[:homework_common_type] - - @homework = HomeworkCommon.new - @homework.safe_attributes = params[:homework_common] - @homework.late_penalty = 2 - @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 = 2 - @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 + render_404 + # @homework_type = "1" + # + # @homework = HomeworkCommon.new + # @homework.safe_attributes = params[:homework_common] + # @homework.late_penalty = 2 + # @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 = 2 + # @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 + #新建作业，在个人作业列表创建作业 def create - if params[:homework_common] - homework = HomeworkCommon.new - homework.name = params[:homework_common][:name] - homework.description = params[:homework_common][:description] - homework.end_time = params[:homework_common][:end_time] - homework.publish_time = params[:homework_common][:publish_time] - homework.homework_type = params[:homework_common][:homework_type] - homework.late_penalty = params[:late_penalty] - homework.user_id = User.current.id - homework.course_id = @course.id - - homework.save_attachments(params[:attachments]) - render_attachment_warning_if_needed(homework) - - if homework.homework_type == 2 - homework_detail_programing = HomeworkDetailPrograming.new - homework_detail_programing.language = params[:language] - homework_detail_programing.standard_code = params[:standard_code] - homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6 - question = {title:homework.name,content:homework.description} - question[:input] = [] - question[:output] = [] - if params[:input] && params[:output] && params[:result] - params[:input].each do |k,v| - if params[:output].include? k - homework_test = HomeworkTest.new - homework_test.input = v - homework_test.output = params[:output][k] - homework_test.result = params[:result][k] - homework_test.error_msg = params[:error_msg] - homework.homework_tests << homework_test - question[:input] << homework_test.input - question[:output] << homework_test.output - end - end - end - - # uri = URI('http://192.168.80.21:8080/api/questions.json') - # body = question.to_json - # res = Net::HTTP.new(uri.host, uri.port).start do |client| - # request = Net::HTTP::Post.new(uri.path) - # request.body = body - # request["Content-Type"] = "application/json" - # client.request(request) - # end - # result = JSON.parse(res.body) - # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0 - - homework.homework_detail_programing = homework_detail_programing - else - #匿评作业相关属性 - homework_detail_manual = HomeworkDetailManual.new - homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6 - homework_detail_manual.comment_status = 1 - homework_detail_manual.evaluation_start = params[:evaluation_start] - homework_detail_manual.evaluation_end = params[:evaluation_end] - homework_detail_manual.evaluation_num = params[:evaluation_num] - homework_detail_manual.absence_penalty = params[:absence_penalty] - homework.homework_detail_manual = homework_detail_manual - end - - if homework.save - homework_detail_programing.save if homework_detail_programing - homework_detail_manual.save if homework_detail_manual - respond_to do |format| - format.html { - flash[:notice] = l(:notice_successful_create) - redirect_to homework_common_index_path(:course => @course.id) - } - end - return - end - end - - respond_to do |format| - format.html { - flash[:notice] = l(:notice_failed_create) - redirect_to new_homework_common_path(:course => @course.id) - } - end + redirect_to user_homeworks_user_path(User.current.id) + # if params[:homework_common] + # homework = HomeworkCommon.new + # homework.name = params[:homework_common][:name] + # homework.description = params[:homework_common][:description] + # homework.end_time = params[:homework_common][:end_time] + # homework.publish_time = params[:homework_common][:publish_time] + # homework.homework_type = params[:homework_common][:homework_type] + # homework.late_penalty = params[:late_penalty] + # homework.user_id = User.current.id + # homework.course_id = @course.id + # + # homework.save_attachments(params[:attachments]) + # render_attachment_warning_if_needed(homework) + # + # if homework.homework_type == 2 + # homework_detail_programing = HomeworkDetailPrograming.new + # homework_detail_programing.language = params[:language] + # homework_detail_programing.standard_code = params[:standard_code] + # homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6 + # question = {title:homework.name,content:homework.description} + # question[:input] = [] + # question[:output] = [] + # if params[:input] && params[:output] && params[:result] + # params[:input].each do |k,v| + # if params[:output].include? k + # homework_test = HomeworkTest.new + # homework_test.input = v + # homework_test.output = params[:output][k] + # homework_test.result = params[:result][k] + # homework_test.error_msg = params[:error_msg] + # homework.homework_tests << homework_test + # question[:input] << homework_test.input + # question[:output] << homework_test.output + # end + # end + # end + # + # # uri = URI('http://192.168.80.21:8080/api/questions.json') + # # body = question.to_json + # # res = Net::HTTP.new(uri.host, uri.port).start do |client| + # # request = Net::HTTP::Post.new(uri.path) + # # request.body = body + # # request["Content-Type"] = "application/json" + # # client.request(request) + # # end + # # result = JSON.parse(res.body) + # # homework_detail_programing.question_id = result["id"] if result["status"] && result["status"] == 0 + # + # homework.homework_detail_programing = homework_detail_programing + # else + # #匿评作业相关属性 + # homework_detail_manual = HomeworkDetailManual.new + # homework_detail_manual.ta_proportion = params[:ta_proportion] || 0.6 + # homework_detail_manual.comment_status = 1 + # homework_detail_manual.evaluation_start = params[:evaluation_start] + # homework_detail_manual.evaluation_end = params[:evaluation_end] + # homework_detail_manual.evaluation_num = params[:evaluation_num] + # homework_detail_manual.absence_penalty = params[:absence_penalty] + # homework.homework_detail_manual = homework_detail_manual + # end + # + # if homework.save + # homework_detail_programing.save if homework_detail_programing + # homework_detail_manual.save if homework_detail_manual + # respond_to do |format| + # format.html { + # flash[:notice] = l(:notice_successful_create) + # redirect_to homework_common_index_path(:course => @course.id) + # } + # end + # return + # end + # end + # + # respond_to do |format| + # format.html { + # flash[:notice] = l(:notice_failed_create) + # redirect_to new_homework_common_path(:course => @course.id) + # } + # end end def edit + @user = User.current respond_to do |format| - format.html + format.html{render :layout => 'new_base_user'} end end @@ -284,7 +259,7 @@ class HomeworkCommonController < ApplicationController def destroy if @homework.destroy respond_to do |format| - format.html {redirect_to homework_common_index_path(:course => @course.id)} + format.html {redirect_to user_homeworks_user_path(User.current.id)} end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9b2d49f2d..088271e86 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -367,6 +367,19 @@ class UsersController < ApplicationController end end + #修改编程作业 + def edit_user_commit_homework + if User.current.logged? + + respond_to do |format| + format.js + format.html {render :layout => 'new_base_user'} + end + else + render_403 + end + end + def user_commit_homework homework = HomeworkCommon.find(params[:homework]) student_work = homework.student_works.where(user_id: User.current.id).first diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index 5b65b5982..d6815a00a 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -1,24 +1,23 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -<%= error_messages_for 'homework_common' %> - -
-

- <%= l(:label_course_homework_edit)%> -

+ +
+
编辑作业
-
- <%if @homework.homework_type == 2%> - <%= form_for @homework do |f| %> - <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %> - 提交 - <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%> - <% end%> - <% else %> - <%= form_for @homework do |f| %> - <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %> - 提交 - <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%> - <% end%> - <% end%> -
+ + +
+ <%= form_for @homework do |f| %> +
+ <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %> +
+ <% end%> +
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 949fb7f83..dfb48ef95 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -11,17 +11,16 @@
- <%= link_to "导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true%> + <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
- + <%= calendar_for('homework_end_time')%> -

-