jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_new_head' into dev-homepage-revision

This commit is contained in:
SylorHuang 2019-11-06 14:35:46 +08:00
parent bfcc9c6b38 8d55788cd0
commit b988cb0a54
18 changed files with 305 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/controllers/users_controller.rb
View File

@ -2222,7 +2222,7 @@ class UsersController < ApplicationController
# 待审批的申请
# 待审批的消息一般不多，可以特殊处理
def unapproval_applied_list
@undo_show_type = 2
@undo_show_type = 6
@message_alls = @user.user_unsolve_messages
@message_count = @message_alls.count
@unsolved_issues_count = @user.user_unsolve_issues.count
@ -2234,18 +2234,13 @@ class UsersController < ApplicationController
# 待完成的作业
def unfinished_homework_list
my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Time.now}'")
homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
student_works = StudentWork.where("user_id = #{@user.id} and homework_common_id in #{homework_ids} and work_status != 0")
finished_works_id = student_works.blank? ? "(-1)" : "(" + student_works.map{ |sw| sw.homework_common_id.to_i }.join(",") + ")"
@unfinished_homeworks = HomeworkCommon.where("course_id in #{my_course_ids} and publish_time <= '#{Time.now}' and id not in #{finished_works_id}").order("updated_at desc")
@unfinished_homeworks_count = @unfinished_homeworks.count
@undo_show_type = 2
@unfinished_homeworks = @user.user_undo_homeworks
@unfinished_homeworks_count = @unfinished_homeworks.size
@limit = 20
@unfinished_homework_pages = Paginator.new @unfinished_homeworks_count, @limit, params['page'] || 1
@offset ||= @unfinished_homework_pages.offset
@unfinished_homeworks = paginateHelper @unfinished_homeworks, @limit
respond_to do |format|
format.js
end
@ -2253,12 +2248,8 @@ class UsersController < ApplicationController
# 待完成的测验
def unfinished_test_list
my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
exercises = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2")
exercise_ids = exercises.blank? ? "(-1)" : "(" + exercises.map{|ex| ex.id}.join(",") + ")"
exercise_users = ExerciseUser.where("user_id = #{@user.id} and exercise_id in #{exercise_ids}")
finished_test_ids = exercise_users.blank? ? "(-1)" : "(" + exercise_users.map{|eu| eu.exercise_id }.join(",") + ")"
@unfinished_test = Exercise.where("course_id in #{my_course_ids} and exercise_status = 2 and id not in #{finished_test_ids}")
@undo_show_type = 3
@unfinished_test = @user.user_undo_tests
@unfinished_test_count = @unfinished_test.count
@limit = 20
@unfinished_test_pages = Paginator.new @unfinished_test_count, @limit, params['page'] || 1
@ -2271,12 +2262,14 @@ class UsersController < ApplicationController
# 待完成的问卷
def unfinished_poll_list
my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
polls = Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
poll_ids = polls.blank? ? "(-1)" : "(" + polls.map{|poll| poll.id}.join(",") + ")"
poll_users = PollUser.where("user_id = #{@user.id} and poll_id in #{poll_ids}")
finished_poll_ids = poll_users.blank? ? "(-1)" : "(" + poll_users.map{|pu| pu.poll_id }.join(",") + ")"
@unfinished_poll = Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2 and id not in #{finished_poll_ids}").order("updated_at desc")
@undo_show_type = 4
# my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
# polls = Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2")
# poll_ids = polls.blank? ? "(-1)" : "(" + polls.map{|poll| poll.id}.join(",") + ")"
# poll_users = PollUser.where("user_id = #{@user.id} and poll_id in #{poll_ids}")
# finished_poll_ids = poll_users.blank? ? "(-1)" : "(" + poll_users.map{|pu| pu.poll_id }.join(",") + ")"
# @unfinished_poll = Poll.where("polls_type = 'Course' and polls_group_id in #{my_course_ids} and polls_status = 2 and id not in #{finished_poll_ids}").order("updated_at desc")
@unfinished_poll = @user.user_undo_polls
@unfinished_poll_count = @unfinished_poll.count
@limit = 20
@unfinished_poll_pages = Paginator.new @unfinished_poll_count, @limit, params['page'] || 1
@ -2289,16 +2282,20 @@ class UsersController < ApplicationController
# 待匿评的作业
def anonymous_evaluation_list
my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
homeworks = HomeworkCommon.includes(:homework_detail_manual).where("homework_commons.course_id in #{my_course_ids} and homework_detail_manuals.comment_status in (1,2)")
homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
student_work_scores = @user.student_works_scores.where("reviewer_role = 3")
anonymous_evaluation_ids = student_work_scores.blank? ? "(-1)" : "(" + student_work_scores.map{|st| st.student_work_id}.join(",") + ")"
unfinished_evaluations = @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
unfinished_evaluations_work_ids = unfinished_evaluations.blank? ? "(-1)" : "(" + unfinished_evaluations.map{|st| st.student_work_id}.join(",") + ")"
@anonymous_evaluation_count = StudentWork.where("student_works.id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").count
homework_ids = StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").blank? ? "(-1)" : "(" + StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").map{|st| st.homework_common_id}.join(",") + ")"
@anonymous_evaluation = HomeworkCommon.where("homework_commons.id in #{homework_ids}")
@undo_show_type = 5
# my_course_ids = StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").blank? ? "(-1)" : "(" + StudentsForCourse.includes(:course).where("student_id = #{@user.id} and courses.is_delete = 0").map{|sc| sc.course_id}.join(",") + ")"
# homeworks = HomeworkCommon.includes(:homework_detail_manual).where("homework_commons.course_id in #{my_course_ids} and homework_detail_manuals.comment_status in (1,2)")
# homework_ids = homeworks.blank? ? "(-1)" : "(" + homeworks.map{|homework| homework.id}.join(",") + ")"
# student_work_scores = @user.student_works_scores.where("reviewer_role = 3")
# anonymous_evaluation_ids = student_work_scores.blank? ? "(-1)" : "(" + student_work_scores.map{|st| st.student_work_id}.join(",") + ")"
# unfinished_evaluations = @user.student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}")
# unfinished_evaluations_work_ids = unfinished_evaluations.blank? ? "(-1)" : "(" + unfinished_evaluations.map{|st| st.student_work_id}.join(",") + ")"
# @anonymous_evaluation_count = StudentWork.where("student_works.id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").count
# homework_ids = StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").blank? ? "(-1)" : "(" + StudentWork.where("id in #{unfinished_evaluations_work_ids} and homework_common_id in #{homework_ids}").map{|st| st.homework_common_id}.join(",") + ")"
#
# @anonymous_evaluation = HomeworkCommon.where("homework_commons.id in #{homework_ids}")
@anonymous_evaluation = @user.user_undo_anonymous
@anonymous_evaluation_count = @anonymous_evaluation.size
@limit = 20
@anonymous_evaluation_pages = Paginator.new @anonymous_evaluation.count, @limit, params['page'] || 1
@offset ||= @anonymous_evaluation_pages.offset

