Skip to content

Commit

Permalink
SAK-33683 commenting all submission log appearances for the moment (s…
Browse files Browse the repository at this point in the history
  • Loading branch information
bgarciaentornos authored and ern committed Dec 11, 2017
1 parent 1f794ab commit 7abd753
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ public interface SerializableSubmissionAccess
* @param id the submitter id to set
*/
public void setSubmitterId(String id);
public void setSubmissionLog(List<String> log);
public List<String> getSubmissionLog();
public void setGrades(List<String> grades);
public List<String> getGrades();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ public class AssignmentSubmissionAccess implements SerializableSubmissionAccess,

protected List<String> feedbackattachments = new ArrayList<String>();

protected List<String> submissionLog = new ArrayList<String>();

protected List<String> grades = new ArrayList<String>();

protected String datesubmitted = null;
Expand Down Expand Up @@ -211,17 +209,6 @@ public String toXml()
}
}

// SAVE THE SUBMISSION LOGS
for (int x = 0; x < this.submissionLog.size(); x++)
{
attributeString = "log" + x;
itemString = (String) this.submissionLog.get(x);
if (itemString != null)
{
submission.setAttribute(attributeString, itemString);
}
}

// SAVE GRADE OVERRIDES
for (int x = 0; x < this.grades.size(); x++) {
attributeString = "grade" + x;
Expand Down Expand Up @@ -486,7 +473,6 @@ else if (StringUtils.trimToNull(attributes.getValue("feedbacktext-formatted")) !
if (getSubmitterId() == null && submitters.size() > 0) {
setSubmitterId(submitters.get(0));
}
addElementsToList("log",submissionLog,attributes,false);
addElementsToList("grade",grades,attributes,false);
}
}
Expand Down Expand Up @@ -927,12 +913,6 @@ public List<String> getSubmitters()
return submitters;
}

public List<String>getSubmissionLog() {
return submissionLog;
}
public void setSubmissionLog(List<String> log) {
this.submissionLog = log;
}
public List<String>getGrades() { return grades; }
public void setGrades(List<String> gr) { this.grades = gr; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6118,7 +6118,7 @@ private void post_save_submission(RunData data, boolean post) {
}

// SAK-17606
String logEntry = new Date().toString() + " ";
/*String logEntry = new Date().toString() + " ";
boolean anonymousGrading = Boolean.parseBoolean(a.getProperties().get(NEW_ASSIGNMENT_CHECK_ANONYMOUS_GRADING));
if (!anonymousGrading) {
String subOrDraft = post ? "submitted" : "saved draft";
Expand All @@ -6129,7 +6129,7 @@ private void post_save_submission(RunData data, boolean post) {
} else {
logEntry += u.getDisplayName() + " (" + u.getEid() + ") " + subOrDraft;
}
}
}*/
// TODO submissionLog
// submission.addSubmissionLogEntry( logEntry );
try {
Expand Down Expand Up @@ -6190,7 +6190,7 @@ private void post_save_submission(RunData data, boolean post) {
}

// SAK-17606
String logEntry = new Date().toString() + " ";
/*String logEntry = new Date().toString() + " ";
boolean anonymousGrading = Boolean.parseBoolean(a.getProperties().get(NEW_ASSIGNMENT_CHECK_ANONYMOUS_GRADING));
if (!anonymousGrading) {
String subOrDraft = post ? "submitted" : "saved draft";
Expand All @@ -6201,7 +6201,7 @@ private void post_save_submission(RunData data, boolean post) {
} else {
logEntry += u.getDisplayName() + " (" + u.getEid() + ") " + subOrDraft;
}
}
}*/
// TODO submission log entry
// submission.addSubmissionLogEntry( logEntry );
assignmentService.updateSubmission(submission);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,20 +342,21 @@ $(document).ready(function(){
</div>
</div>
#end
#if ($!submission && $!submission.getSubmissionLog().size() > 0)
<div class="row">
<div class="col-lg-4 col-sm-6 col-xs-12">
<div class="itemSummaryHeader">$tlang.getString("gen.history")</div>
</div>
<div class="col-lg-4 col-sm-6 col-xs-12">
<div class="itemSummaryValue">
#foreach ($entry in $submission.getSubmissionLog())
$entry<br>
#end
</div>
</div>
</div>
#end
## TODO Submission Log
## #if ($!submission && $!submission.getSubmissionLog().size() > 0)
## <div class="row">
## <div class="col-lg-4 col-sm-6 col-xs-12">
## <div class="itemSummaryHeader">$tlang.getString("gen.history")</div>
## </div>
## <div class="col-lg-4 col-sm-6 col-xs-12">
## <div class="itemSummaryValue">
## #foreach ($entry in $submission.getSubmissionLog())
## $entry<br>
## #end
## </div>
## </div>
## </div>
## #end
</div>
<div class="clearfix"></div>
<h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,17 @@
</td>
</tr>
#end
#if ($!submission && $!submission.getSubmissionLog().size() > 0)
<tr>
<th>$tlang.getString('gen.history')</th>
<td>
#foreach ($entry in $submission.getSubmissionLog())
$entry<br>
#end
</td>
</tr>
#end
## TODO Submission Log
## #if ($!submission && $!submission.getSubmissionLog().size() > 0)
## <tr>
## <th>$tlang.getString('gen.history')</th>
## <td>
## #foreach ($entry in $submission.getSubmissionLog())
## $entry<br>
## #end
## </td>
## </tr>
## #end
</table>
<h4>
#if ($!submission.Submitted)
Expand Down

0 comments on commit 7abd753

Please sign in to comment.