+
<%= 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/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;
}
//老师导入作业时查询作业
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;}