49
app/models/user.rb
View File

@ -440,11 +440,58 @@ class User < Principal
MessageAll.find_by_sql(sql)
end
def get_user_course_ids #获取用户的全部课堂id
StudentsForCourse.includes(:course).where("student_id = #{id} and courses.is_delete = 0").map{|sf| sf.try(:course_id)}
end
def user_undo_homeworks
user_course_ids = get_user_course_ids #学生的全部课堂
publish_homeworks = HomeworkCommon.where(course_id: user_course_ids)&.where("publish_time <= '#{Time.now}'") #已发布的作业
publish_homeworks_ids = publish_homeworks.pluck(:id)
user_homeworks = student_works&.where(homework_common_id: publish_homeworks_ids)
finished_user_homework_ids = user_homeworks&.where("work_status != 0").pluck(:homework_common_id) #用户已完成的作业
publish_homeworks.where(id: (publish_homeworks_ids - finished_user_homework_ids)).order("updated_at desc")
end
#待完成测验
def user_undo_tests
user_course_ids = get_user_course_ids #学生的全部课堂
publish_exercises = Exercise.where(course_id: user_course_ids, exercise_status: 2) #已发布的作业
publish_exercises_ids = publish_exercises.pluck(:id).uniq
finished_user_exercises_ids = exercise_user&.where(exercise_id: publish_exercises_ids, commit_status: 1).pluck(:exercise_id).uniq
publish_exercises.where(id: (publish_exercises_ids - finished_user_exercises_ids)).order("updated_at desc")
end
#待完成的问卷
def user_undo_polls
user_course_ids = get_user_course_ids #学生的全部课堂
publish_polls = Poll.where(polls_type: "Course",polls_group_id: user_course_ids, polls_status: 2)
publish_polls_ids = publish_polls.pluck(:id).uniq
finished_user_polls_ids = poll_users&.where(poll_id: publish_polls_ids).pluck(:poll_id).uniq
publish_polls.where(id: (publish_polls_ids - finished_user_polls_ids)).order("updated_at desc")
end
#待完成的匿评作品
def user_undo_anonymous
user_course_ids = get_user_course_ids #学生的全部课堂
homework_anonymous_works = HomeworkCommon.where(course_id: user_course_ids).includes(:homework_detail_manual).where("homework_detail_manuals.comment_status in (1,2)")
homework_ids = homework_anonymous_works.map{|h| h.try(:id)}
user_student_work_scores = student_works_scores.where(reviewer_role: 3)
anonymous_evaluation_ids = user_student_work_scores.blank? ? "(-1)" : "(#{user_student_work_scores.pluck(:student_work_id).join(",")})"
unfinished_evaluations_work_ids = student_works_evaluation_distributions.where("student_work_id not in #{anonymous_evaluation_ids}").pluck(:student_work_id)
homework_ids = StudentWork.where(id: unfinished_evaluations_work_ids, homework_common_id: homework_ids ).pluck(:homework_common_id)
homework_anonymous_works.where(id: homework_ids)
end
#用户的待办事项计数，包括通知和issue的数量
def count_undo_items
issues_count = user_unsolve_issues.count
apply_messages_count = user_unsolve_messages.count
issues_count + apply_messages_count
undo_homeworks_count = user_undo_homeworks.size
undo_tests_count = user_undo_tests.size
undo_polls_count = user_undo_polls.size
undo_anonymous_count = user_undo_anonymous.size
issues_count + apply_messages_count + undo_homeworks_count + undo_tests_count + undo_polls_count + undo_anonymous_count
end

8
app/views/layouts/new_base_user.html.erb
View File

@ -50,9 +50,11 @@
</div>
</div>
</div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
</div>
</div>
</body>

88
app/views/users/_anonymous_evaluation_list.html.erb
View File

@ -1,54 +1,38 @@
<div class="resources" >
<div class="clear" >
<table class="sy_new_table clear" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th style="width:40px"></th>
<th><li class="fl ml5">作业标题</li></th>
<th style="width:160px">来源</th>
<th style="width:80px">未评</th>
<th style="width:120px">截止剩余时间</th>
</tr>
</thead>
<tbody>
<% @anonymous_evaluation.each do |ae| %>
<tr>
<td class="homepageTabAvatar">
<%= link_to image_tag(url_to_avatar(ae.user), :width => "30", :height => "30"), user_path(ae.user), :target => '_blank' %>
</td>
<td>
<li class="homepageTabTitle">
<%= link_to ae.name.to_s, student_work_index_url(:homework => ae.id, :tab => 2), :target => "_blank", :class => "homepageTabTitle fl ml5" %>
</li>
</td>
<td>
<li class="homepageTabProjectName ml5">
<%= link_to ae.course.try(:name), course_path(ae.course), :class => "homepageTabTitle ml5", :target => "_blank"%>
<li>
</td>
<td>
<li class="homepageTabAuthor ml5" >
<%= homework_evaluation_num(ae) %>
</li>
</td>
<td>
<li class="homepageTabTime ml5" >
<% end_time = ae.homework_detail_manual.evaluation_end.to_time.to_i + 24*60*60 - 1 %>
<% if end_time > Time.now.to_i %>
<span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
<span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
<span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
<% else %>
<span class="c_red">已截止</span>
<% end %>
</li>
</td>
</tr>
<%= render partial: "users/undo_items_title" %>
<div>
<% if @anonymous_evaluation_count > 0 %>
<ul class="p_list_ul">
<% @anonymous_evaluation.each do |ui| %>
<li>
<%= link_to image_tag(url_to_avatar(ui.user), class:"r_list_img"), user_path(ui.user), :target => '_blank' %>
<div class="f14">
<p class="lh25 mb10 fontGrey4 f14">
<span class="mr20 f16">
<%= link_to ui.user.try(:show_name), user_path(ui.user_id), :target => "_blank", :title => "#{ui.user.try(:show_name)}", class: "color-grey3" %>
</span>
<span class="mr20"><%= time_from_now(ui.updated_at) %></span>
<span class="mr20">
<%= homework_type_tip(ui.homework_type) %>
</span>
<span class="fr task-hide" style="max-width: 200px"><%= ui.course.try(:name) %></span>
</p>
<div class="df color-grey3">
<p class="task-hide flex1 mr50">
<%= link_to ui.name.to_s, student_work_index_url(:homework => ui.id, :tab => 2), :target => "_blank", :title => "#{ui.name.to_s}",class: "color-grey3" %>
</p>
<span class="fontGrey4 mr20">未评：<span class="color-orange"> <%= homework_evaluation_num(ui) %></span></span>
<span>截止时间：<span class="c_green"><%= format_time(ui.end_time) %></span></span>
</div>
</div>
</li>
<% end %>
</tbody>
</table>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @anonymous_evaluation_pages, @anonymous_evaluation_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>
</div>
<% else %>
<div>
<%= render partial: "projects/no_data" %>
</div>
<% end %>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @anonymous_evaluation_pages, @anonymous_evaluation_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>

24
app/views/users/_applied_project_content.html.erb
View File

@ -1,27 +1,3 @@
<!--<div class="shortMessageWidth">-->
<!-- <li class="homepageNewsPortrait fl">-->
<%# if ma.status == 4 || ma.status == 6 %>
<%#= link_to image_tag(url_to_avatar(User.where(:id => ma.user_id).first), :width => "30", :height => "30"), user_path(User.where(:id => ma.user_id).first), :target => '_blank' %>
<%# else %>
<%#= link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %>
<%# end %>
<!-- </li>-->
<!-- <li class="homepageNewsPubType fl">-->
<%#= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
<!-- </li>-->
<!-- <li class="messageInformationContents">-->
<%# project = Project.find(ma.project_id) %>
<%#= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
<!-- </li>-->
<!--</div>-->
<!--<li class="messageOperateContents fl">-->
<!-- <span><%#= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>-->
<!--</li>-->
<!--<li class="homepageNewsTime fr"><%#= time_tag(ma.created_at).html_safe %> </li>-->
<!--</div>-->
<% if ma.status == 4 || ma.status == 6 %>
<%= link_to image_tag(url_to_avatar(User.where(:id => ma.user_id).first), class: "r_list_img"), user_path(User.where(:id => ma.user_id).first), :target => '_blank' %>
<% else %>

