diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index f3578e713..5071444f4 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -35,35 +35,6 @@ <% end %> - - - - - - - - - -
- <% if @homework_list.empty? %> -
- 暂无学生提交作业！ -
- <% end %> - 		-
- 什么是项目？ -
-
- - - -
-
<%= render :partial => 'homework_list', :locals => {:homework => @homework_list} %>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 0326f218c..a460a0d7a 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -1,163 +1,218 @@ - -<% is_student = is_cur_course_student(@bid.courses.first) %> -<% is_teacher = is_course_teacher(User.current,@bid.courses.first) %> - -<% is_evaluation = @bid.is_evaluation == 1 || @bid.is_evaluation == nil %> -<%= form_tag(:controller => 'bids', :action => "show_courseEx", :method => :get) do %> -
- - - - - -
<%= l(:label_task_plural)%>(<%= @homework_list.count%>) - <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(is_teacher && @bid.homeworks.count > 0) %> - -
- <% if is_teacher %> - <%= text_field_tag 'student_id', params[:student_id], :size => 30 %> - <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %> - <% end %> -
-
-
-<% end %> -<% display_id = im_watching_student_id? @bid%> -<% @homework_list.each do |homework|%> - - - - - -
- - <% user_name = is_teacher ? (homework.user.lastname + homework.user.firstname) : homework.user.login %> - - - - - - - - - - -
<%= image_tag(url_to_avatar(homework.user), :class => "avatar")%>
-

- <%= link_to user_name, user_path(homework.user),{:style => "color:#727272"} %> -

-
- <% if (users_for_homework(homework).include?(User.current) || is_teacher) %> - <%= link_to l(:button_edit), edit_homework_attach_path(homework) %> - <% if homework.user == User.current || is_teacher %> - <%= link_to(l(:label_bid_respond_delete), homework, - method: :delete, :confirm => l(:text_are_you_sure)) %> - <% end %> - <% end %> -
- - 		- - - - - - + + + 作业列表页_老师界面 + + <%= stylesheet_link_tag 'css', :media => 'all' %> + - - - - + +
+
+
    +
  • 未批作业
    • +
  • 已改作业
    • +
  • 全部作业
    • +
  • 作业下载
    • +
  • 留言(23)
    • -
- - - - - - - -
- 作品名称:  - <% if homework.name == nil || homework.name == "" %> - <% homework_filename = homework.user.name + "提交的作业" %> - <% else %> - <% homework_filename = homework.name %> - <% end %> - - <%= link_to homework_filename , homework_attach_path(homework)%> - - - 合作成员:  - <% homework_users = homework_user_of_homework(homework,is_teacher) %> - <% if homework.users.count == 0 %> - 无 - <% else %> - <%= homework_users %> - <% end %> - - <% if Time.parse(@bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %> - 迟交 - <% end %> -
- 开发项目:  - <% if homework.project != nil %> - - <%= link_to homework.project.name,project_path(homework.project.id)%> - - <% else %> - 暂无 - <% end %> - - 项目得分:  - ;"> - <%= homework.project.nil? ? "N/A" : project_scores(homework.project) %> - - -
- 提交文件:  - <% if is_evaluation || is_teacher%> - <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> - <% else %> - 未开启互评功能作业不允许下载 - <% end %> - - - 互评得分:  - <%# student_homework_score = student_score_for_homework(homework) %> - ;"> - <% score = homework.s_score.nil? ? "N/A" : format("%.2f",homework.s_score) %> - <%= score %> -    - <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> - <%= link_to "学生互评>>",homework_attach_path(homework) %> - <% end %> - -
- <% if is_evaluation || is_teacher%> - <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> - <% end %> - - 终评得分:  - <%# totle_homework_score = score_for_homework(homework) %> - <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * ((@bid.proportion.nil? ? 60 : @bid.proportion) * 1.0 / 100) + - (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - (@bid.proportion.nil? ? 60 : @bid.proportion) * 1.0 / 100)) %> - ;"> - <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> - <%= score %> -    - <% if is_teacher %> - <%= link_to "教师评分>>",homework_attach_path(homework) %> - <% end %> - -
-
-
-<% end %> - - \ No newline at end of file + +
+
+
+
作品列表(20)按 评分 / 时间 排序
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
作品列表(2)按 评分 / 时间 排序
+
+ +
+ +
+ +
+
+
+
作品列表(3)按 评分 / 时间 排序
+
+ +
+ +
+ +
+ +
+
+
+
+
+

留言内容

+ + 取  消留  言 + +
+
+
+ +
+ + + + diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index ecab893ec..9d62bfd4d 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -15,7 +15,6 @@ a:hover{ text-decoration:underline;} /* 作业列表 */ .ttl{ } .ctt{height:820px;clear:both; } -#content{float:right;clear:both;width:693px;/*滑动门的宽度*/} /* TAB 切换效果 */ .tb_{ background-color: #eaeaea; height:40px; } .tb_ ul{height:40px; } @@ -39,7 +38,7 @@ a:hover{ text-decoration:underline;} .pic_head img{ border:1px solid #fff;} .pic_head img:hover{border:1px solid #15bccf;} .dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:20px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;} -.dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:43px;} +.dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:33px;} .wscore{ padding-top:22px; color:#888888;} .dis ul li.wping{margin-left:16px; } .dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;} diff --git a/public/stylesheets/images/225905790.jpg b/public/stylesheets/images/225905790.jpg new file mode 100644 index 000000000..957db4bc8 Binary files /dev/null and b/public/stylesheets/images/225905790.jpg differ diff --git a/public/stylesheets/images/close.png b/public/stylesheets/images/close.png new file mode 100644 index 000000000..301ba5e85 Binary files /dev/null and b/public/stylesheets/images/close.png differ diff --git a/public/stylesheets/images/pic_down.png b/public/stylesheets/images/pic_down.png new file mode 100644 index 000000000..a2252b75d Binary files /dev/null and b/public/stylesheets/images/pic_down.png differ diff --git a/public/stylesheets/images/star.png b/public/stylesheets/images/star.png new file mode 100644 index 000000000..507e19020 Binary files /dev/null and b/public/stylesheets/images/star.png differ