}d
z&aNNdt}K)1rq-*f%e-M^emy+Exong3`_|>Nc-0MWc?UL{7+Tc}zy!11F1_$*AIJz%
z(w8{@C@L#Dh&p@Mxz9JR`>Nd&$%|4KJFV^%9@914;%lGyD#EFCWXBzwjltum`|zE9
zv+Ha<7$>{qk{&4B?>lo)CiPjLnGWXz$yCR}-T;oh4I^yonrAyq74M_AhEr}q0}6HD
z?(~^_khXjLqC7i;zcJt1GdsfK)5Kwuj5WoId$GU;`;BRA4}o*u1h>xkO-S*O@x
z0&!+W^%g`)`MrvPi|ML9{=Ta|I}&0MQl#Y2=*A%ZvX)Y5f9V%@`c|)oA9%8PZ)aYU
zPpwb)$aq7TPyfN=`Mw43=F&c@*=h`2+y9hvb)A0o*hUWSfC5%Z;+*P0yltLc|d7acu1&+6rm$rfwg)qxk5VXV>VJ
z&fd>a7TPTtxZ$CgZI}3@jmzFk)RcZH({Mv>i+4M#h(kwaIoj!MP`;=F;9VE-L+g!P
z8+*NSje^TOz4KDLpzCxF;;HvZLWQ%^xRPL3(mq(R{Mr-3X`1`;_ht8(b6F5Cxxbiu
zlw2BcVuQ5BF}BZqtB&@3(WjlPRT=(_y**Rm9KDG0{Roh>YkE=%Q81FZQx8PUDb9(H~j2&E7?{3HxIFs5P!{Szo)oG
zo*OR?K87)S0^pI4Io1m`Tga|a8xvH`OB=ntr!y(>ag1pbMs
zQ?gDbdnCtDTd@2E+Gcg5&+KLszPlUOoZu8Xt8SFCbR&mfRE;$MoxMIfnGs32myS<)
zf8MJj(Bjw)MpOBE-@LSB(w(n_YeS}r@c+
Date: Wed, 3 Aug 2016 13:46:59 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=9B=86=E7=9A=84?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=81=E6=96=B0=E7=89=88=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 6 +--
app/views/layouts/_logined_header.html.erb | 6 ---
.../_homework_repository_detail.html.erb | 19 +++++++++-
app/views/users/user_homework_type.js.erb | 2 +-
app/views/users/user_homeworks.html.erb | 32 +++++++++-------
app/views/users/user_homeworks.js.erb | 3 +-
app/views/users/user_search_homeworks.js.erb | 2 +-
lib/redmine/pagination.rb | 37 ++++++++++++++++---
public/stylesheets/syllabus.css | 11 +++---
9 files changed, 80 insertions(+), 38 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 61f62480e..d610c701b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -834,12 +834,12 @@ class UsersController < ApplicationController
courses = @user.courses.where("is_delete = 1")
course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")"
if @order == "course_name"
- sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
+ sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}"
@homeworks = HomeworkCommon.find_by_sql(sql)
elsif @order == "user_name"
- @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
+ @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}")
else
- @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
+ @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}")
end
elsif params[:type] == "2" #题库
visible_course = Course.where("is_public = 1 && is_delete = 0")
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 7a47c8b66..b7e2989eb 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -10,15 +10,9 @@
- <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
- <% else %>
-
- <% end %>
diff --git a/app/views/users/_homework_repository_detail.html.erb b/app/views/users/_homework_repository_detail.html.erb
index 90f91c32d..f752fbfb3 100644
--- a/app/views/users/_homework_repository_detail.html.erb
+++ b/app/views/users/_homework_repository_detail.html.erb
@@ -14,7 +14,24 @@
测试集：<%=@homework.homework_tests.count %>组
-
+ <% if @homework.user == User.current && @homework.homework_tests.count > 0 %>
+
+ <% end %>
<% elsif @homework.homework_type ==3 && @homework.homework_detail_group %>
分组人数：<%=@homework.homework_detail_group.min_num %> - <%=@homework.homework_detail_group.max_num %>人
diff --git a/app/views/users/user_homework_type.js.erb b/app/views/users/user_homework_type.js.erb
index aa4c9ed57..95dee1c39 100644
--- a/app/views/users/user_homework_type.js.erb
+++ b/app/views/users/user_homework_type.js.erb
@@ -5,7 +5,7 @@ $("#homework_detail_information").html("<%=escape_javascript(render :partial =>
$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_search_input', :locals=>{:type=>@type,:is_import=>@is_import}) %>");
<% else %>
$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => @is_import,:property => @property,:search=>''})%>');
-$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
$("#homework_search_input").html('<%= escape_javascript(render :partial => 'users/homework_repository_search', :locals => {:type => @type,:is_import => @is_import,:property => @property,:order => @order, :b_sort => @b_sort, :search => ''})%>');
$("#homework_type_all").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 0) %>');
$("#homework_type_nor").attr('href','<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>');
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 7bbc1a82e..91c8beeae 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -25,7 +25,7 @@
}
-
+
-
- <%=render :partial=>'homework_repository_search', :locals=>{:type => '1',:is_import => 0,:property => nil,:order => @order, :b_sort => @b_sort, :search => ''} %>
-
+ <% if @homeworks.empty? %>
+
+
暂无可显示的内容~
+ <% else %>
+
+ <%=render :partial=>'homework_repository_search', :locals=>{:type => '1',:is_import => 0,:property => nil,:order => @order, :b_sort => @b_sort, :search => ''} %>
+
-
- <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
-
-
-
-
- <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-
-
+
+ <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
+
+
+
+
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
+
+
+ <% end %>
' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << ' ' + ' '
+ if is_new
+ html << '' << yield(text, {page_param => paginator.previous_page}, :class => 'pages-big', :remote => remote) << ' ' + ' '
+ else
+ html << '' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << ' ' + ' '
+ end
end
unless paginator.previous_page
if paginator.next_page
@@ -251,7 +256,11 @@ module Redmine
else
text = "\xc2\xab " + l(:label_previous)
end
- html << '' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << ' ' + ' '
+ if is_new
+ html << '' << yield(text, {page_param => paginator.previous_page}, :class => 'pages-big', :remote => remote) << ' ' + ' '
+ else
+ html << '' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << ' ' + ' '
+ end
end
end
@@ -259,14 +268,22 @@ module Redmine
paginator.linked_pages.each do |page|
if previous && previous != page - 1
if flag
- html << '' << content_tag('a', '...', :class => 'c_blue') << ' ' + ' '
+ if is_new
+ html << '' << content_tag('a', '...', :class => 'c_blue') << ' ' + ' '
+ else
+ html << '' << content_tag('a', '...') << ' ' + ' '
+ end
else
html << '' << content_tag('span', '...', :class => 'spacer ') << ' ' + ' '
end
end
if page == paginator.page
if flag
- html << '' << content_tag('a', page.to_s, :class => 'current-page c_white') << ' '
+ if is_new
+ html << '' << content_tag('a', page.to_s, :class => 'active') << ' '
+ else
+ html << '' << content_tag('a', page.to_s, :class => 'current-page c_white') << ' '
+ end
else
html << '' << content_tag('span', page.to_s, :class => 'current-page') << ' '
end
@@ -283,7 +300,11 @@ module Redmine
else
text = l(:label_next) + " \xc2\xbb"
end
- html << '' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << ' ' + ' '
+ if is_new
+ html << '' << yield(text, {page_param => paginator.next_page}, :class => 'pages-big', :remote => remote) << ' ' + ' '
+ else
+ html << '' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << ' ' + ' '
+ end
end
unless paginator.next_page
@@ -293,7 +314,11 @@ module Redmine
else
text = l(:label_next) + " \xc2\xbb"
end
- html << "" << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << " " + ' '
+ if is_new
+ html << '' << yield(text, {page_param => paginator.next_page}, :class => 'pages-big', :remote => remote) << ' ' + ' '
+ else
+ html << '' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << ' ' + ' '
+ end
end
end
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 09eb78be3..768e8dce5 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -607,11 +607,12 @@ a:hover.sy_class_ltitle{ color:#333;}
.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
.hw_list_classname{ width:300px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.hw_list_teachername{ width:80px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
+/* 测试集显示 */
+.hw_popup_testtable{background:#fff; color:#888888; margin:10px 0; border-right:1px solid #e7e7e7; border-bottom:1px solid #e7e7e7;}
+.hw_popup_testtable tr td{ width:47%; padding:10px; color:#888; border-left:1px solid #e7e7e7; border-top:1px solid #e7e7e7; }
+.hw_popup_testtable tr td.test_td_min{ width:5%; color:#888;}
+.hw_popup_testtable tr td.test_td_title{ text-align:center; color:#888888;}
/* 我的作业 */
.hw_classname{ width:180px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
-#hw_tab_con_1 .sy_classbox .sy_classlist:last-child{ border-bottom:1px solid #ddd;}
-.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
-
-
-
+.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
\ No newline at end of file
From bae775ec34c57e02f1805e7c96d1d02a2f7e93dc Mon Sep 17 00:00:00 2001
From: cxt
Date: Wed, 3 Aug 2016 14:06:47 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../users/_homework_repository_list.html.erb | 7 ++++-
.../_homework_repository_search.html.erb | 16 ++--------
.../users/_homework_repository_sort.html.erb | 13 +++++++++
app/views/users/user_homeworks.html.erb | 29 ++++++++-----------
app/views/users/user_search_homeworks.js.erb | 2 +-
5 files changed, 35 insertions(+), 32 deletions(-)
create mode 100644 app/views/users/_homework_repository_sort.html.erb
diff --git a/app/views/users/_homework_repository_list.html.erb b/app/views/users/_homework_repository_list.html.erb
index 24fd0a52c..aa45f2115 100644
--- a/app/views/users/_homework_repository_list.html.erb
+++ b/app/views/users/_homework_repository_list.html.erb
@@ -1,4 +1,8 @@
-<% homeworks.each do |homework| %>
+<% if homeworks.empty? %>
+
+ 暂无可显示的内容~
+<% else %>
+ <% homeworks.each do |homework| %>
@@ -50,4 +54,5 @@
预览
+<% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/users/_homework_repository_search.html.erb b/app/views/users/_homework_repository_search.html.erb
index 4bd6f49d0..26f598a8e 100644
--- a/app/views/users/_homework_repository_search.html.erb
+++ b/app/views/users/_homework_repository_search.html.erb
@@ -1,16 +1,6 @@
-
排序：
-<%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
-<% if order == "publish_time" %>
- <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
-<% else %>
- <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
-<% end %>
-<%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
-<% if order == "quotes" %>
- <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
-<% else %>
- <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
-<% end %>
+
+ <%= render :partial => 'users/homework_repository_sort', :locals => {:type => type,:is_import => is_import,:property => property,:order => @order,:search => search} %>
+
排序：
+<%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
+<% if order == "publish_time" %>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
+<% else %>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
+<% end %>
+<%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
+<% if order == "quotes" %>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
+<% else %>
+ <%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 91c8beeae..338a0d2f3 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -48,24 +48,19 @@
- <% if @homeworks.empty? %>
-
-
暂无可显示的内容~
- <% else %>
-
- <%=render :partial=>'homework_repository_search', :locals=>{:type => '1',:is_import => 0,:property => nil,:order => @order, :b_sort => @b_sort, :search => ''} %>
-
+
+ <%=render :partial=>'homework_repository_search', :locals=>{:type => '1',:is_import => 0,:property => nil,:order => @order, :search => ''} %>
+
-
- <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
-
+
+ <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
+
-
-
- <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-
-
-
- <% end %>
+
+
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
+
+
Date: Wed, 3 Aug 2016 14:57:02 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=BF=BB=E9=A1=B5?=
=?UTF-8?q?=E5=B1=85=E4=B8=AD=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/user_homeworks.html.erb | 12 ++++++++----
public/stylesheets/css/public.css | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 91c8beeae..d2fd17028 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -60,11 +60,15 @@
<%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