24
app/views/users/_undo_items_title.html.erb
View File

@ -1,10 +1,22 @@
<div class="border-1-bottom width100">
<ul>
<li class="undo-item-title fl <%= @undo_show_type == 1 ? "active" : "" %>">
<%= link_to "<span>待解决issue</span><span class='ml10'>#{@unsolved_issues_count}</span>".html_safe, unsolved_issues_list_user_path(@user),remote: true, class: "font-16" %>
<div class="width100">
<ul class="r_infos_menu">
<li class="<%= @undo_show_type == 1 ? "active" : "" %>">
<%= link_to "<span>待解决issue</span>".html_safe, unsolved_issues_list_user_path(@user),remote: true, class: "font-16" %>
</li>
<li class="undo-item-title fl <%= @undo_show_type == 2 ? "active" : "" %>">
<%= link_to "<span>待审批事项</span><span class='ml10'>#{@message_count}</span>".html_safe, unapproval_applied_list_user_path(@user),remote: true, class: "font-16" %>
<li class="<%= @undo_show_type == 2 ? "active" : "" %>">
<%= link_to "<span>待完成作业</span>".html_safe, unfinished_homework_list_user_path(@user),remote: true, class: "font-16" %>
</li>
<li class="<%= @undo_show_type == 3 ? "active" : "" %>">
<%= link_to "<span>待完成测验</span>".html_safe, unfinished_test_list_user_path(@user),remote: true, class: "font-16" %>
</li>
<li class="<%= @undo_show_type == 4 ? "active" : "" %>">
<%= link_to "<span>待完成问卷</span>".html_safe, unfinished_poll_list_user_path(@user),remote: true, class: "font-16" %>
</li>
<li class="<%= @undo_show_type == 5 ? "active" : "" %>">
<%= link_to "<span>待匿评作品</span>".html_safe, anonymous_evaluation_list_user_path(@user),remote: true, class: "font-16" %>
</li>
<li class="<%= @undo_show_type == 6 ? "active" : "" %>">
<%= link_to "<span>待审批申请</span>".html_safe, unapproval_applied_list_user_path(@user),remote: true, class: "font-16" %>
</li>
</ul>
</div>

87
app/views/users/_unfinished_homework_list.html.erb
View File

