Skip to content
Snippets Groups Projects
Commit 783fa0eb authored by srosse's avatar srosse
Browse files

OO-3838: show last user modification in efficiency statements list

parent 918f3b0f
No related branches found
No related tags found
No related merge requests found
......@@ -191,6 +191,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.show",
translate("table.header.show"), CMD_SHOW));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lastModified));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lastUserUpdate));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.certificate, new DownloadCertificateCellRenderer(assessedIdentity, getLocale())));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.recertification, new DateFlexiCellRenderer(getLocale())));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.launchcourse",
......@@ -232,7 +233,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
wrapper.setEfficiencyStatementKey(efficiencyStatement.getKey());
wrapper.setResourceKey(efficiencyStatement.getArchivedResourceKey());
wrapper.setLastModified(efficiencyStatement.getLastModified());
wrapper.setLastUserModified(efficiencyStatement.getLastUserModified());
statments.add(wrapper);
resourceKeyToStatments.put(efficiencyStatement.getArchivedResourceKey(), wrapper);
}
......
......@@ -76,6 +76,7 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
return AssessmentHelper.getRoundedScore(score);
case passed: return statement.getPassed();
case lastModified: return statement.getLastModified();
case lastUserUpdate: return statement.getLastUserModified();
case certificate: return statement.getCertificate();
case recertification: {
if(statement.getCertificate() != null) {
......@@ -89,12 +90,13 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
return null;
}
public static enum Cols implements FlexiSortableColumnDef {
public enum Cols implements FlexiSortableColumnDef {
displayName("table.header.course", true),
score("table.header.score", true),
passed("table.header.passed", true),
lastModified("table.header.lastScoreDate", true),
lastUserUpdate("table.header.lastUserModificationDate", true),
efficiencyStatement("table.header.certificate", true),
certificate("table.header.certificate", true),
recertification("table.header.recertification", true),
......@@ -132,6 +134,7 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
private Boolean passed;
private Date lastModified;
private String displayName;
private Date lastUserModified;
private Long resourceKey;
private Long efficiencyStatementKey;
......@@ -169,6 +172,14 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
this.lastModified = lastModified;
}
public Date getLastUserModified() {
return lastUserModified;
}
public void setLastUserModified(Date lastUserModified) {
this.lastUserModified = lastUserModified;
}
public CertificateLight getCertificate() {
return certificate;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment