From a0f4cc1c0c1d385eedcfd43d8ff83e237b317bb7 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 14 Sep 2016 19:27:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E7=9A=84=E6=8F=90=E4=BA=A4=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/course.js | 7 ++++--- public/javascripts/new_user.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 703624a9c..b9d02d18e 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -857,13 +857,14 @@ function regex_group_attr(){ //验证编程作业的参数 function regex_program_attr() { + var result = true; $.each($('#programHomework textarea.InputBox'), function(i, val){ - if ($(val).val().length<=0) { + if (result && $(val).val().length<=0) { $(val)[0].focus(); - return false; + result = false; } }); - return true; + return result; } function regexHomeworkCommonName() diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index 7a7abc737..314850332 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -236,13 +236,14 @@ function regex_group_attr(){ //验证编程作业的参数 function regex_program_attr() { + var result = true; $.each($('#programHomework textarea.InputBox'), function(i, val){ - if ($(val).val().length<=0) { + if (result && $(val).val().length<=0) { $(val)[0].focus(); - return false; + result = false; } }); - return true; + return result; } //老师导入作业时查询作业 From 020018fd3183ff56c58fddb83814f80ddd9ec08a Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 14 Sep 2016 19:31:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/index.html.erb | 4 ++-- .../student_work/_evaluation_un_group_member_work.html.erb | 4 ++-- app/views/student_work/_show.html.erb | 2 +- public/stylesheets/css/courses.css | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index 167ae98f0..3a171f642 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -3,13 +3,13 @@ $("#homework_name").val(""); $("#homework_publish_time").val(""); $("#homework_end_time").val(""); - document.getElementById("anonymous_comment").checked = true; $("#course_id").val($("#option_select").val()); + $("#homeworkSetting").addClass("undis"); + $("#homeworkSetting").html(""); $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>"); //homework_description_editor.html(""); $("#homework_name_span").text(""); $("#homework_end_time_span").text(""); - $("#homework_end_time_span").text(""); $("#homework_course_id_span").text(""); $("#homework_editor").toggle(); } diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index 63e515f89..13b5b003d 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -23,7 +23,7 @@
<%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
<% if @homework.anonymous_comment == 0 %>
-
+
<% if st.student_score.nil? %> 未参与 <% else %> @@ -45,7 +45,7 @@ <% end %>
<% score = st.work_score %> -
+
<%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb index feab67800..a45eca30b 100644 --- a/app/views/student_work/_show.html.erb +++ b/app/views/student_work/_show.html.erb @@ -115,7 +115,7 @@ <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
<% end%> - <% if is_member_work && student_work_scores.empty? %> + <% if is_member_work && student_work_scores.empty? && !@is_teacher %>

暂无评分

<% end %>
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index 952273eab..7ce5405e7 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -234,7 +234,7 @@ a.hworkExport {background:url(/images/homepage_icon2.png) -10px -401px no-repeat a.hworkSetting {background:url(/images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;} .hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;} .infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px; z-index:99;} -.g_infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:10px;margin-left: 80px; z-index:99;} +.g_infoNi{ width:100px; padding:5px;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; left:0; z-index:99;} .problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;} .rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;} .hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;}