-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+ <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
<%= @member_score.user.name %> 历次作业积分
- 作业名称得分 diff --git a/app/views/courses/show_member_score.js.erb b/app/views/courses/show_member_score.js.erb index fe8d52a2b..87e728901 100644 --- a/app/views/courses/show_member_score.js.erb +++ b/app/views/courses/show_member_score.js.erb @@ -1,3 +1,13 @@ +//$('#ajax-modal').html('<%#= escape_javascript(render :partial => 'courses/show_member_score', :locals => {:member => @member_score}) %>'); +//showModal('ajax-modal', '400px'); +//$('#ajax-modal').addClass('new-watcher'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'courses/show_member_score', :locals => {:member => @member_score}) %>'); showModal('ajax-modal', '400px'); -$('#ajax-modal').addClass('new-watcher'); +//$('#ajax-modal').css('height','569px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + +"
");
+//$('#ajax-modal').parent().removeClass();
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
+$('#ajax-modal').parent().addClass("new-watcher");
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 396db3ddd..0ab5de88b 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -51,6 +51,11 @@ function edit_group(id,url,course_id,group_id)
}
);
}
+
+function hidden_homework_score_form()
+{
+ hideModal($("#user_score"));
+}
///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////新建课程相关
//验证课程名称
From 83796bfaa0aa48d68c95a04383dc51da0a58afd7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 11:18:22 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89puts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/show.html.erb | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 44318c389..ae1be35e3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -104,7 +104,6 @@
- <% puts 11111111111111 %>
<%= user_jour_feed_back_url e %>
From 09c51d1a87a885f5f105d992a13daecd2c8f7fe9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 11:44:52 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=9C=AA=E5=90=AF=E7=94=A8=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=89=80=E6=9C=89=E4=BD=9C=E4=B8=9A=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E7=9C=8B=E4=B8=8D=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/bids_controller.rb | 2 +-
db/schema.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index ec83fbd19..b1cca68ed 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -793,7 +793,7 @@ class BidsController < ApplicationController
@bid.is_evaluation = params[:bid][:is_evaluation]
@bid.proportion = params[:bid][:proportion]
@bid.evaluation_num = params[:bid][:evaluation_num]
- @bid.open_anonymous_evaluation = params[:bid][:open_anonymous_evaluation]
+ params[:bid][:open_anonymous_evaluation] ? @bid.open_anonymous_evaluation = 1 : @bid.open_anonymous_evaluation = 0
@bid.reward_type = 3
# @bid.budget = params[:bid][:budget]
@bid.deadline = params[:bid][:deadline]
diff --git a/db/schema.rb b/db/schema.rb
index f9ade5aa4..63063305f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150409092151) do
+ActiveRecord::Schema.define(:version => 20150415032102) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -1459,7 +1459,7 @@ ActiveRecord::Schema.define(:version => 20150409092151) do
t.string "file_path"
t.integer "pack_times", :default => 1
t.integer "pack_size", :default => 0
- t.string "file_digests"
+ t.text "file_digests"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
From 92eabdbecd7db137f17d4bdcd24b3214c3e0a83a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 11:49:48 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A?=
=?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...20150422034543_change_bid_open_anonymous_evaluation.rb | 8 ++++++++
db/schema.rb | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 db/migrate/20150422034543_change_bid_open_anonymous_evaluation.rb
diff --git a/db/migrate/20150422034543_change_bid_open_anonymous_evaluation.rb b/db/migrate/20150422034543_change_bid_open_anonymous_evaluation.rb
new file mode 100644
index 000000000..e31ad67be
--- /dev/null
+++ b/db/migrate/20150422034543_change_bid_open_anonymous_evaluation.rb
@@ -0,0 +1,8 @@
+class ChangeBidOpenAnonymousEvaluation < ActiveRecord::Migration
+ def chang
+ Bid.where("open_anonymous_evaluation IS NULL").each do |bid|
+ bid.open_anonymous_evaluation = 0
+ bid.save
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 63063305f..ecba4ba96 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150415032102) do
+ActiveRecord::Schema.define(:version => 20150422034543) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false