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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
nwb 2014-06-26 11:43:13 +08:00
parent f8e5c2358a 56ce9e8bdb
commit 9ae5f59a29
3 changed files with 101 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
app/views/bids/_homework_list.html.erb
View File

@ -58,90 +58,93 @@
</td> </td>
<td colspan="2"> <td colspan="2">
<table width="580px" border="0" style="table-layout: fixed"> <table width="580px" border="0" style="table-layout: fixed">
<tr> <tr>
<td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<strong>作品名称:</strong>&nbsp; <strong>作品名称:</strong>&nbsp;
<% if homework.name == nil || homework.name == "" %> <% if homework.name == nil || homework.name == "" %>
<% homework_filename = homework.user.name + "提交的作业" %> <% homework_filename = homework.user.name + "提交的作业" %>
<% else %> <% else %>
<% homework_filename = homework.name %> <% homework_filename = homework.name %>
<% end %> <% end %>
<strong title="<%=homework_filename%>"> <strong title="<%=homework_filename%>">
<%= link_to homework_filename , homework_attach_path(homework)%> <%= link_to homework_filename , homework_attach_path(homework)%>
</strong> </strong>
</td> </td>
<td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> <td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
<strong>合作成员:&nbsp;</strong> <strong>合作成员:&nbsp;</strong>
<% homework_users = homework_user_of_homework(homework,is_teacher) %> <% homework_users = homework_user_of_homework(homework,is_teacher) %>
<% if homework.users.count == 0 %> <% if homework.users.count == 0 %>
无 无
<% else %> <% else %>
<span title="<%= homework_users%>"><%= homework_users %></span> <span title="<%= homework_users%>"><%= homework_users %></span>
<% end %> <% end %>
</td> </td>
<td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px"> <td rowspan="4" style="text-align: center;vertical-align: middle;width: 30px">
<% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %>
<span class="required">迟交</span> <span class="required">迟交</span>
<% end %> <% end %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <td>
<strong>开发项目</strong>:&nbsp; <strong>开发项目</strong>:&nbsp;
<% if homework.project != nil %> <% if homework.project != nil %>
<%= link_to homework.project.name,project_path(homework.project.id)%> <%= link_to homework.project.name,project_path(homework.project.id)%>
<% else %> <% else %>
暂无 暂无
<% end %> <% end %>
</td> </td>
<td> <td>
<strong>项目得分:&nbsp; <strong>项目得分:&nbsp;
<span style="color: #EC6300;"> <span style="color: <%= homework.project.nil? ? "#727272" : "#EC6300"%>;">
<% if homework.project != nil %> <%= homework.project.nil? ? "N/A" : project_score(homework.project) %>
<%= project_score homework.project %> </span>
<% else %> </strong>
0.00 </td>
<% end %> </tr>
</span>
</strong>
</td>
</tr>
<tr>
<td>
<strong>提交文件:&nbsp;
<% if is_evaluation || is_teacher%>
<%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
<% else %>
<span class="required">未开启互评功能作业不允许下载</span>
<% end %>
</strong>
</td>
<td>
<strong>互评得分:&nbsp;
<span style="color: #EC6300;"><%= student_score_for_homework(homework) %></span>&nbsp;&nbsp;
<% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%>
<%= link_to "学生互评>>",homework_attach_path(homework) %>
<% end %>
</strong>
</td>
</tr>
<tr>
<td>
<strong>提交文件:&nbsp;
<% if is_evaluation || is_teacher%>
<%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%>
<% else %>
<span class="required">未开启互评功能作业不允许下载</span>
<% end %>
</strong>
</td>
<td>
<strong>互评得分:&nbsp;
<% student_homework_score = student_score_for_homework(homework) %>
<span style="color:<%= student_homework_score == "0.00"? "#727272" : "#EC6300"%>;">
<% score = student_homework_score == "0.00"? "N/A" : student_homework_score %>
<%= score %>
</span>&nbsp;&nbsp;
<% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%>
<%= link_to "学生互评>>",homework_attach_path(homework) %>
<% end %>
</strong>
</td>
</tr>
<tr> <tr>
<td style="vertical-align: top;width: 200px;"> <td style="vertical-align: top;width: 200px;">
<% if is_evaluation || is_teacher%> <% if is_evaluation || is_teacher%>
<%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %>
<% end %> <% end %>
</td> </td>
<td> <td>
<strong>终评得分:&nbsp; <strong>终评得分:&nbsp;
<span style="color: #EC6300;"><%= score_for_homework homework %></span>&nbsp;&nbsp; <% totle_homework_score = score_for_homework(homework) %>
<% if is_teacher %> <span style="color:<%= totle_homework_score == "0.00"? "#727272" : "#EC6300"%> ;">
<%= link_to "教师评分>>",homework_attach_path(homework) %> <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %>
<% end %> <%= score %>
</strong> </span>&nbsp;&nbsp;
</td> <% if is_teacher %>
<%= link_to "教师评分>>",homework_attach_path(homework) %>
<% end %>
</strong>
</td>
</tr> </tr>
</table> </table>
</td> </td>

14
app/views/layouts/base_homework.html.erb
View File

