注意：只需要填写课程的全称即可
+正确示例：数据结构
+错误示例：数据结构2017本部
+错误示例：数据结构2017秋季
+错误示例：数据结构2017电子商务1班
+请输入正确的邮箱
激活邮箱账号
<%= link_to '首页', home_path %> - | - <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %> + + <%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
@@ -14,7 +14,7 @@
- 立即去邮箱激活账号 + 立即去邮箱激活账号
激活邮件已发送
只需要登录邮箱（<%= @user.mail %>），点击链接激活即可- 立即去邮箱激活账号 + 立即去邮箱激活账号
- 还没有收到激活账号邮件？ @@ -22,13 +22,13 @@
- 2：再次发送验证邮件
- 3：如果仍然没有收到注册验证邮件，请更换邮件地址
- - <%= link_to '重新发送激活邮件'.html_safe, { :controller => 'account', :action => 'resendmail', :user => @user},:id => 'resend_email_a', :class => 'task-btn fl mr20', :remote => true, :method => 'get' %> - 更换邮件地址 + <%= link_to '重新发送激活邮件'.html_safe, { :controller => 'account', :action => 'resendmail', :user => @user},:id => 'resend_email_a', :class => 'task-btn-email fl mr20', :remote => true, :method => 'get' %> + 更换邮件地址
-
- 确定
+ 确定
请输入正确的邮箱
@@ -58,4 +58,11 @@
}
}
}
+
+ $(function(){
+ var uurl = '<%= email %>';
+ console.log(uurl);
+ uurl = gotoEmail(uurl);
+ $("#user_email_link").attr("href", "http://"+uurl);
+ });
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index df1250a67..f513edf67 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -1,21 +1,13 @@
- - - - - -
- - - - -
- - <% if Setting.autologin? %> - - <% end %> - - <% if Setting.lost_password? %>忘记密码<% end %> - - - -
- - - -
- + + + +
- + + + +
-
+
+ <% if Setting.autologin? %> + + + <% end %> +
+ + <% if Setting.lost_password? %>忘记密码?<% end %> + + +
+ - + + +
- +
-
@@ -54,5 +55,10 @@\ No newline at end of file diff --git a/app/views/account/professional_certification.html.erb b/app/views/account/professional_certification.html.erb new file mode 100644 index 000000000..50ba81dad --- /dev/null +++ b/app/views/account/professional_certification.html.erb @@ -0,0 +1,166 @@ ++ <% if !@user.professional_certification && @apply_user_auth.nil? %> ++ +++ <% elsif !@user.professional_certification && @apply_user_auth && @apply_user_auth.status == 0 %> + +
职业认证
+ + +++ <% elsif !@user.professional_certification && @apply_user_auth && @apply_user_auth.status == 2 %> +++职业认证
++ 1填写认证信息 > + 2人工审核 > + 3认证结果 +
+++认证中我们将在1个工作日内完成审核，通过审核后页面会显示“已认证”
++ +
++ + + +认证信息 ++ +职业： +<%= @user.user_extensions.show_identity %> ++ +职称/学号： +<%= @user.user_extensions && @user.user_extensions.identity && @user.user_extensions.identity == 1 ? @user.user_extensions.try(:student_id) : @user.user_extensions.try(:technical_title) %> ++ +单位/学校名称： +<%= @user.user_extensions.school ? @user.user_extensions.school.try(:name) : '' %> ++ +部门/学院名称： +<%= @user.user_extensions.department ? @user.user_extensions.department.try(:name) : '' %> ++ + +职业证正面照： +已上传查看<%= image_tag(url_to_auth_img(@user.id, 'PRO'), :width => 200, :height => 150, :id => "upload_pro_image", :class => "none") %> +若您想重新认证，请先撤销本次认证申请
+++ <% elsif @user.professional_certification %> +++职业认证
++ 1填写认证信息 > + 2人工审核 > + 3认证结果 +
+++未通过原因：<%= @apply_user_auth.remarks %>
+ ++ +
++ + + +认证信息 ++ +职业： +<%= @user.user_extensions.show_identity %> ++ +职称/学号： +<%= @user.user_extensions && @user.user_extensions.identity && @user.user_extensions.identity == 1 ? @user.user_extensions.try(:student_id) : @user.user_extensions.try(:technical_title) %> ++ +单位/学校名称： +<%= @user.user_extensions.school ? @user.user_extensions.school.try(:name) : '' %> ++ +部门/学院名称： +<%= @user.user_extensions.department ? @user.user_extensions.department.try(:name) : '' %> ++ + +职业证正面照： +已上传查看<%= image_tag(url_to_auth_img(@user.id, 'PRO'), :width => 200, :height => 150, :id => "upload_pro_image", :class => "none") %> +若您想重新认证，请点击这里
+++ <% end %> + +++职业认证
++ 1填写认证信息 > + 2人工审核 > + 3认证结果 +
+++已认证
+ ++ +
++ + + +认证信息 ++ +职业： +<%= @user.user_extensions.show_identity %> ++ +职称/学号： +<%= @user.user_extensions && @user.user_extensions.identity && @user.user_extensions.identity == 1 ? @user.user_extensions.try(:student_id) : @user.user_extensions.try(:technical_title) %> ++ +单位/学校名称： +<%= @user.user_extensions.school ? @user.user_extensions.school.try(:name) : '' %> ++ +部门/学院名称： +<%= @user.user_extensions.department ? @user.user_extensions.department.try(:name) : '' %> ++ + +职业证正面照： +已上传查看<%= image_tag(url_to_auth_img(@user.id, 'PRO'), :width => 200, :height => 150, :id => "upload_pro_image", :class => "none") %> +若您想重新认证，请点击这里
++ <%= render :partial => "account/pro_certification_form" %> ++++++ + \ No newline at end of file diff --git a/app/views/account/reset_psd.html.erb b/app/views/account/reset_psd.html.erb index cd4a5536b..ab00efc8e 100644 --- a/app/views/account/reset_psd.html.erb +++ b/app/views/account/reset_psd.html.erb @@ -18,12 +18,11 @@ <%= form_tag(account_reset_psd_path, :remote => true, :method => 'post') do %>-
-
-
-
+
-
至少8位由字母或特殊符号和数字结合
+新密码8-16位，区分大小写字母
-
diff --git a/app/views/account/security_settings.html.erb b/app/views/account/security_settings.html.erb
new file mode 100644
index 000000000..13f6fe657
--- /dev/null
+++ b/app/views/account/security_settings.html.erb
@@ -0,0 +1,40 @@
++ + + + + + + + + + + + + + + ++ \ No newline at end of file diff --git a/app/views/account/user_join.html.erb b/app/views/account/user_join.html.erb index 66437dfa1..1b32e71b5 100644 --- a/app/views/account/user_join.html.erb +++ b/app/views/account/user_join.html.erb @@ -1,279 +1,304 @@ --- - +--
注册
-- <%= link_to '首页', home_path %> - | - <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %> -
---- --- -- - -++ + diff --git a/app/views/admin/_audit_authentication_list.html.erb b/app/views/admin/_audit_authentication_list.html.erb new file mode 100644 index 000000000..bf141ac0e --- /dev/null +++ b/app/views/admin/_audit_authentication_list.html.erb @@ -0,0 +1,58 @@ +<% @unapproved_user.each_with_index do |apply_user, index| %> + <% user = User.find(apply_user.user_id) %> ++++ +++ ++ + ++ + <%= image_tag(url_to_avatar(user), :class => "fl with10 edu-ad-user", :alt => "头像", :width => "50", :height => "50" ) %> + ++<% end %> +++-
+
- + <%= user.show_real_name %> + <%= time_from_now(apply_user.updated_at) %> + <%= apply_user.status == 1 ? "已同意" : "已拒绝" %> + +
- + 身份证号：<%= user.ID_number %> + +
- + <% if !user.user_extensions.school_id.blank? && user.user_extensions.school %> + <%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %> + <% end %> + <% if user.user_extensions && user.user_extensions.identity %> + <%= user.identity %> + <% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %> + <%= user.user_extensions.try(:student_id) %> + <% end %> + <% end %> + +
- + <%= image_tag(url_to_auth_img(user.id, 'ID'), :width => 200, :height => 150, :class => 'edu-renzheng-img fl mr20') %> + + <% if apply_user.status == 2 %> +
- 原因：<%= apply_user.remarks %> + <% end %> +
++ \ No newline at end of file diff --git a/app/views/admin/_authentication_list.html.erb b/app/views/admin/_authentication_list.html.erb new file mode 100644 index 000000000..d35d2b6e6 --- /dev/null +++ b/app/views/admin/_authentication_list.html.erb @@ -0,0 +1,71 @@ +<% unless @unapproved_user.blank? %> + <% @unapproved_user.each do |apply_user| %> + <% user = User.find(apply_user.user_id) %> +++-
+ <%= pagination_links_full @unapproved_user_pages, @unapproved_user_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
+ + <%= image_tag(url_to_avatar(user), :class => "fl with10 edu-ad-user", :alt => "头像", :width => "50", :height => "50" ) %> + ++ <% end %> +<% else %> + <%= render :partial => "welcome/no_data" %> +<% end %> +++-
+
- + <%= user.show_real_name %> + <%= time_from_now(apply_user.updated_at) %> + 拒绝 + 同意 + +
- + 身份证号：<%= user.ID_number %> + +
- + <% if !user.user_extensions.school_id.blank? && user.user_extensions.school %> + <%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %> + <% end %> + <% if user.user_extensions && user.user_extensions.identity %> + <%= user.identity %> + <% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %> + <%= user.user_extensions.try(:student_id) %> + <% end %> + <% end %> + +
- + <%= image_tag(url_to_auth_img(user.id, 'ID'), :width => 200, :height => 150, :class => 'edu-renzheng-img fl mr20') %> + + +
++ + \ No newline at end of file diff --git a/app/views/admin/_tab_applied_departments.erb b/app/views/admin/_tab_applied_departments.erb new file mode 100644 index 000000000..8fb1783ca --- /dev/null +++ b/app/views/admin/_tab_applied_departments.erb @@ -0,0 +1,6 @@ +++-
+ <%= pagination_links_full @unapproved_user_pages, @unapproved_user_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
+\ No newline at end of file diff --git a/app/views/admin/agree_authentication.js.erb b/app/views/admin/agree_authentication.js.erb new file mode 100644 index 000000000..53bfcb733 --- /dev/null +++ b/app/views/admin/agree_authentication.js.erb @@ -0,0 +1 @@ +$("#authentication_list").html("<%= j( render :partial => "admin/authentication_list" ) %>"); \ No newline at end of file diff --git a/app/views/admin/applied_departments.html.erb b/app/views/admin/applied_departments.html.erb new file mode 100644 index 000000000..34ec11da3 --- /dev/null +++ b/app/views/admin/applied_departments.html.erb @@ -0,0 +1,94 @@ +-
+
- <%= link_to '未审批', {:action => 'applied_departments'}, class: "#{current_page?(unapplied_departments_path)? 'selected' : nil }" %> +
- <%= link_to '已审批', {:action => 'has_applied_departments'}, class: "#{current_page?(applied_departments_path)? 'selected' : nil }" %> +
+ <%=l(:label_applied_departments)%> +
+ +<%= render 'tab_applied_departments' %> + +<%= form_tag({}, :method => :get) do %> + +<% end %> + + ++++ +
++ + + + <% @apply_status.each do |apply| %> + <% if apply.status == 0 %> ++ 序号 + ++ 部门名称 + ++ 单位名称 + ++ 申请者 + ++ 用户 + ++ 创建时间 + ++ 操作 + +"> + + <% unless apply.remarks.blank? %> ++ <%= apply.id %> + ++ <%= apply.name %> + ++ <%= apply.school.name %> + ++ <% user = User.where("id=?", apply.user_id).first %> + <% unless user.nil? %> + <%=link_to user.show_name, user_path(user),:target => '_blank', :class => "application-default-link" %> + <% end %> + ++ <% count = UserExtensions.where("department_id = #{apply.department_id}").count %> + <%= count %> + ++ <%= format_date(apply.created_at) %> + ++ <%= link_to( l(:label_approve), { :controller => 'admin', :action => 'approve_applied_departments', :id => apply.id }, :class => "application-default-link" ) %> + <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_departments', :id => apply.id, :tip => 'unapplied' },:method => :delete, :confirm => l(:text_are_you_sure), :class => "application-default-link") %> + ++ + <% end %> + <% end %> + <% end %> + ++ + ++ <%= apply.remarks %> + +-
+ <%= pagination_links_full @apply_pages, @apply_count ,:per_page_links => true, :remote => false, :flag => true %>
+
+ <%=l(:label_applied_departments)%> +
+ +<%= render 'tab_applied_departments' %> + +<%= form_tag({}, :method => :get) do %> + +<% end %> + + ++++ +
++ + + + <% @has_apply_status.each do |apply| %> + <% if apply.status == 1 || apply.status == 2%> ++ 序号 + ++ 部门名称 + ++ 单位名称 + ++ 申请者 + ++ 用户 + ++ 创建时间 + ++ 操作 + +"> + + <% end %> + <% end %> + ++ <%= apply.id %> + ++ <%= apply.name %> + ++ <%= apply.school.name %> + ++ <% user = User.where("id=?", apply.user_id).first %> + <% unless user.nil? %> + <%=link_to user.show_name, user_path(user),:target => '_blank', :class => "application-default-link" %> + <% end %> + ++ <% count = UserExtensions.where("department_id = #{apply.department_id}").count %> + <%= count %> + ++ <%= format_date(apply.created_at) %> + ++ <%= link_to( l(:button_delete), { :controller => 'admin', :action => 'delete_applied_schools', :id => apply.id, :tip => 'applied' },:method => :delete, :confirm => l(:text_are_you_sure) ) %> + +-
+ <%= pagination_links_full @has_apply_pages, @has_apply_count ,:per_page_links => true, :remote => false, :flag => true %>
+
++ \ No newline at end of file diff --git a/app/views/admin/identity_authentication.js.erb b/app/views/admin/identity_authentication.js.erb new file mode 100644 index 000000000..82b62fd42 --- /dev/null +++ b/app/views/admin/identity_authentication.js.erb @@ -0,0 +1,30 @@ +var nTabIcon_1 = $("#edu-tab-con-1"); +var nTabIcon_2 = $("#edu-tab-con-2"); +var nTabNav_1 = $("#edu-tab-nav-1"); +var nTabNav_2 = $("#edu-tab-nav-2"); +var nAudit = $("#audit_all_authentication").parent(); + +<% if params[:type] == "0" %> + $("#authentication_list").html("<%= j( render :partial => "admin/authentication_list" ) %>"); + nTabNav_1.addClass("edu-tab-hover"); + nTabNav_2.removeClass("edu-tab-hover"); + nTabIcon_1.show(); + nTabIcon_2.hide(); +<% else %> + $("#audit_authentication_list").html("<%= j( render :partial => "admin/audit_authentication_list" ) %>"); + nTabNav_1.removeClass("edu-tab-hover"); + nTabNav_2.addClass("edu-tab-hover"); + nTabIcon_1.hide(); + nTabIcon_2.show(); + /* -------------------------- 未审批（全部、同意、拒绝点击时动态样式） ------------------------------ */ + if(<%= params[:type] == "1" %>){ + nAudit.find(".active").removeClass("active"); + $("#audit_agree_authentication").addClass("active"); + }else if(<%= params[:type] == "2" %>){ + nAudit.find(".active").removeClass("active"); + $("#audit_reject_authentication").addClass("active"); + }else{ + nAudit.find(".active").removeClass("active"); + $("#audit_all_authentication").addClass("active"); + } +<% end %> \ No newline at end of file diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index e7d796e6f..ed173930a 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -1,92 +1,92 @@ -++ +身份认证
+- <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %> -- -- <%=l(:label_project_plural)%> -
- -<%= form_tag({}, :method => :get) do %> - -<% end %> - - --- -- -
-- - - - <% @projects.each do |project| %> -- 序号 - -- <%=l(:label_project)%> - -- <%=l(:field_is_public)%> - -- <%=l(:field_created_on)%> - -- "> - - <% end %> - -- <%= project.id %> - -- - <%= link_to_project_settings(project, {}) %> - - -- <%= checked_image project.is_public? %> - -- <%= format_date(project.created_on) %> - -- <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %> - <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %> - <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del', :onClick=>"delcfm()" ) %> - -- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %> -- -<% html_title(l(:label_project_plural)) -%> -项目代码/提交数统计： - <%= link_to "最近一周", {:controller => 'admin', :action => 'export_rep_static_users', :format => 'xls', :cycle => "admin_week" }, :confirm => l(:label_rep_admin_export_tip), :class => "linkBlue2" %> | - <%= link_to "最近一月", {:controller => 'admin', :action => 'export_rep_static_users', :format => 'xls', :cycle => "admin_month" }, :confirm => l(:label_rep_admin_export_tip), :class => "linkBlue2" %>| - <%= link_to "所有", {:controller => 'admin', :action => 'export_rep_static_users', :format => 'xls', :cycle => "admin_all" }, :confirm => l(:label_rep_admin_export_tip), :class => "linkBlue2" %> -- - \ No newline at end of file diff --git a/app/views/admin/shixun_authentication.js.erb b/app/views/admin/shixun_authentication.js.erb new file mode 100644 index 000000000..ecb54991b --- /dev/null +++ b/app/views/admin/shixun_authentication.js.erb @@ -0,0 +1,5 @@ +<% if @shixun.authentication %> + $("#shixun_authentication_<%= params[:index] %>").html("已认证"); +<% else %> + $("#shixun_authentication_<%= params[:index]%>").html("认证"); +<% end %> diff --git a/app/views/admin/shixuns.html.erb b/app/views/admin/shixuns.html.erb new file mode 100644 index 000000000..513f2c705 --- /dev/null +++ b/app/views/admin/shixuns.html.erb @@ -0,0 +1,49 @@ +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %> +实训列表
+<%#= render 'admin/tab_excellent_courses' %> + + + + + ++diff --git a/app/views/attachments/_activity_attach.html.erb b/app/views/attachments/_activity_attach.html.erb index ad87d28bf..162eb239b 100644 --- a/app/views/attachments/_activity_attach.html.erb +++ b/app/views/attachments/_activity_attach.html.erb @@ -1,21 +1,19 @@ - <% if activity.attachments.any? %> <% activity.attachments.each do |attachment| %> -+ +
++ + + + <% @shixuns.each_with_index do |shixun, index| %> ++ 序号 + ++ 实训名 + ++ 创建者 + ++ 操作 + +"> + + <% end %> + ++ <%= shixun.id %> + ++ + <%= link_to(shixun.name, shixun_path(shixun)) %> + + ++ <%= link_to(shixun.try(:owner).try(:realname).truncate(6, omission: '...'), user_path(shixun.owner)) %> + ++ <%#= link_to(shixun.authentication ? "已认证" : "认证", { :controller => 'admin', :action => 'shixun_authentication', :id => shixun.id, :auth => shixun.authentication }, :onclick => 'shixun_authentication()', :class => 'icon-del', :remote => true) %> + <%= shixun.authentication ? "已认证" : "认证" %> + +- - - <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw380', :download => true %> - - - ( - <%= number_to_human_size attachment.filesize %>) - - <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %> - - <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "linkBlue2" %>, - <%= format_time(attachment.created_on) %> - -+ - + + + <%= link_to_short_attachment attachment,:length=> 58, :class => 'color-grey', :download => true %> + ( + <%= number_to_human_size attachment.filesize %>) + + <% user_name = attachment.author.show_real_name.empty? ? attachment.author : attachment.author.show_real_name %> + + <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "color-grey" %>, + <%= format_time(attachment.created_on) %> + + + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb index f4bf75339..e30e0a98e 100644 --- a/app/views/attachments/_show_attachment_history.html.erb +++ b/app/views/attachments/_show_attachment_history.html.erb @@ -1,12 +1,11 @@ -
-
-
-
-
- - <%= link_to( - l(:button_edit_homepage), - {:controller => 'blog_comments',:action => 'edit',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id, :is_homepage => 1}, - :class => 'postOptionLink' - ) if User.current && User.current.id == activity.author.id %> - -
- - <%= link_to( - l(:button_delete_homepage), - {:controller => 'blog_comments',:action => 'destroy',:user_id=>activity.author_id,:blog_id=>activity.blog_id, :id => activity.id}, - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'postOptionLink' - ) if User.current && User.current.id == activity.author.id %> - -
- - <%= link_to( - l(:button_cancel_homepage), - {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>activity.author_id,:id=>activity.blog_id, :article_id => activity.id}, - :method => :post, - :class => 'postOptionLink' - ) if User.current && User.current.id == activity.blog.author_id %> - -
- - "> + 本关任务 + +<% @challenge.challenge_chooses.each_with_index do |choose, index| %> +
- " style="<%= @challenge.challenge_chooses.count > 7 ? (@index == index ? "width:110px" : "flex:1") : "" %>"> + + <%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %> + + +<% end %> diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb new file mode 100644 index 000000000..a47d921f9 --- /dev/null +++ b/app/views/challenges/_choose_type.html.erb @@ -0,0 +1,125 @@ +
-
+
+ + <%= @challenge.subject %> ++
+
-
+
+ + ++
+
-
+
+ + ++
+
-
+
+ + <%= @challenge.path.blank? ? "无" : (h @challenge.path.html_safe) %> ++
+
-
+
+ + <%= @challenge.exec_path.blank? ? "无" : (h @challenge.exec_path) %> ++
+
-
+
+ + 输入输出 ++
+
-
+ + + ++ +
+ 提交：
+
+ 1、每个黑色小方块代表一个空格，
+ 2、代表测试集末尾的换行，
+ 3、代表制表符. +-
+ <% if @test_sets.count > 0 %>
+ <% @test_sets.each_with_index do |test, index| %>
+
-
+
+ 测试集<%= index + 1 %> + <% unless test.is_public? %> + + <% end %> +
+输入：+<%= match_specific_symbol test.input unless test.input.blank? %>
输出：+<%= match_specific_symbol test.output unless test.output.blank? %>
+ <% end %>
+ <% else %>
+ 无
+ <% end %>
+
+ -
+
-
+
+ + ++ +
+
-
+
+ + <%= @challenge.game_difficulty %> ++
+
-
+
+ + <%= @challenge.score.nil? ? 0 : @challenge.score %>分 ++
+
-
+
+ + <%= @challenge.subject %> ++
+
-
+
+ + ++
+
-
+
+ + + ++
+ <% end %>
+
-
+
+ + + ++
+ <% end %>
+
- + + <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :id => "shixun_file_path", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：src/test/welcome.java", :maxlength => "256" %> + + 文件路径不能为空 + + + +
- + + <%= f.text_field :exec_path, :class => "panel-form-width-690 panel-box-sizing fl",:id => "shixun_file_path_play", :no_label => true, :placeholder => "输入关卡需要执行的文件路径，如：src/test/main.java", :maxlength => "256" %> + 执行文件不能为空 + +
- + + <%= select_tag :evaluation_way, options_for_select([["输入输出", 1]]), :name => 'challenge[evaluation_way]', :class => " fl", :style => "height: 40px; width:200px;" %> + 请选择自动检测学员是否完成本任务的评测标准 + +
-
+ <% if params[:action] == "edit" && @challenge.test_sets.count > 0 %>
+
+
-
+ <% @challenge.test_sets.each_with_index do |test_set, index| %>
+
-
+
+ 组<%= index + 1 %> + <% if test_set.is_public? %> + + + + + + <% else %> + + + + + + <% end %> + + <% if index == 0 %> + 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 + <% end %> + + <% if index > 0 %> + + <% end %> +
+ + +
+ <% end %>
+
+ -
+
- + 保存 + <% if @challenge.evaluation_way != 0 %> + 取消 + <% end %> + +
- - - - - - +
- <%= f.text_field :subject, :class => "panel-form-width-690 fl panel-box-sizing", :no_label => true, :placeholder => "请输入当前任务的名称（此信息将提前泄露给学员）" %> - 任务名称不能为空 + 任务名称不能为空
- - <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：app/controllers/welcome_controller.rb", :maxlength => "256" %> + <%= f.text_field :path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "进入实训后将默认打开该文件，如：src/test/welcome.java", :maxlength => "256" %>
-
-
- - <%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %> - -- <%#= f.kindeditor :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务", :width=>'87.5%', :height => 159, :resizeType => 0, :no_label => true %> + + <%= f.text_field :exec_path, :class => "panel-form-width-690 panel-box-sizing fl", :no_label => true, :placeholder => "输入关卡需要执行的文件路径，如：src/test/main.java", :maxlength => "256" %>
-
<%#= f.kindeditor :task_pass, :editor_id => "challenge_task_pass", :width=>'87.5%', :height => 159, :resizeType => 0, :no_label => true %>
- <%= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %>
- 过关任务不能为空
+ <%#= f.text_area :task_pass, :class => "panel-form-width-690 panel-box-sizing", :no_label => true %>
+ + <%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %> + ++ 过关任务不能为空
- - <% if params[:action] == "edit" && @challenge.challenge_samples.count > 0 %> - + + <%= select_tag :evaluation_way, options_for_select([["输入输出", 1]]), :name => 'challenge[evaluation_way]', :class => " fl", :style => "height: 40px; width:200px;" %> + 请选择自动检测学员是否完成本任务的评测标准 + + + +
-
+ <% if params[:action] == "edit" && @challenge.test_sets.count > 0 %>
+
-
- <% @challenge.challenge_samples.each_with_index do |sample, index| %>
+ <% @challenge.test_sets.each_with_index do |test_set, index| %>
-
- 样例<%= index + 1 %> + 组<%= index + 1 %> + <% if test_set.is_public? %> + + + + <% else %> + + + + <% end %> + <% if index == 0 %> - 温馨提示：输入样例供学员参考。 + 温馨提示：选中“锁定”，则对学员隐藏该条测试集，但在“提交评测”时也将被自动检测。 <% end %> <% if index > 0 %> <% end %>
- - + +
<% end %>
-
- - <% if params[:action] == "edit" && @challenge.test_sets.count > 0 %> - - - <% else %> - - - <% end %> - -
-
-
+
<% if params[:action] == "edit" && @challenge_tags.count > 0 %> <% @challenge_tags.each do |tag| %> @@ -153,27 +186,51 @@- +
-
- <%= f.text_area :answer, :class => "panel-form-width-690 panel-form-height-150 fl task-textarea-pd", :no_label => true, :style => "line-height:1.9;" %>
+ + <%#= f.text_area :ready_knowledge, :placeholder => "请输入完成当前任务依赖的知识点或者其它相关信息，指导学员完成任务" %> + ++ <%#= f.text_area :answer, :class => "panel-form-width-690 panel-form-height-150 fl task-textarea-pd", :no_label => true, :style => "line-height:1.9;" %>
+
- - - <%= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %> - 分 + + <%= radio_button_tag("challenge[difficulty]", 1, checked = (@challenge.difficulty ==1 ? true : false), :class=> "magic-radio fl mt3") %> + + + <%= radio_button_tag("challenge[difficulty]", 2, checked = (@challenge.difficulty ==2 ? true : false), :class=> "magic-radio fl mt3") %> + + + <%= radio_button_tag("challenge[difficulty]", 3, checked = (@challenge.difficulty ==3 ? true : false), :class=> "magic-radio fl mt3") %> + + + + + + + + + + +
- + + <%#= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %> + <%= select_tag :challenge_score, options_for_select([100, 200]), :name => 'challenge[score]', :class => " fl", :style => "height: 40px; width:170px;" %> 分值设定不能为空
- <% if params[:action] == "edit" %> - 保存 + 保存 取消 <% else %> - 保存 + 保存 取消 <% end %> @@ -214,12 +271,13 @@ $("#shixun_form").on('click', 'a.sample_icon_add', function () { var html = bt('t:sample-answer-list', null); $(this).parent().parent('.clearfix').after(html); - var inputs = document.getElementsByName("sample[input][]"); - var outputs = document.getElementsByName("sample[output][]"); + var inputs = document.getElementsByName("test_set[input][]"); + var outputs = document.getElementsByName("test_set[output][]"); var inputs_labels = document.getElementsByName("sample_inputs_label"); for (var j = 0; j < inputs_labels.length; j++) { - $(inputs_labels[j]).html("样例" + (j + 1)); + $(inputs_labels[j]).html("组" + (j + 1)); } + // 设置测试集的的输入与输出的回车自动调整宽度 if (inputs.length == outputs.length) { for (var i = 0; i < inputs.length; i++) { autoTextarea(inputs[i], 0, 140); @@ -232,18 +290,109 @@ $(this).parent().parent('.clearfix').remove(); var inputs_labels = document.getElementsByName("sample_inputs_label"); for (var j = 0; j < inputs_labels.length; j++) { - $(inputs_labels[j]).html("样例" + (j + 1)); + $(inputs_labels[j]).html("组" + (j + 1)); } }); + + // 根据难易程度设置不同的奖励经验值（适用新建与编辑模式） + var list= $('input:radio[name="challenge[difficulty]"]:checked').val(); // 获取select的索引值 + if(list == 1){ + $("#challenge_score").empty(); + for(var i= 100; i <= 200; i += 100){ + $("#challenge_score").append(""); + } + }else if(list == 2){ + $("#challenge_score").empty(); + for(var i= 300; i <= 600; i += 100){ + $("#challenge_score").append(""); + } + }else if(list == 3){ + $("#challenge_score").empty(); + for(var i= 700; i <= 1000; i += 100){ + $("#challenge_score").append(""); + } + } + $("#challenge_score").find("option[value='<%= @challenge.score %>']").attr("selected",true); // 设置option默认值 + $("#challenge_difficulty_1").click(function(){ + $("#challenge_score").empty(); + for(var i= 100; i <= 200; i += 100){ + $("#challenge_score").append(""); + } + }); + $("#challenge_difficulty_2").click(function(){ + $("#challenge_score").empty(); + for(var i= 300; i <= 600; i += 100){ + $("#challenge_score").append(""); + } + }); + $("#challenge_difficulty_3").click(function(){ + $("#challenge_score").empty(); + for(var i= 700; i <= 1000; i += 100){ + $("#challenge_score").append(""); + } + }) + + // 知识技能点添加，清空输入框，并focus + $("#add_knowledge").click(function(){ + $("#shixun_skill_input").val(""); + $("#shixun_skill_input").focus(); + }); + }); - var text1 = document.getElementById("textarea_sample_input_test"); - var text2 = document.getElementById("textarea_sample_output_test"); - // autoTextarea(text1, 0, 140); - // autoTextarea(text2, 0, 140); - var text3 = document.getElementById("textarea_input_test"); - var text4 = document.getElementById("textarea_output_test"); - // autoTextarea2(text3, text4, 0, 140); - // autoTextarea2(text4, text3, 0, 140); + + window.onload = function(){ + $("#challenge_task_pass [type=\"latex\"]").bind("click", function(){ + taskpass_editormd.cm.replaceSelection("```latex"); + taskpass_editormd.cm.replaceSelection("\n"); + taskpass_editormd.cm.replaceSelection("\n"); + taskpass_editormd.cm.replaceSelection("```"); + var __Cursor = taskpass_editormd.cm.getDoc().getCursor(); + taskpass_editormd.cm.setCursor(__Cursor.line-1, 0); + }); + + $("#challenge_answer [type=\"latex\"]").bind("click", function(){ + taskanswer_editormd.cm.replaceSelection("```latex"); + taskanswer_editormd.cm.replaceSelection("\n"); + taskanswer_editormd.cm.replaceSelection("\n"); + taskanswer_editormd.cm.replaceSelection("```"); + var __Cursor = taskanswer_editormd.cm.getDoc().getCursor(); + taskanswer_editormd.cm.setCursor(__Cursor.line-1, 0); + }); + + $("#challenge_task_pass [type=\"inline\"]").bind("click", function(){ + taskpass_editormd.cm.replaceSelection("$$$$"); + var __Cursor = taskpass_editormd.cm.getDoc().getCursor(); + taskpass_editormd.cm.setCursor(__Cursor.line, __Cursor.ch-2); + taskpass_editormd.cm.focus(); + }); + + $("#challenge_answer [type=\"inline\"]").bind("click", function(){ + taskanswer_editormd.cm.replaceSelection("$$$$"); + var __Cursor = taskanswer_editormd.cm.getDoc().getCursor(); + taskanswer_editormd.cm.setCursor(__Cursor.line, __Cursor.ch-2); + taskanswer_editormd.cm.focus(); + }); + $("[type=\"inline\"]").attr("title", "行内公式"); + $("[type=\"latex\"]").attr("title", "多行公式"); + + } + + // 设置textarea的宽度到140以后出现滚动条 + var test_set_inputs = document.getElementsByName("test_set[input][]"); + var test_set_outputs = document.getElementsByName("test_set[output][]"); + if (test_set_inputs.length == test_set_outputs.length) { + for (var i = 0; i < test_set_inputs.length; i++) { + autoTextarea(test_set_inputs[i], 0, 140); + autoTextarea(test_set_outputs[i], 0, 140); + } + } +/* autoTextarea(text1, 0, 140); + autoTextarea(text2, 0, 140); + + var text3 = document.getElementById("textarea_sample_input_test"); + var text4 = document.getElementById("textarea_sample_output_test"); + autoTextarea2(text3, text4, 0, 140); + autoTextarea2(text4, text3, 0, 140);*/ $("#challenge_score").keyup(function(){ (this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this) }); @@ -256,12 +405,30 @@ $("#challenge_subject").keydown(function(){ $("#new_shixun_pass").hide(); }); + + // 判断测试集是否锁定, 0未锁定，1锁定 + function test_set_whether_lock(){ + var lock = document.getElementsByName("test_set[lock][]"); + var hid = document.getElementsByName("test_set[hidden][]"); + for(var o = 0; o < lock.length; o++){ + if($(lock[o]).prop("checked")){ + $(hid[o]).val(1); + }else{ + $(hid[o]).val(0); + } + } + } + function challenge_create(){ + test_set_whether_lock(); if($('#challenge_subject').val().trim() == ""){ + $("#challenge_subject").focus(); $("#new_shixun_name").show(); - }else if($("#challenge_task_pass").val().trim() == ""){ + }else if($("#challenge_task_pass textarea").val().trim() == ""){ + $("#challenge_task_pass textarea").focus(); $("#new_shixun_pass").show(); }else if($("#challenge_score").val().trim()==""){ + $("#challenge_score").focus(); $("#new_shixun_score").show(); }else{ $('#challenge_shixun_create').submit(); @@ -269,19 +436,23 @@ } function challenge_update(){ + test_set_whether_lock(); if($('#challenge_subject').val().trim() == ""){ + $("#challenge_subject").focus(); $("#new_shixun_name").show(); - }else if($("#challenge_task_pass").val().trim() == ""){ + }else if($("#challenge_task_pass textarea").val().trim() == ""){ + $("#challenge_task_pass textarea").focus(); $("#new_shixun_pass").show(); }else if($("#challenge_score").val().trim()==""){ + $("#challenge_score").focus(); $("#new_shixun_score").show(); }else{ $('#edit_challenge_<%= @challenge.id %>').submit(); } } - var editor = CodeMirror.fromTextArea(document.getElementById("challenge_answer"), { - mode: {name: '<%= @language %>', +/* var editor = CodeMirror.fromTextArea(document.getElementById("challenge_answer"), { + mode: {name: '<%#= @language %>', version: 2, singleLineStringErrors: false}, lineNumbers: true, @@ -292,9 +463,9 @@ editor.on('change',function(cMirror){ // get value right from instance $('#challenge_answer').val(cMirror.getValue()); - }); + });*/ - challenge_task_pass_editor = KindEditor.create('#challenge_task_pass', + /* challenge_task_pass_editor = KindEditor.create('#challenge_task_pass', {"width":"89.7%", "resizeType":0, "no_label":true, @@ -317,7 +488,7 @@ "fileManagerJson":"/kindeditor/filemanager" }); - +*/ function add_tag(){ var num = $(".task-bd-grey").children('div').length; var val = $(".task-tag-input").val().trim(); @@ -329,6 +500,7 @@ "
- + + + > + + + + > + + + + > + + + + + + +
- + + <%#= f.text_field :score, :class => "panel-form-height-30 fl", :no_label => true, :style => "padding:5px;", :placeholder => "请输入分值（只能是数字）" %> + <%= select_tag :challenge_score, options_for_select([100, 200]), :name => 'challenge[score]', :class => " fl", :style => "height: 40px; width:170px;" %> + + 分值设定不能为空 + + +
- 如果学员查看了参考答案，则不能得到相应的经验值 +
- 如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+100经验值、+100金币 + <% else %> +
- 如果学员答题错误，则不能得到相应的经验值 +
- 如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+10经验值、+10金币 + <% end %> +
- + 保存 + <% if !@challenge.score.nil? %> + 取消 + <% end %> + +
-
+
+ + ++ + +
+
- + + + > + + + + > + + + + > + + + +
- + + <%= select_tag :challenge_score, options_for_select([100, 200]), :name => 'challenge[score]', :class => " fl", :style => "height: 40px; width:170px;" %> + + 分值设定不能为空 + + +
- 如果学员答题错误，则不能得到相应的经验值 +
- 如果学员成功得到经验值，那么将同时获得等值的金币奖励，如：+10经验值、+10金币 +
-
+
+ + <% unless @challenge_choose.blank? %> + <% @challenge_choose.challenge_tags.each do |tag| %> +++ + ++ <% end %> + <% end %> ++ + ++ +添加 +
+
- 学员答题正确将获得技能，否则不能获得技能 +
- + ')">保存 + 取消 + +<% end %> + \ No newline at end of file diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb new file mode 100644 index 000000000..7a2503bb1 --- /dev/null +++ b/app/views/challenges/_single_or_multiple_question_show.html.erb @@ -0,0 +1,90 @@ +<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js' %> +
- + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + 删除 + + <% end %> + +
-
+
+ + ++
+ <% @challenge_choose.challenge_questions.each_with_index do |option, index| %>
+
-
+
+ + <%= option.option_name %> ++
+ <% end %>
+
-
+
+ + ++
+
-
+
+ + <%= difficulty_type @challenge_choose.difficult %> ++
+
-
+
+ + <%= @challenge_choose.score.nil? ? 0 : @challenge_choose.score %>分 ++
+
-
+
+ + <% if @challenge_choose.challenge_tags.blank? %> + 无 + <% else %> + <% @challenge_choose.challenge_tags.each do |tag| %> +++ <%= tag.name %> ++ <% end %> + <% end %> +
+
-
+
+ + <% if params[:action] == "edit" && @challenge_tags.count > 0 %> + <% @challenge_tags.each do |tag| %> +++ + ++ <% end %> + <% end %> + +" id="add_shixun_skill"> + + ++ +添加 +
+
- 学员未参考答案通过了本阶段的评测时将获得技能，否则不能获得技能 + <% else %> +
- 学员答题正确将获得技能，否则不能获得技能 + <% end %> +
- + 保存 + 取消 + +
- + + <%= f.text_field :subject, :class => "panel-form-width-690 fl panel-box-sizing", :no_label => true, :placeholder => "请输入当前任务的名称（此信息将提前泄露给学员）" %> + 任务名称不能为空 + +
-
+
+ + ++ + + 过关任务不能为空 +
+
- + 保存 + <% if params[:action] == "new" %> + 取消 + <% else %> + 取消 + <% end %> + +
- "> + 本关任务 + +
- "> + 评测设置 + +
- "> + 参考答案 + + <% unless @challenge.ready_knowledge.blank? %> +
- "> + 背景知识 + + <% end %> +
- "> + 评分设置 + +
- "> + 技能标签 + +
-
-
- - - - <%#= @challenge.ready_knowledge.blank? ? "无" : (h @challenge.ready_knowledge.html_safe) %> +
- + +
+ <%= @challenge.exec_path.blank? ? "无" : (h @challenge.exec_path) %>- -
- <%= h @challenge.task_pass.html_safe %> ++- - -
-
- <% if @challenge_samples.count > 0 %>
- <% @challenge_samples.each_with_index do |sample, index| %>
-
-
-
- 样例<%= index + 1 %> -
-样例输入：-<%= sample.input %>
样例输出：-<%= sample.output %>
- <% end %>
- <% else %>
- 无
- <% end %>
-
+ 输入输出 +- @@ -86,8 +75,14 @@
测试集<%= index + 1 %> + <% if test.is_public? %> + + <% else %> + + <% end %>
-+<%= test.output %>
输入：+<%= test.input.gsub("\r\n", "
").html_safe unless test.input.blank? %>输出：<%= test.output.gsub("\r\n", "
").html_safe unless test.output.blank? %>- - -
<%= @challenge.answer.blank? ? "无" : (@challenge.answer) %>++ ++- - + +
++ <%= @challenge.game_difficulty %> ++- +
<%= @challenge.score %>分@@ -122,20 +125,23 @@ - + +
- + +
-
<%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "50", :height => "50", :class=> "rankPortrait"),user_path(contributor_score.user) %>
-
<%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %>
+<%=link_to contributor_score.user.show_real_name, user_path(contributor_score.user.id), :title => contributor_score.show_real_name_name %>
diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb index 60258b42f..29a229051 100644 --- a/app/views/courses/_course_heroes.html.erb +++ b/app/views/courses/_course_heroes.html.erb @@ -12,7 +12,7 @@ <% hero_homework_scores.each do |student_score| %> <% if student_score.score.to_i != 0 %> - <%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %>
-
+
<% if !(User.current.allowed_to?(:as_teacher, @course) || User.current.admin?) && User.current.id != student_score.user.id && course_has_score_open_common_homework(@course) %> <%= "**" %> diff --git a/app/views/courses/_course_index_search.html.erb b/app/views/courses/_course_index_search.html.erb new file mode 100644 index 000000000..5d4827952 --- /dev/null +++ b/app/views/courses/_course_index_search.html.erb @@ -0,0 +1,24 @@ + + + \ No newline at end of file diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb index dfa8c0876..7d32321fc 100644 --- a/app/views/courses/_course_teacher.html.erb +++ b/app/views/courses/_course_teacher.html.erb @@ -12,7 +12,7 @@
<%= link_to image_tag(url_to_avatar(member.user), :width => "50", :height => "50", :style => "display:block;", :class =>'teacher_member_img'), user_path(member.user_id), :class => 'fl' ,:alt => "用户头像" %>- <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 mt5 mb10 link-blue db") %> + <%= link_to(member.user.show_real_name, user_path(member.user),:class => "ml10 mt5 mb10 link-blue db") %> <%= l(:label_username)%><%= member.user.login%><%= format_date(member.created_on)%> diff --git a/app/views/courses/_hero_table.html.erb b/app/views/courses/_hero_table.html.erb index 8e1e96242..db7a40972 100644 --- a/app/views/courses/_hero_table.html.erb +++ b/app/views/courses/_hero_table.html.erb @@ -69,7 +69,7 @@ <% @members.each do |member| %> <% is_hidden = boo && User.current.id != member.user_id %>- <%= link_to member.user.show_name, user_path(member.user), :class => 'course_class_users_st_name' %> +<%= link_to member.user.show_real_name, user_path(member.user), :class => 'course_class_users_st_name' %> <%= member.committed_work_num %> <%= member.un_commit_work_num %> <%= member.late_commit_work_num %> @@ -90,6 +90,5 @@ <% else%> --
没有数据可以显示！
+ <%= render :partial => "welcome/no_data" %> <% end %> \ No newline at end of file diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index 84c5ccd2e..9ca8d3347 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -9,7 +9,7 @@- <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%> + <%= link_to journal.user.show_real_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%> <%= format_time(journal.created_on) %> @@ -44,12 +44,12 @@ <% ids = 'project_respond_form_'+ journal.id.to_s%> <% if reply_allow %>diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index 7558a24e3..fd7e0be01 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -1,35 +1,42 @@ -- <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %> + <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => jourshow_real_name_name => true} %><% end %> - <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %> + <%= render :partial => "words/journal_reply", :locals => {:journal => show_real_name:show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>--欢迎加入班级
- - ++ -- <%= form_tag({:controller => 'courses', :action => 'join_course_multi_role'}, :remote => true, :method => :post, :id => 'new-watcher-form') do %> - - <% end %> ++ \ No newline at end of file diff --git a/app/views/courses/all_student_list.js.erb b/app/views/courses/all_student_list.js.erb new file mode 100644 index 000000000..4292ee39f --- /dev/null +++ b/app/views/courses/all_student_list.js.erb @@ -0,0 +1,6 @@ +<% if params[:page] || params[:search] %> +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +$("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>"); +<% else %> +$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show(); +<% end %> \ No newline at end of file diff --git a/app/views/courses/choose_course_group.js.erb b/app/views/courses/choose_course_group.js.erb new file mode 100644 index 000000000..88511d6e1 --- /dev/null +++ b/app/views/courses/choose_course_group.js.erb @@ -0,0 +1,2 @@ +var htmlvalue = "<%= j(render :partial => 'courses/settings/choose_course_group') %>"; +pop_box_new(htmlvalue, 450, 200); \ No newline at end of file diff --git a/app/views/courses/code_repeat.html.erb b/app/views/courses/code_repeat.html.erb index 0ccc4c8fb..13079a8be 100644 --- a/app/views/courses/code_repeat.html.erb +++ b/app/views/courses/code_repeat.html.erb @@ -1,72 +1,82 @@ --查重结果
-代码量少的作品，误报率高，因此不参与查重
---
-
- 被查作品 -
- 疑被抄袭作品 - -
-
-
- 序号 -
- 作品名称 -
- 姓名 -
- 学号 -
- 时间 -
- 作品名称 -
- 姓名 -
- 学号 -
- 时间 -
- 相似度 -
- 对比 -
-
-
- <%=index+1%> - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
- <%=student_work_name%> -
- <%=student_work.user.show_name%> -
- <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
- <%= Time.parse(format_time(student_work.commit_time)).strftime("%m-%d %H:%M")%> - <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %> - <% simi_student_work = @works_hash[student_work.simi_id.to_i] %> - <% simi_student_work_name = simi_student_work.name.nil? || simi_student_work.name.empty? ? simi_student_work.user.show_name + '的作品' : simi_student_work.name%> -
- <%=simi_student_work_name%> -
- <%=simi_student_work.user.show_name%> -
- <%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%> -
- <%= Time.parse(format_time(simi_student_work.commit_time)).strftime("%m-%d %H:%M")%> - <% if student_work.simi_value.to_i >= 90 %> -
- <%=student_work.simi_value.to_i%>% - <% else %> -
- <%=student_work.simi_value.to_i%>% - <% end %> - - - -
- - <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id.to_i),:class => "cha-btn",:remote => true ) %> - - <%else%> -
- -- -
- -- -
- -- -
- -- -
- -- -
- - <% end %> -
+diff --git a/app/views/courses/index.js.erb b/app/views/courses/index.js.erb new file mode 100644 index 000000000..14d11e81a --- /dev/null +++ b/app/views/courses/index.js.erb @@ -0,0 +1,3 @@ +$("#intelligence_course_list").html("<%= j(render :partial => "courses/courseList") %>"); + +$("#search_syllabuses_name").replaceWith("<%= j(render :partial => 'course_index_search') %>"); diff --git a/app/views/courses/join_course_multi_role.js.erb b/app/views/courses/join_course_multi_role.js.erb index fa5bf934d..16d109681 100644 --- a/app/views/courses/join_course_multi_role.js.erb +++ b/app/views/courses/join_course_multi_role.js.erb @@ -3,90 +3,36 @@ <%# end %> <% if @state %> <% if @state == 0 %> -var htmlvalue = '<%= @course.name %> > <%= @homework.homework_type_ch %>作业 + <% if @index %> + >#<%= link_to (get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1), student_work_index_path(:homework => @homework.id) %> + <% end %> +
+++查重结果
+ <%= format_time @homework.simi_time %> + <%= link_to '返回', student_work_index_path(:homework => @homework), :class => "fr font-12 mr15 mt3 link-color-grey" %> ++ + 代码量少的作品，误报率高，因此不参与查重 ++-
+
+-++ +
++ +被查作品 +疑被抄袭作品 ++ + + <% if @homework.homework_type == 2 %> + <% @student_works.each_with_index do |student_work, index| %> + +序号 +姓名 +学号 +时间 +姓名 +学号 +时间 +相似度 +对比 ++ + + <% end %> + <% end %> +<%= index + 1 %> +<%= student_work.user.show_real_name %> +<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> +<%= format_time(student_work.commit_time) %> + + <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %> + <% simi_student_work = @works_hash[student_work.simi_id.to_i] %> +<%=simi_student_work.show_real_name_name%> +<%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%> +<%= format_time(simi_student_work.commit_time) %> + <% if student_work.simi_value.to_i >= 90 %> +<%= student_work.simi_value.to_i %>% + <% else %> +<%=student_work.simi_value.to_i %>% + <% end %> ++ <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id.to_i), :class => "link-color-blue", :target => "_blank") %> + + <% else %> +-- +-- +-- +-- +-- + <% end %> +'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box_redirect("<%=course_path(@course.id) %>", "加入成功"); <% elsif @state == 1 %> -var htmlvalue = '加入成功
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("确定"); <% elsif @state == 2 %> -var htmlvalue = '密码错误
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("班级已过期班级已过期
'+ - '确 定
请联系班级管理员重启班级。(在配置班级处)
请联系班级管理员重启班级。(在配置班级处)"); <% elsif @state == 3 %> -var htmlvalue = ''+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box_redirect("<%=course_path(@course.id) %>", "您已经加入了班级"); <% elsif @state == 4 %> -var htmlvalue = '您已经加入了班级
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("您输入的邀请码错误"); <% elsif @state == 5 %> -var htmlvalue = '您输入的邀请码错误
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("您还未登录"); <% elsif @state == 6 %> -var htmlvalue = '您还未登录
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("申请成功，请等待审核"); <% elsif @state == 7%> -var htmlvalue = '申请成功，请等待审核
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("您已经发送过申请了，请耐心等待"); <% elsif @state == 8%> -var htmlvalue = '您已经发送过申请了，请耐心等待
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box_redirect("<%=course_path(@course.id) %>", "您已经是该班级的教师了"); <% elsif @state == 9%> -var htmlvalue = '您已经是该班级的教师了
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box_redirect("<%=course_path(@course.id) %>", "您已经是该班级的教辅了"); <% elsif @state == 10%> -var htmlvalue = '您已经是该班级的教辅了
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box_redirect("<%=course_path(@course.id) %>", "您已经是该班级的管理员了"); <% elsif @state == 11%> -var htmlvalue = '您已经是该班级的管理员了
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("该班级已归档，请联系老师"); <% elsif @state == 12 %> -var htmlvalue = '该班级已归档，请联系老师
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("您已经发送过申请了，请耐心等待"); <% elsif @state == 13 %> -var htmlvalue = '您已经发送过申请了，请耐心等待
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("申请成功，请等待审核"); <% elsif @state == 14 %> -var htmlvalue = '申请成功，请等待审核
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("此邀请码已停用，请与老师联系"); <% else %> -var htmlvalue = '此邀请码已停用，请与老师联系
'+ - '确 定'+ - ''; -pop_box_new(htmlvalue, 300, 140); +notice_box("未知错误，请稍后再试"); <% end %> -<% end %> -function refresh_current_course(){ - hideModal(); - <% if @course %> - window.location.href= "<%=course_path(@course.id) %>"; - <% end %> -} +<% end %> \ No newline at end of file diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 5f13fd24c..2935dd708 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -1,20 +1,19 @@ -<% if @role.to_i == 1 %> -未知错误，请稍后再试
'+ - '确 定--<% else %> --- <%= render :partial => 'course_teacher', :locals => {:members => @members} %> -<%= @subPage_title %>
- <% if User.current.allowed_to?(:as_teacher,@course) %> - <%=link_to "成员管理", {:controller => 'courses', :action => 'settings', :id => @course.id, :tab=>'member'}, :class => 'link-blue fr mt5' %> - <% end %> - --- <%= render :partial => 'course_member_opr' %> ++-<% end %> diff --git a/app/views/courses/member.js.erb b/app/views/courses/member.js.erb index 4d8c22de6..31a55191f 100644 --- a/app/views/courses/member.js.erb +++ b/app/views/courses/member.js.erb @@ -1 +1,9 @@ -$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @members})%>"); \ No newline at end of file +<% if params[:role] == 't' %> +$("#member_student_list").html("<%= j(render :partial => 'member_teacher_list') %>"); +<% elsif params[:role] == 'as' %> +$("#member_student_list").html("<%= j(render :partial => 'member_all_student_list') %>"); +<% elsif params[:role] == 'ns' %> +$("#member_student_list").html("<%= j(render :partial => 'member_no_group_student_list') %>"); +<% else %> +$("#member_student_list").html("<%= j(render :partial => 'member_group_student_list') %>"); +<% end %> \ No newline at end of file diff --git a/app/views/courses/members.html.erb b/app/views/courses/members.html.erb new file mode 100644 index 000000000..f2b609e68 --- /dev/null +++ b/app/views/courses/members.html.erb @@ -0,0 +1,31 @@ ++ + <%= link_to @course.name, course_path(@course) %> > + 成员列表 +
++ <% if params[:role] == 't' %> + <%= render :partial => 'member_teacher_list' %> + <% elsif params[:role] == 'as' %> + <%= render :partial => 'member_all_student_list'%> + <% elsif params[:role] == 'ns' %> + <%= render :partial => 'member_no_group_student_list' %> + <% else %> + <%= render :partial => 'member_group_student_list' %> + <% end %>- <%= render :partial => 'course_student', :locals => {:members => @members} %>++ + \ No newline at end of file diff --git a/app/views/courses/members.js.erb b/app/views/courses/members.js.erb new file mode 100644 index 000000000..f2a4a7648 --- /dev/null +++ b/app/views/courses/members.js.erb @@ -0,0 +1 @@ +$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/members') %>"); \ No newline at end of file diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index ef0f5c882..8be672ced 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -1,130 +1,155 @@ -+ 成员管理 + <%= link_to '返回', course_path(@course), :class => 'fr mr20 color-orange05' %> +++++ +++++ <%= render :partial => 'courses/settings/members' %> ++--<%= l(:permission_new_course)%>
---
+
- - - <% if @syllabus.nil? %> - <%= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"new_syllabus_id", :class=>"syllabus_input w300 h28", :onchange => "change_course_name();"} %> - <% else %> - <%=@syllabus.title %> - - <% end %> - - 请先选择课程 - +
-
+
+ + +-
-
+
- - - - - 班级名称不能为空且至少有两个字符 - + 请先输入课程 + +
- + + -
- 正确示例：软件工程计算机系2016秋季A班 -
- 错误示例：计算机系2016秋季A班 - -
- - - - - + 课堂名称不能为空且至少有两个字符 -
- - - <%= select_tag :time,options_for_select(course_time_option(@course.time),Time.now.year), {:id=>"new_time", :class => "h28 w145 mr8"} %> - <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"new_term", :class => "h28 w145"} %> - - + +
- + + -
- - - <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),Time.now.year), {:id=>"new_end_time", :class => "h28 w145 mr8"} %> - <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"new_end_term", :class => "h28 w145"} %> - + 请输入正整数 + +
- + + - - - - - - -
- - - - （选中后对所有用户可见，否则仅对本班级成员可见） - - -
- - - - （选中后对所有用户可见，否则仅对本班级成员可见） - - -
- - - id="course_publish_resource" name="course[publish_resource]" type="checkbox" /> - （选中后允许学生上传班级资源，否则不允许） - - -
- - 提交 - <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%> - - - <% end%> -
-
+
+
+
+ ++ + 结束日期必须晚于当前日期 ++ + ++
结束日期过后，课堂进入归档状态<%#= link_to '归档状态', courses_path(:is_over => 1),:target => '_blank', :class => 'color-orange05' %>，只能在历史课堂中查看
+
+ - + + + + +
- + + 保存 + <%= link_to '取消', courses_path, :class => 'task-btn fl' %> + + + <% end %>
-
+
+ + ++ + 请先输入课程 +
-
+
+ -
+
+
+
+ 课堂名称不能为空且至少有两个字符
+
+
- - <%= render :partial => 'courses/settings/member'%> -++++ + ++
注意：1、课堂名称 = 课程名称 + 学期信息 + 其它
+正确示例：数据结构2016秋季班级
+错误示例：数据结构班级
+2、如果本学期包含多个班级，只需创建一个课堂
+然后在课堂内部建立不同的分班
+
+ - + + + + 请输入正整数 + +
- + + + + 请输入正整数或保留一位小数的浮点数 + +
-
+
+
+
+ ++ + 结束日期必须晚于当前日期 ++ + ++
结束日期过后，课堂进入归档状态，只能在历史课堂中查看
+
+ - + + /> + + +
- + + 保存 + <%= link_to '取消', course_path(@course), :class => 'task-btn fl ' %> + +
-
+
教师<%= @teacher_count %>
+
+ -
+
全部学生<%= @student_count %>
+
+ <% if @no_group_count > 0 %>
+ -
+
未分班<%= @no_group_count %>
+
+ <% end %>
+ <% unless @course.course_groups.empty? %>
+ <% @course.course_groups.each do |group| %>
+ -
+
+ <%= group.name %> + <%= group.members.count %> + +
+
+ <% end %>
+ <% end %>
+ -
+
教师<%= @teacher_count %>
+
+ -
+
全部学生<%= @student_count %>
+
+<% if @no_group_count > 0 %>
+ -
+
未分班<%= @no_group_count %>
+
+<% end %>
+<% unless @course.course_groups.empty? %>
+ <% @course.course_groups.each do |group| %>
+ -
+
+ <%= group.name %> + <%= group.members.count %> +
+
+ <% end %>
+<% end %>
+
+
\ No newline at end of file
diff --git a/app/views/courses/settings/_boards_list.html.erb b/app/views/courses/settings/_boards_list.html.erb
new file mode 100644
index 000000000..e22321c7a
--- /dev/null
+++ b/app/views/courses/settings/_boards_list.html.erb
@@ -0,0 +1,63 @@
+<% @board.each_with_index do | board, i | %>
+ - + + + + + + <% end %> + <% end %> +
- - <%=@course.syllabus.title %> + <%#=@course.syllabus.title %> <%#= select_tag :syllabus_id,options_for_select(course_syllabus_option,@course.syllabus_id), {:id=>"edit_syllabus_id", :class=>"syllabus_input", :style=>'width:210px'} %> diff --git a/app/views/courses/settings/_has_group_student_list.html.erb b/app/views/courses/settings/_has_group_student_list.html.erb new file mode 100644 index 000000000..e2042a237 --- /dev/null +++ b/app/views/courses/settings/_has_group_student_list.html.erb @@ -0,0 +1,39 @@ +
-
+
教师<%= @teacher_count %>
+
+ -
+
全部学生<%= @student_count %>
+
+ <% if @no_group_count > 0 %>
+ -
+
未分班<%= @no_group_count %>
+
+ <% end %>
+ <% unless @course.course_groups.empty? %>
+ <% @course.course_groups.each do |group| %>
+ -
+
+ <%= group.name %> + <%= group.members.count %> + +
+
+ <% end %>
+ <% end %>
+ -
+
教师<%= @teacher_count %> +
+
+ -
+
全部学生<%= @student_count %>
+
+ -
+
未分班<%= @no_group_count %>
+
+ <% unless @course.course_groups.empty? %>
+ <% @course.course_groups.each do |group| %>
+ -
+
+ <%= group.name %> + <%= group.members.count %> + +
+
+ <% end %>
+ <% end %>
+ - + + + + + + <% end %> + <% end %> + <% else %> + + <% end %> +
- + + + + + + <% end %> + <% end %> + <% else %> + + <% end %> +
- - <%=mem.user.show_name %>（<%= mem.user.login %>） + <%=mem.user.show_real_name %>（<%= mem.user.login %>） <% end %> <% end %> diff --git a/app/views/courses/settings/_student_table.html.erb b/app/views/courses/settings/_student_table.html.erb new file mode 100644 index 000000000..aadc76717 --- /dev/null +++ b/app/views/courses/settings/_student_table.html.erb @@ -0,0 +1,88 @@ +
-
-
-
-
-
-
-
-
- <%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%> -
- <%= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%> -
- <%= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%> -
- <%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey"%> -
- <%= link_to "论坛动态", {:controller => "courses", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey"%> -
- <%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeMessage postTypeGrey"%> -
- <%= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%> -
-
- -
-
- <%= link_to '成员管理', members_course_path(@course),:class => "color-orange03" %> + <% apply_count = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0).count %> + <% if apply_count > 0 %> + <%= apply_count %> + <% end %> + + <% end %> +
- <%= link_to '+ 发布普通作业'.html_safe, new_homework_common_path(:course => @course.id, :homework_type => 1),:class => "color-orange03" %> +
- <%= link_to '+ 发布实训作业'.html_safe, shixuns_homework_common_index_path(:course => @course.id),:class => "color-orange03", :remote => true %> +
- + 发布资源 + <% course_board = @course.boards.where("parent_id is NULL").first %> +
- <%= link_to '+ 发布帖子'.html_safe, new_board_message_path(:board_id => course_board.id),:class => "color-orange03" %> +
- - <%=convert_to_char (index+1).to_s %> - - - - - <% end %> -
-
- <%=convert_to_char (exercise_question.exercise_choices.count+1).to_s %>
- 新建选项+ - -<% end%> \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb index a9790c470..3efc078b0 100644 --- a/app/views/exercise/_edit_MCQ.html.erb +++ b/app/views/exercise/_edit_MCQ.html.erb @@ -20,51 +20,50 @@ " ");
}
-
-
- + + - -
- - <%=convert_to_char (index+1).to_s %> - - - - - <% end %> -
-
- <%=convert_to_char (exercise_question.exercise_choices.count+1).to_s %>
- 新建选项-
-
-
- + + + + + + <% end %> + + +
- + + + + +
- + + + + +
- + - -
- + + + +
-
+
+
+
+
+ 温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分 + 参考答案仅作为人工评分的参考 + 保存 + 取消 +
+ - + + - -
- + + + + +
- + + + + +
-
+
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + + + + + + + + + + + + +
- + + > + + （选中则学生答题时，题目顺序按照题型随机显示） + + > + + （选中则学生答题时，选项顺序随机显示） + +
- + + > + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + > + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
-
+
+ 1 ? 'disabled' : '' %> class="fl task-form-15 task-height-40 panel-box-sizing <%= @exercise.try(:exercise_status) > 1 ? 'disabled-bg' : '' %>" placeholder="请选择发布时间">
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + class="fl task-form-15 task-height-40 panel-box-sizing <%= @exercise.try(:exercise_status) == 3 ? 'disabled-bg' : '' %>" placeholder="请选择截止时间"> + + + + 不能早于发布时间 + + + + + + + + + + + +
- + + class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_3" type="checkbox" <%= @exercise.question_random == 1 ? 'checked' : '' %>> + + （选中则学生答题时，题目顺序按照题型随机显示） + + class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_4" type="checkbox" <%= @exercise.choice_random == 1 ? 'checked' : '' %>> + + （选中则学生答题时，选项顺序随机显示） + +
- + + > + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + > + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
- + + <%= answer_be_selected?(exercise_choice,User.current) ? "checked" : "" %>> + + + <% end %> +
- + + <%= answer_be_selected?(exercise_choice,User.current) ? "checked" : "" %>> + + + <% end %> +
- + > + + + <% end %>
- + > + + + <% end %>
- <%= link_to "编辑", edit_exercise_path(exercise) %> + <% end %> + +
- <%= link_to "设置", student_exercise_list_exercise_path(exercise, :tab => 3) %> +
- <%= link_to "导出成绩", student_exercise_list_exercise_path(exercise.id,:course_id => @course.id, :format => 'xls') %> + <% unless exercise.is_public %> +
- + 设为公开 + + <% end %> + +
- 删除 +
- + + + + <% end %> +
- + + + + <% end %> +
-
+
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + + + +
-
+
+
+ + + ++
结束之后，系统自动归档试卷
+
+ -
+
+
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + + + + + 不能早于发布时间 + +
-
+
+
+
+ + + ++
结束之后，系统自动归档试卷
+
+ -
+
+
+
+ + + ++
答题时长不填写，则表示不限时长
+学生答题时间即使没有超过答题时长的限制
+但是已到截止时间点，则系统自动为正在答题的学生提交试卷
+
+ - + + + + （选中则学生答题时，题目顺序按照题型随机显示） + + + + （选中则学生答题时，选项顺序随机显示） + +
-
+
+
+
+
+
+ + + ++
允许补交，则在补交截止日期之前，未答题的学生可以补交答题
+但是在发布截止日期~补交截止时间内才答题的学生，将被扣迟交分
+
+ - + + + + +
- + + + + +
-
+
+
+
+ + + ++
答题时长不填写，则表示不限时长
+学生答题时间即使没有超过答题时长的限制
+但是已到截止时间点，则系统自动为正在答题的学生提交试卷
+
+ - + + + + （选中则学生答题时，题目顺序按照题型随机显示） + + + + （选中则学生答题时，选项顺序随机显示） + +
-
+
+
+
+
+
+ + + ++
允许补交，则在补交截止日期之前，未答题的学生可以补交答题
+但是在发布截止日期~补交截止时间内才答题的学生，将被扣迟交分
+
+ - + + + + +
- + + + + +
- + + + + （选中则取各助教最终评分的平均分） + + + + （选中则只取最终次的助教评分） + +
-
+
+ + + ++
计算说明
+教师评分*其百分比+助教评分+其百分比+迟交扣分
+注意
+非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外
的评分选项上。例如教师评分60% + 助教评分40% ，学生A没有得到
教师评分，则最终成绩将按照助教评分100% 进行计算
+
+ - + + + + + +
- + + + + +
- + + + + （选中则取各助教最终评分的平均分） + + + + （选中则只取最终次的助教评分） + +
-
+
+
+ + + ++
计算说明
+教师评分*其百分比+助教评分+其百分比+迟交扣分
+注意
+非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外
的评分选项上。例如教师评分60% + 助教评分40% ，学生A没有得到
教师评分，则最终成绩将按照助教评分100% 进行计算
+
+ - + + + + +
- + + + + +
- + + + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
- + + + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
-
+
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + + + + + + + + + + + + +
- + + > + + （选中则学生答题时，题目顺序按照题型随机显示） + + > + + （选中则学生答题时，选项顺序随机显示） + +
- + + > + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + > + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
-
+
+ 1 ? 'disabled' : '' %> class="fl task-form-15 task-height-40 panel-box-sizing <%= @exercise.try(:exercise_status) > 1 ? 'disabled-bg' : '' %>" placeholder="请选择发布时间">
+
+ + + ++
发布之前，学生不会收到试卷
+
+ - + + class="fl task-form-15 task-height-40 panel-box-sizing <%= @exercise.try(:exercise_status) == 3 ? 'disabled-bg' : '' %>" placeholder="请选择截止时间"> + + + + 不能早于发布时间 + + + + + + + + + + + +
- + + class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_3" type="checkbox" <%= @exercise.question_random == 1 ? 'checked' : '' %>> + + （选中则学生答题时，题目顺序按照题型随机显示） + + class="magic-checkbox fl mt5 magic-checkbox_show" id="dt_4" type="checkbox" <%= @exercise.choice_random == 1 ? 'checked' : '' %>> + + （选中则学生答题时，选项顺序随机显示） + +
- + + > + + （选中则在截止时间之后对班级学生公开所有成员的成绩，否则不公开） + +
- + + > + + （选中则在截止时间之后对班级学生公开试卷题目的答案，否则不公开） + +
-
-
- <% @all_exercises.each_with_index do |exercise,index |%>
- <% if exercise.id == @exercise.id %>
- <%="测验 #{@all_exercises.count - index}" %>
- <% end %>
- <% end%>
-
-
-
- <% @all_exercises.each_with_index do |exercise,index |%>
-
- - <%= link_to "测验#{@all_exercises.count - index}：#{exercise.exercise_name}",student_exercise_list_exercise_path(exercise.id,:course_id => @course.id)%> - <%#= link_to "第#{@homework_commons.count - index}次作业",student_work_index_path(:homework => homework_common.id)%> - - <% end%> -
-
- - + 答题统计 + + <% if @is_teacher %> +
- + 试卷预览 + +
- + 设置 + + <%= link_to "导出成绩", student_exercise_list_exercise_path(@exercise, :course_id => @course.id, :format => 'xls'), :id => "export_exercise_work", :class => "fr white-btn orange-btn ml10 mt10 mr15" %> + <% else %> +
- + 查看设置 + +
- + 答题统计 + +
- + 导出成绩 + + +
- + 你的评阅： + + 不限 + + + + + + +
- + 作品状态： + + 不限 + + + + + + +
- + 分班情况： + + 不限 + + + + + + + +
- + + + +
- + + + +
-
+
+
+
+ 温馨提示：[简答题]属于主观题需要人工评分，未作答的情况下系统将自动评分 + 参考答案仅作为人工评分的参考 + 保存 + 取消 +
+
+ - +
-
+
<% if User.current.logged? || User.current.admin? %>
<% if User.current.admin? || ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) %>
<% if User.current.admin? || ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course") %>
- <%= link_to("发 送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %> -
- <%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %> +
- <%= link_to "设 置".html_safe,file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %>
- <%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %> <% if @course.is_public? %>
- @@ -82,7 +88,7 @@ <%end%>
-
<% if file.destroyable %>
- <%= link_to( '删除资源', attachment_path(file),:data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" %>
+ <%= link_to( '删除资源', "javascript:void(0);", :onclick => "delete_confirm_box_3('#{attachment_path(file)}', '确定要删除该资源吗？')", :class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" %>
<% else %>
<%= link_to '删除资源',attachment_versions_delete_path(file), :class => "postOptionLink", :remote => true %>
<% end %>
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index f7cab96b3..36ba71019 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -1,51 +1,55 @@
--++ --++<%= error_messages_for 'attachment' %><%= l(:label_file_upload_error_messages)%>- <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> + <%= form_tag(course_files_path(course), :multipart => true,:id=>"upload_course_file_form") do %> -
-
+
-
-
+
+
+
标题不能超过60个字符
+
+ -
+
+
+
+
内容不能为空
+
+ -
+ + + + + 上传附件 + ++
+
- + 保存 + 取消 + +
- 胡莎莎 +
- P547687645213 +
- 983
被赞
+ - 983
回复/评论
+ - 983
主题
+ - <%= @user.show_name %> +
- <%= time_from_now @user.last_login_on %> +
- <%= @memos_praise_count %>
被赞
+ - <%= @my_memos_count %>
回复/评论
+ - <%= @my_forums_count %>
主题
+ - + 答题 + + +
- + 答题 + +
- 尚未提交，暂不支持查看 + <% else %> + <% if output.result || @game.status == 2 %> +
- 正确选项：<%= choose.standard_answer %> +
- 你的选项：<%= output.try(:actual_output) %> + <% else %> +
- 错误，不支持查看 + <% end %> + <% end %> +
- 选择题：<%= @game.choose_correct_num.nil? ? 0 : @game.choose_correct_num %>/<%= game_challenge.challenge_chooses.count %> +
- 经验值：+ <%= @final_score %> +
- 金币：+ <%= @final_score %> +
- " onclick="check_tab('blacktab_con','blacktab_hover',this);"> + <% if @language == "Html"%> + 效果显示 + <% end %> + +
- " onclick="check_tab('blacktab_con','blacktab_hover',this);"> + 测试结果 + +
- + 评测信息 + + + +
- + 过关任务 + + <% unless @myshixun.shixun.try(:propaedeutics).blank? %> +
- + 背景知识 + + <% end %> + <% if @st == 0 %> + <% unless @game_challenge.answer.blank? %> +
- + 参考答案 + + <% end %> + <% else %> +
- + 参考答案 + + <% end %> +
- + + 评论<%= @discusses_count if @discusses_count.to_i > 0 %> + + <%#= link_to '', shixun_discuss_shixun_path(@myshixun.shixun), :class => "tab_type", :style => "font-size: 16px", :remote => true %> + + <% if @st == 0 %> + 经验值：<%= @game_challenge.score.to_i %> + <% else %> + 经验值：<%= @game_challenge.choose_score.to_i %> + <% end %> +
- + " onclick="game_praise('<%= @game_challenge.id %>', '<%= @game_challenge.class %>')" id="game_praise_tread" class="pt5 color-grey mr20"> + " alt="赞" ><%= @praise_count %> + + " onclick="game_tread('<%= @game_challenge.id %>')" id="game_tread" class="color-grey" style="padding-top:7px;"> + " ><%= @tread_count %> + + + +
-
+
+
+ + <%= form_for('discuss', :url => {:controller => 'discusses', :action => 'create', :dis_id => @shixun.id, :dis_type => "Shixun", :challenge_id => @game_challenge.try(:id)}, :method => "post", :remote => true, :html => {:id => 'new_comment_form'}) do |f| %> + + + 发送 + + + <% end%> ++
+
+
\ No newline at end of file
diff --git a/app/views/games/_shixun_comment_list.html.erb b/app/views/games/_shixun_comment_list.html.erb
new file mode 100644
index 000000000..7c49cbca2
--- /dev/null
+++ b/app/views/games/_shixun_comment_list.html.erb
@@ -0,0 +1,123 @@
+<% no_children_comments = get_no_children_comments_all @discusses %>
+
- <%= link_to '预览', homework_bank_path(homework), :target => '_blank' %> +
- <%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{homework.id}"]), :remote => true %> + <% unless homework.is_public %> +
- + 设为公开 + + <% end %> + <% if @type.to_i == 1 %> +
- 删除 + <% end %> +
- + + + <% end %> +<% else %> + +<% end %> diff --git a/app/views/homework_bank/_new_common_homework.html.erb b/app/views/homework_bank/_new_common_homework.html.erb new file mode 100644 index 000000000..c0c2ab2a4 --- /dev/null +++ b/app/views/homework_bank/_new_common_homework.html.erb @@ -0,0 +1,76 @@ +
-
+
+ + ++ +
-
+
+ - + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + + +
- + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_bank_index_path(), :class => 'task-btn fr mr10' %> + <% end %> + +
-
+
+ + ++ +
-
+
+ - + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + +
-
+
+
-
+
- + 每组最小人数 + 人 + 每组最大人数 + 人 + + 已有学生提交作品，只能扩大分组范围，原分组人数为<%= @homework.min_num %>-<%= @homework.max_num %>人 + + + 注：任一成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享。 +
+ - + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_bank_index_path(), :class => 'task-btn fr mr10' %> + <% end %> + +
-
+
+ + ++ +
-
+
+ - + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + +
- + + + +
- + + + +
- + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKBANK, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', homework_bank_path(@homework), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_bank_index_path(), :class => 'task-btn fr mr10' %> + <% end %> + +
- + 详情 + + <% if @is_admin %> +
- + 参考答案 + + <% end %> +
- + <%= link_to l(:button_edit), edit_homework_bank_path(@homework) %> + + <% else %> +
- + <%= link_to '进入实训', shixun_path(@homework.homework_bank_shixun.shixun), :target => "_blank" %> + + <% end %> +
- + <%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %> + + <% unless @homework.is_public %> +
- + 设为公开 + + <% end %> +
- + 删除 + + <% elsif @homework.is_public %> +
- + <%= link_to '发送', choose_user_course_homework_bank_index_path(:check_homework_bank => ["#{@homework.id}"]), :remote => true %> + + <% end %> +
- + + 样例<%= index + 1 %> + +
-
+
+ ++
<%=sample.input.blank? ? " " : sample.input %>
+
+ -
+
+ ++
<%=sample.output.blank? ? " " : sample.output %>
+
+ -
+
+ = 3 ? 'disabled' : '' %> type="checkbox" value="1" name="homework_anonymous_comment" <%= @homework.anonymous_comment == 1 ? '' : 'checked' %>>
+
+ + + ++
给在匿评开始时间前提交了作品的全部学生，随机分配指定数量的匿名作品
+
进行匿评 + 作品提交时间迟于匿评开始时间的学生，不会参与匿评，其作品将
按照全部缺评进行扣分
+ - + + = 3 ? 'disabled' : '' %> name="homework_evaluation_start" readonly value="<%= format_time @homework.homework_detail_manual.evaluation_start %>" class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_comment == 1 || @homework.homework_detail_manual.comment_status >= 3 ? 'disabled-bg' : '' %>" placeholder="选择匿评开启时间" /> + + +
- + + = 4 ? 'disabled' : '' %> name="homework_evaluation_end" readonly value="<%= format_time @homework.homework_detail_manual.evaluation_end %>" class=" fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_comment == 1 || @homework.homework_detail_manual.comment_status >= 4 ? 'disabled-bg' : '' %>" placeholder="选择匿评结束时间" /> + + +
- + + = 3 ? 'disabled' : '' %> name="homework_evaluation_num" value="<%= @homework.homework_detail_manual.evaluation_num %>" class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_comment == 1 || @homework.homework_detail_manual.comment_status >= 3 ? 'disabled-bg' : '' %>" placeholder="3" /> + + +
- + + name="homework_absence_penalty" value="<%= @homework.homework_detail_manual.absence_penalty %>" class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_comment == 1 ? 'disabled-bg' : '' %>" placeholder="2" /> + + +
-
+
+ <%= @homework.homework_detail_manual.comment_status >= 4 ? 'disabled' : '' %>>
+
+ + + ++
允许学生对自己作品的匿评评分进行申诉，由教师和助教处理申诉
+
+ 1.接受学生的合理申诉：
+ 被申诉的评分记录，将被视为无效，即不参与最终成绩的计算
+ 被申诉的评阅人的作品，则按照设置扣除违规匿评分
+ 2.拒绝学生的不合理申诉：
+ 被申诉的评分记录有效，且不能对该评分记录进行二次申诉
+ 申诉人和被申诉人的最终成绩均不会扣除违规匿评分
+
+ - + + name="homework_appeal_time" readonly value="<%= format_time @homework.homework_detail_manual.appeal_time %>" class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_appeal == 1 && @homework.homework_detail_manual.comment_status < 5 ? '' : 'disabled-bg' %>" placeholder="选择匿评开启时间" /> + + + +
- + + name="homework_appeal_penalty" value="<%= @homework.homework_detail_manual.appeal_penalty %>" class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.anonymous_appeal == 1 ? '' : 'disabled-bg' %>" placeholder="3" /> + + +
-
+
+ >
+
+ >
+
+ + + + <% if @homework.allow_late %> + <% if @homework.homework_type != 4 %> ++
允许补交，则在结束日期之前，学生可以补交作品
+ <% else %> +
+ 但是在提交截止时间之后才提交作品的学生，将被扣迟交分 +允许补交，则在结束日期之前，学生可以补交作品，并在作业结束时间
+ <% end %> + <% else %> + <% if @homework.homework_type != 4 %> +
之前，根据实训任务的完成情况实时计算学生成绩
+ 但是在提交截止时间之后才创建的作品，将被扣迟交分 +禁止补交，则在提交截止时间之后，学生不能再提交作品
+ <% else %> +禁止补交，则在提交截止时间之后才创建的作品，得分为0
+ <% end %> + <% end %> +
+ - + + " name="homework_late_penalty" placeholder="5" /> + + +
- + + > + + （选中则在作业结束时间之后对班级学生公开所有作品，否则作品不公开） + + <% end %> +
- + + > + + （选中则在作业结束时间之后对班级学生公开作品成绩，否则成绩不公开） + + <% if @homework.homework_type != 4 %> +
- + + > + + （选中则在作业结束时间之后对班级学生公开作业答案，否则答案不公开） + + <% end %> +
-
+
+ 0 ? 'disabled' : '' %> class="fl task-form-15 task-height-40 panel-box-sizing <%= @homework.homework_detail_manual.try(:comment_status) > 0 ? 'disabled-bg' : '' %>" placeholder="<%#= Time.parse((Time.now + 1.days).to_s).strftime("%Y-%m-%d") %>请选择发布时间"/>
+
+
+ + + + ++
发布之前，学生不会收到作业
+
+ -
+
+ class="fl task-form-15 task-height-40 panel-box-sizing <%= !@homework.end_time.nil? && @homework.end_time <= Time.now ? 'disabled-bg' : '' %>" placeholder="<%#= Time.parse((Time.now + 1.days).to_s).strftime("%Y-%m-%d") %>请选择截止时间"/>
+
+
+
+ 不能早于发布时间
+
+ + + + ++
<%= @homework.homework_type == 4 ? "系统在截止时间之前，根据实训任务的完成情况实时计算学生成绩" : "截止时间过后，学生不能修改作品和追加附件" %>
+
+ -
+
+ 请选择结束时间"/>
+
+
+ + + + ++
结束之后，系统自动归档作业
+
+ - + + +
-
+
+ >
+
+ >
+
+ + + ++
零分：查看参考答案才完成的任务，在系统评分时属于未完成任务
+
+ 满分：查看参考答案才完成的任务，在系统评分时属于已完成任务
+
+ - + + +
-
+
+
+ + + ++
系统评分是根据学生的任务完成情况，按照百分比计算
+
+ 例如实训任务5关，学生A完成3关，则最终成绩为 3 / 5 * 100 = 60分
+
+ - + + +
- + + + > + + + （选中则取各助教最终评分的平均分） + +
- + + + > + + + （选中则只取最终次的助教评分） + +
- + + +
-
+
+
+ >
+
+
+
+ + + + <% if @homework.homework_type != 2 %> ++
计算说明：
+ <% else %> +
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百
分比 - ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+ 注意：
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到
另外的评分选项上。例如：教师评分40% + 助教评分35% + 学生匿
评25%，学生A没有得到教师评分，则最终成绩将按照助教评分55%
+ 学生匿评45%进行计算 +计算说明：
+ <% end %> +
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 系统评分 * 其百分比
+ 学生匿评平均分 * 其百分比 - ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规
匿评扣分 * 违规匿评数 ) + 注意：
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到
另外的评分选项上。例如：教师评分30% + 助教评分30% + 系统评
分20% + 学生匿评20%，学生A没有得到教师评分，则最终成绩将按照
助教评分40% + 系统评分30% + 学生匿评30%进行计算 +
+ - + + + + <%= select_tag :te_proportion,options_for_select(ta_proportion_option,@homework.homework_detail_manual.te_proportion), {:class => "task-height-40 task-form-30 normal-bg"} %> + + +
- + + + + <%= select_tag :ta_proportion,options_for_select(ta_proportion_option,@homework.homework_detail_manual.ta_proportion), {:class => "task-height-40 task-form-30 normal-bg"} %> + + + <% if @homework.homework_type == 2 %> +
- + + + + <%= select_tag :sy_proportion,options_for_select(ta_proportion_option,@homework.homework_detail_programing.ta_proportion), {:class => "task-height-40 task-form-30 normal-bg"} %> + + +
- + + + + + + + <% else %> +
- + + + + + + + <% end %> +
-
+
+
+ >
+
+
+ + + ++
计算说明：
+
+ 优先顺序排前的非零评分 * 100% -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 ) + 注意：
+ 有教师评分则教师评分100%，否则教辅评分100%，依次类推 +
+ - + + + <% if @homework.homework_type == 2 %> + 教师评分 → 教辅评分 → 系统评分 → 学生匿评评分 + <% else %> + 教师评分 → 教辅评分 → 学生匿评评分 + <% end %> + + +
- + <%= link_to "编辑", edit_homework_common_path(homework_common) %> + + <% end %> +
- + <%= link_to "设置", student_work_index_path(:homework => homework_common.id, :tab => 4) %> + + + <%# if homework_common.homework_type == 1 || homework_common.homework_type == 3 %> + + <%# end %> + <% unless homework_common.is_public %> +
- + 设为公开 + + <% end %> + <% if (User.current.teacher_of_course(homework_common.course) || homework_common.user == User.current) && User.current.homework_banks.where(:homework_common_id => homework_common.id).empty? %> +
- + <%= link_to "加入题库", add_to_homework_bank_homework_common_path(homework_common, :type => 1), :remote => true %> + + <% end %> + <% if homework_common.user == User.current %> + <% if homework_common.is_update && !User.current.homework_banks.where(:homework_common_id => homework_common.id).blank? %> +
- + <%= link_to "同步到题库", add_to_homework_bank_homework_common_path(homework_common, :type => 2), :remote => true %> + +
- + <%= link_to "另存到题库", add_to_homework_bank_homework_common_path(homework_common, :type => 3), :remote => true %> + + <% end %> + <% end %> +
- + 删除 + +
- + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, + :placeholder => "请在此输入您的作业描述", + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + +
-
+ 是否允许学生在作业结束时间后查看参考答案，请在作业设置中进行设置+
+
- + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @ref_answer.nil? ? 0: @ref_answer.id, + :owner_type => OwnerTypeHelper::HOMEWORKREFERENCEANSWER, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + + + + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_common_index_path(:course => @course, :homework_type => @homework_type), :class => 'task-btn fr mr10' %> + <% end %> + +
- + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + +
-
+
+
-
+
- + 每组最小人数 + 人 + 每组最大人数 + 人 + + 已有学生提交作品，只能扩大分组范围，原分组人数为<%= @homework.homework_detail_group ? @homework.homework_detail_group.min_num : '' %>-<%= @homework.homework_detail_group ? @homework.homework_detail_group.max_num : '' %>人 + + + 注：任一成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享。 +
+ - + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @ref_answer.nil? ? 0: @ref_answer.id, + :owner_type => OwnerTypeHelper::HOMEWORKREFERENCEANSWER, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + + + + + + + + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_common_index_path(:course => @course, :homework_type => @homework_type), :class => 'task-btn fr mr10' %> + <% end %> +
- + + + +
- + + <%= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, :editor_id => 'homework_description_editor', + :owner_id => @homework.nil? ? 0: @homework.id, + :owner_type => OwnerTypeHelper::HOMEWORKCOMMON, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_content', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + +
- + <%= render :partial => 'users/user_homework_attachment', :locals => {:container => @homework} %> + +
- + + + +
- + + + +
- + + + <%= f.kindeditor :reference_answer, :editor_id => 'homework_ref_answer_editor', + :owner_id => @ref_answer.nil? ? 0: @ref_answer.id, + :owner_type => OwnerTypeHelper::HOMEWORKREFERENCEANSWER, + :width => '90%', + :height => 200, + :minHeight=>200, + :class => 'talk_text fl', + :input_html => { :id => 'homework_ref_answer', + :class => 'talk_text fl', + :maxlength => 5000 } + %> + + + + + + + + +
- + 保存 + <% if edit_mode %> + <%= link_to '取消', student_work_index_path(:homework => @homework.id), :class => 'task-btn fr mr10' %> + <% else %> + <%= link_to '取消', homework_common_index_path(:course => @course, :homework_type => @homework_type), :class => 'task-btn fr mr10' %> + <% end %> + +
-
+
+ >
+
+ + + ++
给在匿评开始时间前提交了作品的全部学生，随机分配指定数量的匿名作品
+
进行匿评 + 作品提交时间迟于匿评开始时间的学生，不会参与匿评，其作品将
按照全部缺评进行扣分
+ - + + + +
- + + + +
- + + + +
- + + + +
-
+
+ >
+
+ + + ++
允许学生对自己作品的匿评评分进行申诉，由教师和助教处理申诉
+
+ 1.接受学生的合理申诉：
+ 被申诉的评分记录，将被视为无效，即不参与最终成绩的计算
+ 被申诉的评阅人的作品，则按照设置扣除违规匿评分
+ 2.拒绝学生的不合理申诉：
+ 被申诉的评分记录有效，且不能对该评分记录进行二次申诉
+ 申诉人和被申诉人的最终成绩均不会扣除违规匿评分
+
+ - + + + + +
- + + + +
-
+
+ >
+
+ >
+
+ + + + <% if @homework.allow_late %> + <% if @homework.homework_type != 4 %> ++
允许补交，则在结束日期之前，学生可以补交作品
+ <% else %> +
+ 但是在提交截止时间之后才提交作品的学生，将被扣迟交分 +允许补交，则在结束日期之前，学生可以补交作品，并在作业结束时间
+ <% end %> + <% else %> + <% if @homework.homework_type != 4 %> +
之前，根据实训任务的完成情况实时计算学生成绩
+ 但是在提交截止时间之后才创建的作品，将被扣迟交分 +禁止补交，则在提交截止时间之后，学生不能再提交作品
+ <% else %> +禁止补交，则在提交截止时间之后才创建的作品，得分为0
+ <% end %> + <% end %> +
+ - + + + +
- + + > + + （选中则在作业结束时间之后对课堂成员公开所有作品，否则作品不公开） + + <% end %> +
- + + > + + （选中则在作业结束时间之后对课堂成员公开作品成绩，否则成绩不公开） + + <% if @homework.homework_type != 4 %> +
- + + > + + （选中则在作业结束时间之后对课堂成员公开作业答案，否则答案不公开） + + <% end %> +
-
+
+
+ + + ++
发布之前，学生不会收到作业
+
+ -
+
+
+
+ + + ++
<%= @homework.homework_type == 4 ? "系统在截止时间之前，根据实训任务的完成情况实时计算学生成绩" : "截止时间过后，学生不能修改作品和追加附件" %>
+
+ -
+
+
+ + + ++
结束之后，系统自动归档作业
+
+ - + + +
-
+
+ >
+
+ >
+
+ + + ++
零分：查看参考答案才完成的任务，在系统评分时属于未完成任务
+
+ 满分：查看参考答案才完成的任务，在系统评分时属于已完成任务
+
+ - + + +
-
+
+
+ + + ++
系统评分是根据学生的任务完成情况，按照百分比计算
+
+ 例如实训任务5关，学生A完成3关，则最终成绩为 3 / 5 * 100 = 60分
+
+ - + + +
- + + + > + + + （选中则取各助教最终评分的平均分） + +
- + + + > + + + （选中则只取最终次的助教评分） + +
- + + +
-
+
+
+ >
+
+
+ + + + <% if @homework.homework_type != 2 %> ++
计算说明：
+ <% else %> +
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百
分比 - ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+ 注意：
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到
另外的评分选项上。例如：教师评分40% + 助教评分35% + 学生匿
评25%，学生A没有得到教师评分，则最终成绩将按照助教评分55%
+ 学生匿评45%进行计算 +计算说明：
+ <% end %> +
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 系统评分 * 其百分比
+ 学生匿评平均分 * 其百分比 - ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规
匿评扣分 * 违规匿评数 ) + 注意：
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到
另外的评分选项上。例如：教师评分30% + 助教评分30% + 系统评
分20% + 学生匿评20%，学生A没有得到教师评分，则最终成绩将按照
助教评分40% + 系统评分30% + 学生匿评30%进行计算 +
+ - + + + + + + +
- + + + + + + + <% if @homework.homework_type == 2 %> +
- + + + + + + +
- + + + + + + + <% else %> +
- + + + + + + + <% end %> +
-
+
+
+ >
+
+
+ + + ++
计算说明：
+
+ 优先顺序排前的非零评分 * 100% -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 ) + 注意：
+ 有教师评分则教师评分100%，否则教辅评分100%，依次类推 +
+ - + + + <% if @homework.homework_type == 2 %> + 教师评分 → 教辅评分 → 系统评分 → 学生匿评评分 + <% else %> + 教师评分 → 教辅评分 → 学生匿评评分 + <% end %> + + +
-
- 作业
-
-
- <% if @homework_commons.empty? %>
-
- 目前尚未发布作业 - <% else %> - <% @homework_commons.each_with_index do |homework_common,index |%> -
- - <%= link_to "作业#{@homework_commons.count - index}：#{homework_common.name}",student_work_index_path(:homework => homework_common.id),:target=>"_blank"%> - - <% end%> - <% end %> -
- -
- - <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %> --- <%= render :partial => 'users/news_contents', :locals => {:comment => comment, :type => 'Issue', :user_activity_id => issue.id}%> - -- -- <% if comment.details.any? %> - <% details_to_strings(comment.details).each do |string| %> --
<%= string %>
- <% end %> - <% end %> -<%= comment.notes.html_safe %>
--- -- - - <%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %> - - - <%= link_to( - l(:button_reply), - {:controller => 'issues', :action => 'reply', :user_id => comment.user_id, :id => issue.id, :journal_id => comment.id}, - :remote => true, - :method => 'get', - :title => l(:button_reply)) %> - ︿ - - <%= link_to( - l(:button_delete), - {:controller => 'issues',:action => 'delete_journal', :id => issue.id, :journal_id=>comment.id}, - :method => :get, - :remote => true, - :id => "delete_reply_#{comment.id}", - :class => 'fr mr20 undis', - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if comment.user_id == User.current.id %> - - --
- <% end %>
- -
+ + <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %> +++ <%= render :partial => 'users/news_contents', :locals => {:comment => comment, :type => 'Issue', :user_activity_id => issue.id}%> + ++ ++ <% if comment.details.any? %> + <% details_to_strings(comment.details).each do |string| %> ++
<%= string %>
+ <% end %> + <% end %> +<%= comment.notes.html_safe %>
+++ ++ + + <%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %> + + + <%= link_to( + l(:button_reply), + {:controller => 'issues', :action => 'reply', :user_id => comment.user_id, :id => issue.id, :journal_id => comment.id}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + ︿ + + <%= link_to( + l(:button_delete), + {:controller => 'issues',:action => 'delete_journal', :id => issue.id, :journal_id=>comment.id}, + :method => :get, + :remote => true, + :id => "delete_reply_#{comment.id}", + :class => 'fr mr20 undis', + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if comment.user_id == User.current.id %> + + ++
+ <% end %>
+ - 创建webssh容器名：<%= link_to "huang-01", {:controller => "kubernete", :action => "exec_pod", :name => 1, :type => "webssh"} %> +
- 创建jdk容器名：<%= link_to "huang-02", {:controller => "kubernete", :action => "exec_pod", :name => 2, :type => "jdk"} %> +
- 创建容器名：<%= link_to "huang-03", {:controller => "kubernete", :action => "exec_pod", :name => 3, :type => "webssh"} %> +
- +
- <% count = board ? board.messages.count : 0 %> - <%=board.name %><%=count %> + <%= board.name %> + <%= count %> <% if User.current.logged? %> - <%= link_to( "",course_boards_path(@course, :board_id =>board.id, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> + <%= link_to( "", course_boards_path(@course, :board_id => board.id, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> <% end %> <% end %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 174e8e3c1..b255a3fcf 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -1,113 +1,133 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> <% teacher_num = TeacherAndAssistantCount(@course) %> <% student_num = studentCount(@course) %> -<% course_file_num = visable_attachemnts_incourse(@course).count %> -
-
-
-
-
- <%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "sy_class_option" %> - - <% if @course.syllabus %> -
- <%= link_to "进入课程", syllabus_path(@course.syllabus), :class => "sy_class_option", :target => "_blank" %> - <% end %> - <% if @course.invite_code_halt == 0 %> -
- 暂停加入 - <% elsif @course.invite_code_halt == 1 %> -
- 放开加入 - <% end %> -
- <%= link_to "设置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_class_option" %> -
- -
-
-
-
- - 退出班级 - -
- - + + <%= @course.name %> + <% if @course.is_public == 0 %> + + <% end %> + + + 邀请码： + <% if @course.invite_code_halt == 0 %> + <% if User.current.admin? || User.current.member_of_course?(@course) %> + <%=@course.generate_invite_code %> + <% else %> + ***** + <% end %> + <% else %> + 已停用 + <% end %> + + + + +
-
+ 主讲<%= link_to @course.teacher.show_real_name, user_path(@course.teacher), :class => 'edu-info-dark color-grey3 task-hide fl' %>
+ <%= get_occupation_from_user(@course.teacher).blank? ? '' : get_occupation_from_user(@course.teacher) %>
+ 教师<%= course_teacher_link teacher_num %>
+ 学生<%= course_student_link student_num %>
+ <% if group_num != 0 %>
+
+ 分班<%= course_group_link group_num %>
+
+ <% end %>
+ <% if @course.credit %>
+
+ 学分<%= @course.credit %>
+
+ <% end %>
+ <% if !@course.is_end && @course.end_date %>
+ 结束<%= course_end_date @course %> 天后
+ <% elsif @course.is_end %>
+ 已结束
+ <% end %>
+
+ <% is_AD = get_user_member_roles_course @course, User.current, 3 %>
+ <% is_TA = get_user_member_roles_course @course, User.current, 7 %>
+ <% is_TE = get_user_member_roles_course @course, User.current, 9 %>
+ <% is_ST = get_user_member_roles_course @course, User.current, 10 %>
+ <% if !is_teacher && (is_TE || is_AD) %>
+ <%= link_to '切换为教师', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TE ? 9 : 3)), :class => "white-btn orange-btn font-14 " %>+ <% elsif !is_teacher && is_TA %> +<%= link_to '切换为助教', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => 7), :class => "white-btn orange-btn font-14 " %>+ <% elsif is_teacher && is_ST %> +<%= link_to '切换为学生', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : (is_TE ? 9 : 3)), :tar_role => 10), :class => "white-btn orange-btn font-14 " %>+ <% end %> + + <% unless (is_teacher || is_TA || is_TE || is_ST) %> +++ <% end %> +
<%= link_to "加入课堂", join_private_courses_courses_path, :remote => true, :method => "post", :class => 'white-btn orange-btn' %>
+
+ - 吗？');"><%= @course.is_public == 0 ? "设为公开" : "设为私有" %> + <% if @course.invite_code_halt == 0 %> +
- 停用邀请码 + <% elsif @course.invite_code_halt == 1 %> +
- 恢复邀请码 + <% end %> +
- <%= link_to "设置", {:controller => 'courses', :action => 'settings', :id => @course} %> + <% if User.current == @course.teacher || User.current.admin? %> +
- 删除 + <% end %> +
- 退出课堂 +
- + 动态 + + <% course_board = @course.boards.where("parent_id is NULL").first %> +
- + 通知 + <%= @course.news.count %> + <%#= link_to( "+",new_course_news_path(@course, :is_new => 1), :class => 'fr mr15 font-18 link-color-grey', :title => "#{l(:label_course_news_new)}") if is_teacher %> + + + <% count = course_board ? course_board.messages.count : 0 %> +
- + 讨论 + <%= count %> + <%#= link_to( "+", course_boards_path(@course, :flag => true, :is_new => 1), :class => 'fr mr15 font-18 link-color-grey', :title => "#{l(:label_message_new)}") if User.current.logged? %> + + +
- + 资源 + <%= course_file_num %> + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> + + + <% end %> + + +
- + 作业 + <%=homework_num %> + <% if is_teacher %> + + + <% end %> + + + <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %> +
- + 试卷 + <%= count %> + <%#= link_to( "+", new_exercise_path(:course_id => @course.id), :class => 'fr mr15 font-18 link-color-grey', :title =>"新建试卷") if is_teacher %> + + +
- + @course.id) %>" class="fl ml15 ">问卷 + <%=course_poll_count %> + <%#= link_to( "+", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'fr mr15 font-18 link-color-grey', :title =>"#{l(:label_new_poll)}") if is_teacher %> + + +
- + 统计 + + +
+<%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %>- ++ + + + +
<% if User.current.allowed_to?(:as_teacher,course) %> @@ -103,11 +107,27 @@ function submit_course_resource() { <% if User.current.allowed_to?(:as_teacher,course) %> - if(regex_publish_time()) { - $('#submit_resource').parent().submit(); + if($("#upload_course_file_form").find('.upload_filename').length == 0){ + $("#upload_file_count_notice").html('请至少上传一个资源').show(); + event.preventDefault(); + return false; + }else{ + $("#upload_file_count_notice").hide(); + if(regex_publish_time()) { + $('#submit_resource').parent().submit(); + hideModal(); + } } <% else %> - $('#submit_resource').parent().submit(); + if($("#upload_course_file_form").find('.upload_filename').length == 0){ + $("#upload_file_count_notice").html('请至少上传一个资源').show(); + event.preventDefault(); + return false; + }else { + $("#upload_file_count_notice").hide(); + $('#submit_resource').parent().submit(); + hideModal(); + } <% end %> } function reset_publish_time(){ diff --git a/app/views/files/file_hidden.js.erb b/app/views/files/file_hidden.js.erb index 6f3660ad4..7d2d9759c 100644 --- a/app/views/files/file_hidden.js.erb +++ b/app/views/files/file_hidden.js.erb @@ -1,2 +1,2 @@ var htmlvalue = '<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>'; -pop_box_new(htmlvalue, 340, 140); \ No newline at end of file +pop_box_new(htmlvalue, 500, 200); \ No newline at end of file diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index e2792254d..1e473f47c 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -439,11 +439,11 @@ //更新文件版本 表单提交确认，原则是只能有一个更新文件 function upload_attachment_version(event){ if($("#upload_form").find('.upload_filename').length > 1){ - $("#upload_file_count").html('(只能上传一个更新文件)') + $("#upload_file_count").html('(只能上传一个更新文件)'); event.preventDefault(); return false; }else if($("#upload_form").find('.upload_filename').length == 0){ - $("#upload_file_count").html('(请上传一个更新文件)') + $("#upload_file_count").html('(请上传一个更新文件)'); event.preventDefault(); return false; }else{ diff --git a/app/views/files/republish_file.js.erb b/app/views/files/republish_file.js.erb index e85e5eb50..3ca13ecfb 100644 --- a/app/views/files/republish_file.js.erb +++ b/app/views/files/republish_file.js.erb @@ -1,2 +1 @@ -hideModal(); -$("#resource_detail_<%=@file.id %>").html("<%= escape_javascript(render :partial=>'files/resource_detail',:locals => {:file => @file}) %>") \ No newline at end of file +$("#resource_detail_<%=@file.id %>").html("<%= escape_javascript(render :partial=>'files/resource_detail',:locals => {:file => @file}) %>"); \ No newline at end of file diff --git a/app/views/files/search.js.erb b/app/views/files/search.js.erb index 4c32a1044..7f8835075 100644 --- a/app/views/files/search.js.erb +++ b/app/views/files/search.js.erb @@ -1,4 +1 @@ - - $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>"); - $("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>'); - $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>"); \ No newline at end of file +$("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>"); \ No newline at end of file diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb index 3ca598a83..4c7e4f82c 100644 --- a/app/views/files/search_tag_attachment.js.erb +++ b/app/views/files/search_tag_attachment.js.erb @@ -1,6 +1,5 @@ <% if @course %> $("#resource_list").html("<%= escape_javascript( render :partial => 'files/course_file',:locals => {course:@course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} )%>"); -$("#pages").html('<%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>'); <% else %> $("#resource_list").html("<%= escape_javascript( render :partial => 'files/project_file',:locals => {project:@project, all_attachments:@all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}) %>"); $("#tip_attachment_count").html("<%= escape_javascript( render :partial => 'files/tip_attachment_count') %>"); diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb index cbb53c2cc..94e7a1ce7 100644 --- a/app/views/forums/_file_form.html.erb +++ b/app/views/forums/_file_form.html.erb @@ -3,11 +3,13 @@ input.is_public_checkbox{margin-left:4px;margin-right:4px;}- + <% if defined?(container) && container && container.saved_attachments %> <% container.attachments.each_with_index do |attachment, i| %> - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: + + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly',:style=>'border:none; max-width:980px;white-space: nowrap; text-overflow:ellipsis;font-family: Consolas;') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> <%= if attachment.id.nil? #待补充代码 @@ -16,7 +18,7 @@ end %> <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> - + <%= link_to(''.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> @@ -47,7 +49,7 @@ <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %> - <%= button_tag "上传附件", :id => "upload_attachments", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %> + <%#= button_tag "上传附件", :id => "upload_attachments", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'sub_btn' %> <%= file_field_tag 'attachments[dummy][file]', :id => '_file', @@ -74,7 +76,11 @@ <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %> - + + + + 上传附件 + <% content_for :header_tags do %> <%= javascript_include_tag 'attachments' %> <% end %> diff --git a/app/views/forums/forum_form_add.html b/app/views/forums/forum_form_add.html new file mode 100644 index 000000000..1464fb5ec --- /dev/null +++ b/app/views/forums/forum_form_add.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + + +++ + diff --git a/app/views/forums/forum_form_detail.html b/app/views/forums/forum_form_detail.html new file mode 100644 index 000000000..ef849ed00 --- /dev/null +++ b/app/views/forums/forum_form_detail.html @@ -0,0 +1,116 @@ + + + + + + + + + + + + + ++++ ++++新建话题
+++-
+
+
+ ++ + + + diff --git a/app/views/forums/forum_form_list.html b/app/views/forums/forum_form_list.html new file mode 100644 index 000000000..c23f63efd --- /dev/null +++ b/app/views/forums/forum_form_list.html @@ -0,0 +1,143 @@ + + + + + + + + + + + + + +++ + diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 5b9f374f8..0538f98d4 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -1,3 +1,104 @@ ++++++ + kosasa > 讨论 +
+++ +++++
+ ++-
+
++++问吧
+ + 新话题 +++ + +++ +
+ + 华沙沙 + ++1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈
++ 10 + 10 + 10 + + 最后更新：2小时前 +
+ + +++ +
+ + 华沙沙 + ++1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈
++ 10 + 10 + 10 + + 最后更新：2小时前 +
+ + +++
+ + 华沙沙 + ++1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈
++ 10 + 10 + 10 + + 最后更新：2小时前 +
+ + +++ + + + + + + +<% if false %> <%= content_for(:header_tags) do %> <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> <% end %> @@ -107,34 +208,34 @@ }); var first_click = true; -// function check_and_submit(){ -// if(!check_memo_name()){ -// return; -// } -// if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){ -// first_click = false; -// memo_content.sync(); -// $.ajax({ -// url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos', -// type:'post', -// data:$("#new_memo").serialize(), -// success:function(data){ -// -// }, -// error:function(){ -// alert('请检查当前网络连接') -// } -// }); -// //$("#new_memo").submit(); -// }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){ -// $("#error").html("主题和内容不能为空").show(); -// } -// else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){ -// $("#error").html("主题不能为空").show(); -// }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){ -// $("#error").html("内容不能为空").show(); -// } -// } + // function check_and_submit(){ + // if(!check_memo_name()){ + // return; + // } + // if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){ + // first_click = false; + // memo_content.sync(); + // $.ajax({ + // url:'/forums/'+'<%#= @forum.id.to_s%>'+'/memos', + // type:'post', + // data:$("#new_memo").serialize(), + // success:function(data){ + // + // }, + // error:function(){ + // alert('请检查当前网络连接') + // } + // }); + // //$("#new_memo").submit(); + // }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){ + // $("#error").html("主题和内容不能为空").show(); + // } + // else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){ + // $("#error").html("主题不能为空").show(); + // }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){ + // $("#error").html("内容不能为空").show(); + // } + // } function check_memo_name(){ if($("#memo_subject").val().trim().length > 50){ @@ -156,4 +257,5 @@ memo_content.html('') $('#error').html('').hide(); } - \ No newline at end of file + +<% end %> diff --git a/app/views/games/_acquire_answer.html.erb b/app/views/games/_acquire_answer.html.erb new file mode 100644 index 000000000..a5043fabc --- /dev/null +++ b/app/views/games/_acquire_answer.html.erb @@ -0,0 +1,16 @@ ++ + <%= @user.show_name %> > 讨论区 +
++++++ + <%= image_tag(url_to_avatar(User.current), :width => 60, :height => 60,:alt=>'贴吧图像', :class=>"bor-radius-all" ) %> + ++++-
+
++++帖子
+ + 新话题 ++ <% @memos.each_with_index do |memo, index| %> +++ + <%= image_tag(url_to_avatar(memo.author), :width => 50, :height => 50,:alt=>'用户头像', :class=>"bor-radius-all mt3" ) %> + ++ <% end %> ++++ + <%= memo.subject %> + + <% if memo.sticky %> + 顶 + <% end %> +
+<%= memo.content.html_safe %>++ <%= User.find(memo.author_id).try(:show_name) %> + <%= time_from_now memo.updated_at %> + ++ + <% if @user.admin? || @user == memo.author %> + + <% end %> ++ <% if memo.viewed_count > 0%> + <%= memo.viewed_count %> + <% end %> + <% if get_praise_num(memo) > 0%> + <%= get_praise_num(memo) %> + <% end %> + <% if Memo.where(:root_id => memo.id).count > 0%> + <%= Memo.where(:root_id => memo.id).count %> + <% end %> + + +
+++++-
+ <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
++ \ No newline at end of file diff --git a/app/views/games/_choice_question.html.erb b/app/views/games/_choice_question.html.erb new file mode 100644 index 000000000..0cddf1cf0 --- /dev/null +++ b/app/views/games/_choice_question.html.erb @@ -0,0 +1,155 @@ + ++++ ++++ + + + +<% if false %> +++ +-
+
+++ <% @game_challenge.challenge_chooses.each_with_index do |choose, index| %> + <% output = @game.outputs.where(:test_set_position => choose.position).first %> ++<%= (index + 1).to_s + "." + (choose.category == 1 ? "单选题" : "多选题") %>
++ +++ <% choose.challenge_questions.each_with_index do |question, i| %> ++ <% end %> + + ++ + <% if choose.category == 1 %> + name="answer[<%= index + 1 %>]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-radio ml5"> + <% else %> + + name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5"> + <% end %> + + +
+ <% end %> + ++ ++ ++ <%= render :partial => 'games/game_choose_results', :locals => { :game_challenge => @game_challenge} %> ++++<% end %> \ No newline at end of file diff --git a/app/views/games/_code_actions.html.erb b/app/views/games/_code_actions.html.erb index f8325d57e..f440a4f91 100644 --- a/app/views/games/_code_actions.html.erb +++ b/app/views/games/_code_actions.html.erb @@ -1,27 +1,310 @@ -++-
+
++++1.单选题
+应在下列程序划线处填入的语句是()
+ ++ <% @game_challenge.challenge_chooses.each do |choose| %> + <% choose.challenge_questions.each_with_index do |question, i| %> ++ +" onclick="choice_answer('<%= @st %>', this)"> + + + + ++ <% end %> + <% end %> ++ <%= (question.position + 65).chr %>. ++++
+<%= question.option_name %>---操作
-- 保存修改 - <% if @game.status == 0 %> - <%= link_to "提交评测", { :controller => 'games', - :action => "game_build", - :id => @game, - :myshixun_id => @myshixun}, - :class => "task-btn task-btn-green", - :onclick => "training_task_submmit();", - :remote => true %> - <% elsif @game.status == 2 %> - 评测中.. - <% elsif @game.status == 1 %> - <%= link_to "下 一 步 ", {:controller => 'games', - :action => "next_step", - :id => @game, - :myshixun_id => @myshixun}, - :class => "task-btn task-btn-green", - :onclick => "training_task_submmit();", - :remote => true %> + + +<% if @myshixun.shixun.try(:language) == "PHP/Web" %> ++ + 查看网页效果 + + ++<% end %> +<% if @st == 0 %> +"> + 加载上次通过的代码 ++<% end %> ++ <% if @game.challenge.position > 1 %> + <%= link_to "上一关 ", {:controller => 'games', :action => "prev_step", :id => @game, :myshixun_id => @myshixun}, + :class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "prev_step", :remote => true %> + <% end %> ++ ++ <% if @game.status == 1 %> + 评测中.. + <% end %> + <% if @had_done == 0 %> + <% if show_next_stage?(@game, @myshixun.shixun.try(:status)) %> + <%= link_to "下一关 ", {:controller => 'games', :action => "next_step", :id => @game, :myshixun_id => @myshixun}, + :class => "shixun-task-btn task-btn-orange mr15 mt8", :id => "next_step", :remote => true %> + + <% end %> + <% else %> + 离开 + <% end %> ++ \ No newline at end of file diff --git a/app/views/games/_file_edit_form.html.erb b/app/views/games/_file_edit_form.html.erb index b9b7f5f5b..886aa15b4 100644 --- a/app/views/games/_file_edit_form.html.erb +++ b/app/views/games/_file_edit_form.html.erb @@ -1,41 +1,191 @@ +<%= javascript_include_tag "/codemirror/lib/matchbrackets" %> + - \ No newline at end of file diff --git a/app/views/games/_game_answer_error_pop.html.erb b/app/views/games/_game_answer_error_pop.html.erb new file mode 100644 index 000000000..549cfb593 --- /dev/null +++ b/app/views/games/_game_answer_error_pop.html.erb @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/app/views/games/_game_answer_tip_pop.html.erb b/app/views/games/_game_answer_tip_pop.html.erb new file mode 100644 index 000000000..ec4028990 --- /dev/null +++ b/app/views/games/_game_answer_tip_pop.html.erb @@ -0,0 +1,28 @@ ++ ++ + \ No newline at end of file diff --git a/app/views/games/_game_choose_results.html.erb b/app/views/games/_game_choose_results.html.erb new file mode 100644 index 000000000..3ab0f6e29 --- /dev/null +++ b/app/views/games/_game_choose_results.html.erb @@ -0,0 +1,95 @@ + + ++++ <% if @viewed == 2 %> + 将扣除<%= @challenge_score %>点金币
+
是否确认查看答案
注意：先查看参考答案，再通过评测的学生，实训作业有可能是零分哦~ + <% else %> + 本操作需要扣除<%= @challenge_score %>点金币
你的金币不够 + <% end %> ++ 取消 + hideModal();">确定 +++\ No newline at end of file diff --git a/app/views/games/_game_result_order.html.erb b/app/views/games/_game_result_order.html.erb new file mode 100644 index 000000000..cd6af47f2 --- /dev/null +++ b/app/views/games/_game_result_order.html.erb @@ -0,0 +1,5 @@ +<% if @test_set_error_position.nil? %> ++++++++ <% unless @game.choose_correct_num == nil %> + <% if @game.choose_correct_num != game_challenge.challenge_chooses.count %> +++ <%= @game.choose_correct_num %>/<%= game_challenge.challenge_chooses.count %>共有<%= game_challenge.challenge_chooses.count %>题，其中有<%= game_challenge.challenge_chooses.count - @game.choose_correct_num %>题结果不匹配。详情如下： +
+ <% else %> ++ <%= game_challenge.challenge_chooses.count %>/<%= game_challenge.challenge_chooses.count %> 全部通过 +
+ <% end %> + <% end %> + <% game_challenge.challenge_chooses.each_with_index do |choose, index| %> + <% output = @game.outputs.where(:test_set_position => choose.position).first %> +++ <% end %> ++ + 题目<%= index + 1 %> + <%# outputs = ChooseOutputs.where(:challenge_choose_id => choose.id).first %> + <% if output.present? %> + <%# if choose.choose_outputs.try(:answer) != choose.standard_answer %> + <% if output.result %> + + <% else %> + + <% end %> + <% else %> + + <% end %> ++++-
+ <% if output.try(:actual_output).blank? %>
+
+++++ +++ <% unless @game.choose_correct_num == nil %> + <% if @game.choose_correct_num != game_challenge.challenge_chooses.count %> +++ <%= @game.choose_correct_num %>/<%= game_challenge.challenge_chooses.count %>共有<%= game_challenge.challenge_chooses.count %>题，其中有<%= game_challenge.challenge_chooses.count - @game.choose_correct_num %>题结果不匹配。 +
+ <% else %> ++ <%= game_challenge.challenge_chooses.count %>/<%= game_challenge.challenge_chooses.count %> 全部通过 +
+ <% end %> + <% end %> +++++-
+
<%= @test_sets_count %>/<%= @test_sets_count %> 全部通过
+<% else %> +<%= @test_set_error_position %>/<%= @test_sets_count %> 编译错误
+<% end %> \ No newline at end of file diff --git a/app/views/games/_game_results.html.erb b/app/views/games/_game_results.html.erb new file mode 100644 index 000000000..8c24e171c --- /dev/null +++ b/app/views/games/_game_results.html.erb @@ -0,0 +1,52 @@ +<%= content_for(:header_tags) do %> + <%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %> +<% end %> +-
+
-- -- - + + ++++-
+
--<%= render :partial => 'games/exec_results' %> -<%#= render :partial => 'games/desc_full_show' %> + + + + +- <%= h @game_challenge.task_pass.try(:html_safe) %> +-+++ ++-- <%= h @game_challenge.ready_knowledge.try(:html_safe) %> +- <%= render :partial => 'games/repository' %> ++-+++ ++- -<%= @game_challenge.answer %>++++++++ +++++++ <%#= render :partial => "games/shixun_comment_list" %> ++++-
+ <%= render :partial => "games/shixun_comment_block" %>
+
+
+ + <% if @tpm_modified %> +++ <% end %> - \ No newline at end of file diff --git a/app/views/games/_game_webssh.html.erb b/app/views/games/_game_webssh.html.erb new file mode 100644 index 000000000..c9ea3c760 --- /dev/null +++ b/app/views/games/_game_webssh.html.erb @@ -0,0 +1,3 @@ + diff --git a/app/views/games/_games_list.html.erb b/app/views/games/_games_list.html.erb index 75605342a..7d1602c83 100644 --- a/app/views/games/_games_list.html.erb +++ b/app/views/games/_games_list.html.erb @@ -1,66 +1,64 @@ -++
+ ++更新通知
+ <% if false%> + +本关的测试集已更新，你的代码可能无法通过新的测试集，重新评测试试！
+ + <% end %> + +关卡任务的代码文件有更新，点击立即更新获取最新代码！
+ +---全部任务
<%= @games_count %> +++ \ No newline at end of file diff --git a/app/views/games/_repository.html.erb b/app/views/games/_repository.html.erb index 61de11723..f735604cc 100644 --- a/app/views/games/_repository.html.erb +++ b/app/views/games/_repository.html.erb @@ -1,16 +1,136 @@ -+- + diff --git a/app/views/games/_myshixun_breadcrumbs.html.erb b/app/views/games/_myshixun_breadcrumbs.html.erb index 93d637bed..4e80b7a57 100644 --- a/app/views/games/_myshixun_breadcrumbs.html.erb +++ b/app/views/games/_myshixun_breadcrumbs.html.erb @@ -1,7 +1,7 @@ <% if @path.blank? %> - <%= @repository.identifier %> + <%= "根目录" %> <% else %> - <%= link_to "#{@repository.identifier.present? ? h(@repository.identifier) : 'root'}", myshixun_game_path(@game, :myshixun_id => @myshixun, :type => "root"), :remote => true %> + <%= link_to "根目录", myshixun_game_path(@game, :myshixun_id => @myshixun, :type => "root"), :remote => true %> <% dirs = path.split('/') if 'file' == kind diff --git a/app/views/games/_pass_game_show.html.erb b/app/views/games/_pass_game_show.html.erb index fe8187b35..5b1329923 100644 --- a/app/views/games/_pass_game_show.html.erb +++ b/app/views/games/_pass_game_show.html.erb @@ -1,15 +1,25 @@ -<%= stylesheet_link_tag 'css/bigdata-common', 'css/bigdata-popup' %> +<%= stylesheet_link_tag 'css/edu-common', 'css/edu-popup' %>+- <% @games.each do |game| %> + <% @challenges.each do |challenge| %> + <% game = Game.where(:myshixun_id => @myshixun.id, :challenge_id => challenge.id).first %>全部任务
-- <% if game.status == 0 %> -<% end %>-- 马上开启 - - <% elsif game.status == 1 %> -第<%= game.challenge.try(:position) %>关 - <%= link_to game.challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
-- 已闯关：<%= had_pass(@myshixun.shixun_id, game.challenge.try(:position)) %>人 - 平均耗时：<%= game_spend_time(avg_spend_time(@myshixun.shixun_id, game.challenge.try(:position)), 0) %> -
--- 正在解决中 - - <% elsif game.status == 2 %> -第<%= game.challenge.try(:position) %>关 - <%= game.challenge.try(:subject) %>
-- 已闯关：<%= had_pass(@myshixun.shixun_id, game.challenge.try(:position)) %>人 - 平均耗时：<%= game_spend_time(avg_spend_time(@myshixun.shixun_id, game.challenge.try(:position)), 0) %> -
-第<%= game.challenge.try(:position) %>关 - <%= link_to game.challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
- - -- 开始时间：<%= format_time(game.created_at) %> - 完成时间：<%= format_time(game.updated_at) %> - 耗时：<%= game_spend_time(game.created_at, game.updated_at) %> - 已闯关：<%= had_pass(@myshixun.shixun_id, game.challenge.try(:position)) %>人 - 得分：<%= game.final_score %>分 -
- <% elsif game.status == 3 %> --- 已锁定 - - <% end %> +第<%= game.challenge.try(:position) %>关 - <%= game.challenge.try(:subject) %>
-- 已闯关：<%= had_pass(@myshixun.shixun_id, game.challenge.try(:position)) %>人 - 平均耗时：<%= game_spend_time(avg_spend_time(@myshixun.shixun_id, game.challenge.try(:position)), 0) %> -
-+ <%= challenge.try(:position) %> + + <% if game.try(:status) == 0 %> +<%= link_to challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
+ <% if @myshixun.shixun.try(:status) == 2 %> + + <% end %> + <% elsif game.try(:status) == 1 %> + <% if @myshixun.shixun.try(:status) == 2 %> +<%= challenge.try(:subject) %>
+ 正在解决 + <% else %> +<%= link_to challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
+ <% end %> + <% elsif game.try(:status) == 2 %> +<%= link_to challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
+ <% if @myshixun.shixun.try(:status) == 2 %> + + <% end %> + <% elsif game.try(:status) == 3 %> + <% if @myshixun.shixun.try(:status) == 2 %> +<%= challenge.try(:subject) %>
+ + <% else %> +<%= link_to challenge.try(:subject), myshixun_game_path(game, :myshixun_id => @myshixun), :remote => true %>
+ <% end %> + <% end %> + + ++ <% if game.try(:status) != 2 %> + <% if challenge.st == 0 %> + 经验值<%= challenge.score.to_i %> + 金币<%= challenge.score.to_i %> + 技能标签<%= challenge.challenge_tags.count == 0 ? "无" : challenge.challenge_tags.count %> + <% else %> + 经验值<%= challenge.choose_score.to_i %> + 金币<%= challenge.choose_score.to_i %> + 知识点<%= challenge.choose_tags_num %> + <% end %> + <% elsif game.try(:status) == 2 %> + <% final_score = (game.answer_open? || @myshixun.shixun.status <= 1) ? 0 : game.final_score.to_i %> + <% gold_score = @myshixun.shixun.status <= 1 ? 0 : (game.answer_open? ? -challenge.score.to_i : game.final_score.to_i) %> + 经验值+<%= final_score %> + 金币 ml5"><%= gold_score < 0 ? gold_score : "+"+gold_score.to_s %> + 技能标签 ml5"><%= (game.answer_open? || @myshixun.shixun.status <= 1 || challenge.challenge_tags.count ==0 ) ? "无" : "+"+challenge.challenge_tags.count.to_s %> + <% end %> +\ No newline at end of file +"> - +-<% if had_done == 0 %>恭喜您通过本关
- <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();",:remote => true %> + <%= link_to "下 一 关", {:controller => 'games', :action => "next_step", :id => game, :myshixun_id => myshixun}, :class => "task-su-btn", :onclick => "hideModal();", :remote => true %> <% else %> - 查看光辉历史 + 查看光辉历史 <% end %>- <%= render :partial => 'myshixun_repository' %> -- + ++ <% unless [2,3].include?(@myshixun.shixun.try(:status).to_i) %> ++ +++ <% end %> ++ <%= render :partial => 'myshixun_breadcrumbs', :locals => {:path => @path, :kind => 'dir'} %> +
+ ++++ +++++++ <% if !@content.nil? || params[:action] == "entry" %> +++ <%= render :partial => 'games/file_edit_form', :locals => {:filename => @path, :content => @content} %> ++ <% else %> + <% unless @entries.blank? %> + <%= render :partial => 'tree', :locals => { :extend => false} %> + <% end %> + <% end %> +<%= file_update_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => @path) %>+ \ No newline at end of file diff --git a/app/views/games/_reset_game_code.html.erb b/app/views/games/_reset_game_code.html.erb new file mode 100644 index 000000000..db5aaeb5d --- /dev/null +++ b/app/views/games/_reset_game_code.html.erb @@ -0,0 +1,18 @@ + diff --git a/app/views/games/_send_error_pop.html.erb b/app/views/games/_send_error_pop.html.erb new file mode 100644 index 000000000..15228c295 --- /dev/null +++ b/app/views/games/_send_error_pop.html.erb @@ -0,0 +1,39 @@ + +++ + \ No newline at end of file diff --git a/app/views/games/_send_success_pop.html.erb b/app/views/games/_send_success_pop.html.erb new file mode 100644 index 000000000..3e98f982b --- /dev/null +++ b/app/views/games/_send_success_pop.html.erb @@ -0,0 +1,14 @@ + diff --git a/app/views/games/_shixun_comment_block.html.erb b/app/views/games/_shixun_comment_block.html.erb new file mode 100644 index 000000000..ef33dbc16 --- /dev/null +++ b/app/views/games/_shixun_comment_block.html.erb @@ -0,0 +1,57 @@ +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: true) %> +<% end %> +这个任务有什么问题或错误？
+请尽可能清晰的描述
+ +问题内容不能为空
++ <% if @discusses.blank? %> + <%= render :partial => "welcome/no_data" %> + <% else %> + <% no_children_comments.each do |comment| %> + <% unless comment.nil? %> + ++ + \ No newline at end of file diff --git a/app/views/games/_tree.html.erb b/app/views/games/_tree.html.erb index 145592b17..ea2be4980 100644 --- a/app/views/games/_tree.html.erb +++ b/app/views/games/_tree.html.erb @@ -8,7 +8,7 @@ <% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path) %> <% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %>++ <% end %> + <% end %> + <% end %> ++ <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 50, :height => 50, :alt => "用户头像"), user_url_in_org(comment.creator_user), :target => '_blank' %> ++++ ++++ <% if !comment.parent.nil? %> + <% parents_rely = [] %> + <% parents_rely = get_reply_parents parents_rely, comment %> + <% length = parents_rely.length %> +++ <% if length <= 5 %> + <%=render :partial => 'shixuns/shixun_reply', :locals => {:comment => comment.parent, :parent_id => comment.id, :user_activity_id => @game_challenge.id, :type => @game_challenge.class.to_s} %> + <% else %> ++ <% end %> + +++ <% end %> +++ <%=render :partial => 'shixuns/shixun_reply_detail', :locals => {:comment => parents_rely[0], :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id, :parent_id => comment.id} %> +++ <%=render :partial => 'shixuns/shixun_reply_detail', :locals => {:comment => parents_rely[1], :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id, :parent_id => comment.id} %> +++ <%=render :partial => 'shixuns/shixun_reply_detail', :locals => {:comment => parents_rely[2], :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id, :parent_id => comment.id} %> ++ <%=render :partial => 'shixuns/shixun_reply_detail', :locals => {:comment => parents_rely[length - 1], :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id, :parent_id => comment.id} %> +++ + <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class, :user_activity_id => @game_challenge.id, :parent_id => comment.id),:remote=>true, :class => '' %> ++ <%=render :partial => 'shixuns/shixun_reply_detail', :locals => {:comment => parents_rely[3], :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id, :parent_id => comment.id} %> +++ +<%= comment.content.html_safe %>+ ++++ <%= link_to comment.creator_user.show_real_name, user_url_in_org(comment.creator_user), :class => "content-username hide fl" %> + <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %> +++ <% if comment.creator_user == User.current || User.current.admin? || User.current.manager_of_shixun?(comment.dis_id) %> + 删除 + <% end %> + | + <%= link_to( + '回复'.html_safe, + {:controller => 'users' ,:action => 'reply_to',:reply_id => comment.id, :type => @game_challenge.class.to_s, :user_activity_id => @game_challenge.id}, + :remote => true, + :method => 'get', + :title => l(:button_reply),:class => "color-grey" + ) %> + | + + <%=render :partial=> "praise_tread/edu_praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + +
++ + ++- + <%= link_to h(ent_name), {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @game, :myshixun_id => @myshixun, :path => to_path_param(ent_path), :rev => @rev, :extend => extend }, :remote => true, diff --git a/app/views/games/answer.js.erb b/app/views/games/answer.js.erb new file mode 100644 index 000000000..1acdc17b8 --- /dev/null +++ b/app/views/games/answer.js.erb @@ -0,0 +1,10 @@ +<% if @viewed == 1 %> + $("#tab_con_3").html('<%= j (render :partial => 'games/acquire_answer') %>'); + $(".-tab-nav li").removeClass("tab_hover"); + $("#tab_nav_3").addClass('tab_hover'); + $(".tab-info").hide(); + $("#tab_con_3").show(); +<% else %> + var htmlvalue = "<%= escape_javascript(render :partial => 'game_answer_tip_pop') %>"; + pop_box_new(htmlvalue,460,300); +<% end %> \ No newline at end of file diff --git a/app/views/games/entry.js.erb b/app/views/games/entry.js.erb index da73ff9e9..23f0de04e 100644 --- a/app/views/games/entry.js.erb +++ b/app/views/games/entry.js.erb @@ -1,6 +1,5 @@ -$("#myshixun_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_repository') %>'); -$("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>'); -//$("#game_rep_modify").html('保存修改'); +$("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); + diff --git a/app/views/games/game_build.js.erb b/app/views/games/game_build.js.erb deleted file mode 100644 index 7e69fd92e..000000000 --- a/app/views/games/game_build.js.erb +++ /dev/null @@ -1 +0,0 @@ -//$("#code_results").html('<%#= escape_javascript(render :partial => 'games/exec_results') %>'); \ No newline at end of file diff --git a/app/views/games/index.js.erb b/app/views/games/index.js.erb index d4b4a5625..b3f2963eb 100644 --- a/app/views/games/index.js.erb +++ b/app/views/games/index.js.erb @@ -1,10 +1,19 @@ -$("#content_list").html('<%= escape_javascript(render :partial => 'games/games_list') %>'); -$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); -$("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); -// 左侧导航样式改动 -$("#current_task_tab").removeClass("leftnav-active"); -$("#all_task_tab").addClass("leftnav-active"); -// 宽版隐藏 -$("#myshixun_extend_repository").hide(); -$("#game_left_contents").hide(); -$("#extend_code_results").hide(); \ No newline at end of file +$("#all_task_show").html('<%= escape_javascript(render :partial => 'games/games_list') %>'); +$("#all_task_show").css("height", "100%"); +if(fadein == 0){ + $("#all_task_show").css("background", "rgba(0,0,0,0.3)"); + $("#all_task_show").show(); + $("#all_task_index").css("left","-420px").stop().animate({ + left: 0 + }, 400, function(){ + fadein = 1; + }); +}else{ + $("#all_task_show").css("background","rgba(0,0,0,0)"); + $("#all_task_index").css("left", 0).stop().animate({ + left: "-505px" + }, 400, function(){ + $("#all_task_show").hide(); + fadein = 0; + }); +} diff --git a/app/views/games/minus_score.js.erb b/app/views/games/minus_score.js.erb new file mode 100644 index 000000000..8c2cc57dd --- /dev/null +++ b/app/views/games/minus_score.js.erb @@ -0,0 +1,8 @@ +$("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); +$("#tab_con_3").html('<%= j (render :partial => 'games/acquire_answer') %>'); +$("#experience_value").html("+ 0"); +$("#grade_value").html("+ 0"); +$(".-tab-nav li").removeClass("tab_hover"); +$("#tab_nav_3").addClass('tab_hover'); +$(".tab-info").hide(); +$("#tab_con_3").show(); diff --git a/app/views/games/refresh_game_list.js.erb b/app/views/games/refresh_game_list.js.erb new file mode 100644 index 000000000..a7a15076b --- /dev/null +++ b/app/views/games/refresh_game_list.js.erb @@ -0,0 +1,5 @@ +if($("#all_task_index").css("left") == "0px"){ + $("#all_task_tab").trigger("click"); // 模拟全部任务点击事件 +} +$("#all_task_show").html("<%= j (render :partial => "games_list") %>"); +hideModal(); \ No newline at end of file diff --git a/app/views/games/reset_new_code.js.erb b/app/views/games/reset_new_code.js.erb new file mode 100644 index 000000000..f81d37708 --- /dev/null +++ b/app/views/games/reset_new_code.js.erb @@ -0,0 +1,8 @@ +<% if @error_messages %> + notice_sure_box('<%= @error_messages %>'); +<% else %> + $("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); + HoverLi_new(1); +<% end %> +//$("#coding_area").show(); +$("#coding_ajax_loading").css("display", "none"); \ No newline at end of file diff --git a/app/views/games/reset_original_code.js.erb b/app/views/games/reset_original_code.js.erb new file mode 100644 index 000000000..2d7607680 --- /dev/null +++ b/app/views/games/reset_original_code.js.erb @@ -0,0 +1,6 @@ +<% if @error_messages %> +notice_sure_box('<%= @error_messages %>'); +<% else %> +$("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); +HoverLi_new(1); +<% end %> diff --git a/app/views/games/show.html.erb b/app/views/games/show.html.erb index 0b80122f8..d10801622 100644 --- a/app/views/games/show.html.erb +++ b/app/views/games/show.html.erb @@ -1,51 +1,22 @@ -<%= javascript_include_tag 'baiduTemplate', 'jquery.datetimepicker.js' %> -<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> -<%= stylesheet_link_tag "/assets/codemirror/codemirror" %> - - <%= render :partial => "game_show" %> +<%= javascript_include_tag "/codemirror/lib/codemirror", "/codemirror/mode/javascript/javascript", "/codemirror/addon/hint/show-hint", "/codemirror/addon/hint/javascript-hint", "/codemirror/addon/selection/active-line", "/codemirror/addon/lint/javascript-lint", "/codemirror/addon/lint/css-lint", "/codemirror/addon/lint/lint", "/codemirror/addon/lint/json-lint", "/editormd/lib/codemirror/addon/lint/css-lint" %> +<%= stylesheet_link_tag "/codemirror/lib/codemirror" %> +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%> ++-+ <%= render :partial => "games_list" %> +++ <%= render :partial => 'games/game_show' %> +- <%= render :partial => 'desc_full_show'%> --- <%= render :partial => 'myshixun_extend_repository' %> --- <%= render :partial => 'extend_test_output' %> -- - + \ No newline at end of file diff --git a/app/views/games/show.js.erb b/app/views/games/show.js.erb index ef45d7921..e2dfd4266 100644 --- a/app/views/games/show.js.erb +++ b/app/views/games/show.js.erb @@ -1,6 +1,32 @@ -$("#content_list").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); -$("#content_attr_1").html('<%= escape_javascript(render :partial => 'games/desc_full_show') %>'); -$("#myshixun_extend_repository").html('<%= escape_javascript(render :partial => 'games/myshixun_extend_repository') %>'); -$("#content_attr_2").html('<%= escape_javascript(render :partial => 'games/extend_test_output') %>'); -$("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); -$("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); +<% if params[:index].nil? %> + clearInterval(cm); // tpi关闭耗时 + <% if !@type.blank? || !params[:path].nil? %> + $("#games_repository_contents").html('<%= escape_javascript(render :partial => 'games/repository') %>'); + <% elsif params[:choose].present? %> + $("#games_valuation_contents").html("<%= j(render :partial => 'games/game_choose_results', :locals => { :game_challenge => @game_challenge}) %>"); + $("#all_task_show").html("<%= j(render :partial => "games_list") %>"); + $("#game_operate_action").html("<%= j(render :partial => "games/code_actions") %>"); + <% else %> + $("#game_show_content").html('<%= escape_javascript(render :partial => 'games/game_show') %>'); + <% end %> + $("#myshixun_top").html('<%= escape_javascript(render :partial => 'myshixuns/myshixun_top') %>'); + $("#current_task_tab").attr('href','<%= myshixun_game_path(@myshixun.current_task, :myshixun_id => @myshixun) %>'); + $("#all_task_show").html("<%= j (render :partial => "games_list") %>"); + $("#all_task_show").hide(); + fadein = 0; + // 选择题 + <% if params[:choose] == "true" %> + <% if @had_done == 0 %> + $("#code_estimate").html("下一关"); + var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game=> @game, :myshixun => @myshixun, :had_done => 0}) %>"; + <% else %> + $("#code_estimate").html("退出实训"); + var htmlvalue = "<%= j (render :partial => 'games/pass_game_show', :locals => { :game => @game, :myshixun => @myshixun, :had_done => 1}) %>"; + <% end %> + // 传递具体屏幕的宽高，实现不同浏览器与不同分辨率都能撑满屏幕 + pop_box_new2(htmlvalue, window.innerWidth, window.innerHeight); + <% end %> +<% else %> + $("#all_task_show").html("<%= j (render :partial => "games_list") %>"); + $("#all_task_tab").trigger("click"); // 模拟全部任务点击事件 +<% end %> diff --git a/app/views/games/web_display.html.erb b/app/views/games/web_display.html.erb new file mode 100644 index 000000000..97b28adbe --- /dev/null +++ b/app/views/games/web_display.html.erb @@ -0,0 +1,2 @@ + diff --git a/app/views/homework_bank/_homework_bank_list.html.erb b/app/views/homework_bank/_homework_bank_list.html.erb new file mode 100644 index 000000000..20c3890bb --- /dev/null +++ b/app/views/homework_bank/_homework_bank_list.html.erb @@ -0,0 +1,119 @@ ++ ++ + \ No newline at end of file diff --git a/app/views/homework_bank/_hw_search_course_list.html.erb b/app/views/homework_bank/_hw_search_course_list.html.erb new file mode 100644 index 000000000..7c00061d9 --- /dev/null +++ b/app/views/homework_bank/_hw_search_course_list.html.erb @@ -0,0 +1,12 @@ +<% if @courses.count > 0 %> + <% @courses.each do |course| %> +++共 <%= @hw_count %>个搜索结果
+ <%= link_to '引用次数排序', homework_bank_index_path(:type => @type, :order => "quotes", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr mr15 #{@order == 'quotes' ? 'color-orange03' : ''}", :remote => true %> + | + <%= link_to '更新时间排序', homework_bank_index_path(:type => @type, :order => "updated_at", :search => @search, :sort => @r_sort, :property=>@property), :class => "fr #{@order == 'updated_at' ? 'color-orange03' : ''}", :remote => true %> +++++ ++ <%= link_to '全部', homework_bank_index_path(:type => @type), :class => 'edu-filter-cir-grey mr5 active font-12 fl', :id => 'homework_bank_pro_0', :remote => true %> + <%#= link_to '编程', homework_bank_index_path(:type => @type, :property => 2), :class => 'edu-filter-cir-grey mr5 font-12 fl', :id => 'homework_bank_pro_2', :remote => true %> + <%= link_to '普通', homework_bank_index_path(:type => @type, :property => 1), :class => 'edu-filter-cir-grey mr5 font-12 fl', :id => 'homework_bank_pro_1', :remote => true %> + <%#= link_to '分组', homework_bank_index_path(:type => @type, :property => 3), :class => 'edu-filter-cir-grey mr5 font-12 fl', :id => 'homework_bank_pro_3', :remote => true %> + <%= link_to '实训', homework_bank_index_path(:type => @type, :property => 4), :class => 'edu-filter-cir-grey mr5 font-12 fl', :id => 'homework_bank_pro_4', :remote => true %> + <%#= link_to '试卷', homework_bank_path(:type => @type, :property => 5), :class => 'edu-filter-cir-grey mr5', :remote => true %> +
+ 新建 + ++ <% if @hw_count != 0 %> + <%= form_tag(choose_user_course_homework_bank_index_path(), :id => 'hb_search_course_h_form', :remote => true, :method => 'post') do %> + <% @homeworks.each do |homework| %> ++ <% if false %> +++ <% end %> + <% end %> + <% else %> + <%= render :partial => 'welcome/no_data' %> + <% end %> ++ + + <%= link_to homework.name, homework_bank_path(homework.id), :class => 'edu-class-inner-list fl ml25', :target => '_blank' %> + <% unless homework.is_public %> + + <% end %> + +++ 更新于<%= time_from_now homework.updated_at %> + <%= homework.quotes %> 次引用 + <%= StudentWork.where(:is_delete => 0, :work_status => [1, 2, 3], :homework_common_id => homework.homework_commons.map(&:id)).count %> 次答题 + <%# if homework.syllabus_id && homework.syllabus.major_level %> + <%# syllabus = homework.syllabus %> + + + + + + <%# end %> +
++ ++-
+
++ <% end %> +已经过职业认证的教师才能访问公共题库
+ +-
+
+
+
+
++-
+ <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
+
++<%= edit_mode ? '编辑' : '新建' %>普通作业
++ + 有3 处问题导致无法保存 ++-
+
++ + diff --git a/app/views/homework_bank/_new_group_homework.html.erb b/app/views/homework_bank/_new_group_homework.html.erb new file mode 100644 index 000000000..e97fa613a --- /dev/null +++ b/app/views/homework_bank/_new_group_homework.html.erb @@ -0,0 +1,92 @@ +<% not_allow_select = edit_mode && @homework.student_works.has_committed.count != 0 %> + +++++-
+
+
++<%= edit_mode ? '编辑' : '新建' %>分组作业
++ + 有3 处问题导致无法保存 ++-
+
++ +< \ No newline at end of file diff --git a/app/views/homework_bank/_new_program_homework.html.erb b/app/views/homework_bank/_new_program_homework.html.erb new file mode 100644 index 000000000..bb3204374 --- /dev/null +++ b/app/views/homework_bank/_new_program_homework.html.erb @@ -0,0 +1,169 @@ +++++-
+
+
++<%= edit_mode ? '编辑' : '新建' %>编程作业
++ + 有3 处问题导致无法保存 ++-
+
+
++ + + + + diff --git a/app/views/homework_bank/_new_shixun_homework_list.html.erb b/app/views/homework_bank/_new_shixun_homework_list.html.erb new file mode 100644 index 000000000..f5e253e60 --- /dev/null +++ b/app/views/homework_bank/_new_shixun_homework_list.html.erb @@ -0,0 +1,37 @@ +++++-
+
+
+++ +
++ + + 请至少选中一个实训 + + <% @shixuns.each do |shixun| %> +实训名称 +创建者 +学员数 ++ + <% end %> + ++ + + <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3 ml20",:style=> "text-align:left", :target => "_blank" %> + +<%= link_to shixun.owner.try(:show_real_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> +<%= shixun.myshixuns.count %> ++ +\ No newline at end of file diff --git a/app/views/homework_bank/_send_homework_bank.html.erb b/app/views/homework_bank/_send_homework_bank.html.erb new file mode 100644 index 000000000..a5f84cd13 --- /dev/null +++ b/app/views/homework_bank/_send_homework_bank.html.erb @@ -0,0 +1,34 @@ +++-
+ <%= pagination_links_full @shixun_pages, @shixuns_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
+ +\ No newline at end of file diff --git a/app/views/homework_bank/_shixuns.html.erb b/app/views/homework_bank/_shixuns.html.erb new file mode 100644 index 000000000..41fb704cb --- /dev/null +++ b/app/views/homework_bank/_shixuns.html.erb @@ -0,0 +1,21 @@ ++++++ + 选择的题将会发送到指定班级 ++ + <%= form_tag(send_h_bank_to_course_homework_bank_index_path(), :id => 'send_hb_to_course_form', :remote => true, :method => 'post') do %> ++ <% @homework_ids.each do |id| %> + + <% end %> ++ <% end %> + +-
+ <%= render :partial => 'homework_bank/hw_search_course_list' %>
+
+ +\ No newline at end of file diff --git a/app/views/homework_bank/choose_user_course.js.erb b/app/views/homework_bank/choose_user_course.js.erb new file mode 100644 index 000000000..678680b27 --- /dev/null +++ b/app/views/homework_bank/choose_user_course.js.erb @@ -0,0 +1,6 @@ +<% if params[:is_observe].nil? %> +var htmlvalue = "<%= escape_javascript(render :partial => 'homework_bank/send_homework_bank') %>"; +pop_box_new(htmlvalue, 452, 463); +<% else %> +$("#search_course_list").html("<%= escape_javascript(render :partial => 'homework_bank/hw_search_course_list') %>"); +<% end %> diff --git a/app/views/homework_bank/edit.html.erb b/app/views/homework_bank/edit.html.erb new file mode 100644 index 000000000..76c374af1 --- /dev/null +++ b/app/views/homework_bank/edit.html.erb @@ -0,0 +1,42 @@ +<% content_for :header_tags do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> ++ <%= labelled_form_for @homework, :url =>{:controller=> 'homework_bank', :action => 'shixuns', :is_search => 1}, :html => {:id => 'shixun_search_form'}, :method => "get", :remote => true do |f| %> + + <% end %> + <%= labelled_form_for @homework, :url =>{:controller=> 'homework_bank', :action => 'create'}, :html => {:id => 'shixun_homework_bank_new'}, :method => "post" do |f| %> +++ <%= render :partial => "new_shixun_homework_list" %> ++ <% end %> +++ + \ No newline at end of file diff --git a/app/views/homework_bank/index.html.erb b/app/views/homework_bank/index.html.erb new file mode 100644 index 000000000..7846062ec --- /dev/null +++ b/app/views/homework_bank/index.html.erb @@ -0,0 +1,32 @@ + + ++ + <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 编辑 +
+ <%= form_for @homework, :html => {:id => 'homework_common_submit_form'} do |f| %> + <% if @homework_type == 1 %> + <%= render :partial => 'new_common_homework', :locals => {:f => f, :edit_mode => true} %> + <% elsif @homework_type == 2 %> + <%= render :partial => 'new_program_homework', :locals => {:f => f, :edit_mode => true} %> + <% elsif @homework_type == 3 %> + <%= render :partial => 'new_group_homework', :locals => {:f => f, :edit_mode => true} %> + <% end %> + <% end %> ++\ No newline at end of file diff --git a/app/views/homework_bank/index.js.erb b/app/views/homework_bank/index.js.erb new file mode 100644 index 000000000..238c42b62 --- /dev/null +++ b/app/views/homework_bank/index.js.erb @@ -0,0 +1,20 @@ +$("#edu-tab-con-1").html("<%= j(render :partial => 'homework_bank/homework_bank_list') %>"); +<% if params[:property] %> +$(".edu-filter-cir-grey").removeClass("active"); +<% case params[:property].to_i %> +<% when 1 %> + $("#homework_bank_pro_1").addClass("active"); +<% when 2 %> + $("#homework_bank_pro_2").addClass("active"); +<% when 3 %> + $("#homework_bank_pro_3").addClass("active"); +<% when 4 %> + $("#homework_bank_pro_4").addClass("active"); +<% else %> + $("#homework_bank_pro_0").addClass("active"); +<% end %> +<% end %> +if(<%= params[:type] == '2' %>){ + $("#edu-tab-nav-1").removeClass("background-orange"); + $("#edu-tab-nav-2").addClass("background-orange"); +} \ No newline at end of file diff --git a/app/views/homework_bank/new.html.erb b/app/views/homework_bank/new.html.erb new file mode 100644 index 000000000..af27570e0 --- /dev/null +++ b/app/views/homework_bank/new.html.erb @@ -0,0 +1,48 @@ + +<% content_for :header_tags do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> +<%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > 题库
+ +++ + \ No newline at end of file diff --git a/app/views/homework_bank/send_h_bank_to_course.js.erb b/app/views/homework_bank/send_h_bank_to_course.js.erb new file mode 100644 index 000000000..cd9b51b7b --- /dev/null +++ b/app/views/homework_bank/send_h_bank_to_course.js.erb @@ -0,0 +1 @@ +yes_notice_box("已发送到目标班级的作业列表+ + <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= link_to '我的题库', homework_bank_index_path() %> > 新建 +
+ <%= labelled_form_for @homework, :url =>{:controller=>'homework_bank',:action => 'create'}, :html => {:id => 'homework_common_submit_form'}, :method => "post" do |f| %> + <% if @homework_type == 1 %> + <%= render :partial => 'new_common_homework', :locals => {:f => f, :edit_mode => false} %> + <% elsif @homework_type == 2 %> + <%= render :partial => 'new_program_homework', :locals => {:f => f, :edit_mode => false} %> + <% elsif @homework_type == 3 %> + <%= render :partial => 'new_group_homework', :locals => {:f => f, :edit_mode => false} %> + <% end %> + <% end %> +
但需要您设置发布和截止时间，以激活相应作业，谢谢！"); \ No newline at end of file diff --git a/app/views/homework_bank/set_public.js.erb b/app/views/homework_bank/set_public.js.erb new file mode 100644 index 000000000..f3a982e14 --- /dev/null +++ b/app/views/homework_bank/set_public.js.erb @@ -0,0 +1,2 @@ +hideModal(); +$("#set_homework_public_<%= @homework.id %>").remove(); \ No newline at end of file diff --git a/app/views/homework_bank/shixuns.js.erb b/app/views/homework_bank/shixuns.js.erb new file mode 100644 index 000000000..546c4fa0e --- /dev/null +++ b/app/views/homework_bank/shixuns.js.erb @@ -0,0 +1,6 @@ +<% if params[:is_search] %> +$("#new_shixun_homework_list").html("<%= j(render :partial => 'homework_bank/new_shixun_homework_list') %>"); +<% else %> +var htmlvalue = "<%= escape_javascript(render :partial => 'homework_bank/shixuns') %>"; +pop_box_new(htmlvalue, 680, 454); +<% end %> \ No newline at end of file diff --git a/app/views/homework_bank/show.html.erb b/app/views/homework_bank/show.html.erb new file mode 100644 index 000000000..9f780e821 --- /dev/null +++ b/app/views/homework_bank/show.html.erb @@ -0,0 +1,182 @@ +<% content_for :header_tags do %> + <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> + <%= javascript_include_tag "resizeable_table" %> + <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> +<% end %> + + + ++\ No newline at end of file diff --git a/app/views/homework_common/_edit_anon_setting.html.erb b/app/views/homework_common/_edit_anon_setting.html.erb new file mode 100644 index 000000000..8619e1be4 --- /dev/null +++ b/app/views/homework_common/_edit_anon_setting.html.erb @@ -0,0 +1,70 @@ ++ + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path() %> > <%= @homework.user == User.current ? link_to('我的题库', homework_bank_index_path()) : link_to('公共题库', homework_bank_index_path(:type => 2)) %>
++++ <% unless @homework.is_public %> + + <% end %> + <%= @homework.name %> +
+ <%= link_to '返回', @homework.user == User.current ? homework_bank_index_path() : homework_bank_index_path(:type => 2), :class => 'fr font-12 mr15 mt3 link-color-grey' %> +++++++-
+
+ ++-
+ <% if @is_admin %>
+ <% if @homework.homework_type != 4 %>
+
+++ + +++ <%= @homework.description.html_safe %> ++-
+ <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => @homework} %>
+
++ <% end %> + + <% if @homework.homework_type == 2 %> + <% samples = @homework.homework_bank_samples %> + <% unless samples.empty? %> +++分组要求
+++分组人数： <%= @homework.min_num %> - <%= @homework.max_num %> 人
+ 注：任一成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享。 +++ <% end %> + + <%# if @is_teacher %> +++输入输出样例：<%= samples.count %> 组
++ <% samples.each_with_index do |sample, index| %> ++++ <% end %> +-
+
++ <% end %> + <%# end %> +++测试集：<%=@homework.homework_bank_tests.count %> 组
++++ +
++ + + + <% @homework.homework_bank_tests.each_with_index do |test, i| %> +序号 +测试集输入 +测试集输出 ++ + <% end %> + +<%=i+1 %> ++ ++<%=test.input.blank? ? " " : test.input %>
+ ++<%=test.output.blank? ? " " : test.output %>
++ ++++ <% unless @homework.reference_answer.blank? %> + <%= @homework.reference_answer.html_safe %> + <% else %> ++
+ 暂未设置参考答案 ~
+ <% end %> +++匿评设置
++\ No newline at end of file diff --git a/app/views/homework_common/_edit_late_setting.html.erb b/app/views/homework_common/_edit_late_setting.html.erb new file mode 100644 index 000000000..33f9238d9 --- /dev/null +++ b/app/views/homework_common/_edit_late_setting.html.erb @@ -0,0 +1,44 @@ +++-
+
-
+
++补交设置
++\ No newline at end of file diff --git a/app/views/homework_common/_edit_public_setting.html.erb b/app/views/homework_common/_edit_public_setting.html.erb new file mode 100644 index 000000000..c0803a28b --- /dev/null +++ b/app/views/homework_common/_edit_public_setting.html.erb @@ -0,0 +1,37 @@ + + +++-
+
-
+
++公开设置
++\ No newline at end of file diff --git a/app/views/homework_common/_edit_publish_setting.html.erb b/app/views/homework_common/_edit_publish_setting.html.erb new file mode 100644 index 000000000..10fa2d2ed --- /dev/null +++ b/app/views/homework_common/_edit_publish_setting.html.erb @@ -0,0 +1,48 @@ +++-
+ <% if @homework.homework_type != 4 %>
+
++发布设置
++\ No newline at end of file diff --git a/app/views/homework_common/_edit_score_setting.html.erb b/app/views/homework_common/_edit_score_setting.html.erb new file mode 100644 index 000000000..2c2e3ed99 --- /dev/null +++ b/app/views/homework_common/_edit_score_setting.html.erb @@ -0,0 +1,165 @@ +++-
+
++<% if @homework.homework_type == 4 %> +评分设置
+++<% else %> +++-
+
++<% end %> diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index f4f35f0f3..dab6f2359 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -1,18 +1,133 @@ <% if homework_commons.count != 0 %> - <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,:page => 0,:course_id => course_id} %> +++-
+
+ <% homework_commons.each_with_index do |homework_common, index|%> ++ <%# unless homework_common.is_public %> + + <%# end %> +<% else %> - -+ # <%= get_hw_index(homework_common, @is_teacher, @homework_type) + 1 %> + <% homework_curr_status = homework_curr_time(homework_common) %> + <%= link_to homework_common.name.to_s, student_work_index_path(:homework => homework_common.id,:host=> Setting.host_course), :class => "edu-class-inner-list fl color-grey3"%> + <% unless homework_common.is_public %> + + <% end %> + <% if homework_curr_status[:status] != "" %> + <%= homework_curr_status[:status] %> + <% end %> + <% if homework_common.homework_detail_manual.try(:comment_status) != 0 && homework_common.homework_detail_manual.try(:comment_status) != 6 %> + <% allow_late = homework_common.allow_late ? '已开启补交' : '未开启补交' %> + <%= allow_late %> + <% end %> -+ <% end %> + <% if @obj_count > 15 %> +-+ <% if @is_teacher %> +-+ <% if !@is_teacher && User.current.member_of_course?(@course) && homework_common.student_works.where("user_id = #{User.current.id} and work_status > 0").blank? %> + 未提交 + <% end %> + + +-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
-
+ + 创建于<%=time_from_now homework_common.created_at %> + + <% if [1,2,3,4,5,6].include?(homework_common.homework_detail_manual.try(:comment_status)) %> + <% if @is_teacher %> + + <%= link_to had_commit_studentwork_count(homework_common), student_work_index_path(:homework => homework_common.id, :tab => 2, :status => ['1', '2']), :class => 'color-orange03 mr5', :target => '_blank' %> + 已交 + + + <%= link_to had_uncommit_studentwork_count(homework_common), student_work_index_path(:homework => homework_common.id, :tab => 2, :status => ['0']), :class => 'color-orange03 mr5', :target => '_blank' %> + 未交 + + <% if homework_common.homework_type != 4 %> + + <%= link_to had_unevaluate_count(homework_common), student_work_index_path(:homework => homework_common.id, :tab => 2, :comment => ['0']), :class => 'color-orange03 mr5', :target => '_blank' %> + 未评 + + <% end %> + <% else %> + + <%= link_to had_commit_studentwork_count(homework_common), student_work_index_path(:homework => homework_common.id, :tab => 2), :class => 'color-orange03 mr5', :target => '_blank' %> + 已交 + + + <%= link_to had_uncommit_studentwork_count(homework_common), student_work_index_path(:homework => homework_common.id, :tab => 2), :class => 'color-orange03 mr5', :target => '_blank' %> + 未交 + + <% end %> + <% end %> + <% if homework_common.homework_detail_manual.try(:comment_status) == 0 && homework_common.publish_time %> + 将于 <%= format_time(homework_common.publish_time).to_s %> 发布 + <% else %> + <%= homework_curr_status[:time] %> + <% end %> +
++ ++ <% end %> +-
+ <% if homework_common.homework_type != 4 %>
+
++ <% end %>++-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+
--没有数据可以显示！
++ <%= render :partial => "welcome/no_data" %><% end %> \ No newline at end of file diff --git a/app/views/homework_common/_homework_index_tab.html.erb b/app/views/homework_common/_homework_index_tab.html.erb new file mode 100644 index 000000000..55336d0b4 --- /dev/null +++ b/app/views/homework_common/_homework_index_tab.html.erb @@ -0,0 +1,9 @@ + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">全部 +<% if @is_teacher %> + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">未发布 +<% end %> + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">提交中 + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">匿评中 + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">申诉中 + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">评阅中 + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">已结束 diff --git a/app/views/homework_common/_homework_search_form.html.erb b/app/views/homework_common/_homework_search_form.html.erb index 250d72467..c2f03570a 100644 --- a/app/views/homework_common/_homework_search_form.html.erb +++ b/app/views/homework_common/_homework_search_form.html.erb @@ -1,6 +1,20 @@ -<%= form_tag( homework_common_index_url_in_org(course.id), - :remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %> - - <%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %> - -<% end %> \ No newline at end of file +<%= form_tag(homework_common_index_path(:course => @course.id, :order => @order, :homework_type => @homework_type), :remote => true , :method => 'get', :id => 'resource_search_form') do %> + + + +<% end %> + + diff --git a/app/views/homework_common/_new_common_homework.html.erb b/app/views/homework_common/_new_common_homework.html.erb new file mode 100644 index 000000000..af04d1f4e --- /dev/null +++ b/app/views/homework_common/_new_common_homework.html.erb @@ -0,0 +1,69 @@ +++<%= edit_mode ? '编辑' : '新建' %>普通作业
++ + 有3 处问题导致无法保存 ++-
+
+\ No newline at end of file diff --git a/app/views/homework_common/_new_group_homework.html.erb b/app/views/homework_common/_new_group_homework.html.erb new file mode 100644 index 000000000..fbbfcbb63 --- /dev/null +++ b/app/views/homework_common/_new_group_homework.html.erb @@ -0,0 +1,87 @@ +<% not_allow_select = edit_mode && @homework.student_works.has_committed.count != 0 %> + +++-
+
+
++<%= edit_mode ? '编辑' : '新建' %>分组作业
++ + 有3 处问题导致无法保存 ++-
+
+\ No newline at end of file diff --git a/app/views/homework_common/_new_program_homework.html.erb b/app/views/homework_common/_new_program_homework.html.erb new file mode 100644 index 000000000..adc5e7bd6 --- /dev/null +++ b/app/views/homework_common/_new_program_homework.html.erb @@ -0,0 +1,165 @@ +++++-
+
+
++<%= edit_mode ? '编辑' : '新建' %>编程作业
++ + 有3 处问题导致无法保存 ++-
+
+
++ + + + \ No newline at end of file diff --git a/app/views/homework_common/_new_shixun_homework_list.html.erb b/app/views/homework_common/_new_shixun_homework_list.html.erb new file mode 100644 index 000000000..f24f6ff53 --- /dev/null +++ b/app/views/homework_common/_new_shixun_homework_list.html.erb @@ -0,0 +1,37 @@ +++++-
+
+
+++ +
++ + + 请至少选中一个实训 + + <% @shixuns.each do |shixun| %> +实训名称 +创建者 +学员数 ++ + <% end %> + ++ + + <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3 ml20",:style=> "text-align:left", :target => "_blank" %> + +<%= link_to shixun.owner.try(:show_real_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> +<%= shixun.myshixuns.count %> ++ +\ No newline at end of file diff --git a/app/views/homework_common/_reference_answers_attachments.html.erb b/app/views/homework_common/_reference_answers_attachments.html.erb new file mode 100644 index 000000000..5e6f84d0b --- /dev/null +++ b/app/views/homework_common/_reference_answers_attachments.html.erb @@ -0,0 +1,58 @@ +++-
+ <%= pagination_links_full @shixun_pages, @shixuns_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
+ + <% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("ref_attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%> + <%= text_field_tag("ref_attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("ref_attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(''.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "ref_attachments[p#{i}][token]", "#{attachment.token}" %> + + + <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("ref_attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("ref_attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("ref_attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(''.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "ref_attachments[p#{i}][token]", "#{attachment.token}" %> + + + <% end %> + <% end %> + + <%= file_field_tag 'ref_attachments[dummy][file]', + :id => 'ref_file', + :class => ie8? ? '' : 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this);', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js',:project =>nil), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), + :delete_all_files => l(:text_are_you_sure_all) + } %> ++ + ++ + + 上传附件 + ++ +<% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> +<% end %> \ No newline at end of file diff --git a/app/views/homework_common/_shixuns.html.erb b/app/views/homework_common/_shixuns.html.erb new file mode 100644 index 000000000..d43230a9c --- /dev/null +++ b/app/views/homework_common/_shixuns.html.erb @@ -0,0 +1,21 @@ ++ +\ No newline at end of file diff --git a/app/views/homework_common/_show_anon_setting.html.erb b/app/views/homework_common/_show_anon_setting.html.erb new file mode 100644 index 000000000..f8db1bc32 --- /dev/null +++ b/app/views/homework_common/_show_anon_setting.html.erb @@ -0,0 +1,64 @@ ++ <%= labelled_form_for @homework, :url =>{:controller=> 'homework_common', :action => 'shixuns', :course => @course.id, :is_search => 1}, :html => {:id => 'shixun_search_form'}, :method => "get", :remote => true do |f| %> + + <% end %> + <%= labelled_form_for @homework, :url =>{:controller=> 'homework_common', :action => 'create', :course => @course.id}, :html => {:id => 'shixun_homework_common_new'}, :method => "post" do |f| %> +++ <%= render :partial => "new_shixun_homework_list" %> ++ <% end %> +++匿评设置
++\ No newline at end of file diff --git a/app/views/homework_common/_show_late_setting.html.erb b/app/views/homework_common/_show_late_setting.html.erb new file mode 100644 index 000000000..9c24b2ae4 --- /dev/null +++ b/app/views/homework_common/_show_late_setting.html.erb @@ -0,0 +1,43 @@ +++-
+
-
+
++补交设置
++\ No newline at end of file diff --git a/app/views/homework_common/_show_public_setting.html.erb b/app/views/homework_common/_show_public_setting.html.erb new file mode 100644 index 000000000..40505b05d --- /dev/null +++ b/app/views/homework_common/_show_public_setting.html.erb @@ -0,0 +1,40 @@ + +++-
+
-
+
++公开设置
++\ No newline at end of file diff --git a/app/views/homework_common/_show_publish_setting.html.erb b/app/views/homework_common/_show_publish_setting.html.erb new file mode 100644 index 000000000..9a64d251b --- /dev/null +++ b/app/views/homework_common/_show_publish_setting.html.erb @@ -0,0 +1,40 @@ +++-
+ <% if @homework.homework_type != 4 %>
+
++发布设置
+ <% if @is_teacher %> + 编辑 + <% end %> ++\ No newline at end of file diff --git a/app/views/homework_common/_show_score_setting.html.erb b/app/views/homework_common/_show_score_setting.html.erb new file mode 100644 index 000000000..e71630ddc --- /dev/null +++ b/app/views/homework_common/_show_score_setting.html.erb @@ -0,0 +1,160 @@ +++-
+
++<% if @homework.homework_type == 4 %> +评分设置
+++<% else %> +++-
+
++<% end %> \ No newline at end of file diff --git a/app/views/homework_common/add_to_homework_bank.js.erb b/app/views/homework_common/add_to_homework_bank.js.erb index aa0924b24..159f83ab8 100644 --- a/app/views/homework_common/add_to_homework_bank.js.erb +++ b/app/views/homework_common/add_to_homework_bank.js.erb @@ -6,14 +6,5 @@ var str = ""; <% elsif params[:type].to_i == 3 %> str = "已经另存到题库"; <% end %> -notice_box(str); -<% if @hw_status == 5 %> -$("#homework_post_brief").html("<%= escape_javascript(render :partial => 'student_work/homework_post_brief', :locals => {:homework => @homework, :is_teacher => @is_teacher}) %>"); -<% else %> -$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:hw_status=>@hw_status}) %>"); -<% end %> -<% if @user_activity_id != @homework.id %> -sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); -<% else %> -sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); -<% end %> \ No newline at end of file +notice_sure_box(str); +$(".add_to_homework_bank_<%= @homework.id %>").remove(); \ No newline at end of file diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb index 3240cfdea..6f6f52f25 100644 --- a/app/views/homework_common/edit.html.erb +++ b/app/views/homework_common/edit.html.erb @@ -1,63 +1,19 @@ - -++-
+
-- - - -编辑作业-- <% committed_work_count = @homework.student_works.has_committed.count %> - <% stu_pro_count = @homework.student_work_projects.count %> - <% if committed_work_count != 0 %> - <% if @homework.homework_type == 1 %> -\ No newline at end of file diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 1351b67ac..9e77b7116 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -1,85 +1,33 @@ - - - -已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型。
- <% elsif @homework.homework_type == 2 %> -已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和测试集。
- <% elsif @homework.homework_type == 3 %> -已有<%=committed_work_count %>个学生提交作品，不允许再修改作业类型和分组设置(可扩大分组范围)。
+<% content_for :header_tags do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> ++++ + <%= link_to @course.name, course_path(@course) %> > + <%= link_to "#{@homework.homework_type_ch}作业", homework_common_index_path(:course => @course, :homework_type => @homework_type) %> > + 编辑
+ <%= form_for @homework, :html => {:id => 'homework_common_submit_form'} do |f| %> + <% if @homework_type == 1 %> + <%= render :partial => 'new_common_homework', :locals => {:f => f, :edit_mode => true} %> + <% elsif @homework_type == 2 %> + <%= render :partial => 'new_program_homework', :locals => {:f => f, :edit_mode => true} %> + <% elsif @homework_type == 3 %> + <%= render :partial => 'new_group_homework', :locals => {:f => f, :edit_mode => true} %> <% end %> - <% elsif stu_pro_count != 0 && @homework.homework_type == 3 %> -已有<%=stu_pro_count %>个学生关联项目，不允许再修改作业类型。
<% end %> - - <%= form_for @homework do |f| %> - - -- <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %> -- <% end%> --- ---
-
+- - diff --git a/app/views/homework_common/index.js.erb b/app/views/homework_common/index.js.erb index 4a9ec6ad3..c3dba6782 100644 --- a/app/views/homework_common/index.js.erb +++ b/app/views/homework_common/index.js.erb @@ -1,4 +1,3 @@ -/* -$("#user_show_more_homework").replaceWith("<%#= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id} )%>");*/ - -$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id}) %>"); +$("#homework_index_list").html("<%=escape_javascript(render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks, :course_id => @course.id, :order => @order, :search => @search}) %>"); +$("#homework_index_tab").html("<%= j( render :partial => "homework_common/homework_index_tab") %>"); +//$("#search_div").html("<%#= j( render :partial => "homework_common/homework_search_form") %>"); diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb new file mode 100644 index 000000000..198ce9f71 --- /dev/null +++ b/app/views/homework_common/new.html.erb @@ -0,0 +1,19 @@ +<% content_for :header_tags do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> ++- ++-<%= @homework_type == 4 ? '实训列表' : '作业列表' %>
+ <% if @is_teacher %> + <% if @homework_type != 4 %> + <%= link_to '新建', new_homework_common_path(:course => @course.id, :homework_type =>@homework_type), :class => "white-btn orange-btn fr mr20", :title => "新建作业" %> + <%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id, :homework_type =>@homework_type), :class => "white-btn orange-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %> + <% else %> + <%= link_to '选用实训', shixuns_homework_common_index_path(:course => @course.id), :remote => true, :class => "white-btn orange-btn fr mr20", :title => "新建作业" %> + <% if User.current.admin? %> + <%= link_to("实训统计", shixun_statistics_course_path(@course, :format => "xls"), :class => "white-btn orange-btn fr mr10",:title=>"实训作业统计") %> + <% end %> + <% end %> + <% end %> +- <%= render :partial => 'homework_search_form',:locals => {:course=>@course} %> --+++ <%= render :partial => "homework_common/homework_index_tab" %> +
++ <%= render :partial => 'homework_search_form', :locals => {:course => @course} %> +- <% if @is_teacher%> - -- <%= labelled_form_for @new_homework,:url => user_new_homework_users_path,:method => "post" do |f| %> -- <% end%> -- <%= render :partial => 'users/user_homework_form', :locals => { :homework => @new_homework,:f => f,:edit_mode => false,:select_course => false } %> - -- <% end%> -- <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %> +++ <%= render :partial => 'homework_common/homework_index_list', :locals => {:homework_commons => @homeworks,:course_id => @course.id} %> +++\ No newline at end of file diff --git a/app/views/homework_common/set_public.js.erb b/app/views/homework_common/set_public.js.erb new file mode 100644 index 000000000..a409d571c --- /dev/null +++ b/app/views/homework_common/set_public.js.erb @@ -0,0 +1,3 @@ +hideModal(); +$("#set_homework_public_<%= @homework.id %>").remove(); +$("#homework_public_<%= @homework.id %>").remove(); diff --git a/app/views/homework_common/setting.html.erb b/app/views/homework_common/setting.html.erb new file mode 100644 index 000000000..2e2278542 --- /dev/null +++ b/app/views/homework_common/setting.html.erb @@ -0,0 +1,76 @@ + ++ + <%= link_to @course.name, course_path(@course) %> > + <%= link_to "#{@homework.homework_type_ch}作业", homework_common_index_path(:course => @course, :homework_type => @homework_type) %> > + 新建
+ <%= labelled_form_for @homework, :url =>{:controller=>'homework_common',:action => 'create', :course => @course.id}, :html => {:id => 'homework_common_submit_form'}, :method => "post" do |f| %> + <% if @homework_type == 1 %> + <%= render :partial => 'new_common_homework', :locals => {:f => f, :edit_mode => false} %> + <% elsif @homework_type == 2 %> + <%= render :partial => 'new_program_homework', :locals => {:f => f, :edit_mode => false} %> + <% elsif @homework_type == 3 %> + <%= render :partial => 'new_group_homework', :locals => {:f => f, :edit_mode => false} %> + <% end %> + <% end %> ++\ No newline at end of file diff --git a/app/views/homework_common/shixuns.js.erb b/app/views/homework_common/shixuns.js.erb new file mode 100644 index 000000000..5192bd2a6 --- /dev/null +++ b/app/views/homework_common/shixuns.js.erb @@ -0,0 +1,6 @@ +<% if params[:is_search] %> +$("#new_shixun_homework_list").html("<%= j(render :partial => 'new_shixun_homework_list') %>"); +<% else %> +var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/shixuns') %>"; +pop_box_new(htmlvalue, 680, 454); +<% end %> \ No newline at end of file diff --git a/app/views/iframes/_html_show.html.erb b/app/views/iframes/_html_show.html.erb new file mode 100644 index 000000000..b71582518 --- /dev/null +++ b/app/views/iframes/_html_show.html.erb @@ -0,0 +1 @@ +<%= @contents.html_safe %> diff --git a/app/views/iframes/html_content.html.erb b/app/views/iframes/html_content.html.erb new file mode 100644 index 000000000..731621860 --- /dev/null +++ b/app/views/iframes/html_content.html.erb @@ -0,0 +1 @@ +<%= @contents.html_safe %> diff --git a/app/views/iframes/html_content.html.erb.BASE.erb b/app/views/iframes/html_content.html.erb.BASE.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/iframes/html_content.html.erb.LOCAL.erb b/app/views/iframes/html_content.html.erb.LOCAL.erb new file mode 100644 index 000000000..0fb51d1b8 --- /dev/null +++ b/app/views/iframes/html_content.html.erb.LOCAL.erb @@ -0,0 +1 @@ +<%= @contents.html_safe %> \ No newline at end of file diff --git a/app/views/iframes/html_content.html.erb.REMOTE.erb b/app/views/iframes/html_content.html.erb.REMOTE.erb new file mode 100644 index 000000000..737901f03 --- /dev/null +++ b/app/views/iframes/html_content.html.erb.REMOTE.erb @@ -0,0 +1,14 @@ + + + + ++ + <%= link_to @course.name, course_path(@course) %> + > <%= link_to "#{@homework.homework_type_ch}作业", homework_common_index_path(:course => @course.id, :homework_type => @homework.homework_type) %> > #<%= link_to (get_hw_index(@homework, @is_teacher, @homework.homework_type).to_i + 1), student_work_index_path(:homework => @homework.id) %> +
+ +++ + <%= form_tag(homework_setting_homework_common_path(@homework), :method => "post", :id => 'homework_setting_form') do |f| %> ++ <% if !@homework.is_public %> + + <% end %> + <%= @homework.name %>
+ <%= link_to '作业详情', student_work_index_path(:homework => @homework.id), :class => 'fr font-12 mr15 color-orange03 mt3' %> ++ ++ + + <% end %> ++ <% edit_mode = @is_new && @is_teacher %> ++ ++ <%= render :partial => 'show_publish_setting' %> +++ <%= render :partial => 'edit_publish_setting' %> ++++ + <% if @homework.homework_type != 4 %> ++ <%= render :partial => 'show_late_setting' %> +++ <%= render :partial => 'edit_late_setting' %> +++ <% end %> + ++ <%= render :partial => 'show_anon_setting' %> +++ <%= render :partial => 'edit_anon_setting' %> +++ ++ <%= render :partial => 'show_score_setting' %> +++ <%= render :partial => 'edit_score_setting' %> +++ ++ <%= render :partial => 'show_public_setting' %> +++ <%= render :partial => 'edit_public_setting' %> ++Hello world + + + +biaoti
+ddd +HelloWord
+good + + \ No newline at end of file diff --git a/app/views/iframes/html_content.js.erb b/app/views/iframes/html_content.js.erb new file mode 100644 index 000000000..14237c30b --- /dev/null +++ b/app/views/iframes/html_content.js.erb @@ -0,0 +1 @@ +$("#html_contents").html('<%= j (render :partial => "iframes/html_show" ) %>'); \ No newline at end of file diff --git a/app/views/iframes/show.html.erb b/app/views/iframes/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb index 3f1950318..bbc6db496 100644 --- a/app/views/issues/_issue_replies.html.erb +++ b/app/views/issues/_issue_replies.html.erb @@ -1,89 +1,89 @@ --
- <% @journals.each do |comment| %>
-
-
- -- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %> -- -- <% if User.current.logged? %> -- +- <%= form_for('new_form', :url => add_journal_issue_path(@issue.id, :is_issue_show => true), :method => "post", :remote => true) do |f| %> - - - - - -- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> - - -- <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %> -- - 发送 - - <% end %> --
+ <% @journals.each do |comment| %>
+
+
+ +\ No newline at end of file diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb index a5cae65f4..f87092cd4 100644 --- a/app/views/issues/_issue_reply_ke_form.html.erb +++ b/app/views/issues/_issue_reply_ke_form.html.erb @@ -1,27 +1,27 @@ -+ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %> ++ ++ <% if User.current.logged? %> +++ <%= form_for('new_form', :url => add_journal_issue_path(@issue.id, :is_issue_show => true), :method => "post", :remote => true) do |f| %> + + + + + ++ <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> + + ++ <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %> ++ + 发送 + + <% end %> +- -- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %> -- -- <% if User.current.logged? %> -+- <%= form_for('new_form',:url => add_reply_issue_path(@issue.id, :is_issue_show => true),:method => "post", :remote => true) do |f|%> - - - - - - - 发送 - - <% end %> -- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> - - -+ +\ No newline at end of file diff --git a/app/views/kubernete/exec_container.jsl.erb b/app/views/kubernete/exec_container.jsl.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/kubernete/new.html.erb b/app/views/kubernete/new.html.erb new file mode 100644 index 000000000..cfa4cd700 --- /dev/null +++ b/app/views/kubernete/new.html.erb @@ -0,0 +1,10 @@ ++ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %> ++ ++ <% if User.current.logged? %> ++ <%= form_for('new_form',:url => add_reply_issue_path(@issue.id, :is_issue_show => true),:method => "post", :remote => true) do |f|%> + + + + + + + 发送 + + <% end %> ++ <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> + + ++diff --git a/app/views/layouts/_bigdata_header.html.erb b/app/views/layouts/_bigdata_header.html.erb index 4cf79ca30..bce467cfb 100644 --- a/app/views/layouts/_bigdata_header.html.erb +++ b/app/views/layouts/_bigdata_header.html.erb @@ -1,6 +1,6 @@++K8S开启容器
+-
+
- <%= link_to image_tag("../images/bigdata/new-logo.png",width:"51px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %> + <%= link_to image_tag("../images/bigdata/bigdata-logo.png",width:"51px", height: "45px", alt:"高校智能化教学与实训平台", class:"fl "), home_path %>注册 diff --git a/app/views/layouts/_board_children_list.html.erb b/app/views/layouts/_board_children_list.html.erb index 39bfe1798..78a565b51 100644 --- a/app/views/layouts/_board_children_list.html.erb +++ b/app/views/layouts/_board_children_list.html.erb @@ -1,11 +1,12 @@ <% unless course_board.children.empty? %> -高校教育大数据服务平台
-
+
-
<% course_board.children.reorder("position asc").each do |board| %>
-
- <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :title => '主讲老师', :class => 'sy_cgrey') %> - > - <% if @course.syllabus %> - <%=link_to @course.syllabus.title, syllabus_path(@course.syllabus_id), :class => 'sy_cgrey', :title => '课程名称' %> - > - <% end %> - <%=link_to @course.name, course_path(@course), :class => 'sy_cgrey' %> -
+<% group_num = groupCount(@course) %> -<% if is_teacher %> ---<% elsif User.current.logged? && User.current.member_of_course?(@course) %> --
-
--<% end %> - - --
-
-- <% if is_teacher%> - <%=link_to image_tag(url_to_avatar(@course),width:"96", height: "96", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:course => @course.id), :remote => true%> --- <%=link_to '', my_clear_user_avatar_temp_path(:course => @course.id), :class => 'homepageEditProfileIcon', :title => '点击编辑头像', :remote => true %> -++ + +-+ <% if @course.invite_code_halt == 0 %> + <% if User.current.admin? || User.current.member_of_course?(@course) %> + 请将邀请码告诉成员
他们可以主动加入 + <% else %> + 请向课堂教师或助教
索要邀请码 + <% end %> <% else %> - <%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %> - <% end %> ---邀 请 码
- - <% if @course.invite_code_halt == 0 %> - <% if User.current.admin? || User.current.member_of_course?(@course) %> - <%=@course.generate_invite_code %> - <% else %> - 请询问老师 - <% end %> - <% else %> - 已停用 - <% end %> - + 邀请码已停用
成员不能主动加入哦 + <% end %>-- -<% if is_teacher %> ---- <%=@course.name %> -
- - -- 教师：<%= course_teacher_link teacher_num %> - 学生：<%= course_student_link student_num %> - <%= current_time_and_term @course %> - <%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %> -
- <% is_TA = get_user_member_roles_course @course, User.current, 7 %> - <% is_TE = get_user_member_roles_course @course, User.current, 9 %> - <% is_ST = get_user_member_roles_course @course, User.current, 10 %> - <% if !is_teacher && is_TE %> - <%= link_to '教师身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl", :title => "由学生身份切换至教师身份" %> - <% elsif !is_teacher && is_TA %> - <%= link_to '助教身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => 10, :tar_role => (is_TA ? 7 : 9)), :class => "sy_btn_orange mr10 fl", :title => "由学生身份切换至教师身份" %> - <% elsif is_teacher && is_ST %> - <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl", :title => "由教师身份切换至学生身份" %> - <% end %> - <% unless (is_teacher || is_TA || is_TE || is_ST) %> -<%= join_in_course_header(@course, User.current) %>- <% end %> -- - -<%= @course.invite_code_halt == 0 ? "请将邀请码告诉成员" : "邀请码已停用" %>
-<%= @course.invite_code_halt == 0 ? "他们可以主动加入" : "暂时停止成员主动加入" %>
+ ++\ No newline at end of file diff --git a/app/views/layouts/_course_left_info.html.erb b/app/views/layouts/_course_left_info.html.erb new file mode 100644 index 000000000..604b7c8e2 --- /dev/null +++ b/app/views/layouts/_course_left_info.html.erb @@ -0,0 +1,52 @@ ++ ++-
+
+ ++ + <% elsif User.current.logged? && User.current.member_of_course?(@course) %> +-
+
+ ++ <% end %> + +-
+
+ + ++ +-
+
-
+
+
+
++ + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '在线课堂', courses_path %> > <%= link_to '新建课堂' %> +
+++ \ No newline at end of file diff --git a/app/views/courses/no_group_student_list.html.erb b/app/views/courses/no_group_student_list.html.erb new file mode 100644 index 000000000..d7f0e262e --- /dev/null +++ b/app/views/courses/no_group_student_list.html.erb @@ -0,0 +1 @@ +<%= render :partial => "courses/settings/no_group_student_list_block" %> \ No newline at end of file diff --git a/app/views/courses/no_group_student_list.js.erb b/app/views/courses/no_group_student_list.js.erb new file mode 100644 index 000000000..0590baec6 --- /dev/null +++ b/app/views/courses/no_group_student_list.js.erb @@ -0,0 +1,6 @@ +<% if params[:page] || params[:search] %> +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +$("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>"); +<% else %> +$("#setting_teacher_list").html("<%= j(render :partial => 'courses/settings/no_group_student_list') %>").show(); +<% end %> \ No newline at end of file diff --git a/app/views/courses/private_or_public.js.erb b/app/views/courses/private_or_public.js.erb index 520e8a75f..c2114139e 100644 --- a/app/views/courses/private_or_public.js.erb +++ b/app/views/courses/private_or_public.js.erb @@ -1,5 +1,6 @@ +hideModal(); <% if params[:user_page].nil? %> - $("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/course_base_info') %>'); + $("#course_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/course_base_info') %>'); if(document.getElementById("course_is_public")) { <% if @course.is_public == 0%> $("#course_is_public").attr("checked",false); diff --git a/app/views/courses/search_not_students.js.erb b/app/views/courses/search_not_students.js.erb new file mode 100644 index 000000000..553c5d086 --- /dev/null +++ b/app/views/courses/search_not_students.js.erb @@ -0,0 +1,10 @@ +<% if params[:is_observe] || params[:page] %> + <% unless params[:page] %> + $("#choose_student_ids").val(''); + <% end %> +$("#search_not_students_list").html("<%= j(render :partial => 'courses/settings/search_not_students_list') %>"); +<% else %> +laststSearchCondition = ''; +var htmlvalue = "<%= j(render :partial => 'courses/settings/add_students') %>"; +pop_box_new(htmlvalue, 560, 600); +<% end %> \ No newline at end of file diff --git a/app/views/courses/search_not_teachers.js.erb b/app/views/courses/search_not_teachers.js.erb new file mode 100644 index 000000000..09320f786 --- /dev/null +++ b/app/views/courses/search_not_teachers.js.erb @@ -0,0 +1,10 @@ +<% if params[:is_observe] || params[:page] %> + <% unless params[:page] %> + $("#choose_student_ids").val(''); + <% end %> +$("#search_not_teachers_list").html("<%= j(render :partial => 'courses/settings/search_not_teachers_list') %>"); +<% else %> +lastteSearchCondition = ""; +var htmlvalue = "<%= j(render :partial => 'courses/settings/add_teachers') %>"; +pop_box_new(htmlvalue, 600, 420); +<% end %> \ No newline at end of file diff --git a/app/views/courses/set_invite_code_halt.js.erb b/app/views/courses/set_invite_code_halt.js.erb index 13fc1aa49..8fc2a2623 100644 --- a/app/views/courses/set_invite_code_halt.js.erb +++ b/app/views/courses/set_invite_code_halt.js.erb @@ -1,2 +1,2 @@ -$("#project_info_<%=@course.id %>").html("<%= escape_javascript(render :partial => 'layouts/course_base_info') %>"); +$("#course_info_<%=@course.id %>").html("<%= escape_javascript(render :partial => 'layouts/course_base_info') %>"); hideModal(); \ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index b6fe7260f..962077bbb 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -1,69 +1,167 @@ -+ 新建课堂 ++<%= labelled_form_for @course do |f| %> -- +-
+
++ ++ + ++++ ++ + ++注意：1、课堂名称 = 课程名称 + 学期信息 + 其它
+正确示例：数据结构2016秋季班级
+错误示例：数据结构班级
+2、如果本学期包含多个班级，只需创建一个课堂
+然后在课堂内部建立不同的分班
+- - --- 如果列表中没有对应的课程，请您先<%=link_to '创建课程', new_syllabus_path(),:target => '_blank', :class => 'ml5 green_btn_share c_white'%>，然后【刷新】 -
+ 请输入正整数或保留一位小数的浮点数 + +- - --- 班级是一个由教师、助教（教辅）和学生组成的临时的教学群体，在规定的时间内（如一个
学期）完成一门课程规定的教学任务。本质上，一门课程就是一个教学计划。
- 特别注意：如果您同时开设了教学内容完全同步的多个班级，强烈建议您：只需创建一个班
级，然后在这个班级中新建多个小班，这样您发布的所有信息就能够在不同小班中共享了。 -- - --- 仅针对跨越多个学期的班级，否则与开始学期保持一致。 -
--班级配置
-- +<%= javascript_include_tag 'jquery.datetimepicker.js' %> -- <%= render :partial => 'courses/settings/edit' %> -+++ 设置 + <%= link_to '返回', course_path(@course), :class => 'fr mr20 color-orange05' %> +++- + \ No newline at end of file diff --git a/app/views/courses/settings/_add_students.html.erb b/app/views/courses/settings/_add_students.html.erb new file mode 100644 index 000000000..b2364003d --- /dev/null +++ b/app/views/courses/settings/_add_students.html.erb @@ -0,0 +1,65 @@ + ++ ++ <%= labelled_form_for @course, :html => {:remote => true} do |f| %> +-++ <% end %> +-
+
+
- <%= render :partial => 'courses/settings/join_org' %> -- -- <%= render :partial => 'courses/settings/boards_setting' %> + + + ++ ++ + \ No newline at end of file diff --git a/app/views/courses/settings/_add_teachers.html.erb b/app/views/courses/settings/_add_teachers.html.erb new file mode 100644 index 000000000..5fb7a0e7b --- /dev/null +++ b/app/views/courses/settings/_add_teachers.html.erb @@ -0,0 +1,79 @@ + ++++ <%= form_tag url_for(course_memberships_path(@course)), :remote => true, :method => :post, :id => 'add_student_form' do |f| %> +++ ++ <% end %> + ++ <% if @course.course_groups.count > 0 %> + <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"task-form-100 task-height-40 panel-box-sizing mb10 color-grey3"} %> + <% end %> + + + + +++ + +
++ <%= render :partial => 'courses/settings/search_not_students_list' %> +++ ++ + \ No newline at end of file diff --git a/app/views/courses/settings/_all_student_list.html.erb b/app/views/courses/settings/_all_student_list.html.erb new file mode 100644 index 000000000..c0be48c37 --- /dev/null +++ b/app/views/courses/settings/_all_student_list.html.erb @@ -0,0 +1,39 @@ ++ ++++ + \ No newline at end of file diff --git a/app/views/courses/settings/_all_student_list_block.html.erb b/app/views/courses/settings/_all_student_list_block.html.erb new file mode 100644 index 000000000..24e52571e --- /dev/null +++ b/app/views/courses/settings/_all_student_list_block.html.erb @@ -0,0 +1,107 @@ +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +++ <%= render :partial => "courses/settings/all_student_list_block" %> +-
+
++ + + diff --git a/app/views/courses/settings/_all_teacher_list_ul.erb b/app/views/courses/settings/_all_teacher_list_ul.erb new file mode 100644 index 000000000..fae5b49c6 --- /dev/null +++ b/app/views/courses/settings/_all_teacher_list_ul.erb @@ -0,0 +1,31 @@ ++ 成员列表（全部学生） + <% if is_teacher %> + + <%= link_to '添加学生', search_not_students_course_path(@course), :remote => true, :class => 'white-btn orange-btn' %> + <%= link_to "导出成绩", export_course_member_excel_course_path(@course, :group_id => 0, :name => @search, :format => 'xls'), :class => 'white-btn orange-btn' %> + + <% end %> +++ + <% if User.current.admin? %> +++ <%= render :partial => 'courses/settings/import_info' %> ++ <% end %> + <% if is_teacher %> ++ ＋ 新建分班 + + <% if @course.course_groups.count > 0 %> + value="1"/> + <% end %> ++ <% end %> + ++ + + +++ <%= render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher} %> +++ <%=board.name %> + + + + + <% unless i == 0 %> + <%= link_to('上移', {:controller => 'boards', :action => 'update_boards_position', :id => board.id, :course_id => @course.id, :opr => 'up'},:remote => true, :method => 'post', :class => "", :title => '上移') %> + <% end %> + + + <% if i < @board_count - 1 %> + <%= link_to('下移', {:controller => 'boards', :action => 'update_boards_position', :id => board.id, :course_id => @course.id, :opr => 'down'}, :remote => true, :method => 'post', :class => "", :title => '下移') %> + <% end %> + + + 编辑 + + + 删除 + +
+<% end %> + \ No newline at end of file diff --git a/app/views/courses/settings/_change_manager.html.erb b/app/views/courses/settings/_change_manager.html.erb index d6d78485d..6484a0bba 100644 --- a/app/views/courses/settings/_change_manager.html.erb +++ b/app/views/courses/settings/_change_manager.html.erb @@ -1,76 +1,36 @@ ---更换管理员
- - ++ ---- 选择的成员将会成为新的管理员，您的角色将变更为“教师” +\ No newline at end of file diff --git a/app/views/courses/settings/_choose_course_group.html.erb b/app/views/courses/settings/_choose_course_group.html.erb new file mode 100644 index 000000000..2a1b6b4ac --- /dev/null +++ b/app/views/courses/settings/_choose_course_group.html.erb @@ -0,0 +1,21 @@ ++- \ No newline at end of file ++-+ 选择的成员将会成为新的管理员-
您将不再拥有管理员的权限，但您仍是教师团队的一员- - - <%= form_tag(change_manager_course_path(@course), method: 'post', :remote => true, :class => "",:id => "change_manager_form") do %> --- <%=render :partial => 'courses/settings/search_teacher_list', :locals => {:members => nil} %> -- <% end %> - - -- - - 确定 - 取消 - + <%= form_tag(change_manager_course_path(@course), method: 'post', :remote => true, :class => "",:id => "change_manager_form") do %> +++ <% end %> + 请选择一个教师 + 确定 + 取消 +-
+ <% members = @teachers %>
+ <% unless members.nil? || members.empty? %>
+ <% members.each do |mem| %>
+
+ +\ No newline at end of file diff --git a/app/views/courses/settings/_course_member.html.erb b/app/views/courses/settings/_course_member.html.erb index b2712645e..7d41b742a 100644 --- a/app/views/courses/settings/_course_member.html.erb +++ b/app/views/courses/settings/_course_member.html.erb @@ -13,7 +13,7 @@+ <%= form_tag(teacher_assign_group_course_path(@course), :method => 'post', :remote => true, :id => 'teacher_assign_group_form') do %> + <% @member_ids.each do |id| %> + + <% end %> + + <%= select_tag :course_group_id,options_for_select(course_group_option(@course),0), {:id=>"course_group_id", :class=>"task-height-40 color-grey ml10", :style => 'width:400px;border:1px solid #ddd;background:#fff;'} %> + + 请先选择一个分班 + <% end %> ++ +<%= index + 1 %> - <%= link_to member.user.show_name, user_path(member.user), :class => "pro_new_idname ml10 mr10", :title => "#{member.user.show_name}" %> + <%= link_to member.user.show_real_name, user_path(member.user), :class => "pro_new_idname ml10 mr10", :title => "#{member.show_real_name_name}" %> <%=member.user.user_extensions.student_id %> diff --git a/app/views/courses/settings/_edit.html.erb b/app/views/courses/settings/_edit.html.erb index 8f7c895c6..ace220cf3 100644 --- a/app/views/courses/settings/_edit.html.erb +++ b/app/views/courses/settings/_edit.html.erb @@ -5,7 +5,7 @@ ++ + \ No newline at end of file diff --git a/app/views/courses/settings/_has_group_student_list_block.html.erb b/app/views/courses/settings/_has_group_student_list_block.html.erb new file mode 100644 index 000000000..5bf490f8c --- /dev/null +++ b/app/views/courses/settings/_has_group_student_list_block.html.erb @@ -0,0 +1,104 @@ +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +++ <%= render :partial => "courses/settings/has_group_student_list_block" %> +-
+
++ + \ No newline at end of file diff --git a/app/views/courses/settings/_import_info.html.erb b/app/views/courses/settings/_import_info.html.erb new file mode 100644 index 000000000..4fc7aaa50 --- /dev/null +++ b/app/views/courses/settings/_import_info.html.erb @@ -0,0 +1,18 @@ ++ 成员列表（<%= @group.name %>） + <% if is_teacher %> + + <%= link_to "导出成绩", export_course_member_excel_course_path(@course, :group_id => @group.id, :name => @search, :format => 'xls'), :class => 'white-btn orange-btn font-14' %> + + + 分班重命名 + + + 删除分班 + + <% end %> +++++ + <% if is_teacher %> +++ + 删除 + 请先选择学生 +
+ <% elsif User.current.member_of_course?(@course) && @course.choose_group_allow && @course.members.where(:user_id => User.current.id).first.course_group_id != @group.id %> ++ 加入分班 +
+ <% end %> + + ++ + + +++ <%= render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher} %> +++diff --git a/app/views/courses/settings/_import_students.html.erb b/app/views/courses/settings/_import_students.html.erb new file mode 100644 index 000000000..452f0670f --- /dev/null +++ b/app/views/courses/settings/_import_students.html.erb @@ -0,0 +1,48 @@ + ++ + + 导入学生信息 + <% if @import_attachments.present? %> + 已导入<%= @import_attachments.count %>个学生信息列表： + <% @import_attachments.each do |attachment| %> + <%= attachment.filename %> + <% end %> + + <% end %> +
+ <% if @import_attachments.count > 0 %> ++ <%= link_to "同步成员", sync_students_course_path(@course), :class => "white-btn orange-btn", :remote => true %> +
+ <% end %> ++ + ++ + \ No newline at end of file diff --git a/app/views/courses/settings/_import_students_result.html.erb b/app/views/courses/settings/_import_students_result.html.erb new file mode 100644 index 000000000..6dbbc7330 --- /dev/null +++ b/app/views/courses/settings/_import_students_result.html.erb @@ -0,0 +1,12 @@ + +++ <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> ++ <%= error_messages_for 'attachment' %> ++ +<%= l(:label_file_upload_error_messages)%>+ + <%= form_tag(import_excel_course_path(course), :multipart => true, :remote => !ie8?, :id=>"upload_course_file_form") do %> + + + ++ <%= render :partial => 'files/new_style_attachment_list',:locals => {:container => course} %> ++ + + + 确定 + 取消 + + <% end %> ++ +diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index bee8543a2..cdb8e9d0b 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -1,120 +1,82 @@ -<%= error_messages_for 'member' %> -<% - roles = Role.givable.all - roles = roles[3..5] - members = @course.member_principals.includes(:roles, :principal).all.sort -%> - -+++ 本次新加入<%= @had_import_count %>个学生，还有<%= @list_count - @had_import_count %>个学生没有加入 ++- <% if members.any? %> -- -- -
- <% else %> -- - - - <% members.each do |member| %> - <% next if member.new_record? %> -<%= l(:label_user) %> -<%= l(:label_role_plural) %> -- <%= call_hook(:view_projects_settings_members_table_header, :course => @course) %> - - - <% end; reset_cycle %> - -- <%= link_to_user member.principal %> - -- - <%= h member.roles.sort.collect(&:to_s).join(', ') %> - - <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), - :method => :put, - :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} - ) do |f| %> - - - <% if member.roles.first.to_s == "Manager" %> -- <% roles.each do |role| %> - -
- <%= hidden_field_tag 'membership[role_ids][]', '' %> -
- <% end %> -<%= submit_tag l(:button_change), :class => "small" %> - <%= link_to_function l(:button_cancel), - "$('#member-#{member.id}-roles').show(); $('#member-#{member.id}-roles-form').hide(); return false;" - %>
- <% end %> -- - - <% else %> -- <%= link_to_function l(:button_edit), - "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;", - :class => 'icon icon-edit' %> - <%= delete_link membership_path(member), - :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> - - <% end %> - - <%= call_hook(:view_projects_settings_members_table_header, {:course => @course, :member => member}) %> --没有数据可以显示！
- <% end %> -- <% if roles.any? %> - <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %> - +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +@@ -179,9 +179,9 @@ - + - 发送 + 发送 <% end%> diff --git a/app/views/courses/sync_students.js.erb b/app/views/courses/sync_students.js.erb new file mode 100644 index 000000000..5201ada5b --- /dev/null +++ b/app/views/courses/sync_students.js.erb @@ -0,0 +1,6 @@ +$("#setting_teacher_list").hide(); +$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show(); +<%# if @had_import_count > 0 %> +//var htmlvalue = '<%#= escape_javascript(render :partial => 'courses/settings/import_students_result', :locals => {:course => @course}) %>'; +//pop_box_new(htmlvalue, 440, 490); +<%# end %> \ No newline at end of file diff --git a/app/views/courses/teacher_assign_group.js.erb b/app/views/courses/teacher_assign_group.js.erb index 503c530cd..f91d2b989 100644 --- a/app/views/courses/teacher_assign_group.js.erb +++ b/app/views/courses/teacher_assign_group.js.erb @@ -1,13 +1,18 @@ -<% if params[:group_id] != "0" %> -var all_indexes = $("#member_li_<%=@member.id %>").nextAll().find("td:first-child"); -for(var i = 0; i < all_indexes.length; i++){ - $(all_indexes[i]).html(parseInt($(all_indexes[i]).html()) - 1); +notice_box("加入成功"); +<% if !(User.current.admin? || User.current.allowed_to?(:as_teacher, @course)) %> +window.location.href = "<%= course_member_path(@course, :role => @group.id) %>"; +<% else %> +<% if params[:type] == "all" %> +if($("#sy_08").length > 0){ + window.location.href = "/courses/<%= @course.id %>/all_student_list"; +} else{ + $(".stud-class-set .news .container .member .people .left ul li[data-option='allstudent']").click(); +} +<% else %> +if($("#sy_09").length > 0){ + window.location.href = "/courses/<%= @course.id %>/no_group_student_list"; +} else{ + $(".stud-class-set .news .container .member .people .left ul li[data-option='noclass']").click(); } -$("#member_li_<%=@member.id %>").remove(); <% end %> -<% if @group && @group != "-1" %> -//$("#member_content").html("<%#= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @results})%>"); -$("#join_or_add").html("<%= escape_javascript( render :partial => 'join_or_add')%>"); -<% end %> -$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>"); -$("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>"); +<% end %> \ No newline at end of file diff --git a/app/views/courses/unjoin_group.js.erb b/app/views/courses/unjoin_group.js.erb index c9f865acd..f4a1e3ee3 100644 --- a/app/views/courses/unjoin_group.js.erb +++ b/app/views/courses/unjoin_group.js.erb @@ -1,2 +1,7 @@ -$("#st_groups").html("<%= escape_javascript( render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>"); -$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @results})%>"); \ No newline at end of file +hideModal(); +<% if !(User.current.admin? || User.current.allowed_to?(:as_teacher, @group.course)) && @user == User.current %> +window.location.href = "<%= course_member_path(@group.course, :role => @group.id) %>"; +<% else %> +$(".stud-class-set .news .container .member .people .left ul li[data-group-id='<%= @group.id %>']").click(); +$("#all_teacher_list_ul").html("<%= j(render :partial => 'courses/settings/all_teacher_list_ul') %>"); +<% end %> \ No newline at end of file diff --git a/app/views/courses/update.js.erb b/app/views/courses/update.js.erb new file mode 100644 index 000000000..883d28c0a --- /dev/null +++ b/app/views/courses/update.js.erb @@ -0,0 +1 @@ +notice_box_redirect("<%= settings_course_url(@course) %>", '<%= @course.errors.full_messages.count <= 0 ? "更新成功" : "保存失败，请重新编辑" %>'); \ No newline at end of file diff --git a/app/views/courses/update_position.js.erb b/app/views/courses/update_position.js.erb new file mode 100644 index 000000000..8cd11193d --- /dev/null +++ b/app/views/courses/update_position.js.erb @@ -0,0 +1,4 @@ +notice_box("保存成功"); +$("#setting_moduels_list").html("<%= j( render :partial => 'courses/settings/moduels' ) %>"); + + diff --git a/app/views/department/destroy.js.erb b/app/views/department/destroy.js.erb new file mode 100644 index 000000000..4c853a4b0 --- /dev/null +++ b/app/views/department/destroy.js.erb @@ -0,0 +1,6 @@ +console.log(111); +for(var i=0; i<$("#apply_add_department_<%= @apply_dep.id %>").nextAll().length; i++){ + var index = parseInt($($("#apply_add_department_<%= @apply_dep.id %>").nextAll()[i]).children(":first").html()); + $($("#apply_add_department_<%= @apply_dep.id %>").nextAll()[i]).children(":first").html(index - 1); +} +$("#apply_add_department_<%= @apply_dep.id %>").remove(); \ No newline at end of file diff --git a/app/views/discusses/_dis_praise.html.erb b/app/views/discusses/_dis_praise.html.erb new file mode 100644 index 000000000..529ff0f81 --- /dev/null +++ b/app/views/discusses/_dis_praise.html.erb @@ -0,0 +1,15 @@ +<% if PraiseTread.praised(discuss) %> + + 赞 + <%= discuss.praise_tread_cache ? (discuss.praise_tread_cache.praise_num == 0 ? "" : discuss.praise_tread_cache.praise_num ) : "" %> + +<% else %> + + 赞 + <%= discuss.praise_tread_cache ? (discuss.praise_tread_cache.praise_num == 0 ? "" : discuss.praise_tread_cache.praise_num ) : "" %> + +<% end %> \ No newline at end of file diff --git a/app/views/discusses/destroy.js.erb b/app/views/discusses/destroy.js.erb new file mode 100644 index 000000000..ee900a21a --- /dev/null +++ b/app/views/discusses/destroy.js.erb @@ -0,0 +1,3 @@ +<% if @shixun %> +$.get('<%= shixun_discuss_shixun_path(@shixun, :challenge_id => @game_challenge.try(:id)) %>'); +<% end %> \ No newline at end of file diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb index 9dbb510b2..4cc388333 100644 --- a/app/views/exercise/_edit_MC.html.erb +++ b/app/views/exercise/_edit_MC.html.erb @@ -21,48 +21,44 @@ } -++ + \ No newline at end of file diff --git a/app/views/courses/settings/_moduels.html.erb b/app/views/courses/settings/_moduels.html.erb new file mode 100644 index 000000000..79f79f640 --- /dev/null +++ b/app/views/courses/settings/_moduels.html.erb @@ -0,0 +1,104 @@ +++-
+ <%= render :partial => 'courses/settings/all_teacher_list_ul' %>
+
++ 成员列表（教师） + <% if is_teacher %> + + <%= link_to '+ 教师/助教'.html_safe, search_not_teachers_course_path(@course), :remote => true, :class => 'white-btn orange-btn font-14' %> + <% end %> - <% end %> +++++ +
++ + + + <% @teachers.each_with_index do |teacher, index| %> + <% user = teacher.user %> +序号 +姓名 +用户ID +角色 +操作 ++ + <% end %> + <% if is_teacher %> + <% @apply_users.each_with_index do |apply, index| %> + <% user = User.find(apply.course_message_id) %> +<%= index + 1 %> ++ <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5 alink-name' %> + +<%= user.try(:login) %> +<%= zh_course_role(h teacher.roles.where("name != 'Student'").first.name) %> ++ <% if is_teacher %> + <% if User.current == @course.teacher && user.id == @course.tea_id %> + 更换管理员 + <% elsif user.id != @course.tea_id %> + 删除 + <% end %> + <% end %> + ++ + <% end %> + <% end %> + +<%= @teacher_count + index + 1 %> ++ <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> + +<%= user.try(:login) %> +<%= apply.content && apply.content.include?('9') ? "教师" : "助教" %> ++ <%= link_to '同意', dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>apply.id), :class=>'color-red mr5'%> + <%= link_to '拒绝', dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>apply.id), :class=>'color-red'%> + +-
+
++ + + \ No newline at end of file diff --git a/app/views/courses/settings/_no_group_student_list_block.html.erb b/app/views/courses/settings/_no_group_student_list_block.html.erb new file mode 100644 index 000000000..86b6ec0ff --- /dev/null +++ b/app/views/courses/settings/_no_group_student_list_block.html.erb @@ -0,0 +1,87 @@ +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> +++ <%= render :partial => "courses/settings/no_group_student_list_block" %> +-
+
++ + + \ No newline at end of file diff --git a/app/views/courses/settings/_search_not_students_list.html.erb b/app/views/courses/settings/_search_not_students_list.html.erb new file mode 100644 index 000000000..bb7748fc5 --- /dev/null +++ b/app/views/courses/settings/_search_not_students_list.html.erb @@ -0,0 +1,80 @@ ++ 成员列表（未分班） ++ + +-
+ <% unless @users.empty? %>
+ <% @users.each do |user| %>
+ <% if user && user.user_extensions %>
+
++ + \ No newline at end of file diff --git a/app/views/courses/settings/_search_not_teachers_list.html.erb b/app/views/courses/settings/_search_not_teachers_list.html.erb new file mode 100644 index 000000000..30f71c656 --- /dev/null +++ b/app/views/courses/settings/_search_not_teachers_list.html.erb @@ -0,0 +1,78 @@ ++ ++ +++ + 确定 + 取消 +-
+ <%= pagination_links_full @users_pages, @users_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+
-
+ <% unless @users.empty? %>
+ <% @users.each do |user| %>
+ <% if user && user.user_extensions %>
+
++ + \ No newline at end of file diff --git a/app/views/courses/settings/_search_teacher_list.html.erb b/app/views/courses/settings/_search_teacher_list.html.erb index bcfa8da14..f2121c08f 100644 --- a/app/views/courses/settings/_search_teacher_list.html.erb +++ b/app/views/courses/settings/_search_teacher_list.html.erb @@ -3,7 +3,7 @@ <% members.each do |mem| %>+ ++ +++ +-
+ <%= pagination_links_full @users_pages, @users_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+
+ +
+ ++ + + + <% unless @members.blank? %> + <% @members.each_with_index do |member, index| %> + <% user = member.user %> ++ + <% unless is_teacher %> + 序号 + <% else %> + + + <% end %> + + +用户ID +姓名 +学号 +分班 +作业成绩 +发布资源 +发布帖子 +回复评论 + ++ + <% end %> + <% end %> + ++ + <% unless is_teacher %> + <%= index + 1 + (@page -1) * 20 %> + <% else %> + " name="member_ids[]" value="<%= member.id %>"/> + + <% end %> + + +<%= user.login %> +<%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5 alink-name', :target => '_blank' %> +<%= user.user_extensions ? user.user_extensions.student_id : '' %> +<%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> +<%= student_course_homework_score @course, user %> +<%= student_course_resource_num @course, user %> +<%= student_course_message_num @course, user %> +<%= student_course_reply_num @course, user %> + +++ + \ No newline at end of file diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index 8c5d98c81..3ae3a9804 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -7,27 +7,27 @@ --
+ <%= pagination_links_full @member_pages, @member_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+
--- <%= render :partial => 'courses/course_activity', :locals => {:course_activities => @course_activities,:page => 0,:type => @type} %> +- <%= get_acts_list_type @type %>--
-
+ <% if false %> + <% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %> +\ No newline at end of file diff --git a/app/views/courses/show.js.erb b/app/views/courses/show.js.erb index 3f82dcf3a..ee99a8894 100644 --- a/app/views/courses/show.js.erb +++ b/app/views/courses/show.js.erb @@ -1 +1,5 @@ -$("#show_more_course_activities").replaceWith("<%= escape_javascript( render :partial => 'courses/course_activity',:locals => {:course_activities => @course_activities, :page => @page,:type => @type} )%>"); +<% if params[:page] %> + $("#show_more_course_activities").replaceWith("<%= escape_javascript( render :partial => 'courses/course_activity',:locals => {:course_activities => @course_activities, :page => @page,:type => @type} )%>"); +<% else %> + $("#course_activities_content").html("<%= j(render :partial => 'courses/course_activity_content', :locals => {:course_activities => @course_activities, :page => 0}) %>"); +<% end %> \ No newline at end of file diff --git a/app/views/courses/show_comparecode.html.erb b/app/views/courses/show_comparecode.html.erb new file mode 100644 index 000000000..bd38cfd27 --- /dev/null +++ b/app/views/courses/show_comparecode.html.erb @@ -0,0 +1,112 @@ +<% content_for :header_tags do %> + <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> + <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> + <%= stylesheet_link_tag "/assets/codemirror/merge" %> + <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"%> + <%= javascript_include_tag "/assets/codemirror/merge" %> +<% end %> + +-
+ <% if false %>
+
+ <%= render :partial => 'courses/course_activity_content', :locals => {:course_activities => @course_activities} %> +++ + diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index ec81b0d18..f6855839e 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -75,7 +75,7 @@<%= @course.name %> > <%= @homework.homework_type_ch %>作业 + <% if @index %> + >#<%= link_to (get_hw_index(@homework, @is_teacher, @homework.homework_type) + 1), student_work_index_path(:homework => @homework.id) %> + <% end %> +
+ ++++++ +
++ + +<%= @src_username %> ++ <% if @simi_value.to_i >= 90 %> + 相似度<%=@simi_value.to_i%>% + <% else %> + 相似度<%=@simi_value.to_i%>% + <% end %> + +<%= @dst_username %> +<%= @src_code if @src_code %>
+<%= @dst_code if @dst_code%>
+ +- <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <%= link_to @article.author.show_real_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %><%= format_time( @article.created_on)%>@@ -120,7 +120,7 @@- +- <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <%= link_to reply.aushow_real_name_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %><%= reply.content.html_safe%> @@ -145,7 +145,7 @@ ) if reply.author.id == User.current.id %>-- - 分 - <%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> - 标准答案： - --- - - -- ---
-
- - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> --- - 分 - <%=convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> - 标准答案： - ++<% end%> \ No newline at end of file diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb index 6c8e165a0..e9b78ca71 100644 --- a/app/views/exercise/_edit_head.html.erb +++ b/app/views/exercise/_edit_head.html.erb @@ -1,41 +1,31 @@ -<%= form_for @exercise, :remote=>true do |f| %> -+- ++-多选题
+ + +- ++ + --- - + <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> +-
-
- - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> ---- -- -- "/> - <%= calendar_for('exercise_end_time')%> --测验时长:分钟- -- "/> - <%= calendar_for('exercise_publish_time')%> -- - - - +<%= form_for(@exercise, :html => {:multipart => true, :id => "exercise_head_form"}, :remote => true) do |f| %> ++++ ++ <% end %> - \ No newline at end of file + + diff --git a/app/views/exercise/_edit_multi.html.erb b/app/views/exercise/_edit_multi.html.erb index 2e2721282..bf5b49605 100644 --- a/app/views/exercise/_edit_multi.html.erb +++ b/app/views/exercise/_edit_multi.html.erb @@ -7,33 +7,28 @@ } --- - 分 - --- +- <% end%> \ No newline at end of file diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb index 661ff12af..70aa2b17a 100644 --- a/app/views/exercise/_edit_single.html.erb +++ b/app/views/exercise/_edit_single.html.erb @@ -1,5 +1,6 @@ <%= form_for("",:url => update_exercise_question_exercise_index_path(:exercise_question => exercise_question.id),:remote => true) do |f|%> + <% if false %> - -+- -简答题
+ +-- - + + +- - -- --- - 分 - --- + <% end %> +- -<% end%> \ No newline at end of file +<% end %> \ No newline at end of file diff --git a/app/views/exercise/_edu_edit_form.html.erb b/app/views/exercise/_edu_edit_form.html.erb new file mode 100644 index 000000000..7c041d2c1 --- /dev/null +++ b/app/views/exercise/_edu_edit_form.html.erb @@ -0,0 +1,258 @@ ++- -填空题
+- -- - + <% end %> + + +++ ++ <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %> +++ <% if is_edit %> + <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %> + <% else %> + <%= render :partial => 'new_head', :locals => {:exercise => @exercise} %> + <% end %> +++ <%= render :partial => "exercise/total_questions_score" %> ++ ++ <% if is_edit %> + <%= render :partial => "exercise/exercise_content" %> + <% end %> ++ ++ <%= render :partial => "exercise/new_question" %> ++ ++ ++ + + + + + + + \ No newline at end of file diff --git a/app/views/exercise/_exercise_content.html.erb b/app/views/exercise/_exercise_content.html.erb index 92cc2f0dd..ed43bff31 100644 --- a/app/views/exercise/_exercise_content.html.erb +++ b/app/views/exercise/_exercise_content.html.erb @@ -1,56 +1,34 @@ -<% mc_question_list = exercise.exercise_questions.where("question_type=1") %> -<% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> -<% single_question_list = exercise.exercise_questions.where("question_type=3") %> -<% multi_question_list = exercise.exercise_questions.where("question_type=4") %> -"> --单选题
- <% mc_question_list.each_with_index do |exercise_question, index| %> --- <% end %> -- <%= render :partial => 'show_MC', :locals => {:exercise_question => exercise_question} %> --- <%= render :partial => 'edit_MC', :locals => {:exercise_question => exercise_question} %> --"> --多选题
- <% mcq_question_list.each_with_index do |exercise_question, index| %> --- <% end %> -- <%= render :partial => 'show_MCQ', :locals => {:exercise_question => exercise_question} %> --- <%= render :partial => 'edit_MCQ', :locals => {:exercise_question => exercise_question} %> --"> --填空题
- <% single_question_list.each_with_index do |exercise_question, index| %> --- <% end %> -- <%= render :partial => 'show_single', :locals => {:exercise_question => exercise_question} %> --- <%= render :partial => 'edit_single', :locals => {:exercise_question => exercise_question} %> --"> -\ No newline at end of file +<% @exercise.exercise_questions.each do |eq| %> +问答题
- <% multi_question_list.each_with_index do |exercise_question, index| %> --- <% end %> -- <%= render :partial => 'show_multi', :locals => {:exercise_question => exercise_question} %> --- <%= render :partial => 'edit_multi', :locals => {:exercise_question => exercise_question} %> --+ <% case eq.question_type %> + <% when 1 %> ++<% end %> \ No newline at end of file diff --git a/app/views/exercise/_exercise_index_tab.html.erb b/app/views/exercise/_exercise_index_tab.html.erb new file mode 100644 index 000000000..8eaf28572 --- /dev/null +++ b/app/views/exercise/_exercise_index_tab.html.erb @@ -0,0 +1,22 @@ ++ <%= render :partial => 'show_MC', :locals => {:exercise_question => eq} %> +++ <%= render :partial => 'edit_MC', :locals => {:exercise_question => eq} %> ++ <% when 2 %> ++ <%= render :partial => 'show_MCQ', :locals => {:exercise_question => eq} %> +++ <%= render :partial => 'edit_MCQ', :locals => {:exercise_question => eq} %> ++ <% when 3 %> ++ <%= render :partial => 'show_single', :locals => {:exercise_question => eq} %> +++ <%= render :partial => 'edit_single', :locals => {:exercise_question => eq} %> ++ <% when 4 %> ++ <%= render :partial => 'show_multi', :locals => {:exercise_question => eq} %> +++ <%= render :partial => 'edit_multi', :locals => {:exercise_question => eq} %> ++ <% end %> ++ edu-filter-cir-grey mr5 font-12 fl" data-remote="true">全部 + <% if @is_teacher %> + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">未发布 + <% end %> + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">提交中 + edu-filter-cir-grey mr5 font-12 fl" data-remote="true">已截止 + + +
++ <%= form_tag(exercise_index_path(:course_id => @course.id, :type => @type), :remote => true , :method => 'get', :id => 'exercise_search_form') do %> + + <% end %> +\ No newline at end of file diff --git a/app/views/exercise/_exercise_setting.html.erb b/app/views/exercise/_exercise_setting.html.erb new file mode 100644 index 000000000..758229dcc --- /dev/null +++ b/app/views/exercise/_exercise_setting.html.erb @@ -0,0 +1,356 @@ +<% edit_mode = @is_new && @is_teacher %> ++ +\ No newline at end of file diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb index bae12dab5..493d808db 100644 --- a/app/views/exercise/_exercise_student.html.erb +++ b/app/views/exercise/_exercise_student.html.erb @@ -3,7 +3,7 @@ $("#RSide").removeAttr("id"); $("#homework_page_right").css("min-height",$("#courseLSide").height()-33); $("#Container").css("width","1000px"); - var end_time = <%=exercise.end_time.to_i%>; + var end_time = <%=@exercise.end_time.to_i%>; getTime(end_time); /*start_time = new Date(); start_time.setFullYear(<%#=exercise_user.start_at.year%>); @@ -42,323 +42,239 @@ //} } -++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +++ + +++ +++发布设置
+ <% if @is_teacher %> + 编辑 + <% end %> +++++-
+
++ +++答题设置
+++++-
+
+
+
+
+
+
+
+
+
+
+
+
+
++++公开设置
+++++-
+
+ <%= form_tag(ex_setting_exercise_path(@exercise), :method => "post", :id => 'exercise_setting_form') do |f| %> ++++ +++发布设置
+++++-
+
++ +++答题设置
+++++-
+
+
+
+
+
+
+
+
+
+
+
+
+
++ <% end %> +++公开设置
+++++-
+
---- <% current_score = get_current_score exercise %> -<%= exercise.exercise_name%>
-<%=exercise_user.start_at %>-- 开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S")%> - 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%> - <% unless exercise.time == -1 %> - 测验时长：<%=exercise.time %>分钟 - <% end %> - --<%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
- -- <%= render :partial => 'exercise/total_questions_score', :locals => {:exercise => exercise, :current_score => current_score} %> -+++ -+ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > <%= link_to @exercise.exercise_name, student_exercise_list_exercise_path(@exercise) %> > <%= @exercise_user.user.show_real_name %> +
++- + + <% if !@exercise.try(:exercise_description).nil? && @exercise.try(:exercise_description) != "" %> ++ <% unless @exercise.is_public %> + + <% end %> + <%= @exercise.exercise_name %> +
- <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> - <% single_question_list = exercise.exercise_questions.where("question_type=3") %> - <% multi_question_list = exercise.exercise_questions.where("question_type=4") %> - <% if exercise.question_random == 1 %> - <% mc_question_list = mc_question_list.shuffle %> - <% mcq_question_list = mcq_question_list.shuffle %> - <% single_question_list = single_question_list.shuffle %> - <% multi_question_list =multi_question_list.shuffle %> - <% end %> -"> --单选题
- <% mc_question_list.each_with_index do |exercise_question, list_index| %> --- <% end %> ------ 第<%= list_index+1%>题：<%= exercise_question.question_title %> (<%= exercise_question.question_score %>分) -- ---- - <% exercise_choices = exercise.choice_random == 1 ? exercise_question.exercise_choices.shuffle : exercise_question.exercise_choices.reorder("choice_position") %> - <% exercise_choices.each_with_index do |exercise_choice,index| %> -
-- - <% end %> - -- - -"> --多选题
- <% mcq_question_list.each_with_index do |exercise_question,list_index| %> --- <% end %> ------ 第<%= list_index+1%>题：<%= exercise_question.question_title %> (<%= exercise_question.question_score %>分) -- ---- - <% exercise_choices = exercise.choice_random == 1 ? exercise_question.exercise_choices.shuffle : exercise_question.exercise_choices.reorder("choice_position") %> - <% exercise_choices.each_with_index do |exercise_choice,index| %> -
-- - <% end %> - -- - -"> --填空题
- <% single_question_list.each_with_index do |exercise_question, list_index| %> --- <% end %> ------ 第<%= list_index+1%>题：<%= exercise_question.question_title %> (<%= exercise_question.question_score %>分) -- -- - > --"> -- -问答题
- <% multi_question_list.each_with_index do |exercise_question, list_index| %> --- <% end %> ------ 第<%= list_index+1%>题：<%= exercise_question.question_title %> (<%= exercise_question.question_score %>分) -- -- - ---- -答题情况
-- 单选题： - <% mc_question_list.each_with_index do |exercise_question, list_index| %> - <%= list_index + 1 %> - <% end %> - --- 多选题： - <% mcq_question_list.each_with_index do |exercise_question, list_index| %> - <%= list_index + 1 %> - <% end %> - --- 填空题： - <% single_question_list.each_with_index do |exercise_question, list_index| %> - <%= list_index + 1 %> - <% end %> - --- 问答题： - <% multi_question_list.each_with_index do |exercise_question, list_index| %> - <%= list_index + 1 %> - <% end %> - --- 马上提交 -- - + <%= format_time @exercise_user.start_at %> 开始答题++ <% end %> + +<%= @exercise.try(:exercise_description).html_safe%>
++ <%= render :partial => "exercise/total_questions_score" %> ++ ++++ 已答 + 未答 ++ <% if @exercise.question_random == 1 %> + <% question_list = @exercise.exercise_questions.shuffle %> + <% else %> + <% question_list = @exercise.exercise_questions %> + <% end %> + ++ <% question_list.each_with_index do |eq, index| %> + <%= index + 1 %> + <% end %> +++ <% question_list.each_with_index do |exercise_question, i| %> ++ + <% if @can_edit_excercise %> +++ <% end %> +++第<%= i + 1 %>题:[<%= exercise_question.question_type_name %>]<%= exercise_question.question_score %>分
+<%= exercise_question.question_title.html_safe %>+ <% case exercise_question.question_type %> + <% when 1 %> ++ <% exercise_choices = @exercise.choice_random == 1 ? exercise_question.exercise_choices.shuffle : exercise_question.exercise_choices.reorder("choice_position") %> + <% exercise_choices.each_with_index do |exercise_choice,index| %> ++ <% when 2 %> ++ <% exercise_choices = @exercise.choice_random == 1 ? exercise_question.exercise_choices.shuffle : exercise_question.exercise_choices.reorder("choice_position") %> + <% exercise_choices.each_with_index do |exercise_choice,index| %> ++ <% when 3 %> ++ + ++ <% when 4 %> ++ + ++ <% end %> +++ <% end %>+ 交卷 +
+---<%= exercise.exercise_name%>
-- 开始时间：<%=Time.parse(h(exercise_user.start_at)).strftime("%Y-%m-%d %H:%M:%S") %> - 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S")%> - <% unless exercise.time == -1 %> - 测验时长：<%=exercise.time %>分钟 + + +++ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > <%= link_to @exercise.exercise_name, student_exercise_list_exercise_path(@exercise) %> > <%= @exercise_user.user.show_real_name %> +
+++ + <% if !@exercise.try(:exercise_description).nil? && @exercise.try(:exercise_description) != "" %> ++ <% unless @exercise.is_public %> + + <% end %> + <%= @exercise.exercise_name %> +
+ + <%= link_to "返回", student_exercise_list_exercise_path(@exercise), :class => "fr font-12 mr15 mt3 color-grey" %> +++<% end %> + +<%= @exercise.try(:exercise_description).html_safe%>
++ <%= render :partial => "exercise/total_questions_score" %> ++ ++++ 客观题 + 正确 + 错误 ++总分：<%= @exercise_user.score.nil? ? "--" : format("%.1f",@exercise_user.score)%>分
++ <% @exercise.exercise_questions.where(:question_type => [1, 2, 3]).each_with_index do |eq, index| %> + <% is_correct = answer_is_correct(eq, user) %> + <%= eq.question_number %> + <% end %> +++ 主观题 + 已评 + 未评 +++ <% @exercise.exercise_questions.where(:question_type => 4).each_with_index do |eq, index| %> + <% ea = User.current.exercise_answer.where(:exercise_question_id => eq.id).first %> + <%= eq.question_number %> + <% end %> ++ ++ <% @exercise.exercise_questions.each_with_index do |exercise_question, i| %> ++-+-第<%= exercise_question.question_number %>题:[<%= exercise_question.question_type_name %>]<%= exercise_question.question_score %>分<%= question_commit_status exercise_question, @exercise_user.user %>
+ <% if exercise_question.question_type != 4 %> + <% is_correct = answer_is_correct(exercise_question, user) %> +<%= is_correct ? exercise_question.question_score : 0 %>分
+ <% else %> + <% answer = get_user_answer(exercise_question, user)%> +mr3"><%= answer.empty? ? 0 : (answer.first.score == -1 ? "未批" : answer.first.score) %><%= answer.empty? ? "分" : (answer.first.score == -1 ? "" : "分") %>
<% end %> - <%# time = exercise_user.end_at - exercise_user.start_at %><%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
- --- - <% mc_question_list = exercise.exercise_questions.where("question_type=1") %> - <% mcq_question_list = exercise.exercise_questions.where("question_type=2") %> - <% single_question_list = exercise.exercise_questions.where("question_type=3") %> - <% multi_question_list = exercise.exercise_questions.where("question_type=4") %> - -得分：<%=exercise_user.score %>分- <% if User.current.admin? || User.current.allowed_to?(:as_teacher,exercise.course) || (exercise.exercise_status == 3 && exercise.show_result == 1) %> - <%= link_to '返回统计结果>>',student_exercise_list_exercise_path(exercise.id,:course_id => exercise.course.id) , :class => "fr linkBlue" %> - <% end %> -"> -单选题
- <% mc_question_list.each_with_index do |exercise_question, list_index| %> --- --- <% end %> --+-- - -- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> --- <% answer = get_user_answer(exercise_question, user)%> - <% standard_answer = get_user_standard_answer(exercise_question, user)%> - <% is_correct = !answer.empty? && !standard_answer.empty? && answer.first.exercise_choice.choice_position == standard_answer.first.exercise_choice_id %> -- -- 得分：- -<%= is_correct ? exercise_question.question_score : 0 %>-<%= exercise_question.question_title %>
---- - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> -
-- - <% end %> - -- - -<%= exercise_question.question_title.html_safe %>+ <% case exercise_question.question_type %> + <% when 1 %> ++ <% exercise_choices = exercise_question.exercise_choices.reorder("choice_position") %> + <% exercise_choices.each_with_index do |exercise_choice,index| %> +-"> -多选题
- <% mcq_question_list.each_with_index do |exercise_question, list_index| %> ---- --- <% end %> --+ <% end %> + <% when 2 %> +- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> --- <% answer = get_user_answer(exercise_question, user)%> - <% standard_answer = get_user_standard_answer(exercise_question, user)%> - <% is_correct = !standard_answer.empty? && get_mulscore(exercise_question, user).to_i == standard_answer.first.exercise_choice_id %> -- -- 得分：- -<%= is_correct ? exercise_question.question_score : 0 %>-<%= exercise_question.question_title %>
+ <% if @is_teacher || @exercise.answer_open %> ++ 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>- - ---- - <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> -
-- - <% end %> - -- - -+ <% exercise_choices = exercise_question.exercise_choices.reorder("choice_position") %> + <% exercise_choices.each_with_index do |exercise_choice,index| %> +-"> -填空题
- <% single_question_list.each_with_index do |exercise_question,list_index| %> --\ No newline at end of file diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index 4c6618102..05ca1c960 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -1,29 +1,82 @@ ---- --- <% end %> -- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 --- <% answer = get_user_answer(exercise_question, user)%> - <% standard_answer = get_user_standard_answer(exercise_question, user)%> - <% is_correct = !answer.empty? && !standard_answer.empty? && standard_answer.include?(answer.first.answer_text) %> -- -- 得分：- -<%= is_correct ? exercise_question.question_score : 0 %>-<%= exercise_question.question_title %>
+ <% if @is_teacher || @exercise.answer_open %> ++ 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>- - -+ <% end %> + <% when 3 %> + <% unless get_anwser_vote_text(exercise_question.id,user.id) == "" %> +-<%= get_anwser_vote_text(exercise_question.id,user.id).html_safe %>
+ <% end %> + <% if @is_teacher || @exercise.answer_open %> +<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %> - 参考答案<%= convert_to_chi_num(index+1) %>：<%= exercise_choice.answer_text%>-
+候选答案<%= convert_to_chi_num(index+1) %>：<%= exercise_choice.answer_text%>
<% end %>- > + <% end %> + <% when 4 %> + <% unless get_anwser_vote_text(exercise_question.id,user.id) == "" %> +-<%= get_anwser_vote_text(exercise_question.id,user.id).html_safe %>
+ <% end %> + <% if exercise_question.exercise_standard_answers.count > 0 && (@is_teacher || @exercise.answer_open) %> ++ 隐藏参考答案-"> -+ <% end %> +问答题
- <% multi_question_list.each_with_index do |exercise_question, list_index| %> --- + <% end %> + <% end %> +-- - --- <% end %> ---- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 --- <% answer = get_user_answer(exercise_question, user)%> -- +- <% if User.current.admin? || User.current.allowed_to?(:as_teacher,exercise.course) %> - 得分： - <% if answer.empty? %> --- 0 -- <% else %> -- <%= answer.first.score == -1 ? "双击批阅" : answer.first.score %> -- <% end %> - <% else %> - 得分：<%= answer.empty? ? 0 : (answer.first.score == -1 ? "未批" : answer.first.score) %>- <% end %> -++ <% end %> + <% if !answer.empty? && @is_teacher %> + - - <% if exercise_question.exercise_standard_answers.count > 0 %> -参考答案
+<%= exercise_question.exercise_standard_answers.first.answer_text%>
+- 参考答案：- <% end %> -<%= exercise_question.exercise_standard_answers.first.answer_text%>
-- ---- -所有试卷 - （<%= @obj_count%>） -
- <% if @is_teacher%> - <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> - <%= link_to "导入试卷", other_exercise_exercise_index_path(:course_id => @course.id), :remote=>true,:class => "newbtn"%> - <% end%> -- <% if @exercises.count != 0 %> - <% @exercises.each_with_index do |exercise,index|%> -\ No newline at end of file +<% if @exercises.count != 0 %> +-
- <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
-
-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
-没有数据可以显示！
- <% end %> -+ <% @exercises.each do |exercise| %> ++++ <% end %> ++ # <%= get_ex_index(exercise, @course, @is_teacher) + 1 %> + <%= link_to exercise.exercise_name, student_exercise_list_exercise_path(exercise), :class => "edu-class-inner-list fl color-grey3" %> + <% unless exercise.is_public %> + + <% end %> + <% ex_curr_status = exercise_curr_time exercise %> + <% if ex_curr_status[:status] != "" %> + <%= ex_curr_status[:status] %> + <% end %> + ++ <% if @is_teacher %> ++ 创建于<%=time_from_now exercise.created_at %> + 更新于<%=time_from_now exercise.updated_at %> + <% if exercise.try(:exercise_status) > 1 %> + <% if @is_teacher %> + + <%= link_to exercise.exercise_users.where("commit_status = 1").count, student_exercise_list_exercise_path(exercise, :ex_status => ['1']), :class => "color-orange05 mr3", :target =>"_blank" %> + 已答 + + <%= link_to (exercise.course.student.count - exercise.exercise_users.where("commit_status = 1").count), student_exercise_list_exercise_path(exercise, :ex_status => ['0']), :class => "color-orange05 mr3", :target =>"_blank" %> + 未答 + <%# count = exercise.exercise_users.where("commit_status = 1 and subjective_score = -1").count %> + + <%= link_to un_commit_num(exercise), student_exercise_list_exercise_path(exercise, :ex_comment => ['0']), :class => "color-orange05 mr3", :target =>"_blank" %> + 未评 + <% else %> + + <%= link_to exercise.exercise_users.where("commit_status = 1").count, student_exercise_list_exercise_path(exercise), :class => "color-orange05 mr3", :target =>"_blank" %> + 已答 + + <%= link_to (exercise.course.student.count - exercise.exercise_users.where("commit_status = 1").count), student_exercise_list_exercise_path(exercise), :class => "color-orange05 mr3", :target =>"_blank" %> + 未答 + <% end %> + <% end %> + <% if exercise.try(:exercise_status) == 1 && exercise.publish_time %> + 将于 <%= format_time(exercise.publish_time).to_s %> 发布 + <% else %> + <%= ex_curr_status[:time] %> + <% end %> +
++ ++ <% end %> +-
+ <% if exercise.exercise_status == 1 %>
+
++<% else %> +++-
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true %>
+
+ <%= render :partial => "welcome/no_data" %> ++<% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index 1ff27f1fc..fca7c23cd 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -1,70 +1,73 @@ -<%= form_for(ExerciseQuestion.new, - :html => { :multipart => true }, - :url=>create_exercise_question_exercise_path(exercise.id), - :remote=>true ) do |f| %> --+<% if exercise.id %> +- <% score = exercise.exercise_questions.where("question_type=1").last.nil? ? "": exercise.exercise_questions.where("question_type=1").last.question_score %> - - 分 - 请点击选项 - 标准答案： - --- - - -- - - -+ <% eq = ExerciseQuestion.new %> + <%= form_for(eq, + :html => {:multipart => true}, + :url => create_exercise_question_exercise_path(exercise.id), + :remote => true ) do |f| %> + + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index cc1034070..858342cbe 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -1,69 +1,67 @@ -<%= form_for(ExerciseQuestion.new, +<% if exercise.id %> ++ <%= form_for(ExerciseQuestion.new, :html => { :multipart => true }, :url=>create_exercise_question_exercise_path(exercise.id), :remote=>true ) do |f| %> --<% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_head.html.erb b/app/views/exercise/_new_head.html.erb new file mode 100644 index 000000000..419ec5825 --- /dev/null +++ b/app/views/exercise/_new_head.html.erb @@ -0,0 +1,17 @@ +<%= form_for(@exercise, + :html => {:multipart => true, :id => "exercise_head_form"}, + :url => {:controller => 'exercise', + :action => 'create', + :course_id => @course.id + }, + :method => :post, :remote => true) do |f| %> +- <% score = exercise.exercise_questions.where("question_type=2").last.nil? ? "": exercise.exercise_questions.where("question_type=2").last.question_score %> - - 分 - 请点击选项 - 标准答案： - + + <% end %>-- - - -- - - -+ +++ +++ 保存 +
+<% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_multi.html.erb b/app/views/exercise/_new_multi.html.erb index 1baef7772..2c3f970c1 100644 --- a/app/views/exercise/_new_multi.html.erb +++ b/app/views/exercise/_new_multi.html.erb @@ -1,38 +1,41 @@ -<%= form_for(ExerciseQuestion.new, +<% if exercise.id %> ++ <%= form_for(ExerciseQuestion.new, :html => { :multipart => true }, :url=>create_exercise_question_exercise_path(exercise.id), :remote=>true ) do |f| %> -<% end %> \ No newline at end of file diff --git a/app/views/exercise/_new_question.html.erb b/app/views/exercise/_new_question.html.erb index 68d98eaca..cc2d7c80e 100644 --- a/app/views/exercise/_new_question.html.erb +++ b/app/views/exercise/_new_question.html.erb @@ -1,57 +1,152 @@ - - +<% content_for :header_tags do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %> + ++ 单选题 ++ 多选题 ++ 填空题 ++ 简答题 + +-+ + <% end %> +- <% score = exercise.exercise_questions.where("question_type=4").last.nil? ? "": exercise.exercise_questions.where("question_type=4").last.question_score %> - - 分 - --- - - ---- - -- - -- -+ +\ No newline at end of file diff --git a/app/views/exercise/_other_exercises.html.erb b/app/views/exercise/_other_exercises.html.erb index 10638efe4..8e9be9aa3 100644 --- a/app/views/exercise/_other_exercises.html.erb +++ b/app/views/exercise/_other_exercises.html.erb @@ -1,48 +1,36 @@ ---选择试卷导入本班级
- - ++ ---+ -- - ++ \ No newline at end of file diff --git a/app/views/exercise/_select_examination_list.html.erb b/app/views/exercise/_select_examination_list.html.erb new file mode 100644 index 000000000..968c63c2a --- /dev/null +++ b/app/views/exercise/_select_examination_list.html.erb @@ -0,0 +1,28 @@ ++-+ 我的试卷 + ++ <%=form_tag import_other_exercise_exercise_index_path, method: :post, remote: true, id: "import_other_exercise_form" do %> - --- <%=render :partial => 'all_import_exercises', :locals => {:exercises => exercises, :course_id => course_id, :order => @order} %> --- - -+ +-----
- <%= pagination_links_full @ex_pages, @ex_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-
+ <%= render :partial => "select_examination_list" %><% end %>+++ + <% @exercises.each do |exercise| %> +
++ + <% end %> + ++ + + ++ +\ No newline at end of file diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index 054f74ae0..9218eeef1 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -1,137 +1,68 @@ -++ + +-
+ <%= pagination_links_full @ex_pages, @ex_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
-+-- - -- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> --- <% type = exercise_question.question_type %> - <% exercise = exercise_question.exercise %> - <% count = exercise.exercise_questions.where(:question_type => type).count %> - - - - <% if exercise_question.question_number < count %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'down'},:remote => true, :method => 'post', :class => "poll-down up_and_down", :title => '下移') %> - <% end %> - <% unless exercise_question.question_number == 1 %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'up'},:remote => true, :method => 'post', :class => "poll-up up_and_down", :title => '上移') %> - <% end %> -- -<%= exercise_question.question_title %>
-<%= exercise_question.question_title.html_safe %>++ <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> +++ 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> ++++ -\ No newline at end of file diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 6e9cbd256..ffe7db1d4 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -1,133 +1,66 @@ --+-- - -- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 - 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> --- <% type = exercise_question.question_type %> - <% exercise = exercise_question.exercise %> - <% count = exercise.exercise_questions.where(:question_type => type).count %> - - - - <% if exercise_question.question_number < count %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'down'},:remote => true, :method => 'post', :class => "poll-down up_and_down", :title => '下移') %> - <% end %> - <% unless exercise_question.question_number == 1 %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'up'},:remote => true, :method => 'post', :class => "poll-up up_and_down", :title => '上移') %> - <% end %> -- -<%= exercise_question.question_title %>
-<%= exercise_question.question_title.html_safe %>++ <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %> +++ 标准答案：<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %> +++\ No newline at end of file diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb index 8fe5131b4..a392bce81 100644 --- a/app/views/exercise/_show_head.html.erb +++ b/app/views/exercise/_show_head.html.erb @@ -1,24 +1,15 @@ -- - -\ No newline at end of file + + +<%= exercise.exercise_name%>
-- <% unless exercise.publish_time.nil? %> - 发布时间：<%=Time.parse(h(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%> - <% end %> - 截止时间：<%=Time.parse(h(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %> - <% if exercise.time != -1 %> - 测验时长：<%= exercise.time %>分钟 - <% end %> --<%= exercise.exercise_description.nil? ? "" :exercise.exercise_description.html_safe%>
-- id="show_question_random"> - - id="show_question_random"> - - id="show_question_random"> - -- -++ + \ No newline at end of file diff --git a/app/views/exercise/_show_multi.html.erb b/app/views/exercise/_show_multi.html.erb index 8a0c4fa60..664453873 100644 --- a/app/views/exercise/_show_multi.html.erb +++ b/app/views/exercise/_show_multi.html.erb @@ -1,91 +1,59 @@ -<%= @exercise.try(:exercise_description).nil? ? "" : @exercise.try(:exercise_description).html_safe%>
+--- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 --- <% type = exercise_question.question_type %> - <% exercise = exercise_question.exercise %> - <% count = exercise.exercise_questions.where(:question_type => type).count %> - - - - <% if exercise_question.question_number < count %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'down'},:remote => true, :method => 'post', :class => "poll-down up_and_down", :title => '下移') %> - <% end %> - <% unless exercise_question.question_number == 1 %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'up'},:remote => true, :method => 'post', :class => "poll-up up_and_down", :title => '上移') %> - <% end %> -- -<%= exercise_question.question_title %>
+++ -++第<%= exercise_question.question_number%>题:[简答题]<%= exercise_question.question_score %>分
++ <% if exercise_question.question_number < @exercise.exercise_questions.count %> + + <% end %> + <% unless exercise_question.question_number == 1 %> + + <% end %> + + + +
+<%= exercise_question.question_title.html_safe %>++- - <% if exercise_question.exercise_standard_answers.count > 0 %> -参考答案：
+<%= exercise_question.exercise_standard_answers.count > 0 ? exercise_question.exercise_standard_answers.first.answer_text : "无"%>
- 参考答案：- <% end %><%= exercise_question.exercise_standard_answers.first.answer_text%>
-+\ No newline at end of file diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index d3298a5b9..d810585e4 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -1,113 +1,60 @@ ---- 第<%= exercise_question.question_number%>题. <%= exercise_question.question_score %>分 --- <% type = exercise_question.question_type %> - <% exercise = exercise_question.exercise %> - <% count = exercise.exercise_questions.where(:question_type => type).count %> - - - - <% if exercise_question.question_number < count %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'down'},:remote => true, :method => 'post', :class => "poll-down up_and_down", :title => '下移') %> - <% end %> - <% unless exercise_question.question_number == 1 %> - <%= link_to('', {:controller => 'exercise', :action => 'update_question_num', :id => exercise.id, :ques_id => exercise_question.id, :opr => 'up'},:remote => true, :method => 'post', :class => "poll-up up_and_down", :title => '上移') %> - <% end %> -- -<%= exercise_question.question_title %>
+++- -第<%= exercise_question.question_number%>题:[填空题]<%= exercise_question.question_score %>分
++ <% if exercise_question.question_number < @exercise.exercise_questions.count %> + + <% end %> + <% unless exercise_question.question_number == 1 %> + + <% end %> + + + +
++ -<%= exercise_question.question_title.html_safe %>+<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %> - 参考答案<%= convert_to_chi_num(index+1) %>：<%= exercise_choice.answer_text%>
+候选答案<%= convert_to_chi_num(index+1) %>：<%= exercise_choice.answer_text%>
<% end %>+\ No newline at end of file diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index 04d874000..ef0daf3f9 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -1,30 +1,88 @@ -- - 测验 - - (<%= @exercise_count%>人已答) - - - <%if @is_teacher || @exercise.exercise_status == 3%> - - <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@select_group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> - <% end %> - [ 显示测验信息 ] ++ <%= link_to "提交时间排序", student_exercise_list_exercise_path(@exercise, :order => "end_at", :sort => @score, :name => @name, :ex_group => @group, :ex_comment => @comment, :ex_status => @status), :class => "#{@order == 'end_at' ? 'color-orange03' : ''} fl ml15", :remote => true %> + | + <%= link_to "最终成绩排序", student_exercise_list_exercise_path(@exercise, :order => "score", :sort => @score, :name => @name, :ex_group => @group, :ex_comment => @comment, :ex_status => @status), :class => "#{@order == 'score' ? 'color-orange03' : ''} fl", :remote => true %> ++<%= @exercise_count %> 个检索结果（学生：<%= @course.student.count %>人）
++ +
-+ + + + <% @exercise_users_list.each_with_index do |exercise, index| %> +序号 +姓名 +学号 +提交状态 +提交时间 +客观题得分 +主观题教师评分 + +最终成绩 +操作 ++ + <% end %> + +<%= (@page - 1) * @limit + index + 1 %> ++ <%= link_to exercise.user.show_real_name, user_path(exercise.user),:class=>"color-grey3" %> + +"> + <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id %> + ++ <%= (list_work_status exercise.commit_status).html_safe %> + +<%= exercise.commit_status == 0 ? '--' : format_time(exercise.end_at) %> ++ <%= exercise.objective_score == -1 ? "--" : format("%.1f",exercise.objective_score)%> + ++ <%= exercise.subjective_score == -1 ? "--" : format("%.1f",exercise.subjective_score)%> + + + + + + + + + + ++ <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%> + <%# unless exercise.score.nil? %> + + + + + + + + + + <%# end %> + ++ <% if exercise.commit_status > 0 %> + <% if @is_teacher %> + <%= link_to '评阅', show_student_result_exercise_path(@exercise,:user_id => exercise.user_id), :target => "_blank" %> + <% else %> + <%= link_to '查看', exercise.commit_status == 1 ? exercise_path(@exercise,:user_id => exercise.user_id) : show_student_result_exercise_path(@exercise,:user_id => exercise.user_id), :target => "_blank" %> + <% end %> + <% else %> + -- + <% end %> + +- - -\ No newline at end of file diff --git a/app/views/exercise/_total_questions_score.html.erb b/app/views/exercise/_total_questions_score.html.erb index bd6bc291a..6119a820a 100644 --- a/app/views/exercise/_total_questions_score.html.erb +++ b/app/views/exercise/_total_questions_score.html.erb @@ -1,8 +1,12 @@ -客观题由系统自动评分：
+
- 单选题、多选题、填空题
主观题需要人工评分，但未作答时系统
自动评零分：
问答题 -+- - -+--
+ <%= pagination_links_full @exercise_pages, @exercise_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>
+
- <%= render :partial => "student_table" %> -- \ No newline at end of file +" id="current_score_div"> - 单选题 <%= exercise.exercise_questions.where("question_type=1").count %> 题，共<%= current_score[1] %>分 - 多选题 <%= exercise.exercise_questions.where("question_type=2").count %> 题，共<%= current_score[2] %>分 - 填空题 <%= exercise.exercise_questions.where("question_type=3").count %> 题，共<%= current_score[3] %>分 - 问答题 <%= exercise.exercise_questions.where("question_type=4").count %> 题，共<%= current_score[4] %>分 - 合计 <%= exercise.exercise_questions.count %> 题，共<%= current_score[0] %>分 - +<% current_score = get_current_score @exercise %> +"> +\ No newline at end of file diff --git a/app/views/exercise/commit_exercise.js.erb b/app/views/exercise/commit_exercise.js.erb index d91806fbb..8633682ba 100644 --- a/app/views/exercise/commit_exercise.js.erb +++ b/app/views/exercise/commit_exercise.js.erb @@ -1 +1 @@ -notice_box_redirect("<%= exercise_index_path(:course_id => @course.id) %>", "提交成功"); \ No newline at end of file +notice_box_redirect("<%= student_exercise_list_exercise_path(@exercise) %>", "提交成功"); \ No newline at end of file diff --git a/app/views/exercise/create.js.erb b/app/views/exercise/create.js.erb index 65b8dd327..1ad55e671 100644 --- a/app/views/exercise/create.js.erb +++ b/app/views/exercise/create.js.erb @@ -1,4 +1,5 @@ -$("#polls_head_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:exercise => @exercise}) %>"); -$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:exercise => @exercise}) %>"); -$("#polls_head_edit").hide(); -$("#polls_head_show").show(); \ No newline at end of file +$("#exercise_head_show").html("<%= escape_javascript(render :partial => 'show_head') %>"); +$("#exercise_head_edit").html("<%= escape_javascript(render :partial => 'edit_head') %>"); +$("#exercise_head_edit").hide(); +$("#exercise_head_show").show(); +$("#new_exercise_question").html("<%= escape_javascript(render :partial => 'exercise/new_question') %>"); \ No newline at end of file diff --git a/app/views/exercise/create_exercise_question.js.erb b/app/views/exercise/create_exercise_question.js.erb index 09878440c..8ccc46e94 100644 --- a/app/views/exercise/create_exercise_question.js.erb +++ b/app/views/exercise/create_exercise_question.js.erb @@ -1,54 +1,4 @@ -<% if @is_insert %> - $("#poll_content").html('<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise})%>'); - $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>"); - <% current_score = get_current_score @exercise %> - $("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score', :locals => {:exercise => @exercise, :current_score => current_score}) %>"); -<% else %> + $("#exercise_question_list").html("<%= escape_javascript(render :partial => 'exercise/exercise_content') %>"); + $("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score') %>"); $("#new_exercise_question").html('<%= escape_javascript(render :partial => 'new_question', :locals => {:exercise => @exercise}) %>'); - $("#new_poll_question").html(""); - $("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>"); - <%if @exercise_questions.question_type == 1%> - $("#mc_question_list>div").last().children().first().addClass("border_b"); - $("#mc_question_list").show().append("+ 单选题 <%= @exercise.exercise_questions.where("question_type=1").count %> 题，共 <%= current_score[1] %> 分 + 多选题 <%= @exercise.exercise_questions.where("question_type=2").count %> 题，共 <%= current_score[2] %> 分 + 填空题 <%= @exercise.exercise_questions.where("question_type=3").count %> 题，共 <%= current_score[3] %> 分 + 简答题 <%= @exercise.exercise_questions.where("question_type=4").count %> 题，共 <%= current_score[4] %> 分 +
+ + 合计 <%= @exercise.exercise_questions.count %> 题，共 <%= current_score[0] %> 分 +" + - ""); - <% end %> - <%if @exercise_questions.question_type == 2%> - $("#mcq_question_list").show().append("" + - "<%= escape_javascript(render :partial => 'show_MC', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - ""); - <% end %> - <%if @exercise_questions.question_type == 3%> - $("#single_question_list").show().append("" + - "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - ""); - <% end %> - <%if @exercise_questions.question_type == 4%> - $("#multi_question_list").show().append("" + - "<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - "<%= escape_javascript(render :partial => 'edit_single', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - ""); - <% end %> -$("#total_questions_score").show(); -<% current_score = get_current_score @exercise %> -$("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score', :locals => {:exercise => @exercise, :current_score => current_score}) %>"); -<% end %> + $("#new_poll_question").html(""); \ No newline at end of file diff --git a/app/views/exercise/delete_exercise_question.js.erb b/app/views/exercise/delete_exercise_question.js.erb index 0d20f1ccb..88e8297d2 100644 --- a/app/views/exercise/delete_exercise_question.js.erb +++ b/app/views/exercise/delete_exercise_question.js.erb @@ -1,5 +1,3 @@ hideModal(); -$("#poll_content").html("<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise}) %>"); -<% current_score = get_current_score @exercise %> -$("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score', :locals => {:exercise => @exercise, :current_score => current_score}) %>"); -$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>"); \ No newline at end of file +$("#exercise_question_list").html("<%= escape_javascript(render :partial => 'exercise/exercise_content') %>"); +$("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score') %>"); \ No newline at end of file diff --git a/app/views/exercise/destroy.js.erb b/app/views/exercise/destroy.js.erb deleted file mode 100644 index 82fbc95b3..000000000 --- a/app/views/exercise/destroy.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -hideModal(); -$("#exercise").html("<%= escape_javascript(render :partial => 'exercises_list') %>"); \ No newline at end of file diff --git a/app/views/exercise/edit.html.erb b/app/views/exercise/edit.html.erb index 48d307c78..e67399309 100644 --- a/app/views/exercise/edit.html.erb +++ b/app/views/exercise/edit.html.erb @@ -1,9 +1,15 @@ -<%= render :partial => 'exercise_form'%> - +<%#= render :partial => 'exercise_form'%> +" + - "<%= escape_javascript(render :partial => 'show_multi', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "" + - "<%= escape_javascript(render :partial => 'edit_multi', :locals => {:exercise_question => @exercise_questions}) %>" + - "" + - "++ diff --git a/app/views/exercise/examination_setting.html b/app/views/exercise/examination_setting.html new file mode 100644 index 000000000..4f2e60585 --- /dev/null +++ b/app/views/exercise/examination_setting.html @@ -0,0 +1,392 @@ + + + + + + + + + + + + + + ++ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > <%= link_to @exercise.exercise_name, student_exercise_list_exercise_path(@exercise) %> > 编辑 +
+++ + <%= render :partial => "exercise/edu_edit_form", :locals => {:is_edit => true} %> +编辑试卷
+ <%= link_to "返回", student_exercise_list_exercise_path(@exercise), :class => "fr font-12 color-grey mr15 mt5" %> + <%#= link_to "设置", student_exercise_list_exercise_path(@exercise, :tab => 3), :class => "fr font-12 mr15 mt5 color-grey" %> ++ + + + ++ + diff --git a/app/views/exercise/import_other_exercise.js.erb b/app/views/exercise/import_other_exercise.js.erb index 5227d7cd2..2b454b3d9 100644 --- a/app/views/exercise/import_other_exercise.js.erb +++ b/app/views/exercise/import_other_exercise.js.erb @@ -1,9 +1 @@ -var htmlvalue = '+++ ++++ ++ + 实验四 多周期CPU与存储器实验 +
+ 返回 ++++ ++++ +++++发布设置
+ 编辑 +++++-
+
++++发布设置
+++++-
+
++ +++++答题设置
+++++-
+
-
+
++++答题设置
+++++-
+
-
+
++ +++++主观题评分设置
+++++-
+
-
+
++++主观题评分设置
+++++-
+
-
+
++ ++ ++++公开设置
+++++-
+
++++公开设置
+++++-
+
'+ - ''; -pop_box_new(htmlvalue, 400, 152); - -function click_OK(){ - hideModal(); - window.location.href = "<%= exercise_index_path(:course_id => @course.id) %>"; -} \ No newline at end of file +notice_box_redirect("<%= student_exercise_list_exercise_path(@exercise, :tab => 3) %>", "导入成功"); \ No newline at end of file diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 8d2bfe700..7a456dfef 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -1,8 +1,5 @@ <%= stylesheet_link_tag 'polls', :media => 'all' %> -试卷已导入
' + - '知道了
但需要您设置发布时间和截止时间，以激活相应的试卷-- <%= render :partial => 'exercises_list'%> -+ ++\ No newline at end of file diff --git a/app/views/exercise/index.js.erb b/app/views/exercise/index.js.erb new file mode 100644 index 000000000..a64ce1d4a --- /dev/null +++ b/app/views/exercise/index.js.erb @@ -0,0 +1,4 @@ +<% unless params[:page] %> + $("#exercise_index_tab").html("<%= j(render :partial => 'exercise/exercise_index_tab') %>"); +<% end %> +$("#exercise_index_list").html("<%= j(render :partial => 'exercise/exercises_list') %>"); \ No newline at end of file diff --git a/app/views/exercise/new.html.erb b/app/views/exercise/new.html.erb index 3d983d64f..ec179510e 100644 --- a/app/views/exercise/new.html.erb +++ b/app/views/exercise/new.html.erb @@ -1 +1,13 @@ -<%= render :partial => 'exercise_form'%> +<%#= render :partial => 'exercise_form'%> ++diff --git a/app/views/exercise/other_exercise.js.erb b/app/views/exercise/other_exercise.js.erb index 68d5c804b..d04ed1d03 100644 --- a/app/views/exercise/other_exercise.js.erb +++ b/app/views/exercise/other_exercise.js.erb @@ -1,8 +1,10 @@ <% if @exercises.blank? %> -var htmlvalue = '+ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > 新建 +
+++ + <%= render :partial => "exercise/edu_edit_form", :locals =>{:is_edit => false} %> +新建试卷
+ <%= link_to "返回", exercise_index_path(:course_id => @course.id), :class => "fr font-12 color-grey mr15 mt5" %> +'+ - ''; -pop_box_new(htmlvalue, 300, 140); + notice_box("您的其它班级下没有试卷可供导入"); <% else %> -var html_value = '<%= escape_javascript(render :partial => 'other_exercises',:locals => {:exercises => @exercises, :course_id=>@course_id}) %>'; -pop_box_new(html_value, 745, 600); + <% unless params[:search] %> + var html_value = '<%= escape_javascript(render :partial => 'other_exercises') %>'; + pop_box_new(html_value, 620, 568); + <% else %> + $("#test_nav_1").html("<%= j(render :partial => "select_examination_list") %>"); + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/exercise/set_public.js.erb b/app/views/exercise/set_public.js.erb new file mode 100644 index 000000000..6881ffb9f --- /dev/null +++ b/app/views/exercise/set_public.js.erb @@ -0,0 +1,2 @@ +$("#set_exercise_public_<%= @exercise.id %>").remove(); +$("#exercise_public_icon_<%= @exercise.id %>").remove(); \ No newline at end of file diff --git a/app/views/exercise/setting.html.erb b/app/views/exercise/setting.html.erb new file mode 100644 index 000000000..dc2c41bb0 --- /dev/null +++ b/app/views/exercise/setting.html.erb @@ -0,0 +1,378 @@ + +您的其它班级下没有试卷可供导入
确定+\ No newline at end of file diff --git a/app/views/exercise/show.html.erb b/app/views/exercise/show.html.erb index c488ec203..71011cf9d 100644 --- a/app/views/exercise/show.html.erb +++ b/app/views/exercise/show.html.erb @@ -1,10 +1,10 @@ <%= stylesheet_link_tag 'polls', :media => 'all' %> <% if @is_teacher %> - <%= render :partial => 'exercise_teacher', :locals =>{:exercise =>@exercise, :exercise_questions => @exercise_questions} %> + <%= render :partial => 'exercise_teacher' %> <% else %> - <% if @can_edit_excercise %> - <%=render :partial => 'exercise_student', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user} %> - <% else %> - <%=render :partial => 'exercise_student_result', :locals => {:exercise =>@exercise, :exercise_questions => @exercise_questions,:exercise_user => @exercise_user,:user=>User.current} %> - <% end %> + <%# if @can_edit_excercise %> + <%=render :partial => 'exercise_student' %> + <%# else %> + <%#=render :partial => 'exercise_student_result', :locals => {:user=>User.current} %> + <%# end %> <% end %> \ No newline at end of file diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb index 10ba57ff3..11ae67db1 100644 --- a/app/views/exercise/student_exercise_list.html.erb +++ b/app/views/exercise/student_exercise_list.html.erb @@ -1,126 +1,232 @@ - -+ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > #<%= get_ex_index(@exercise, @course, @is_teacher) + 1 %> +
+++ ++ + <%= @exercise.exercise_name %> +
+ <%= link_to "返回", student_exercise_list_exercise_path(@exercise), :class => "fr font-12 mr15 mt3 color-grey" %> ++<% edit_mode = @is_new && @is_teacher %> +++ ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +++ + +++ +++发布设置
+ <% if @is_teacher %> + 编辑 + <% end %> +++++-
+
++ +++答题设置
+++++-
+
+
+
+
+
+
+
+
+
+
+
+
+
++++公开设置
+++++-
+
+ <%= form_tag(ex_setting_exercise_path(@exercise), :method => "post", :id => 'exercise_setting_form') do |f| %> ++++ +++发布设置
+++++-
+
++ +++答题设置
+++++-
+
+
+
+
+
+
+
+
+
+
+
+
+
++ <% end %> +++公开设置
+++++-
+
---- --- - <% if @is_teacher%> --
-
- <%= link_to "导出成绩", student_exercise_list_exercise_path(@exercise.id,:course_id => @course.id, :format => 'xls'),:class=>'linkBlue', :id => "export_student_work"%> -- <% end%> - --- <%= link_to @exercise.exercise_name, exercise_path(@exercise), :class => 'homepagePostTitle fl hidden m_w460', :title => "#{@exercise.exercise_name}", :target => '_blank' %> - <% if @exercise.exercise_status == 1 %> - 未发布 - <% elsif @exercise.exercise_status == 2 %> - 已发布 - <% elsif @exercise.exercise_status == 3 %> - 已截止 - <% end%> - [ 隐藏测验信息 ] - -发布者：<%= @exercise.user.show_name %>--- - - -<%= @exercise.exercise_description.html_safe %>--+ <% end %> + + <% end %> + +截止时间：<%= format_time @exercise.end_time %>- <% if @exercise.exercise_status == 1 %> -发布时间：<%= format_time @exercise.publish_time %>- <% end %> - <% if @exercise.end_time && @exercise.end_time.to_time.to_i > Time.now.to_i %> - <% end_time = @exercise.end_time.to_time.to_i %> -提交剩余时间： <%= (end_time - Time.now.to_i) / (24*60*60) %> 天 - <%= ((end_time - Time.now.to_i) % (24*60*60)) / (60*60)%> 小时 - <%= (((end_time - Time.now.to_i) % (24*60*60)) % (60*60)) / 60%> 分++-+ + <%= link_to @course.name, course_path(@course) %> > <%= link_to "试卷列表", exercise_index_path(:course_id => @course.id) %> > #<%= get_ex_index(@exercise, @course, @is_teacher) + 1 %> +
++++ <% unless @exercise.is_public %> + + <% end %> + <%= @exercise.exercise_name %> +
+ <%= link_to "返回", exercise_index_path(:course_id => @course.id), :class => "fr font-12 mr15 mt3 color-grey" %> ++--
+
+ <% ex_user = @exercise.exercise_users.where(:user_id => User.current).first %> + <% if ex_user %> + <% if ex_user.commit_status > 0 %> + <%= link_to '查看答题', ex_user.commit_status == 1 ? exercise_path(@exercise,:user_id => User.current.id) : show_student_result_exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr mt10 mr15" %> <% else %> -
提交已截止+ <% if @exercise.exercise_status == 2 %> + <%= link_to (ex_user.start_at.nil? ? "开始答题" : "继续答题"), exercise_path(@exercise,:user_id => User.current.id), :class => "white-btn orange-btn fr mt10 mr15" %> + <% end %> <% end %> - -+- \ No newline at end of file + \ No newline at end of file diff --git a/app/views/exercise/student_exercise_list.js.erb b/app/views/exercise/student_exercise_list.js.erb index dd9aa50c3..fe0a29278 100644 --- a/app/views/exercise/student_exercise_list.js.erb +++ b/app/views/exercise/student_exercise_list.js.erb @@ -1,2 +1,2 @@ $("#exercise_student_work_list").html("<%= escape_javascript(render :partial => 'exercise/student_exercise') %>"); -$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出成绩", student_exercise_list_exercise_path(@exercise.id,:course_id => @course.id, :group => @select_group, :name => @name, :format => 'xls'),:class=>'linkBlue', :id => 'export_student_work') %>"); \ No newline at end of file +$("#export_exercise_work").replaceWith("<%= escape_javascript(link_to "导出成绩", student_exercise_list_exercise_path(@exercise, :course_id => @course.id, :format => 'xls'), :class => "fr white-btn orange-btn ml10 mt8", :id => "export_exercise_work") %>"); \ No newline at end of file diff --git a/app/views/exercise/student_look_fortime.html b/app/views/exercise/student_look_fortime.html new file mode 100644 index 000000000..391b3d7fb --- /dev/null +++ b/app/views/exercise/student_look_fortime.html @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + ++ + <% if @is_teacher %> ++ + + ++ + + diff --git a/app/views/exercise/student_write_answer.html b/app/views/exercise/student_write_answer.html new file mode 100644 index 000000000..2f4822b59 --- /dev/null +++ b/app/views/exercise/student_write_answer.html @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + ++++ + + ++++试卷须知： + 共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。 + 请大家认真答题，本次作业成绩将计入期末成绩。
++++ 单选题 3 题，共 15 分 + 多选题 5 题，共 25 分 + 填空题 10 题，共 25 分 + 简答题 10 题，共 25 分 +
+合计 18 题，共 100 分
++ +++ 满分 + 零分 + 其它 ++总分：89分
++ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 ++ ++ 已答 + 未答 +++ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 ++++++ +++第1题:[多选题]10分
+ +10分
+ +黑盒测试和白盒测试的区别
++ + + + ++ ++ 标准答案：ABCD ++ +++ +++第2题:[单选题]5分
+0分
+黑盒测试和白盒测试的区别
++ + + + +++ 标准答案：A ++++ +++第3题:[填空题]5分
+0分
+黑盒测试和白盒测试（没有）区别
+++候选答案1：哈哈哈哈
+候选答案1：呵呵呵呵
+++++第4题:[简答题]10分
+9分
+黑盒测试和白盒测试的区别
+学生所填答案收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试.验收测试验收测.+++ +参考答案
+黑盒测试也称功能测试或数据驱动测试，它是在已知产品所应具有的功能，通过测试来检测每个功能是否都能正常使用，在测试时，把程序看作一个不能打开的黑盆子，在完全不考虑程序内部结构和内部特性的情况下，
++ + + ++ + + diff --git a/app/views/exercise/teacher_check_exam.html b/app/views/exercise/teacher_check_exam.html new file mode 100644 index 000000000..c5f04c08a --- /dev/null +++ b/app/views/exercise/teacher_check_exam.html @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + ++++ ++++ +软件测试小测
+ + + 返回 +++试卷须知： + 共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。 + 请大家认真答题，本次作业成绩将计入期末成绩。
++++ 单选题 3 题，共 15 分 + 多选题 5 题，共 25 分 + 填空题 10 题，共 25 分 + 简答题 10 题，共 25 分 +
+合计 18 题，共 100 分
++ +++ 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 ++++++ +++第1题:[多选题]10分
+黑盒测试和白盒测试的区别
++ + + + ++++ +++第2题:[单选题]5分
+黑盒测试和白盒测试的区别
++ + + + ++++ +++第3题:[填空题]5分
+黑盒测试和白盒测试（）区别
++ ++++++第4题:[简答题]10分
+黑盒测试和白盒测试的区别
++ +++ + + ++ + + diff --git a/app/views/exercise/teacher_edit_exam.html b/app/views/exercise/teacher_edit_exam.html new file mode 100644 index 000000000..5d6d59945 --- /dev/null +++ b/app/views/exercise/teacher_edit_exam.html @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + ++++ + + ++++试卷须知： + 共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。 + 请大家认真答题，本次作业成绩将计入期末成绩。
++++ 单选题 3 题，共 15 分 + 多选题 5 题，共 25 分 + 填空题 10 题，共 25 分 + 简答题 10 题，共 25 分 +
+合计 18 题，共 100 分
++++ 主观题 + 已评 + 未评 +++ 1 + 2 + 3 + 4 + 5 +++ 客观题 + 正确 + 错误 +++ 1 + 2 + 3 + 4 + 5 ++++++ +++第1题:[多选题]10分
+10分
+黑盒测试和白盒测试的区别
++ + + + +++ 标准答案：ABCD ++++ +++第2题:[单选题]5分
+0分
+黑盒测试和白盒测试的区别
++ + + + +++ 标准答案：A ++++ +++第3题:[填空题]5分
+0分
+黑盒测试和白盒测试（没有）区别
+++候选答案1：哈哈哈哈
+候选答案1：呵呵呵呵
+++++第4题:[简答题]10分
+9分
+黑盒测试和白盒测试的区别
+学生所填答案收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试验收测试.验收测试验收测.+ 隐藏参考答案 +++ +参考答案
+黑盒测试也称功能测试或数据驱动测试，它是在已知产品所应具有的功能，通过测试来检测每个功能是否都能正常使用，在测试时，把程序看作一个不能打开的黑盆子，在完全不考虑程序内部结构和内部特性的情况下，
++ + + ++ + + diff --git a/app/views/exercise/teacher_examination_list.html b/app/views/exercise/teacher_examination_list.html new file mode 100644 index 000000000..104d04c57 --- /dev/null +++ b/app/views/exercise/teacher_examination_list.html @@ -0,0 +1,316 @@ + + + + + + + + + + + + ++++ + + ++++试卷须知： + 共有选择、填空、简答、编程题4种题型，其中选择题包括单选题和多选题。 + 请大家认真答题，本次作业成绩将计入期末成绩。
++++ 单选题 3 题，共 15 分 + 多选题 5 题，共 25 分 + 填空题 10 题，共 25 分 + 简答题 10 题，共 25 分 +
+合计 18 题，共 100 分
++ + + + + + ++++单选题+多选题+填空题+简答题++ + + ++ + diff --git a/app/views/exercise/teacher_score_list.html b/app/views/exercise/teacher_score_list.html new file mode 100644 index 000000000..d306ecdb0 --- /dev/null +++ b/app/views/exercise/teacher_score_list.html @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + ++++++ + 胡莎莎 > 智能课堂> 计算机基础> 计算机基础学院工程专业 +
++ + ++ ++++++++ +++++ +++ +++++ + +++ + +++ + +++ + +++ + +++ + ++ + ++ + + ++ + diff --git a/app/views/exercise/teacher_send_examination.html b/app/views/exercise/teacher_send_examination.html new file mode 100644 index 000000000..e75a489d8 --- /dev/null +++ b/app/views/exercise/teacher_send_examination.html @@ -0,0 +1,358 @@ + + + + + + + + + + + + ++++ + ++++-
+
+ +++ +
+ ++ + + +序号 +姓名 +学号 +提交状态 +提交时间 +客观题得分 +主观题教师评分 +主观题助教评分 +最终成绩 +操作 ++ +48 +李航 +2015551337 +按时提交 +2016-11-24 17:53 +-- +-- +91.0 + + ++ + ++5名助教进行了评分
+
平均分：91.0 分 +91.0 + ++ + ++胡莎莎（ruanjianlihang）
+
+ 最终评分：91.0 分
+ 迟交扣分：0 分
+ 最终成绩：91.0 分
+评阅 ++ +48 +胡莎莎 +2015551337 +延时提交 +2016-11-24 17:53 +95 +-- +91.0 + + ++ + ++1名助教进行了评分
+
复审分：91.0 分 +52.0 + ++ + ++李航（ruanjianlihang）
+
+ 最终评分：91.0 分
+ 迟交扣分：0 分
+ 最终成绩：91.0 分
+评阅 ++ + +48 +李航 +2015551337 +未提交 +2016-11-24 17:53 +-- +65.0 +65.0 + + ++ + ++1名助教进行了评分
+
复审分：91.0 分 +91.0 + ++ + ++李航（ruanjianlihang）
+
+ 最终评分：91.0 分
+ 迟交扣分：0 分
+ 最终成绩：91.0 分
++ 评阅 + + + ++ + + + ++ + + diff --git a/app/views/exercise/update.js.erb b/app/views/exercise/update.js.erb index 9724b2bd1..edfb7a7e6 100644 --- a/app/views/exercise/update.js.erb +++ b/app/views/exercise/update.js.erb @@ -1,5 +1,4 @@ -$("#polls_head_show").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:exercise => @exercise}) %>"); -$("#polls_head_edit").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:exercise => @exercise}) %>"); -$("#polls_head_edit").hide(); -$("#polls_head_show").show(); -$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>"); \ No newline at end of file +$("#exercise_head_show").html("<%= escape_javascript(render :partial => 'show_head') %>"); +$("#exercise_head_edit").html("<%= escape_javascript(render :partial => 'edit_head') %>"); +$("#exercise_head_edit").hide(); +$("#exercise_head_show").show(); \ No newline at end of file diff --git a/app/views/exercise/update_exercise_question.js.erb b/app/views/exercise/update_exercise_question.js.erb index 89dfb27b6..624df0dc5 100644 --- a/app/views/exercise/update_exercise_question.js.erb +++ b/app/views/exercise/update_exercise_question.js.erb @@ -20,6 +20,4 @@ $("#poll_questions_<%= @exercise_question.id%>").html("+++++ + 班级首页 > 试卷 +
+++ +新建试卷
+ 返回 +++ ++ +++ ++++ + + + + + + + + + +单选题+多选题+填空题+简答题+++ +简答题
++++ 单选题 3 题，共 15 分 + 多选题 5 题，共 25 分 + 填空题 10 题，共 25 分 + 简答题 10 题，共 25 分 +
+ + 合计 10 题，共 100 分 + +{:exercise_question => @exercise_question}) %>" + "<% end%>" + ""); -<% current_score = get_current_score @exercise %> -$("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score', :locals => {:exercise => @exercise, :current_score => current_score}) %>"); -$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise_question.exercise}) %>"); +$("#total_questions_score").html("<%= escape_javascript(render :partial => 'exercise/total_questions_score') %>"); \ No newline at end of file diff --git a/app/views/exercise/update_question_num.js.erb b/app/views/exercise/update_question_num.js.erb index 4a3bef3f9..6f5f7bb5f 100644 --- a/app/views/exercise/update_question_num.js.erb +++ b/app/views/exercise/update_question_num.js.erb @@ -7,7 +7,7 @@ <% elsif @before_que.question_type == 3%> $("#show_poll_questions_<%= @before_que.id %>").html("<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @before_que}) %>"); <% elsif @before_que.question_type == 4%> - $("#show_poll_questions_<%= @before_que.id %>").html("<%= escape_javascript(render :partial => 'show_mulit', :locals => {:exercise_question => @before_que}) %>"); + $("#show_poll_questions_<%= @before_que.id %>").html("<%= escape_javascript(render :partial => 'show_multi', :locals => {:exercise_question => @before_que}) %>"); <% end%> <% elsif @after_que %> $("#poll_questions_<%= @exercise_question.id%>").insertAfter($("#poll_questions_<%= @after_que.id%>")); @@ -18,7 +18,7 @@ <% elsif @after_que.question_type == 3%> $("#show_poll_questions_<%= @after_que.id %>").html("<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @after_que}) %>"); <% elsif @after_que.question_type == 4%> - $("#show_poll_questions_<%= @after_que.id %>").html("<%= escape_javascript(render :partial => 'show_mulit', :locals => {:exercise_question => @after_que}) %>"); + $("#show_poll_questions_<%= @after_que.id %>").html("<%= escape_javascript(render :partial => 'show_multi', :locals => {:exercise_question => @after_que}) %>"); <% end%> <% end %> <% if @exercise_question.question_type == 1%> @@ -28,5 +28,7 @@ <% elsif @exercise_question.question_type == 3%> $("#show_poll_questions_<%= @exercise_question.id %>").html("<%= escape_javascript(render :partial => 'show_single', :locals => {:exercise_question => @exercise_question}) %>"); <% elsif @exercise_question.question_type == 4%> - $("#show_poll_questions_<%= @exercise_question.id %>").html("<%= escape_javascript(render :partial => 'show_mulit', :locals => {:exercise_question => @exercise_question}) %>"); -<% end%> \ No newline at end of file + $("#show_poll_questions_<%= @exercise_question.id %>").html("<%= escape_javascript(render :partial => 'show_multi', :locals => {:exercise_question => @exercise_question}) %>"); +<% end%> +$(".data-tip-down").html(""); +$(".data-tip-down").hide(); \ No newline at end of file diff --git a/app/views/files/_arrow_show.erb b/app/views/files/_arrow_show.erb index 2189595d2..84aa16898 100644 --- a/app/views/files/_arrow_show.erb +++ b/app/views/files/_arrow_show.erb @@ -1,9 +1,9 @@ <% if sort == current %> <% if order =="asc" %> - ↑ + ↑ <% elsif order == "desc" %> - ↓ + ↓ <% else %> <% end %> diff --git a/app/views/files/_attachment_history_popub.html.erb b/app/views/files/_attachment_history_popub.html.erb index f864f3a4f..d6459e546 100644 --- a/app/views/files/_attachment_history_popub.html.erb +++ b/app/views/files/_attachment_history_popub.html.erb @@ -1,8 +1,8 @@ -+
资源名称 -下载数 +下载数 引用数 版本号 @@ -10,7 +10,7 @@ - <%= @attachment.filename %>
当前版本<%= @attachment.filename %>
当前版本<%= @attachment.downloads %> <%= @attachment.try(:quotes).to_i %> <%= format_time(@attachment.created_on) %> @@ -42,25 +42,29 @@ -+<%= render :partial => 'attachments/upload_attachment_new_version' %>+ - -- 取消 - <%#= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %> - 确定 ++ + +
+ + <% end %> diff --git a/app/views/files/_attachment_history_popub_delete.html.erb b/app/views/files/_attachment_history_popub_delete.html.erb index bab987800..d73ea48f0 100644 --- a/app/views/files/_attachment_history_popub_delete.html.erb +++ b/app/views/files/_attachment_history_popub_delete.html.erb @@ -1,8 +1,8 @@ -+
-资源名称 -下载数 +下载数 引用数 版本号 @@ -10,7 +10,7 @@ - <%= @attachment.filename %>当前版本
<%= @attachment.filename %>
当前版本<%= @attachment.downloads %> <%= @attachment.try(:quotes).to_i %> <%= format_time(@attachment.created_on) %> @@ -19,35 +19,46 @@ <% @attachment_histories.each do |history| %>- <% end %>+
<%= link_to history.filename, download_history_attachment_path(history.id, history.filename), :title => history.filename+"\n"+history.description.to_s %>
<%= history.downloads %> <%= history.try(:quotes).to_i %> <%= format_time(history.created_on) %> - <%= link_to( '删除资源', attachment_path(history.attachment, :history_id => history, :type => "history_delete"), + <%= link_to( ''.html_safe, attachment_path(history.attachment, :history_id => history, :type => "history_delete"), :remote => true, - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :class => "postOptionLink", - :class => "btn") if allow_to_delete_attachment(history) %> + :method => :delete,:class => "mr5") if allow_to_delete_attachment(history) %> + +++ + diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 6e10e4114..a3bdfbb10 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -68,23 +68,14 @@ $('#insite').attr("class", "re_schbtn b_lblue"); } - -只删除资源的历史版本，请点击相应版本的删除按钮
<% if @attachment.container_type == "Project" %> - <%= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %> + <%#= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :method => :delete,:class => "fr fontGrey2 mb5 btn", :onclick =>"hideModal();") if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %> + <% if (is_project_manager?(User.current.id, @attachment.container_id) || User.current.id == @attachment.author_id || User.current.admin?) %> + 删除所有资源 + <% end %> <% elsif @attachment.container_type == "Course" %> - <%= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %> + <%#= link_to( '删除所有资源', attachment_path(@attachment, :history_delete => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5 btn", :onclick =>"hideModal();") if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %> + <% if (User.current.allowed_to?(:as_teacher, @attachment.container) || User.current.id == @attachment.author_id || User.current.admin?) %> + 删除所有资源 + <% end %> <% elsif @attachment.container_type == "OrgSubfield" %> - <%= link_to( '删除所有资源', attachment_path(@attachment, :history => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr fontGrey2 mb5", :onclick =>"hideModal();") if (User.current.id == @attachment.author_id || User.current.admin_of_org?(@attachment) || User.current.admin?) %> + <%= link_to( '删除所有资源', attachment_path(@attachment, :history => true), :data => {:confirm => @attachment_histories_count.to_i > 0 ? l(:text_history_are_you_sure) : l(:text_are_you_sure)}, :method => :delete,:class => "fr mb5 white-btn orange-btn", :onclick =>"hideModal();") if (User.current.id == @attachment.author_id || User.current.admin_of_org?(@attachment) || User.current.admin?) %> <% end %>++<% end %> --<% unless User.current.logged? %> @@ -94,38 +85,28 @@资源库- +资源列表+ <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %> + 上传资源 + <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "white-btn orange-btn fr mr5", :remote => true) %> + <% end %>-+<%# html_title(l(:label_attachment_plural)) -%> + \ No newline at end of file diff --git a/app/views/files/_course_file_filter_order.html.erb b/app/views/files/_course_file_filter_order.html.erb index a740d9481..43496828a 100644 --- a/app/views/files/_course_file_filter_order.html.erb +++ b/app/views/files/_course_file_filter_order.html.erb @@ -1,15 +1,15 @@ <% if @order == "asc" %> - 按 <%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey", :remote => true %> - <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> / - <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey",:remote => true %> - <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %> / - <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort => "quotes:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey", :remote => true %> + 按 <%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey #{@sort == 'created_on' ? 'color-orange05' : ''}", :remote => true %> + <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> | + <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey #{@sort == 'downloads' ? 'color-orange05' : ''}",:remote => true %> + <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %> | + <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort => "quotes:desc", :tag_name => @tag_name.nil? ? " " : @tag_name, :q => @q.nil? ? " " : @q), :class => "f_b c_grey #{@sort == 'quotes' ? 'color-orange05' : ''}", :remote => true %> <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %> 排序 <% else %> - 按 <%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey" , :remote => true %> - <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> / - <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey", :remote => true %> - <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %> / - <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort =>"quotes:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q),:class => "f_b c_grey", :remote => true %> + 按 <%= link_to "时间", search_tag_attachment_course_files_path(@course, :sort => "created_on:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey #{@sort == 'created_on' ? 'color-orange05' : ''}" , :remote => true %> + <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"created_on"} %> | + <%= link_to "下载次数", search_tag_attachment_course_files_path(@course, :sort => "downloads:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q), :class => "f_b c_grey #{@sort == 'downloads' ? 'color-orange05' : ''}", :remote => true %> + <%= render partial: 'files/arrow_show',locals: { sort: @sort,order:@order,current:"downloads"} %> | + <%= link_to "引用次数", search_tag_attachment_course_files_path(@course, :sort =>"quotes:asc", :tag_name => @tag_name.nil? ? ' ' : @tag_name, :q => @q.nil? ? ' ' : @q),:class => "f_b c_grey #{@sort == 'quotes' ? 'color-orange05' : ''}", :remote => true %> <%= render partial:'files/arrow_show',locals: { sort: @sort,order:@order,current:"quotes"} %> 排序 <% end %> \ No newline at end of file diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 42cfcd165..67c6a458d 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -1,3 +1,10 @@ + <% if curse_attachments.count != 0 %> <% curse_attachments.each do |file| %> <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %> @@ -8,15 +15,17 @@- <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %> - <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%> - <%= submit_tag "班内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %> - <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %> - <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %> - - <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %> - <% end %> - <% end %> - - - -+-<%# html_title(l(:label_attachment_plural)) -%> \ No newline at end of file +-<% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %> -- <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @tag_name}%> --++<% end %>私有资源：
@@ -133,8 +114,41 @@
仅对本班级成员可见<%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %><%= file.filename %>是私有资源<% end %> <% end %> ++-++-
+ <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true %>
+
-
- <%= pagination_links_full @feedback_pages, @feedback_count, :per_page_links => false, :remote => true, :flag => true%>
-
--没有数据可以显示！
++ <%= render :partial => "welcome/no_data" %><% end %> - diff --git a/app/views/files/_file_description.html.erb b/app/views/files/_file_description.html.erb index 0b7dd26ad..7f278c513 100644 --- a/app/views/files/_file_description.html.erb +++ b/app/views/files/_file_description.html.erb @@ -1,5 +1,5 @@ -')> - 资源描述：<% if file.description.blank? %>双击添加描述<% else %><%= file.description %><% end %> +
+ 资源描述：<% if file.description.blank? %><% else %><%= file.description %><% end %> <%#= file.description.blank? ? "该资源暂无描述" : file.description %> - <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_file_description("+file.id.to_s+");"%> + <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), attachments_versions_path(file), :remote =>true %>
\ No newline at end of file diff --git a/app/views/files/_hidden_file.html.erb b/app/views/files/_hidden_file.html.erb index 6d8d861d5..b72173a9b 100644 --- a/app/views/files/_hidden_file.html.erb +++ b/app/views/files/_hidden_file.html.erb @@ -1,25 +1,33 @@ ---发布设置
- - ++ -+<%= form_tag(republish_file_course_file_path(@course,@file), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %> ++ + + <%= @file.is_public == 1 ? "disabled" : "" %> id="public_user" class="ml-3 mr5 magic-checkbox"> + + +
-@@ -28,11 +36,8 @@ function regex_publish_time() { var myDate = new Date(); - if($.trim($("#datetimepicker_mask").val()) == "") + if($.trim($("#datetimepicker_mask").val()) != "") { - $("#publish_time_notice").text("发布时间不能为空"); - return false; - } else{ var publish_time = Date.parse($("#datetimepicker_mask").val()); if(Date.parse(formate_time(myDate)) > publish_time) { @@ -44,12 +49,15 @@ $("#publish_time_notice").text(""); return true; } + } else{ + return true; } } function submit_republish_file() { if(regex_publish_time()) { $('#submit_file').parent().submit(); + hideModal(); } } diff --git a/app/views/files/_new_style_attachment_list.html.erb b/app/views/files/_new_style_attachment_list.html.erb index 80e41d55a..81060df6a 100644 --- a/app/views/files/_new_style_attachment_list.html.erb +++ b/app/views/files/_new_style_attachment_list.html.erb @@ -1,6 +1,7 @@ <% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%> - + 文件浏览 + <%= file_field_tag 'attachments[dummy][file]', :id => "_file#{container.id}", :class => ie8? ? '':'file_selector', @@ -23,12 +24,8 @@ - - <%= l(:label_no_file_uploaded)%> - -单个文件最大限制:<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %> +单个文件最大限制:<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>- - <%#= calendar_for('attachment_publish_time')%> +- 确定 - 取消 + <% end %>+ " class="InputBox fl calendar_input" readonly="readonly">清空 - + +- - +\ No newline at end of file diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb index 14ac36856..cc48a8ca5 100644 --- a/app/views/files/_resource_detail.html.erb +++ b/app/views/files/_resource_detail.html.erb @@ -1,8 +1,8 @@ <% delete_allowed = User.current.allowed_to?(:manage_files, @course) %> -+- <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %> + <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50,:class => "bor-radius-all"), user_path(file.author) %>@@ -10,33 +10,26 @@ <% if file.attachment_histories.count == 0 %> <%= link_to truncate(file.filename,length: 40, omission: '...'), download_named_attachment_path(file.id, file.filename), - :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkGrey3 f_14" %> + :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "color-grey3 f_14" %> <% else %> <%= link_to truncate(file.filename,length: 40, omission: '...'), attachment_history_download_path(file.id), :title => file.filename+"\n"+file.description.to_s, - :class => "linkGrey3 f_14", + :class => "color-grey3 f_14", :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :remote=>true %> <% end %> - <%= file_preview_eye(file, class: 'preview') %> + <%#= file_preview_eye(file, class: 'preview') %> <% if file.is_public? == false%> - 私有 + + <%end %> <% if file.is_publish == 0 %> - <%= format_time file.publish_time %>点发布 + <%= file.publish_time.nil? ? '挂起' : (format_time(file.publish_time) + "点发布") %> <% end %>-- 上传时间：<%= format_time(file.created_on)%> - <% if file.tag_list.length > 0%> - 上传类型：<%= file.tag_list[0] %> - <% end %> -+ <%# unless file.description.blank? %> - <% if User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course")) %>文件大小：<%= number_to_human_size(file.filesize) %>
-下载<%= file.downloads%> | 引用<%= file.quotes.nil? ? 0:file.quotes %>
-@@ -54,20 +47,33 @@ <% end %> <%# end %> -- - <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %> - <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %> ++ <%= file.author.show_real_name %> + <%= format_time(file.created_on)%> + <%# if file.tag_list.length > 0%> + + <%# end %> + 大小 <%= number_to_human_size(file.filesize) %> + 下载 <%= file.downloads%> + 引用 <%= file.quotes.nil? ? 0:file.quotes %>+ + +-
-
- --diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb index 17a68b2a0..7f92e0ec9 100644 --- a/app/views/blog_comments/_simple_ke_reply_form.html.erb +++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb @@ -1,28 +1,28 @@ -- <%= render :partial => "files/attachment_history_popub" %> + -diff --git a/app/views/attachments/_show_attachment_history_delete.html.erb b/app/views/attachments/_show_attachment_history_delete.html.erb index 85f46ea72..4c1b7e12e 100644 --- a/app/views/attachments/_show_attachment_history_delete.html.erb +++ b/app/views/attachments/_show_attachment_history_delete.html.erb @@ -1,19 +1,17 @@ -- -- + <% end %>- -- <%= render :partial => "files/attachment_history_popub_delete" %> +diff --git a/app/views/attachments/_upload_attachment_new_version.html.erb b/app/views/attachments/_upload_attachment_new_version.html.erb index a0c79626f..4cfe2564f 100644 --- a/app/views/attachments/_upload_attachment_new_version.html.erb +++ b/app/views/attachments/_upload_attachment_new_version.html.erb @@ -1,6 +1,6 @@ @@ -18,6 +18,7 @@ :description_placeholder => l(:label_optional_description), :field_is_public => l(:field_is_public), :are_you_sure => l(:text_are_you_sure), + :allow_blank => '0', :file_count => l(:label_file_count), :lebel_file_uploding => l(:lebel_file_uploding), :delete_all_files => l(:text_are_you_sure_all) diff --git a/app/views/attachments/update_attachment_publish_time.js.erb b/app/views/attachments/update_attachment_publish_time.js.erb index e3537a1a8..89b3bee45 100644 --- a/app/views/attachments/update_attachment_publish_time.js.erb +++ b/app/views/attachments/update_attachment_publish_time.js.erb @@ -1,2 +1,2 @@ hideModal(); -$(".re_search").submit(); // 为了刷新 +submit_resource_search(); // 为了刷新 diff --git a/app/views/attachments/upload_attachment_version.js.erb b/app/views/attachments/upload_attachment_version.js.erb index fd2cc3d21..6744fa07d 100644 --- a/app/views/attachments/upload_attachment_version.js.erb +++ b/app/views/attachments/upload_attachment_version.js.erb @@ -1,7 +1,7 @@ <% if @flag %> <% if @status == 1 %> notice_box("更新成功"); - $(".re_search").submit(); // 为了刷新 + submit_resource_search(); // 为了刷新 <% else %> var htmlvalue = "<%=escape_javascript(render :partial => 'update_publish_time_box') %>"; pop_box_new(htmlvalue, 470, 140); diff --git a/app/views/avatar/upload.js.erb b/app/views/avatar/upload.js.erb index 3f6f67c2d..22502d5fe 100644 --- a/app/views/avatar/upload.js.erb +++ b/app/views/avatar/upload.js.erb @@ -1,8 +1,22 @@ <% if @is_direct == '1' && (@source_type=='User'|| @source_type == 'Course' || @source_type == 'Project' || @source_type == 'Organization'|| @source_type == 'Contest') %> -var imgSpan = $("img[nhname='avatar_image']"); -imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'}); + var imgSpan = $("img[nhname='avatar_image']"); + imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'}); +<% elsif @is_direct == '1' && @source_type == 'UserAuthentication' %> + <% if @auth_type == "ID" %> + var imgSpan = $("#nh_source_id"); + $("#upload_img_id_sign").val(1); + <% else %> + var imgSpan = $("#nh_source_pro"); + $("#upload_img_pro_sign").val(1); + <% end %> + imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'}); + imgSpan.parent().attr("href", imgSpan.attr('src')+".png"); + $("#shili_link").attr("href", imgSpan.attr('src')+".png"); <% else %> -var imgSpan = jQuery('#avatar_image'); - -imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'}); + <% if @source_type=='User' %> + var imgSpan = jQuery('#nh_user_logo'); + <% else %> + var imgSpan = jQuery('#avatar_image'); + <% end %> + imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'}); <% end %> \ No newline at end of file diff --git a/app/views/blog_comments/_blog_comment_show_replies.html.erb b/app/views/blog_comments/_blog_comment_show_replies.html.erb index 23cabb67d..1b2cc07b8 100644 --- a/app/views/blog_comments/_blog_comment_show_replies.html.erb +++ b/app/views/blog_comments/_blog_comment_show_replies.html.erb @@ -46,7 +46,7 @@-<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>-- <% if User.current.logged? %> -- +- <%= form_for('new_form', :url => {:controller => 'blog_comments',:action => 'reply', :id => reply.id, :blog_id => reply.blog.id, :user_id => User.current.id}, :method => "post", :html => {:multipart => true}) do |f| %> - - <%#= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %> - - <% if course_id%> - - <% end %> - <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %> - <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author_id %> - - - 发送 - - - <% end%> -- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> - -+\ No newline at end of file diff --git a/app/views/blog_comments/quote.js.erb b/app/views/blog_comments/quote.js.erb index 6d3264a22..958c32124 100644 --- a/app/views/blog_comments/quote.js.erb +++ b/app/views/blog_comments/quote.js.erb @@ -1,8 +1,9 @@ -if($("#reply_message_<%= @blogComment.id%>").length > 0) { +if($("#reply_message_<%= @blogComment.id%>").html() == "") { + $(".reply_to_message").html(""); $("#reply_message_<%= @blogComment.id%>").replaceWith("<%= escape_javascript(render :partial => 'blog_comments/simple_ke_reply_form', :locals => {:reply => @blogComment,:temp =>@temp,:course_id=>@course_id}) %>"); $(function(){ sd_create_editor_from_data(<%= @blogComment.id%>,null,"100%", "<%=@blogComment.class.to_s%>"); }); -}else if($("#reply_to_message_<%= @blogComment.id%>").length >0) { - $("#reply_to_message_<%= @blogComment.id%>").replaceWith(""); +}else { + $("#reply_message_<%= @reply.id%>").html(""); } \ No newline at end of file diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb index 2b921c7a4..6eea11e82 100644 --- a/app/views/blogs/_homepage.html.erb +++ b/app/views/blogs/_homepage.html.erb @@ -1,98 +1,98 @@ -<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>++ <% if User.current.logged? %> +++ <%= form_for('new_form', :url => {:controller => 'blog_comments',:action => 'reply', :id => reply.id, :blog_id => reply.blog.id, :user_id => User.current.id}, :method => "post", :html => {:multipart => true}) do |f| %> + + <%#= form_for @blog_comment, :as => :reply, :url => {:controller => 'blog_comments',:action => 'reply', :id => @blogComment.id}, :html => {:multipart => true, :id => 'new_form'} do |f| %> + + <% if course_id%> + + <% end %> + <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %> + <%= hidden_field_tag 'reply_id', params[:reply_id], :value => reply.author_id %> + + + 发送 + + + <% end%> ++ <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> + +-- \ No newline at end of file diff --git a/app/views/boards/_contest_boardlist.html.erb b/app/views/boards/_contest_boardlist.html.erb index 96a6af0e0..d45566ae2 100644 --- a/app/views/boards/_contest_boardlist.html.erb +++ b/app/views/boards/_contest_boardlist.html.erb @@ -1,6 +1,6 @@- <% if activity.author.id == User.current.id%> -- <% all_repies = BlogComment.where("root_id = #{activity.id}").reorder("created_on desc") %> - <% count = all_repies.count %> - <% no_children_comments = get_no_children_comments all_repies %> --- <%end%> --
-
- <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, - :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey", :style => 'text-align:center;' %> -- <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %> - - - - - -- <%= render :partial => 'users/reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :homepage => 1, :expand_more =>no_children_comments[:three_more]} %> - - <% if count > 0 %> --- <%= render :partial => 'users/message_replies', :locals => {:comments => no_children_comments[:no_children_comments], :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%> -- <% end %> - - <% if activity.locked == false && User.current.logged?%> --- <% end %> -<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>-- <% if User.current.logged? %> -- -- <%= form_for('new_form',:url => {:controller => 'blog_comments', :action => 'reply', :user_id=>activity.author_id,:blog_id=>activity.blog_id,:id=>activity.id,:homepage=>1},:method => "post", :remote => true) do |f|%> - - - - - - - - - 发送 - - - <% end%> -- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> - --+讨论区列表
排序： diff --git a/app/views/boards/_contest_new.html.erb b/app/views/boards/_contest_new.html.erb index fcc6b1c5d..e27cace77 100644 --- a/app/views/boards/_contest_new.html.erb +++ b/app/views/boards/_contest_new.html.erb @@ -122,7 +122,7 @@- +diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index ddb0fea27..91bb5c852 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -8,8 +8,7 @@ if(!regexTopicSubject()) { result=false; return result; - } - if(params.content!=undefined){ + } else if(params.content!=undefined){ if(params.content.isEmpty()){ result=false; } @@ -88,7 +87,7 @@ //paramsHeight = params.kindutil.removeUnit(this.height); edit.iframe.height(150); this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150)); - elocalStorage(message_content_editor,'topic_course_<%=course.id %>'); + elocalStorage(message_content_editor,'topic_course_<%=course.id %>','des'); } }).loadPlugin('paste'); return editor; @@ -122,16 +121,16 @@- +<%if User.current.allowed_to?(:as_teacher, course) %>- <%= f.check_box :sticky, :value => topic.sticky %> - <%= label_tag 'message_sticky', l(:label_board_sticky) %> - <%= f.check_box :locked, :value => topic.locked %> - <%= label_tag 'message_locked', l(:label_board_locked) %> + <%= f.check_box :sticky, :value => topic.sticky, :class => 'magic-checkbox fl' %> + <%= label_tag 'message_sticky', l(:label_board_sticky), :class => 'fl' %> + <%= f.check_box :locked, :value => topic.locked, :class => 'magic-checkbox fl' %> + <%= label_tag 'message_locked', l(:label_board_locked), :class => 'fl ml10' %><% end %> @@ -155,8 +154,8 @@ - - + +diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 33f4fbd2e..f102e2f36 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -1,44 +1,13 @@ - - ---- <%= @board.parent_id.nil? ? "班级讨论区" : "#{@board.name}" %> +\ No newline at end of file diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index 64654f517..8b766d033 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -3,6 +3,4 @@ <%= javascript_include_tag "create_kindeditor" %> <% end %> -<% if @topics || topics %> - <%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics ? @topics: topics , :is_course => 1, :is_board=>1} %> -<% end %> \ No newline at end of file +<%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %> diff --git a/app/views/boards/create.js.erb b/app/views/boards/create.js.erb index 1daa92536..b9b273a8d 100644 --- a/app/views/boards/create.js.erb +++ b/app/views/boards/create.js.erb @@ -1,4 +1,6 @@ <% if @course %> + $("#setting_boards_list").html("<%= j( render :partial => 'courses/settings/boards_list' ) %>"); + hideModal(); $("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); <% course_board = @course.boards.where("parent_id is NULL").first %> $("#board_children_list").html("<%= escape_javascript(render :partial => 'layouts/board_children_list', :locals => {:course_board => course_board})%>"); diff --git a/app/views/boards/destroy.js.erb b/app/views/boards/destroy.js.erb index e9ebf2024..2f28865b8 100644 --- a/app/views/boards/destroy.js.erb +++ b/app/views/boards/destroy.js.erb @@ -1,3 +1,4 @@ +$("#setting_boards_list").html("<%= j( render :partial => 'courses/settings/boards_list' ) %>"); <% if @course %> hideModal(); $("#tbc_04").html("<%=escape_javascript(render :partial => 'courses/settings/boards_setting') %>"); diff --git a/app/views/boards/show.js.erb b/app/views/boards/show.js.erb index cb7ee64a1..b2376d4c6 100644 --- a/app/views/boards/show.js.erb +++ b/app/views/boards/show.js.erb @@ -1,5 +1,5 @@ <% if @course %> - $("#course-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>'); +$("#course-boardlist_new").html('<%= escape_javascript( render :partial => 'course_show_detail', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>'); <% else %> $("#project-boardlist").replaceWith('<%= escape_javascript( render :partial => 'users/project_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1}) %>'); <% end %> \ No newline at end of file diff --git a/app/views/boards/update_boards_name.js.erb b/app/views/boards/update_boards_name.js.erb new file mode 100644 index 000000000..4930834a8 --- /dev/null +++ b/app/views/boards/update_boards_name.js.erb @@ -0,0 +1,2 @@ +$("#setting_boards_list").html("<%= j( render :partial => 'courses/settings/boards_list' ) %>"); +hideModal(); \ No newline at end of file diff --git a/app/views/boards/update_boards_position.js.erb b/app/views/boards/update_boards_position.js.erb new file mode 100644 index 000000000..2ec51e6fb --- /dev/null +++ b/app/views/boards/update_boards_position.js.erb @@ -0,0 +1 @@ +$("#setting_boards_list").html("<%= j( render :partial => 'courses/settings/boards_list' ) %>"); \ No newline at end of file diff --git a/app/views/challenges/_answer_form.html.erb b/app/views/challenges/_answer_form.html.erb new file mode 100644 index 000000000..406f01fc8 --- /dev/null +++ b/app/views/challenges/_answer_form.html.erb @@ -0,0 +1,92 @@ +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> + + + \ No newline at end of file diff --git a/app/views/challenges/_choose_tab.html.erb b/app/views/challenges/_choose_tab.html.erb new file mode 100644 index 000000000..260bb4296 --- /dev/null +++ b/app/views/challenges/_choose_tab.html.erb @@ -0,0 +1,10 @@ ++++-++帖子列表
+ <% if User.current.logged? %> + + 我要发布 + <% end %> ++ <%= render :partial => "course_show_detail", :locals => {:topics => @topics, :page => 0} %>- - <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@board.course)) %> - <% if is_teacher %> - <%= link_to "添加子栏目", settings_course_path(@board.course.id,'boards'), :class => "link-blue fr mt5" %> - <% end %>- <% if User.current.logged? %> - <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new', :board_id => @board.id, :is_board => 'true'}, - :html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %> - <%= render :partial => 'course_new', :locals => {:f => f, :topic => @message, :edit_mode => false, :course => @board.course} %> - <% end %> - <% end %> -- <%= render :partial=> 'course_show_detail',:locals =>{:topics => @topics, :page => 0} %> -++ \ No newline at end of file diff --git a/app/views/challenges/_content_list.html.erb b/app/views/challenges/_content_list.html.erb index 75526be97..16b99b5b6 100644 --- a/app/views/challenges/_content_list.html.erb +++ b/app/views/challenges/_content_list.html.erb @@ -1,50 +1,88 @@ --
+
+ <%= render :partial => "challenges/choose_tab" %> ++ +++ ++++++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
+ <%#= render :partial => "single_or_multiple_question" %> ++ + <%#= render :partial => 'single_or_multiple_question_show'%> +--全部任务
- <% if @challenges.count != 0 %> - <%= @challenges.count %> - <% end %> - <% if User.current.manager_of_shixun?(@shixun) || User.current.admin? %> - 新建阶段 +++-全部任务
+ <% if @challenges.count != 0 %> + <%= @challenges.count %> + <% end %> + <% if User.current.manager_of_shixun?(@shixun) && @shixun.status == 0 %> + +实践任务 + +选择题任务 + + <% end %>++ \ No newline at end of file diff --git a/app/views/challenges/_edit_answer.html.erb b/app/views/challenges/_edit_answer.html.erb new file mode 100644 index 000000000..e34a0a24b --- /dev/null +++ b/app/views/challenges/_edit_answer.html.erb @@ -0,0 +1,41 @@ +<% @challenges.each_with_index do |challenge, index| -%> -\ No newline at end of file +--第<%= challenge.position %>关 - <%= link_to challenge.subject, shixun_challenge_path(@shixun.id, challenge), :target => "_blank" %> +
+- <% end %>+ + <% if challenge.st == 0 %> + + <% else %> + + <% end%> + + + 第<%= challenge.position %>关 + <%#= link_to challenge.subject, shixun_challenge_path(@shixun.id, challenge), :target => "_blank" %> + <% if User.current.manager_of_shixun?(@shixun) %> + <%= link_to challenge.subject, edit_shixun_challenge_path(challenge, :shixun_id => @shixun), :target => "_blank" %> + <% else %> + <% if allow_to_view_challenge(challenge, @shixun) %> + <%= link_to challenge.subject, myshixun_game_path(challenge.current_user_game, :myshixun_id => challenge.current_user_game.try(:myshixun)), :target => "_blank" %> + <% else %> + <%= challenge.subject %> + <% end %> + <% end %>
<% if User.current.manager_of_shixun?(@shixun) %> -- <% unless challenge.position < 2 %> - +
+ <% if @shixun.status == 0 %> + + <% unless challenge.position < 2 %> + + <% end %> + <% if @shixun.challenges.count != challenge.position %> + + <% end %> <% end %> - <% if @shixun.challenges.count != challenge.position %> - - <% end %> - +
<% end %> -- 正在挑战：<%= shixun_running(@shixun, challenge.position).to_i %> - 完成挑战：<%= shixun_done(@shixun, challenge.position).to_i %> - 最佳表现：<%= top_score(@shixun, challenge.position).to_i %>分 - 平均表现：<%= shixun_avg_score(@shixun, challenge.position).to_i %>分 +
+ <%= shixun_done(@shixun, challenge.position).to_i %>人 完成挑战 + <%= shixun_running(@shixun, challenge.position).to_i %>人 正在挑战 + <% if challenge.st != 0 %> + <%= challenge.choose_score %>经验值 + <% else %> + <%= challenge.score %>经验值 + <% end %> + <% if @shixun.status == 2 %> + <% game = Game.where(:challenge_id => challenge.id, :user_id => User.current.id).first %> + + <% case game.try(:status) %> + <% when 0 %> + 待完成 + <% when 1 %> + + <% when 2 %> + 已完成 + <% when 3,nil %> + 未开始 + <% end %> + + <% end %>
+ <% if @editor.blank? && !@challenge.answer.blank? %> ++ \ No newline at end of file diff --git a/app/views/challenges/_edit_evaluating.html.erb b/app/views/challenges/_edit_evaluating.html.erb new file mode 100644 index 000000000..bb589188c --- /dev/null +++ b/app/views/challenges/_edit_evaluating.html.erb @@ -0,0 +1,83 @@ + +++ <% end %> + <% if @challenge.answer.blank? || !@editor.blank? %> ++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
-
+ <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 3), :html => {:id => "challenge_shixun_answer_update"} do |f| %>
+ <%= render :partial => "answer_form", :locals => {:f => f} %>
+ <% end %>
+
++ \ No newline at end of file diff --git a/app/views/challenges/_edit_propaedeutics.html.erb b/app/views/challenges/_edit_propaedeutics.html.erb new file mode 100644 index 000000000..bdc032f39 --- /dev/null +++ b/app/views/challenges/_edit_propaedeutics.html.erb @@ -0,0 +1,44 @@ +"> +++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
- " id="evaluating_edit">
+ <%= labelled_form_for @challenge, :url => update_evaluation_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 2), :html => {:id => "challenge_evaluation_update"} do |f| %>
+ <%= render :partial => "evaluating_form", :locals => {:f => f} %>
+ <% end %>
+
+ <% if @editor.blank? && !@challenge.ready_knowledge.blank? %> ++ \ No newline at end of file diff --git a/app/views/challenges/_edit_scoring.html.erb b/app/views/challenges/_edit_scoring.html.erb new file mode 100644 index 000000000..3eab2d79b --- /dev/null +++ b/app/views/challenges/_edit_scoring.html.erb @@ -0,0 +1,37 @@ + +++ <% end %> + <% if @challenge.ready_knowledge.blank? || !@editor.blank? %> ++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
-
+ <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 6), :html => {:id => "challenge_shixun_propaedeutics"} do |f| %>
+ <%= render :partial => "propaedeutics_form", :locals => {:f => f} %>
+ <% end %>
+
++ \ No newline at end of file diff --git a/app/views/challenges/_edit_skill.html.erb b/app/views/challenges/_edit_skill.html.erb new file mode 100644 index 000000000..27b3a53cf --- /dev/null +++ b/app/views/challenges/_edit_skill.html.erb @@ -0,0 +1,37 @@ +"> +++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
- " id="scoring_edit">
+ <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 4), :html => {:id => "challenge_score_update"} do |f| %>
+ <%= render :partial => "score_form", :locals => {:f => f} %>
+ <% end %>
+
+ + + + + + + + + + + + + + + + + + + + + + + ++ diff --git a/app/views/challenges/_edit_task_pass.html.erb b/app/views/challenges/_edit_task_pass.html.erb new file mode 100644 index 000000000..862d01231 --- /dev/null +++ b/app/views/challenges/_edit_task_pass.html.erb @@ -0,0 +1,79 @@ +- " id="skill_edit">
+ <%= form_for @challenge, :url => update_evaluation_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 5),
+ :html => {:id => "challenge_skill_update", :onkeydown => "if(event.keyCode==13)return false;"} do |f| %>
+ <%= render :partial => "skill_form", :locals => {:f => f} %>
+ <% end %>
+
+ <% if @editor.blank? && @challenge.subject %> ++ +<%# if @challenge.st == 1 %> + +<%# end %> + \ No newline at end of file diff --git a/app/views/challenges/_evaluating_form.html.erb b/app/views/challenges/_evaluating_form.html.erb new file mode 100644 index 000000000..2d92aacf5 --- /dev/null +++ b/app/views/challenges/_evaluating_form.html.erb @@ -0,0 +1,215 @@ + + +++ <% if false%> + <% if @challenge.st == 1 %> ++++ <% if User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
+-
+
-
+ <% @challenge.challenge_questions.each_with_index do |question, index| %>
+
-
+ <% @challenge.challenge_questions.each_with_index do |question, index| %>
+
-
+ <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 1), :html => {:id => "challenge_shixun_update"} do |f| %>
+ <%= render :partial => "task_pass_form", :locals => {:f => f} %>
+ <% end %>
+
++ + diff --git a/app/views/challenges/_form.html.erb b/app/views/challenges/_form.html.erb index ababe3b8e..93ead326c 100644 --- a/app/views/challenges/_form.html.erb +++ b/app/views/challenges/_form.html.erb @@ -2,21 +2,72 @@ <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min' %> +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> - + @@ -25,122 +76,104 @@"); $(".task-tag-input").attr("value",""); } + $("#shixun_skill_input").val(""); } function close_tag(thisObj){ @@ -336,5 +508,4 @@ var obj = thisObj.parentNode.id; $("#"+obj).remove(); } - diff --git a/app/views/challenges/_propaedeutics_form.html.erb b/app/views/challenges/_propaedeutics_form.html.erb new file mode 100644 index 000000000..3e1732bb2 --- /dev/null +++ b/app/views/challenges/_propaedeutics_form.html.erb @@ -0,0 +1,79 @@ +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> + + + \ No newline at end of file diff --git a/app/views/challenges/_score_form.html.erb b/app/views/challenges/_score_form.html.erb new file mode 100644 index 000000000..174b10ea1 --- /dev/null +++ b/app/views/challenges/_score_form.html.erb @@ -0,0 +1,101 @@ +++ + diff --git a/app/views/challenges/_single_or_multiple_question.html.erb b/app/views/challenges/_single_or_multiple_question.html.erb new file mode 100644 index 000000000..e066ccea3 --- /dev/null +++ b/app/views/challenges/_single_or_multiple_question.html.erb @@ -0,0 +1,522 @@ +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> + + +<%= form_for("", :url => "", :html => {:id => 'challenge_choose_update'}) do |f| %> +<%#= form_tag(url_for(new_or_edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :type => @type, :position => @position)), :remote => true, :id => 'challenge_choose_update') do |f| %> + +++ +-
+ <% if @st == 0 %>
+
+ ++ + +++ + +++ + +++++-
+
++++技能标签不能为空
+++-
+
++ + \ No newline at end of file diff --git a/app/views/challenges/_skill_form.html.erb b/app/views/challenges/_skill_form.html.erb new file mode 100644 index 000000000..99f88e0c2 --- /dev/null +++ b/app/views/challenges/_skill_form.html.erb @@ -0,0 +1,93 @@ +++ +++ +++ +++++ + diff --git a/app/views/challenges/_task_edit_page.html.erb b/app/views/challenges/_task_edit_page.html.erb new file mode 100644 index 000000000..06295a539 --- /dev/null +++ b/app/views/challenges/_task_edit_page.html.erb @@ -0,0 +1,5 @@ +技能标签不能为空
+++ +-
+ <% if @st == 0 %>
+
-
+ <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 1), :html => {:id => "challenge_shixun_update"} do |f| %>
+ <%= render :partial => "task_pass_form", :locals => {:f => f} %>
+ <% end %>
+
++ + diff --git a/app/views/challenges/add_choose_question.js.erb b/app/views/challenges/add_choose_question.js.erb new file mode 100644 index 000000000..55a88fe8d --- /dev/null +++ b/app/views/challenges/add_choose_question.js.erb @@ -0,0 +1 @@ +$("#task_content").html("<%= j(render :partial => "single_or_multiple_question") %>"); \ No newline at end of file diff --git a/app/views/challenges/choose_type_show.js.erb b/app/views/challenges/choose_type_show.js.erb new file mode 100644 index 000000000..3d062efc1 --- /dev/null +++ b/app/views/challenges/choose_type_show.js.erb @@ -0,0 +1,20 @@ +$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>"); +$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>"); +/* +// JS局部刷新时，有可能加载不成功，需要重新加载一次（具体原因不明） +editormd.loadKaTeX(function() { + editormd.markdownToHTML("challenge_choose_subject_show", { + htmlDecode: "style,script,iframe", // you can filter tags decode + taskList: true, + tex: true, // 默认不解析 + flowChart: true, // 默认不解析 + sequenceDiagram: true // 默认不解析 + }); + editormd.markdownToHTML("choose_task_pass_show", { + htmlDecode: "style,script,iframe", // you can filter tags decode + taskList: true, + tex: true, // 默认不解析 + flowChart: true, // 默认不解析 + sequenceDiagram: true // 默认不解析 + }) +});*/ diff --git a/app/views/challenges/destroy.js.erb b/app/views/challenges/destroy.js.erb new file mode 100644 index 000000000..aa2a35e20 --- /dev/null +++ b/app/views/challenges/destroy.js.erb @@ -0,0 +1 @@ +$("#challenge_list").html('<%= escape_javascript( render :partial => 'content_list') %>'); \ No newline at end of file diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb index 4ba955ad1..4fe82812e 100644 --- a/app/views/challenges/edit.html.erb +++ b/app/views/challenges/edit.html.erb @@ -1,22 +1,108 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: true, prettify: false, init_activity: false) %> - <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> - <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -<% end %> +<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> +<%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -----编辑阶段
--+<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js' %> + +-
- <%= labelled_form_for @challenge, :url => shixun_challenge_path(@challenge, :shixun_id => @shixun) do |f| %>
- <%= render :partial => "form", :locals => {:f => f} %>
- <% end %>
-
++++ <% if @challenge.st == 0 %> ++ <% if @st == 0 %> + + + + <% else %> + + + + <% end %> +阶段详情（第<%= @challenge.position %>关）
+ <% unless @next_challenge.blank? %> + 下一阶段 + <% end %> + <% unless @prev_challenge.blank? %> + 上一阶段 + <% end %> + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + + +实践任务 + + + +选择题任务 + <% end %> +++ <% else %> + <%= render :partial => "choose_type" %> + <% end %>-
+
+ <% if @tab == 1 || @tab.blank? %> + <%= render :partial => "edit_task_pass" %> + <% elsif @tab == 2 %> + <%= render :partial => "edit_evaluating" %> + <% elsif @tab == 3 %> + <%= render :partial => "edit_answer" %> + <% elsif @tab == 4 %> + <%= render :partial => "edit_scoring" %> + <% elsif @tab == 5 %> + <%= render :partial => "edit_skill" %> + <% elsif @tab == 6 %> + <%= render :partial => "edit_propaedeutics" %> + <% end %> ++++ \ No newline at end of file diff --git a/app/views/challenges/edit.js.erb b/app/views/challenges/edit.js.erb new file mode 100644 index 000000000..ed1fdeb98 --- /dev/null +++ b/app/views/challenges/edit.js.erb @@ -0,0 +1 @@ +$("#task_show_page").html('<%= j(render :partial => "task_edit_page") %>'); \ No newline at end of file diff --git a/app/views/challenges/edit_choose_question.js.erb b/app/views/challenges/edit_choose_question.js.erb new file mode 100644 index 000000000..d1ce84abd --- /dev/null +++ b/app/views/challenges/edit_choose_question.js.erb @@ -0,0 +1,2 @@ +$("#task_content").html("<%= j(render :partial => "single_or_multiple_question") %>"); +$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>"); \ No newline at end of file diff --git a/app/views/challenges/index.html.erb b/app/views/challenges/index.html.erb index 9bc199e8e..1dc205b89 100644 --- a/app/views/challenges/index.html.erb +++ b/app/views/challenges/index.html.erb @@ -1,21 +1,54 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: true,init_activity: true) %> -<% end %> - +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> +<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%> +已保存+---简介
+ <% if @shixun.status == 1 && (User.current.manager_of_shixun?(@shixun) || User.current.admin?) %> +正在等待管理员的审核。在审核通过前，可以随时撤销发布+ <% end %> +++ + \ No newline at end of file diff --git a/app/views/challenges/new.html.erb b/app/views/challenges/new.html.erb index a89c69707..68aec6a16 100644 --- a/app/views/challenges/new.html.erb +++ b/app/views/challenges/new.html.erb @@ -1,22 +1,19 @@ -<%= content_for(:header_tags) do %> - <%= import_ke(enable_at: true, prettify: false, init_activity: false) %> - <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> - <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -<% end %> - -+-简介
-+ + + + + + + + + + + + + + +- <%= h @shixun.description.html_safe %> -
+ ++<%= render :partial => "content_list" %>----新建阶段
--- +<%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> +<%= stylesheet_link_tag "/assets/codemirror/codemirror" %> +-
- <%= labelled_form_for @challenge, :url => shixun_challenges_path(@shixun), :html => {:id => "challenge_shixun_create"} do |f| %>
- <%= render :partial => "form", :locals => {:f => f} %>
- <% end %>
-
++ diff --git a/app/views/challenges/new_choose_question.js.erb b/app/views/challenges/new_choose_question.js.erb new file mode 100644 index 000000000..13e2341a9 --- /dev/null +++ b/app/views/challenges/new_choose_question.js.erb @@ -0,0 +1,16 @@ +$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>"); +$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>"); +editormd.markdownToHTML("challenge_choose_subject_show", { + htmlDecode: "style,script,iframe", // you can filter tags decode + taskList: true, + tex: true, // 默认不解析 + flowChart: true, // 默认不解析 + sequenceDiagram: true // 默认不解析 +}); +editormd.markdownToHTML("choose_task_pass_show", { + htmlDecode: "style,script,iframe", // you can filter tags decode + taskList: true, + tex: true, // 默认不解析 + flowChart: true, // 默认不解析 + sequenceDiagram: true // 默认不解析 +}); \ No newline at end of file diff --git a/app/views/challenges/new_or_edit_choose_question.js.erb b/app/views/challenges/new_or_edit_choose_question.js.erb new file mode 100644 index 000000000..b5c714994 --- /dev/null +++ b/app/views/challenges/new_or_edit_choose_question.js.erb @@ -0,0 +1 @@ +$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>"); \ No newline at end of file diff --git a/app/views/challenges/show.html.erb b/app/views/challenges/show.html.erb index 0e3e60090..b07e262a6 100644 --- a/app/views/challenges/show.html.erb +++ b/app/views/challenges/show.html.erb @@ -1,41 +1,44 @@ <%= javascript_include_tag "/assets/codemirror/codemirror_python_ruby_c" %> <%= stylesheet_link_tag "/assets/codemirror/codemirror" %> -<%= stylesheet_link_tag "/assets/kindeditor/plugins/code/previewcode" %> - -<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min' %> +<%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', - '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%> - - - + '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js' %> ++- +新建阶段
++-
+ <%= labelled_form_for @challenge, :url => shixun_challenges_path(@shixun, :st => @st), :html => { :id => "challenge_shixun_update"} do |f| %>
+ <%= render :partial => "task_pass_form", :locals => {:f => f} %>
+ <% end %>
+
- diff --git a/app/views/challenges/update_choose_question.js.erb b/app/views/challenges/update_choose_question.js.erb new file mode 100644 index 000000000..e589ae71b --- /dev/null +++ b/app/views/challenges/update_choose_question.js.erb @@ -0,0 +1,2 @@ +$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>"); +$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>"); \ No newline at end of file diff --git a/app/views/comments/_simple_ke_reply_form.html.erb b/app/views/comments/_simple_ke_reply_form.html.erb index 764d4a1af..893f7e182 100644 --- a/app/views/comments/_simple_ke_reply_form.html.erb +++ b/app/views/comments/_simple_ke_reply_form.html.erb @@ -1,20 +1,20 @@ -阶段详情
- 新建阶段 + <% unless @next_challenge.blank? %> + 下一阶段 + <% end %> + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + + +单选任务 + +多选任务 + +实践任务 + <% end %>-@@ -46,37 +49,23 @@ <%= @challenge.path.blank? ? "无" : (h @challenge.path.html_safe) %>第<%= @challenge.position %>关<%= @challenge.subject %>
- - + + <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> + 编辑 + <% end %> +
-<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>-- <% if User.current.logged? %> -- +- <%= form_for @comment, :as => :reply, :url => {:controller => 'comments',:action => 'reply', :id => @comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %> - - - 发送 - - - <% end%> -- <% else %> - <%= render :partial => "users/show_unlogged" %> - <% end %> - -+\ No newline at end of file diff --git a/app/views/comments/quote.js.erb b/app/views/comments/quote.js.erb index cc5bc98ac..db1ab7935 100644 --- a/app/views/comments/quote.js.erb +++ b/app/views/comments/quote.js.erb @@ -1,8 +1,9 @@ -if($("#reply_message_<%= @comment.id%>").length > 0) { +if($("#reply_message_<%= @comment.id%>").html() == "") { + $(".reply_to_message").html(""); $("#reply_message_<%= @comment.id%>").replaceWith("<%= escape_javascript(render :partial => 'comments/simple_ke_reply_form', :locals => {:reply => @comment}) %>"); $(function(){ sd_create_editor_from_data(<%= @comment.id%>,null,"100%", "<%=@comment.class.to_s%>"); }); -}else if($("#reply_to_message_<%= @comment.id %>").length >0) { - $("#reply_to_message_<%= @comment.id%>").replaceWith(""); +}else { + $("#reply_message_<%= @message.id%>").html(""); } \ No newline at end of file diff --git a/app/views/common/403.html b/app/views/common/403.html index cd8112d6a..26819665f 100644 --- a/app/views/common/403.html +++ b/app/views/common/403.html @@ -39,11 +39,24 @@ $("#textCount").text(50-$("#subject").val().length) } }); + + $("#message_to_admin").on("click", function(){ + if($("#subject").val().trim() == ""){ + $("#error_tip").show(); + return; + }else{ + $('#new_memo').submit(); + } + }) + + $("#subject").on("focus", function(){ + $("#error_tip").hide(); + }) }); - +<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>++ <% if User.current.logged? %> +++ <%= form_for @comment, :as => :reply, :url => {:controller => 'comments',:action => 'reply', :id => @comment.id}, :method => 'post', :html => {:multipart => true, :id => 'new_form'} do |f| %> + + + 发送 + + + <% end%> ++ <% else %> + <%= render :partial => "users/show_unlogged" %> + <% end %> + ++ \ No newline at end of file diff --git a/app/views/contestant_works/_contestant_work_attachment.html.erb b/app/views/contestant_works/_contestant_work_attachment.html.erb index ae88d4565..01344d163 100644 --- a/app/views/contestant_works/_contestant_work_attachment.html.erb +++ b/app/views/contestant_works/_contestant_work_attachment.html.erb @@ -1,56 +1,56 @@ -
@@ -58,8 +71,9 @@
<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %>
<%= f.text_area :subject, :id=>"subject", :class => "feedbackText mb5", :placeholder => "请在此输入平台的问题和建议，您也可以通过QQ留言，谢谢！" %>
<%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
+ 留言不能为空
还能输入50个字符
- 留 言
+ 留 言
取 消
<% end %>
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index 48f7440f7..45689e399 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -1,18 +1,32 @@
+<%= javascript_include_tag "/codemirror/lib/codemirror", "/codemirror/mode/javascript/javascript", "/codemirror/addon/hint/show-hint", "/codemirror/addon/hint/javascript-hint", "/codemirror/addon/selection/active-line", "/codemirror/addon/lint/javascript-lint", "/codemirror/addon/lint/css-lint", "/codemirror/addon/lint/lint", "/codemirror/addon/lint/json-lint", "/editormd/lib/codemirror/addon/lint/css-lint" %>
+<%= stylesheet_link_tag "/codemirror/lib/codemirror" %>
+
\ No newline at end of file +-<% line_num = 1 %> -<% syntax_highlight_lines(filename, Redmine::CodesetUtil.to_utf8_by_setting(content)).each do |line| %> -
-- - <% line_num += 1 %> -<% end %> +- <%= line_num %> - -- -<%= line.html_safe %>
-- - <% if defined?(container) && container && container.saved_attachments %> - <% container.attachments.each_with_index do |attachment, i| %> - - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%> - <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> - <%= l(:field_is_public)%>: - <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> - <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> - <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> - - - <% end %> - <% container.saved_attachments.each_with_index do |attachment, i| %> - - <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> - <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> - <%= l(:field_is_public)%>: - <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> - <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> - <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> - - - <% end %> - <% end %> - - <%= file_field_tag 'attachments[dummy][file]', - :id => '_file', - :class => ie8? ? '' : 'file_selector', - :multiple => true, - :onchange => 'addInputFiles(this);', - :style => ie8? ? '' : 'display:none', - :data => { - :max_file_size => Setting.attachment_max_size.to_i.kilobytes, - :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), - :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, - :upload_path => uploads_path(:format => 'js',:project =>nil), - :description_placeholder => l(:label_optional_description), - :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure), - :file_count => l(:label_file_count), - :lebel_file_uploding => l(:lebel_file_uploding), - :delete_all_files => l(:text_are_you_sure_all) - } %> -- - -- - 上传附件 -- -<% content_for :header_tags do %> - <%= javascript_include_tag 'attachments' %> ++ + <% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename link_file', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + + + <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> + <%= l(:field_is_public)%>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%> + <%= link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') unless attachment.id.nil? %> + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + + + <% end %> + <% end %> + + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => ie8? ? '' : 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this);', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js',:project =>nil), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :lebel_file_uploding => l(:lebel_file_uploding), + :delete_all_files => l(:text_are_you_sure_all) + } %> ++ + ++ + 上传附件 ++ +<% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> <% end %> \ No newline at end of file diff --git a/app/views/contestant_works/_work_post_brief.html.erb b/app/views/contestant_works/_work_post_brief.html.erb index 59d923a3c..ea6594210 100644 --- a/app/views/contestant_works/_work_post_brief.html.erb +++ b/app/views/contestant_works/_work_post_brief.html.erb @@ -5,9 +5,9 @@<%= link_to homework.user.show_name, user_activities_path(homework.user_id), :class => "newsBlue mr15"%>-+<% else%> -<% index = get_work_index(homework, is_teacher) %> - <%= link_to homework.name,contestant_works_path(:work => homework.id),:class => "postGrey"%> + <%= link_to homework.name,contestant_works_path(:work => homework.id),:class => "postGrey edu-txt-850"%><%=get_cw_status(homework).html_safe %> diff --git a/app/views/contestant_works/index.html.erb b/app/views/contestant_works/index.html.erb index 375cdca4a..b3ddcb904 100644 --- a/app/views/contestant_works/index.html.erb +++ b/app/views/contestant_works/index.html.erb @@ -86,7 +86,7 @@ <%#= link_to "导出作业附件", "javascript:void(0)", class: "hworkExport resourcesGrey", :onclick => "alert('没有学生提交作业，无法下载附件')" %> <% else%> <%= link_to "导出作业附件", zipdown_assort_path(obj_class: @contestwork.class, obj_id: @contestwork, format: :json), - remote: true, class: "hworkExport resourcesGrey", :id => "download_homework_attachments" %> + remote: true, class: "hworkExport resourcesGrey download_homework_attachments" %> <% end%> diff --git a/app/views/courses/_act_table.html.erb b/app/views/courses/_act_table.html.erb index 99d67917a..2a8294951 100644 --- a/app/views/courses/_act_table.html.erb +++ b/app/views/courses/_act_table.html.erb @@ -1,116 +1,115 @@ <% if @members.count != 0 %> --+---
- <%= pagination_links_full @mem_pages, @members_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
-
-没有数据可以显示！
+ <%= render :partial => "welcome/no_data" %> <% end %> \ No newline at end of file diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 8ad3323f6..cbc0821b8 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -7,49 +7,27 @@ $(document).ready(function(){ $("#relateProject,.relatePInfo").mouseover(function(){ $(".relatePInfo").css("display","block"); - }) + }); $("#relateProject,.relatePInfo").mouseout(function(){ $(".relatePInfo").css("display","none"); - }) -// $(".homepagePostPortrait").mouseover(function(){ -// onImage = true; -// $(this).children(".userCard").css("display","block"); -// }) -// $(".homepagePostPortrait").mouseout(function(){ -// var cur = $(this); -// onImage = false; -// setTimeout(function(){ -// if (onUserCard == false && onImage == false){ -// $(cur).children(".userCard").css("display", "none"); -// } -// }, 500); -// }) -// $(".userCard").mouseover(function(){ -// onUserCard = true; -// $(this).css("display","block"); -// }) -// $(".userCard").mouseout(function(){ -// onUserCard = false; -// $(this).css("display","none"); -// }); + }); $(".coursesLineGrey").mouseover(function(){ $(this).css("color","#ffffff"); - }) + }); $(".coursesLineGrey").mouseout(function(){ $(this).css("color","#808080"); - }) + }); $(".homepagePostSetting,.coursesLineGrey").mouseover(function(){ $(this).prev().css("color","#ffffff"); $(this).css("z-index", "9999"); - }) + }); $(".homepagePostSetting").mouseout(function(){ $(this).prev().css("color","#808080"); $(this).css("z-index", "1"); - }) + }); }) - + <% course_activities.includes(:course_act).each do |activity| if course_activities %> diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb index 6bc049ebd..c1813865d 100644 --- a/app/views/courses/_course_activity_users.html.erb +++ b/app/views/courses/_course_activity_users.html.erb @@ -15,7 +15,7 @@ <% if !total_score.nil? && total_score !=0 %> -
-
+
-
-
+登录
-- <%= link_to '首页', home_path %> - | - <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %> -
-登录
- + - +
@@ -33,34 +25,37 @@
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index d94f41c44..6a188dc30 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -3,14 +3,15 @@
- <%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
- <%= back_url_hidden_field_tag %>
-
-
-
<%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
--
+
<%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %>
+找回密码
<%= link_to '首页', home_path %> - | - <%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %> + + <%#= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168" %>
找回密码
| 第一步：安全验证 + <%= link_to "返回登录", signin_path, :class => "fr mr20 color-light-green" %>
@@ -25,7 +26,7 @@
- 