Skip to content
Snippets Groups Projects

Deploy

Merged
Ruben Backxrequested to merge
dev into master
3 files
+ 11
8
Compare changes
  • Side-by-side
  • Inline

Files

@@ -727,7 +727,7 @@ public class ApplicationService {
"Student Response" };
} else {
headers = new String[] { "Student Number", "Email", "Name", "Edition", "Job Offer",
"TAed Before", "Status", "Student Response" };
"Status", "Student Response" };
}
Map<TrainingType, String> trainingTypes = trainingTypeService.getAllWithProgramNames();
@@ -740,17 +740,18 @@ public class ApplicationService {
Stream<String[]> data = applications.stream().map(app -> {
PersonSummaryDTO applicant = personService.getOrThrow(app.getId().getPersonId());
EditionDetailsDTO edition = editionService.getOrThrow(app.getJobOffer().getEditionId());
String taedBefore = hasTAedBefore(applicant.getId(), app.getJobOffer().getId()) ? "YES" : "NO";
String[] row;
if (specificJobOffer) {
String taedBefore = hasTAedBefore(applicant.getId(), app.getJobOffer().getId()) ? "YES"
: "NO";
row = new String[] { applicant.getNumber().toString(), applicant.getEmail(),
applicant.getDisplayName(), taedBefore, app.getStatus().toString(),
app.getContent() };
} else {
row = new String[] { applicant.getNumber().toString(), applicant.getEmail(),
applicant.getDisplayName(), edition.getCourse().getName() + " - " + edition.getName(),
app.getJobOffer().getName(), taedBefore, app.getStatus().toString(),
app.getJobOffer().getName(), app.getStatus().toString(),
app.getContent() };
}
Loading