diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 38e2ece34..d7611e8b7 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -124,14 +124,28 @@
+ <% if @bid.reward_type == 3 %> - + + + + + + + + + <% else %> + + - + + <% end %>
<%= l(:label_bidding_user) %> + <%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %>
<%= l(:label_bidding_user_homework) %> <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %> -
<%= l(:label_bidding_reason_homewrok) %><%= b_project.description %>
<%= l(:label_bidding_user) %> + <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %> +
<%= l(:label_bidding_reason) %><%= b_project.description %>
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 50f34d3d8..9afa3ea9d 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,19 +1,24 @@ <%= render_flash_messages %> -<% if @bid.reward_type == 3 %> +<% if @bid.reward_type == 3 %> + <% if User.current.user_extensions.identity == 1 %> +
+

贴心小提示:

+

亲,在这里我们的作业将以项目的形式提交,如果小伙伴们还没有创建项目,请先创建一个项目。项目创建成功后,就可以再 + 回到这里来提交作业哦~ 这样在作业提交后,老师就可以随时关注你的作业进展啦~祝使用愉快^^

+
+ <% end %> - - <% if User.current.logged? %> + - <% end %> +
<%= l(:label_homework_project) %>(<%= @bidding_project.count%>)<%= l(:label_homework_project) %>(<%= @bidding_project.count%>) - <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> + <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
<%= toggle_link l(:label_commit_homework), 'put-bid-form' %>
<% end %> -
- +