@ -1,54 +1,37 @@
<div class="resources" >
<div class="clear" >
<table class="sy_new_table clear" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th style="width:40px"></th>
<th><li class="fl ml5">作业标题</li></th>
<th style="width:160px">来源</th>
<th style="width:80px">类型</th>
<th style="width:120px">截止剩余时间</th>
</tr>
</thead>
<tbody>
<% @unfinished_homeworks.each do |uh| %>
<tr>
<td class="homepageTabAvatar">
<%= link_to image_tag(url_to_avatar(uh.user), :width => "30", :height => "30"), user_path(uh.user), :target => '_blank' %>
</td>
<td>
<li class="homepageTabTitle">
<%= link_to uh.name.to_s, student_work_index_path( :homework => uh.id, :tab => 1), :target => "_blank", :class => "homepageTabTitle fl ml5", :title => "#{uh.name.to_s}" %>
</li>
</td>
<td>
<li class="homepageTabProjectName ml5">
<%= link_to uh.course.try(:name), course_path(uh.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :target => "_blank", :title => "#{uh.course.try(:name)}" %>
<li>
</td>
<td>
<li class="homepageTabAuthor ml5" >
<%= homework_type_tip(uh.homework_type) %>
</li>
</td>
<td>
<li class="homepageTabTime ml5" >
<% end_time = uh.end_time.to_i %>
<% if end_time > Time.now.to_i %>
<span class="c_red"><%= (end_time - Time.now.to_i) / (24*60*60) %></span> 天
<span class="c_red"><%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
<span class="c_red"><%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
<% else %>
<span class="c_red">已截止</span>
<% end %>
</li>
</td>
</tr>
<%= render partial: "users/undo_items_title" %>
<div>
<% if @unfinished_homeworks_count > 0 %>
<ul class="p_list_ul">
<% @unfinished_homeworks.each do |ui| %>
<li>
<%= link_to image_tag(url_to_avatar(ui.user), class:"r_list_img"), user_path(ui.user), :target => '_blank' %>
<div class="f14">
<p class="lh25 mb10 fontGrey4">
<span class="mr20 f16">
<%= link_to ui.user.try(:show_name), user_path(ui.user_id), :target => "_blank", :title => "#{ui.user.try(:show_name)}", class: "color-grey3" %>
</span>
<span class="mr20"><%= time_from_now(ui.updated_at) %></span>
<span class="mr20">
<%= homework_type_tip(ui.homework_type) %>
</span>
<span class="fr task-hide" style="max-width: 200px"><%= ui.course.try(:name) %></span>
</p>
<div class="df color-grey3">
<p class="task-hide flex1 mr50">
<%= link_to ui.name.to_s, student_work_index_path( :homework => ui.id, :tab => 1), :target => "_blank", :title => "#{ui.name.to_s}", class: "color-grey3" %>
</p>
<span>截止时间：<span class="c_green"><%= format_time(ui.end_time) %></span></span>
</div>
</div>
</li>
<% end %>
</tbody>
</table>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_homework_pages, @unfinished_homeworks_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>
</div>
<% else %>
<div>
<%= render partial: "projects/no_data" %>
</div>
<% end %>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_homework_pages, @unfinished_homeworks_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>

72
app/views/users/_unfinished_poll_list.html.erb
View File

@ -1,37 +1,39 @@
<div class="resources" >
<div class="clear" >
<table class="sy_new_table clear" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th style="width:40px"></th>
<th><li class="fl ml5">问卷标题</li></th>
<th style="width:160px">来源</th>
</tr>
</thead>
<tbody>
<% @unfinished_poll.each do |up| %>
<tr>
<td class="homepageTabAvatar">
<%= link_to image_tag(url_to_avatar(up.user), :width => "30", :height => "30"), user_path(up.user), :target => '_blank' %>
</td>
<td>
<li class="homepageTabPollTitle">
<%= link_to up.polls_name.to_s, poll_path(up.id), :target => "_blank", :class => "homepageTabPollTitle fl ml5", :title => "#{up.polls_name.to_s}" %>
</li>
</td>
<td>
<li class="homepageTabProjectName ml5">
<% if up.polls_type == "Course" %>
<%= link_to Course.find(up.polls_group_id).name, course_path(Course.find(up.polls_group_id)), :target => "_blank", :title => "#{Course.find(up.polls_group_id).name}" %>
<% end %>
<li>
</td>
</tr>
<%= render partial: "users/undo_items_title" %>
<div>
<% if @unfinished_poll_count > 0 %>
<ul class="p_list_ul">
<% @unfinished_poll.each do |ui| %>
<li>
<%= link_to image_tag(url_to_avatar(ui.user), class:"r_list_img"), user_path(ui.user), :target => '_blank' %>
<div class="f14">
<p class="lh25 mb10 fontGrey4 f14">
<span class="mr20 f16">
<%= link_to ui.user.try(:show_name), user_path(ui.user_id), :target => "_blank", :title => "#{ui.user.try(:show_name)}", class: "color-grey3" %>
</span>
<span class="mr20"><%= time_from_now(ui.updated_at) %></span>
<% if ui.polls_type == "Course" %>
<% course = Course.find(ui.polls_group_id) %>
<span class="fr task-hide" style="max-width: 200px">
<%= link_to course.try(:name), course_path(course), :target => "_blank", :title => "#{course.name}" %>
<%#= ui.course.try(:name) %>
</span>
<% end %>
</p>
<div class="df color-grey3">
<p class="task-hide flex1 mr50">
<%= link_to ui.polls_name.to_s, poll_path(ui.id), :target => "_blank", :title => "#{ui.polls_name.to_s}",class: "color-grey3" %>
</p>
</div>
</div>
</li>
<% end %>
</tbody>
</table>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_poll_pages, @unfinished_poll_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>
</div>
<% else %>
<div>
<%= render partial: "projects/no_data" %>
</div>
<% end %>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_poll_pages, @unfinished_poll_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>

88
app/views/users/_unfinished_test_list.html.erb
View File

@ -1,57 +1,35 @@
<div class="resources" >
<div class="clear" >
<table class="sy_new_table clear" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th style="width:40px"></th>
<th><li class="fl ml5">测验标题</li></th>
<th style="width:160px">来源</th>
<th style="width:80px">测验时长</th>
<th style="width:120px">截止剩余时间</th>
</tr>
</thead>
<tbody>
<% @unfinished_test.each do |ut| %>
<tr>
<td class="homepageTabAvatar">
<%= link_to image_tag(url_to_avatar(ut.user), :width => "30", :height => "30"), user_path(ut.user), :target => '_blank' %>
</td>
<td>
<li class="homepageTabTitle">
<%= link_to ut.exercise_name.to_s, exercise_index_path(:course_id => ut.course_id), :target => "_blank", :class => "homepageTabTitle fl ml5", :title => "#{ut.exercise_name.to_s}" %>
</li>
</td>
<td>
<li class="homepageTabProjectName ml5">
<%= link_to ut.course.try(:name), course_path(ut.course_id), :target => "_blank", :class => "homepageTabTitle ml5", :title => "#{ut.course.try(:name)}" %>
<li>
</td>
<td>
<li class="homepageTabAuthor ml5" >
<% if ut.time.to_i == -1 %>
不限时
<% else %>
<%= ut.time %>
<% end %>
</li>
</td>
<td>
<li class="homepageTabTime ml5" >
<% if ut.end_time > Time.now %>
<span class="c_red"><%= (ut.end_time.to_i - Time.now.to_i) / (24*60*60) %></span> 天
<span class="c_red"><%= ((ut.end_time.to_i - Time.now.to_i) % (24*60*60)) / (60*60)%></span> 小时
<span class="c_red"><%= (((ut.end_time.to_i - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%></span> 分
<% else %>
<span class="c_red">已截止</span>
<% end %>
</li>
</td>
</tr>
<%= render partial: "users/undo_items_title" %>
<div>
<% if @unfinished_test_count > 0 %>
<ul class="p_list_ul">
<% @unfinished_test.each do |ui| %>
<li>
<%= link_to image_tag(url_to_avatar(ui.user), class:"r_list_img"), user_path(ui.user), :target => '_blank' %>
<div class="f14">
<p class="lh25 mb10 fontGrey4 f14">
<span class="mr20 f16">
<%= link_to ui.user.try(:show_name), user_path(ui.user_id), :target => "_blank", :title => "#{ui.user.try(:show_name)}", class: "color-grey3" %>
</span>
<span class="mr20"><%= time_from_now(ui.updated_at) %></span>
<span class="fr task-hide" style="max-width: 200px"><%= ui.course.try(:name) %></span>
</p>
<div class="df color-grey3">
<p class="task-hide flex1 mr50">
<%= link_to ui.exercise_name.to_s, exercise_index_path(:course_id => ui.course_id), :target => "_blank", :title => "#{ui.exercise_name.to_s}",class: "color-grey3" %>
</p>
<span>截止时间：<span class="c_green"><%= format_time(ui.end_time) %></span></span>
</div>
</div>
</li>
<% end %>
</tbody>
</table>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_test_pages, @unfinished_test_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>
</div>
<% else %>
<div>
<%= render partial: "projects/no_data" %>
</div>
<% end %>
<ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
<%= pagination_links_full @unfinished_test_pages, @unfinished_test_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
</ul>
</div>

18
app/views/users/_unsolved_issues_list.html.erb
View File

@ -8,20 +8,22 @@
<%#= render :partial => 'users/user_message_forge', :locals => {:ma => ui} %>
<%= link_to image_tag(url_to_avatar(ui.author), class:"r_list_img"), user_path(ui.author), :target => '_blank' %>
<div>
<p class="lh25 mb10">
<span class="mr20 f16 color-grey3">
<%= link_to ui.author.try(:show_name), user_path(ui.author_id), :target => "_blank", :title => "#{ui.author.try(:show_name)}" %>
<div class="f14">
<p class="lh25 mb10 fontGrey4">
<span class="mr20 f16">
<%= link_to ui.author.try(:show_name), user_path(ui.author_id), :target => "_blank", :title => "#{ui.author.try(:show_name)}", class: "color-grey3" %>
</span>
<span class="fontGrey4 f12"><%= time_from_now(ui.updated_on) %></span>
<span class="mr20"><%= time_from_now(ui.updated_on) %></span>
<span class="mr20"><%= ui.status %></span>
<span class="infoTips tips_issue_<%= ui.priority_id %> ml15"><%= get_issue_priority_api(ui.priority_id) %></span>
<span class="color-grey3 ml15"><%= ui.status %></span>
<span class="fr task-hide" style="max-width: 200px"><%= ui.try(:subject) %></span>
</p>
<p class="c_grey02 f14">
<p class="c_grey02">
<span class="homepageNewsType fl">
指派了问题给你：
</span>
<%= link_to ui.try(:subject), ui, target: "_blank" %>
<%= link_to ui.try(:subject), ui, target: "_blank", class: "color-grey3" %>
</p>
</div>
</li>

36
app/views/users/_user_at_message.html.erb
View File

@ -1,43 +1,11 @@
<!--<ul class="homepageNewsList fl">-->
<!-- <div class="longMessageWidth">-->
<!-- <li class="homepageNewsPortrait fl">-->
<%#= link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"), user_path(ma.author) %>
<!-- </li>-->
<!-- <li class="homepageNewsPubType fl">-->
<!-- <span class="newsBlue homepageNewsPublisher">-->
<%#= link_to ma.author.show_name, user_path(ma.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<!-- </span><span class="homepageNewsType fl">提到了你：</span>-->
<!-- </li>-->
<!-- <li class="messageInformationContents">-->
<%# if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
<!-- <#%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,-->
<!-- :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,-->
<!-- :topic_id => ma.at_message.id),-->
<!-- :title => "#{ma.subject.html_safe}",-->
<!-- :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>-->
<%# elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
<!-- <#%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,-->
<!-- :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,-->
<!-- :topic_id => ma.at_message.id),-->
<!-- :title => "#{ma.subject.html_safe}",-->
<!-- :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>-->
<%# else %>
<!-- <#%= link_to ma.subject.html_safe, ma.url,-->
<!-- :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",-->
<!-- :title => "#{ma.subject.html_safe}" %>-->
<%# end %>
<!-- </li>-->
<!-- </div>-->
<!-- <li class="homepageNewsTime fr"><%#= time_tag(ma.created_at).html_safe %> </li>-->
<!--</ul>-->
<%= link_to image_tag(url_to_avatar(ma.author), class:"r_list_img"), user_path(ma.author), :target => '_blank' %>
<div>
<div class="f14">
<p class="lh25 mb10">
<span class="mr20 f16 color-grey3">
<%= link_to ma.author.try(:show_name), user_path(ma.author), :target => "_blank", :title => "#{ma.author.try(:show_name)}" %>
</span>
<span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
<span class="fontGrey4"><%= time_from_now(ma.updated_at) %></span>
</p>
<p class="c_grey02 f14">
<span class="homepageNewsType fl">

10
app/views/users/_user_show_left.html.erb
View File

@ -37,7 +37,7 @@
<ul class="l_backlog_list">
<li class="f18 clearfix fontGrey4">
<i class="iconfont icon-base mr8"></i><%= @user.check_user_him(User.current.id) %>的项目
<span class="fr fontGrey4 f16">20</span>
<span class="fr fontGrey4 f16"><%= @user.get_user_projects.size %></span>
</li>
<% @user.get_user_projects.each do |project| %>
<li class="l_backlog_list_item clearfix">
@ -53,9 +53,11 @@
<li><%= link_to "#{@user.check_user_him(User.current.id)}发布的issue",user_manage_issues_user_path(@user), target: "_blank" %></li>
<li><%= link_to "#{@user.check_user_him(User.current.id)}收到的issue", user_receive_issues_user_path(@user), target: "_blank" %></li>
</div>
<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-weizhi mr8 fl mt1"></i>湖南长沙</p>
<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-shijian mr8 f11 fl mt3 ml1"></i>2016-06-13开始使用</p>
<p class="fontGrey4 f12 mb20 clearfix ml4"><i class="iconfont icon-liulanyan mr8 fl mt2"></i>13115次访问（自2016年5月）</p>
<% if @user&.user_extensions&.location.present? %>
<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-weizhi mr8 fl mt1"></i><%= @user&.user_extensions&.location %></p>
<% end %>
<p class="fontGrey4 f12 mb5 clearfix ml4"><i class="iconfont icon-shijian mr8 f11 fl mt3 ml1"></i><%= @user.created_on.strftime("%Y-%m-%d") %>开始使用</p>
<p class="fontGrey4 f12 mb20 clearfix ml4"><i class="iconfont icon-liulanyan mr8 fl mt2"></i><%= @user.visits %>次访问（自<%= @user.created_on.strftime("%Y-%m") %>）</p>
<script>
$(function () {

5
app/views/users/anonymous_evaluation_list.js.erb
View File

@ -1,2 +1,3 @@
$("#user_homepage_message_list").html("<%= escape_javascript( render :partial => 'users/anonymous_evaluation_list') %>");
$("#anonymous_evaluation_num").html("<%= @anonymous_evaluation_count %>");
//$("#user_homepage_message_list").html("<#%= escape_javascript( render :partial => 'users/anonymous_evaluation_list') %>");
//$("#anonymous_evaluation_num").html("<#%= @anonymous_evaluation_count %>");
$("#user-info-right-<%= @user.login %>").html("<%= escape_javascript( render :partial => 'users/anonymous_evaluation_list') %>");

53
app/views/users/show.html.erb
View File

@ -1,55 +1,4 @@
<%#= render partial: "users/users_schedule" %>
<div id="user-info-right-<%= @user.login %>">
<%= render partial: "users/usersInfo" %>
</div>
<!--<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>-->
<!--<input type="hidden" value="<%#= @type %>" name="type" id="user_activities_type">-->
<!--<script>-->
<!-- $(function(){-->
<!-- $($(".homepage_tab_div")[$(".homepage_tab_div").length - 1]).css("border", "none");-->
<!-- });-->
<!-- // 个人主页的tab-->
<!-- function g(o){-->
<!-- return document.getElementById(o);-->
<!-- }-->
<!-- function HoverLi(n){-->
<!-- // g('message_all_list').className='undis';-->
<!-- //如果有N个标签,就将i<=N;-->
<!-- for(var i = 1; i <= 6; i++){-->
<!-- if (g('user_homepage_tab_'+i) != null)-->
<!-- g('user_homepage_tab_'+i).className='flex-cell_homepage';-->
<!-- // if(g('message_list_content_'+i) != null)-->
<!-- // g('message_list_content_'+i).className='undis';-->
<!-- }-->
<!--// g('message_list_content_'+n).className='dis';-->
<!-- g('user_homepage_tab_'+n).className='homepageClickBackground';-->
<!-- }-->
<!--</script>-->
<%# if is_current_user %>
<%# if task_count(@unsolved_issues_count, @unfinished_homework_count, @unfinished_test_count, @unfinished_poll_count, @anonymous_evaluation_count, @applied_message_alls_count) > 0 %>
<!-- <div class="homepagetopBanner mb10" style="width:748px;">-->
<!-- <div class="flex-container_homepage">-->
<%#= render :partial => "users/task_tip" %>
<!-- </div>-->
<!-- </div>-->
<%# end %>
<!-- <div id="user_homepage_message_list">-->
<%#= render :partial => 'users/user_message_list'%>
<!-- </div>-->
<%# else %>
<!-- <div class="homepageRightBanner">-->
<!-- <div class="NewsBannerName">Ta的动态</div>-->
<!-- </div>-->
<!-- 显示个人主页-->
<%# if @user_activities_count > 0 %>
<%#= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities, :page => 0, :type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id), :action => "user_activities"} %>
<%# else %>
<!-- <div class="mb10">-->
<%#= render :partial => 'users/no_data' %>
<!-- </div>-->
<%# end %>
<%# end %>

5
app/views/users/unfinished_homework_list.js.erb
View File

@ -1,2 +1,3 @@
$("#user_homepage_message_list").html("<%= escape_javascript( render :partial => 'users/unfinished_homework_list') %>");
$("#unfinished_homework_num").html("<%= @unfinished_homeworks_count %>");
//$("#user_homepage_message_list").html("<#%= escape_javascript( render :partial => 'users/unfinished_homework_list') %>");
//$("#unfinished_homework_num").html("<#%= @unfinished_homeworks_count %>");
$("#user-info-right-<%= @user.login %>").html("<%= escape_javascript( render :partial => 'users/unfinished_homework_list') %>");

6
app/views/users/unfinished_poll_list.js.erb
View File

@ -1,2 +1,4 @@
$("#user_homepage_message_list").html("<%= escape_javascript( render :partial => 'users/unfinished_poll_list') %>");
$("#unfinished_poll_num").html("<%= @unfinished_poll_count %>");
//$("#user_homepage_message_list").html("<#%= escape_javascript( render :partial => 'users/unfinished_poll_list') %>");
//$("#unfinished_poll_num").html("<#%= @unfinished_poll_count %>");
$("#user-info-right-<%= @user.login %>").html("<%= escape_javascript( render :partial => 'users/unfinished_poll_list') %>");

6
app/views/users/unfinished_test_list.js.erb
View File

@ -1,2 +1,4 @@
$("#user_homepage_message_list").html("<%= escape_javascript( render :partial => 'users/unfinished_test_list') %>");
$("#unfinished_test_num").html("<%= @unfinished_test_count %>");
//$("#user_homepage_message_list").html("<#%= escape_javascript( render :partial => 'users/unfinished_test_list') %>");
//$("#unfinished_test_num").html("<#%= @unfinished_test_count %>");
$("#user-info-right-<%= @user.login %>").html("<%= escape_javascript( render :partial => 'users/unfinished_test_list') %>");

37
public/stylesheets/css/structure.css
View File

@ -8,6 +8,33 @@
position: relative;
padding-bottom: 120px;
}
#ajax-indicator {
position: absolute; /* fixed not supported by IE*/
background-color:#eee;
border: 1px solid #bbb;
top:35%;
left:40%;
width:20%;
/*height:5%;*/
font-weight:bold;
text-align:center;
padding:0.6em;
z-index:100000;
opacity: 0.5;
}
html>body #ajax-indicator { position: fixed; }
#ajax-indicator span{
/*color:#fff;*/
color: #333333;
background-position: 0% 40%;
background-repeat: no-repeat;
background-image: url(/images/loading.gif);
padding-left: 26px;
vertical-align: bottom;
z-index:100000;
}
#Container{ width:1000px; margin:0 auto; }
/*主内容*/
#Main{ background:#fff; margin-bottom:10px;}
@ -99,7 +126,7 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-
.homepageNewsPortrait img:hover{border: 3px solid #e6e6e6;}
.homepageNewsPortrait img { border: 3px solid #fff;border-radius:50px;}
.homepageNewsPublisher { max-width:100px; font-size:12px; color:#3b94d6; display:block; /*padding-left:5px;*/ overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
.homepageNewsType {max-width: 320px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
.homepageNewsType {max-width: 320px; padding-left: 5px; color:#888888; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
.homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
.homepageNewsPubType {auto-width:230px; font-size:12px; color:#888888; display: block;}
.homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
@ -1074,10 +1101,10 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
color: white;
border-radius:2px;
}
.tips_issue_1{background: #06BEF9}
.tips_issue_2{background:#60B25E }
.tips_issue_3{background:#E67E23 }
.tips_issue_4{background:#1ABC9C }
.tips_issue_1{background: #1ABC9C}
.tips_issue_2{background:#28BD6C }
.tips_issue_3{background:#E67E21 }
.tips_issue_4{background:#DF493A }
.tips_issue_5{background:#E74C3B }
.text-red{color: #E74C3B}