Skip to content
Snippets Groups Projects
Commit 5bcc5220 authored by srosse's avatar srosse
Browse files

OO-3217: export empty check list and oder small fix

parent 6cfb1292
No related branches found
No related tags found
No related merge requests found
......@@ -189,13 +189,23 @@ public class AssessmentForm extends FormBasicController {
}
public boolean isUserCommentDirty () {
return hasComment && !userComment.getValue().equals(userCommentValue);
if(!hasComment) {
return false;
}
if(!StringHelper.containsNonWhitespace(userComment.getValue()) && !StringHelper.containsNonWhitespace(userCommentValue)) {
return false;
}
return !userComment.getValue().equals(userCommentValue);
}
public TextElement getUserComment() {
return userComment;
}
public boolean isCoachCommentDirty () {
if(!StringHelper.containsNonWhitespace(coachComment.getValue()) && !StringHelper.containsNonWhitespace(coachCommentValue)) {
return false;
}
return !coachComment.getValue().equals(coachCommentValue);
}
......
......@@ -345,7 +345,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode implements
@Override
public boolean hasIndividualAsssessmentDocuments() {
return true;
return getModuleConfiguration().getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_INDIVIDUAL_ASSESSMENT_DOCS, false);
}
/**
......@@ -579,13 +579,13 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode implements
}
}
}
String filename = dirName + "/" + StringHelper.transformDisplayNameToFileSystemName(getShortName());
new CheckListExcelExport(this, course, locale).exportAll(filename, exportStream);
}
String filename = dirName + "/" + StringHelper.transformDisplayNameToFileSystemName(getShortName());
new CheckListExcelExport(this, course, locale).exportAll(filename, exportStream);
//assessment documents
if(config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_INDIVIDUAL_ASSESSMENT_DOCS, false)) {
if(hasIndividualAsssessmentDocuments()) {
List<AssessmentEntry> assessmentEntries = course.getCourseEnvironment()
.getAssessmentManager().getAssessmentEntries(this);
if(assessmentEntries != null && !assessmentEntries.isEmpty()) {
......
......@@ -642,8 +642,9 @@ public class GTACourseNode extends AbstractAccessableCourseNode implements Persi
List<File> assessmentDocuments = course.getCourseEnvironment()
.getAssessmentManager().getIndividualAssessmentDocuments(this, assessedIdentity);
if(assessmentDocuments != null && !assessmentDocuments.isEmpty()) {
String assessmentDir = userDirName + "/" + (++flow) + "_assessment/";
for(File document:assessmentDocuments) {
String path = userDirName + "/" + (++flow) + "_assessment/" + document.getName();
String path = assessmentDir + document.getName();
ZipUtil.addFileToZip(path, document, exportStream);
}
}
......
......@@ -200,7 +200,7 @@ public class CheckListConfigurationController extends FormBasicController {
commentEl.select(onKeys[0], true);
}
assessmentDocsEl = uifactory.addCheckboxesHorizontal("form.individual.assessment.docs", formLayout, new String[]{"xx"}, new String[]{null});
assessmentDocsEl = uifactory.addCheckboxesHorizontal("form.individual.assessment.docs", formLayout, onKeys, new String[]{null});
boolean docsCf = config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_INDIVIDUAL_ASSESSMENT_DOCS, false);
if(docsCf) {
assessmentDocsEl.select(onKeys[0], true);
......
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