@ -38,7 +38,7 @@
<a><%= link_to request.host()+"/courses", :controller => 'courses', :action => 'index' %></a></td> <a><%= link_to request.host()+"/courses", :controller => 'courses', :action => 'index' %></a></td>
<td><p class="top-content-list-homework"><%= link_to "主页", home_path %> <td><p class="top-content-list-homework"><%= link_to "主页", home_path %>
> <%= link_to l(:label_course_practice), :controller => 'courses', :action => 'index' %> > > <%= link_to l(:label_course_practice), :controller => 'courses', :action => 'index' %> >
<span><%= link_to(@bid.courses.first.name.to_s, homework_course_path(@bid.courses.first)) if @bid.courses.first %></span> <span><%= link_to(course.name.to_s, homework_course_path(course)) if course %></span>
> >
<%= link_to(@bid.name, respond_path(@bid)) %></p></td> <%= link_to(@bid.name, respond_path(@bid)) %></p></td>
</tr> </tr>
@ -65,7 +65,7 @@
<td style="vertical-align: top;font-size: 16px;text-align: center;"> <td style="vertical-align: top;font-size: 16px;text-align: center;">
<span style=" word-wrap: break-word; word-break: break-all"> <span style=" word-wrap: break-word; word-break: break-all">
<strong> <strong>
<%= link_to @bid.courses.first.name.to_s, homework_course_path(@bid.courses.first) if @bid.courses.first %> <%= link_to course.name.to_s, homework_course_path(course) if course %>
</strong> </strong>
</span> </span>
</td> </td>
@ -211,9 +211,9 @@
<li> <li>
<%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show'}, :class => link_class(:respond) %> <%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show'}, :class => link_class(:respond) %>
</li> </li>
<% if User.current.member_of? @bid.courses.first %> <% if User.current.member_of_course? course %>
<li> <li>
<% if User.current.logged? && @bid.courses.first && (!Member.where('user_id = ? and course_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?', 5, 10, 7)).size >0) %> <% if User.current.logged? && course && (!Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, course.id).first.roles&Role.where('id = ? or id = ? or id =?', 5, 10, 7)).size >0) %>
<%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_course'}, :class => link_class(:course) %> <%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_course'}, :class => link_class(:course) %>
<% else %> <% else %>
<%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_course'}, :class => link_class(:course) %> <%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_course'}, :class => link_class(:course) %>
@ -221,9 +221,9 @@
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
<!-- <li><%= link_to l(:label_homework_statistics), {:controller => 'bids', :action => 'homework_statistics'}, :class => link_class(:homework_statistics) %></li> --> <!-- <li><%#= link_to l(:label_homework_statistics), {:controller => 'bids', :action => 'homework_statistics'}, :class => link_class(:homework_statistics) %></li> -->
<!-- <li><%= link_to l(:label_homework_respond), {:controller => 'bids', :action => 'homework_respond'}, :class => link_class(:homework_respond) %></li> <!-- <li><%#= link_to l(:label_homework_respond), {:controller => 'bids', :action => 'homework_respond'}, :class => link_class(:homework_respond) %></li>-->
--></ul> </ul>
</div> </div>
<%= yield %> <%= yield %>

74
db/schema.rb
View File

@ -175,58 +175,6 @@ ActiveRecord::Schema.define(:version => 20140626012511) do
add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
create_table "code_review_assignments", :force => true do |t|
t.integer "issue_id"
t.integer "change_id"
t.integer "attachment_id"
t.string "file_path"
t.string "rev"
t.string "rev_to"
t.string "action_type"
t.integer "changeset_id"
end
create_table "code_review_project_settings", :force => true do |t|
t.integer "project_id"
t.integer "tracker_id"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "updated_by"
t.boolean "hide_code_review_tab", :default => false
t.integer "auto_relation", :default => 1
t.integer "assignment_tracker_id"
t.text "auto_assign"
t.integer "lock_version", :default => 0, :null => false
t.boolean "tracker_in_review_dialog", :default => false
end
create_table "code_review_user_settings", :force => true do |t|
t.integer "user_id", :default => 0, :null => false
t.integer "mail_notification", :default => 0, :null => false
t.datetime "created_at"
t.datetime "updated_at"
end
create_table "code_reviews", :force => true do |t|
t.integer "project_id"
t.integer "change_id"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "line"
t.integer "updated_by_id"
t.integer "lock_version", :default => 0, :null => false
t.integer "status_changed_from"
t.integer "status_changed_to"
t.integer "issue_id"
t.string "action_type"
t.string "file_path"
t.string "rev"
t.string "rev_to"
t.integer "attachment_id"
t.integer "file_count", :default => 0, :null => false
t.boolean "diff_all"
end
create_table "comments", :force => true do |t| create_table "comments", :force => true do |t|
t.string "commented_type", :limit => 30, :default => "", :null => false t.string "commented_type", :limit => 30, :default => "", :null => false
t.integer "commented_id", :default => 0, :null => false t.integer "commented_id", :default => 0, :null => false
@ -793,20 +741,20 @@ ActiveRecord::Schema.define(:version => 20140626012511) do
end end
create_table "relative_memos", :force => true do |t| create_table "relative_memos", :force => true do |t|
t.integer "osp_id" t.integer "osp_id", :null => false
t.integer "parent_id" t.integer "parent_id"
t.string "subject", :null => false t.string "subject", :null => false
t.text "content", :limit => 16777215, :null => false t.text "content", :null => false
t.integer "author_id" t.integer "author_id"
t.integer "replies_count", :default => 0 t.integer "replies_count", :default => 0
t.integer "last_reply_id" t.integer "last_reply_id"
t.boolean "lock", :default => false t.boolean "lock", :default => false
t.boolean "sticky", :default => false t.boolean "sticky", :default => false
t.boolean "is_quote", :default => false t.boolean "is_quote", :default => false
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
t.integer "viewed_count_crawl", :default => 0 t.integer "viewed_count_crawl", :default => 0
t.integer "viewed_count_local", :default => 0 t.integer "viewed_count_local", :default => 0
t.string "url" t.string "url"
t.string "username" t.string "username"
t.string "userhomeurl" t.string "userhomeurl"