From 355f0580cbc02925b1118192efe2fb36de2ba375 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 9 Sep 2016 15:28:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 37 +++++++++++++++++++ app/views/users/_course_homework.html.erb | 30 +-------------- .../users/_user_homework_detail.html.erb | 34 +---------------- public/stylesheets/css/courses.css | 10 ++++- 4 files changed, 50 insertions(+), 61 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3c125a185..c1d6950fa 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3420,6 +3420,43 @@ def get_hw_index(hw,is_teacher) return index end +def get_hw_status homework_common + str = "" + if homework_common.homework_detail_manual + if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil? + str += '挂起' + elsif homework_common.homework_detail_manual.comment_status == 0 + str += '未发布' + elsif homework_common.homework_detail_manual.comment_status == 1 + if homework_common.anonymous_comment == 0 + str += '未开启匿评' + else + str += '匿评已禁用' + end + if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") + str += '作品提交中' + elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") + str += '作品补交中' + end + elsif homework_common.homework_detail_manual.comment_status == 2 + if homework_common.anonymous_comment == 0 + str += '匿评中' + else + str += '匿评已禁用' + end + str += '教师评阅中' + elsif homework_common.homework_detail_manual.comment_status == 3 + if homework_common.anonymous_comment == 0 + str += '匿评已结束' + else + str += '匿评已禁用' + end + str += '教师评阅中' + end + end + str +end + def get_group_member_names work result = "" unless work.nil? diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 41251a3a5..cf5f5881b 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -16,34 +16,8 @@ - <% if activity.homework_detail_manual%> - <% if activity.homework_detail_manual.comment_status == 1%> - <% if activity.anonymous_comment == 0%> - 未开启匿评 - <% else %> - 匿评已禁用 - <% end %> - <% if Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%> - 作品提交中 - <% elsif Time.parse(activity.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %> - 作品补交中 - <% end %> - <% elsif activity.homework_detail_manual.comment_status == 2%> - <% if activity.anonymous_comment == 0%> - 匿评中 - <% else %> - 匿评已禁用 - <% end %> - 教师评阅中 - <% elsif activity.homework_detail_manual.comment_status == 3%> - <% if activity.anonymous_comment == 0%> - 匿评已结束 - <% else %> - 匿评已禁用 - <% end %> - 教师评阅中 - <% end%> - <% end%> + + <%=get_hw_status(activity).html_safe %>
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 50de18fb9..6f1fb7843 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -21,38 +21,8 @@ <% end %> - <% if homework_common.homework_detail_manual%> - <% if homework_common.homework_detail_manual.comment_status == 0 && homework_common.publish_time.nil? %> - 挂起 - <% elsif homework_common.homework_detail_manual.comment_status == 0 %> - 未发布 - <% elsif homework_common.homework_detail_manual.comment_status == 1%> - <% if homework_common.anonymous_comment == 0%> - 未开启匿评 - <% else %> - 匿评已禁用 - <% end %> - <% if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")%> - 作品提交中 - <% elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") %> - 作品补交中 - <% end %> - <% elsif homework_common.homework_detail_manual.comment_status == 2%> - <% if homework_common.anonymous_comment == 0%> - 匿评中 - <% else %> - 匿评已禁用 - <% end %> - 教师评阅中 - <% elsif homework_common.homework_detail_manual.comment_status == 3%> - <% if homework_common.anonymous_comment == 0%> - 匿评已结束 - <% else %> - 匿评已禁用 - <% end %> - 教师评阅中 - <% end%> - <% end%> + <%=get_hw_status(homework_common).html_safe %> +
<% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1%> 系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 7d0e6c866..77f7fdfe2 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -539,4 +539,12 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .hwork-table-wrap th {font-size:14px; color:#2d2d2d; border-bottom:1px solid #e1e1e1; text-align:center;} /*20160901作品信息确认*/ -#worksDescription p {word-wrap:break-word;} \ No newline at end of file +#worksDescription p {word-wrap:break-word;} + +/*20160907作业详情更改*/ +.homework-type-option {border:1px solid #d9d9d9; width:98px; height:28px; color:#888; font-size:14px;} +.homework-detail-tab {font-size:14px; color:#484848; overflow:hidden;} +.homework-detail-tab li {float:left; width:100px; text-align:center; padding:3px 0; border-bottom:2px solid #ddd;} +.homework-detail-tab li.selected {border-bottom:2px solid #f00;} +.test-set-table, .test-set-table tr, .test-set-table th, .test-set-table td {border-collapse:collapse; text-align:left; border:1px solid #ddd; color:#484848;} +.test-set-table th, .test-set-table td {padding:2px 5px;} \ No newline at end of file From 724ae058db3c467405bce96598b3cd6536338b2f Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 9 Sep 2016 15:49:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=88=86=E7=8F=AD=E2=80=9D=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_tool_expand.html.erb | 6 +++++- public/stylesheets/syllabus.css | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index 72ae83b92..8f9530e35 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -45,9 +45,13 @@ <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %> <% end %> +<% if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin? %> +
  • + <%=link_to "分班", course_member_path(@course, :role => 2) %> +
    • +<% end %> <% if show_nav?(0) %>
  • 统计 -
    • <% end %> \ No newline at end of file diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index cf504a10d..78b9de21a 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -408,6 +408,10 @@ a:hover.sy_btn_orange{ color: #ee4a1f; background: #fff; } +.sub-menu > li:hover > a{ + color: #ee4a1f; + background: #fff; +} .accordion > li:target > a, .accordion > li > a.active { color: #ee4a1f;