<% if @memo.parent.nil? && @memo.children.first.nil? %>
- <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%>
+ <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%>
<% else %>
- <%= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%>
+ <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%>
<% end %>
<% if User.current.admin?%>
From 857110d537a324db91e1f75db9db6db3a6a3d592 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 11:54:01 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=EF=BC=8C?=
=?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/_student_work.html.erb | 21 +++++++++++--------
.../student_work/_student_work_title.html.erb | 17 ++++++++-------
public/stylesheets/courses.css | 4 +++-
public/stylesheets/public.css | 2 ++
4 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index e39cb130d..22df921ec 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -11,14 +11,17 @@
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
-
- <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
+
+ 06-01
-
- <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
+
+ <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
-
- <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
+
+ <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+
+
+ <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
<% unless student_work.student_score.nil?%>
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
@@ -27,12 +30,12 @@
现共有
<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>
名学生进行了匿评，平均分为
- <%= format("%.2f",student_work.student_score)%> 分。
+ <%= format("%.1f",student_work.student_score)%> 分。
<% end%>
-
Date: Fri, 19 Jun 2015 13:59:02 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE--=E7=89=88=E6=9C=AC=E5=BA=93--=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=20404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/repositories_controller.rb | 2 +-
.../settings/_new_repositories.html.erb | 3 +--
.../projects/settings/_repositories.html.erb | 26 ++++++-------------
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index d0af82c8c..ffa3fb4aa 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -227,7 +227,7 @@ update
elsif request.get?
respond_to do |format|
format.html{
- render :layout => "project_base"
+ render :layout => "base_projects"
}
end
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 6e0d74849..ca771a487 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -33,8 +33,7 @@
<% if repository.scm_name=="Git"%>
<%if User.current.allowed_to?(:manage_repository, @project) %>
- <%= link_to(l(:label_user_plural), committers_repository_path(repository)
- ) %>
+ <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
<% end %>
<% end %>
|
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index 3d9d71a56..6c340f47c 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -27,25 +27,15 @@
<% end %>
- <% if repository.scm_name=="Subversion"%>
- <%if User.current.allowed_to?(:manage_repository, @project) %>
- <%= link_to(l(:label_user_plural), committers_repository_path(repository),
- :class => 'icon icon-user') %>
- <%= link_to(l(:button_edit), edit_repository_path(repository),
- :class => 'icon icon-edit') %>
- <%= delete_link repository_path(repository) %>
- <% end %>
- <% elsif repository.scm_name=="Git"%>
- <%if User.current.allowed_to?(:manage_repository, @project) %>
-
- <%= link_to(l(:label_user_plural), committers_repository_path(repository),
- :class => 'icon icon-user') %>
- <% if repository.login.to_s==User.current.login.to_s %>
- <%= delete_link repository_path(repository) %>
- <% end %>
- <% end %>
- <% end %>
+ <%= link_to(l(:label_user_plural), committers_repository_path(repository), :class => 'icon icon-user') %>
+ <% if repository.login.to_s==User.current.login.to_s %>
+ <%= delete_link repository_path(repository) %>
+ <% end %>
+ <% end %>
|
<% end %>
From fa3b216e0f1ad020e0f1384523fe7f15e5cfeed4 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 19 Jun 2015 14:02:58 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E8=B2=8C=E4=BC=BC=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=B8=8D=E4=BC=9A=E6=9B=B4=E6=96=B0=E7=BC=93?=
=?UTF-8?q?=E5=AD=98=20=E8=BF=98=E6=98=AF=E5=85=88=E4=B8=8D=E7=94=A8?=
=?UTF-8?q?=E7=BC=93=E5=AD=98=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 524bde9d7..210ac8f3d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -695,12 +695,13 @@ class CoursesController < ApplicationController
# 显示老师和助教的活动
# @authors = searchTeacherAndAssistant(@course)
@authors = course_all_member(@course)
- Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
+ #TODO 貌似删除操作不会更新缓存 还是先不用缓存吧
+ # Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
events = []
- key = "course_events_#{@course.id}".to_sym
- if Rails.env.production? && Setting.course_cahce_enabled?
- events = Rails.cache.read(key) || []
- end
+ # key = "course_events_#{@course.id}".to_sym
+ # if Rails.env.production? && Setting.course_cahce_enabled?
+ # events = Rails.cache.read(key) || []
+ # end
if events.empty?
@authors.each do |author|
@activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
@@ -716,7 +717,7 @@ class CoursesController < ApplicationController
events += @activity.events(@days, @course.created_at, :is_public => 1)
end
end
- Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
+ # Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
end
else
# @author = @course.teacher
From e05a66e8fdd29abc39e93bf84a28bd811449408f Mon Sep 17 00:00:00 2001
From: huang
Date: Fri, 19 Jun 2015 14:10:08 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=BA=93=E6=9F=A5=E7=9C=8B=E4=BF=AE=E8=AE=A2404=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/repositories_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ffa3fb4aa..607c9b5db 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -376,7 +376,7 @@ update
def revision
respond_to do |format|
- format.html{render :layout => 'project_base'}
+ format.html{render :layout => 'base_projects'}
format.js {render :layout => false}
end
end
From b6ff494b562188ffc35404cf4ffd1707bd8addb6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:20:00 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=BC=BA=E8=AF=84=EF=BC=9B=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_work_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index c8cbde626..af2a25f1d 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -243,7 +243,7 @@ class StudentWorkController < ApplicationController
(SELECT COUNT(*) FROM `student_works_evaluation_distributions` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS all_count,
(SELECT COUNT(*) FROM `student_works_scores` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS has_count
FROM `student_works`
- WHERE homework_common_id = 213
+ WHERE homework_common_id = #{@homework.id}
) AS table_1
ORDER BY absence #{order}")
@order = order == "desc" ? "asc" : "desc"
From 044370b95814f06a297efbbfe0be1d6710b6e8c9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:21:36 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../20150619060110_homework_common_time.rb | 19 +++++++++++++++++++
db/schema.rb | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 db/migrate/20150619060110_homework_common_time.rb
diff --git a/db/migrate/20150619060110_homework_common_time.rb b/db/migrate/20150619060110_homework_common_time.rb
new file mode 100644
index 000000000..c574ad93c
--- /dev/null
+++ b/db/migrate/20150619060110_homework_common_time.rb
@@ -0,0 +1,19 @@
+class HomeworkCommonTime < ActiveRecord::Migration
+ def up
+ count = StudentWork.all.count / 100 + 1
+ transaction do
+ for i in 1 ... count do i
+ StudentWork.page(i).per(100).each do |homework|
+ old_homework = HomeworkAttach.where(:user_id => homework.user_id, :name => homework.name, :description => homework.description).first
+ if old_homework
+ homework.update_column('created_at', old_homework.created_at)
+ end
+ end
+ end
+ puts i.to_s
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 68f00c1cd..420432355 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 => 20150604153000) do
+ActiveRecord::Schema.define(:version => 20150619060110) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
From 44a49af68b030a019464d346b366b8207b02588e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:30:43 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/_student_work_title.html.erb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 982eb34d8..9e50ed72d 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -8,7 +8,10 @@
作品名称
- 时间
+ <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
+ <% if @show_all && @order == "created_at"%>
+
+ <% end%>
<%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
From 489f62edb7992a5207a26da2cb7086cd0f4b1658 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 19 Jun 2015 14:49:18 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B8=96=E5=AD=90?=
=?UTF-8?q?=E4=B9=9F=E8=A6=81=E6=9B=B4=E6=96=B0=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/trustie/cache/clear_course_event.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/trustie/cache/clear_course_event.rb b/lib/trustie/cache/clear_course_event.rb
index a5f44bf45..cc643020d 100644
--- a/lib/trustie/cache/clear_course_event.rb
+++ b/lib/trustie/cache/clear_course_event.rb
@@ -6,6 +6,7 @@ module Trustie
def self.included(base)
base.class_eval{
after_create :clear_course_events
+ after_destroy :clear_course_events
}
end
From 881854a2f00cd5cb039c2e7a98ec58b19bfa958f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:50:46 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=A7=93=E5=90=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_work_controller.rb | 12 ++++++++++--
app/views/student_work/_student_work_title.html.erb | 5 ++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index af2a25f1d..d14382ae8 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -14,13 +14,21 @@ class StudentWorkController < ApplicationController
@show_all = @is_teacher || @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3
if @show_all
if @homework.homework_type == 1 || @is_teacher || User.current.admin?
- @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+ if @order == "name"
+ @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+ else
+ @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+ end
else
my_work = @homework.student_works.where(:user_id => User.current.id)
if my_work.empty?
@stundet_works = []
else
- @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+ if @order == "name"
+ @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+ else
+ @stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
+ end
end
end
else #学生
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 9e50ed72d..2a3a5e124 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -2,7 +2,10 @@
学号
- 姓名
+ <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
+ <% if @show_all && @order == "name"%>
+
+ <% end%>
作品名称
From e1cf19baacb1047c116f8d3cd9e11bc2825b8957 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 19 Jun 2015 14:51:39 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 210ac8f3d..3b25438df 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -695,13 +695,11 @@ class CoursesController < ApplicationController
# 显示老师和助教的活动
# @authors = searchTeacherAndAssistant(@course)
@authors = course_all_member(@course)
- #TODO 貌似删除操作不会更新缓存 还是先不用缓存吧
- # Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
events = []
- # key = "course_events_#{@course.id}".to_sym
- # if Rails.env.production? && Setting.course_cahce_enabled?
- # events = Rails.cache.read(key) || []
- # end
+ key = "course_events_#{@course.id}".to_sym
+ if Rails.env.production? && Setting.course_cahce_enabled?
+ events = Rails.cache.read(key) || []
+ end
if events.empty?
@authors.each do |author|
@activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
@@ -717,7 +715,7 @@ class CoursesController < ApplicationController
events += @activity.events(@days, @course.created_at, :is_public => 1)
end
end
- # Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
+ Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
end
else
# @author = @course.teacher
From a72bbee503594fa1cd60e53c0c8cf2b4bee80244 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 14:59:28 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8C=89=E5=90=8D=E5=AD=97=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_work_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d14382ae8..3ca836773 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -15,7 +15,7 @@ class StudentWorkController < ApplicationController
if @show_all
if @homework.homework_type == 1 || @is_teacher || User.current.admin?
if @order == "name"
- @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+ @stundet_works = search_homework_member @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
else
@stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
end
@@ -25,7 +25,7 @@ class StudentWorkController < ApplicationController
@stundet_works = []
else
if @order == "name"
- @stundet_works = @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}")
+ @stundet_works = search_homework_member @homework.student_works.joins(:user).order("users.lastname #{@b_sort}, users.firstname #{@b_sort}"),@name
else
@stundet_works = search_homework_member @homework.student_works.order("#{@order} #{@b_sort}"),@name
end