SAK-30714 The student's grade does not appear in 'Assignment List by …

…Student' when the grade is unreleased
aagrandaz · Apr 13, 2016 · fcbfd78 · fcbfd78
1 parent f76eab6
commit fcbfd78
Showing 1 changed file with 1 addition and 18 deletions.
diff --git a/...ool/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/...ool/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
@@ -188,33 +188,16 @@
 											&nbsp;
 										</td>
 										<td headers="status">
-											#if ($!submission.Returned)
-												$tlang.getString("gen.returned")
-											#else
-												#if ($!submission.getGraded())
-													#if ($!submission.getGradeReleased())
-														$tlang.getString("gen.relea")
-													#else
-														$tlang.getString("gen.gra")
-													#end
-												#else
-													#if ($!submission.Submitted)
-														$tlang.getString("ungra")
-													#end
-												#end
-											#end
+											$submission.getStatus()
 											&nbsp;
 										</td>
 										#if ($withGrade)
 											<td headers="grade">
-												#if ($!submission.Graded && ($!submission.GradeReleased || $!submission.Returned))
-													##show grade when it is released or when submission is returned
 													#if ($assignment.getContent().TypeOfGrade == 1)
 														$tlang.getString("gen.nograd")
 													#else
 														$!submission.gradeDisplay
 													#end
-												#end
 											</td>
 										#end
 									</tr>