Skip to content
Snippets Groups Projects

Resolve "Also export payscale when exporting 'all applications'"

4 files
+ 44
18
Compare changes
  • Side-by-side
  • Inline

Files

@@ -798,10 +798,10 @@ public class ApplicationService {
String[] headers;
if (specificJobOffer) {
headers = new String[] { "Student Number", "Email", "Name", "TAed Before", "Status",
headers = new String[] { "Student Number", "Email", "Name", "Pay Scale", "TAed Before", "Status",
"Student Response" };
} else {
headers = new String[] { "Student Number", "Email", "Name", "Edition", "Job Offer",
headers = new String[] { "Student Number", "Email", "Name", "Pay Scale", "Edition", "Job Offer",
"Status", "Student Response" };
}
@@ -830,11 +830,12 @@ public class ApplicationService {
PersonSummaryDTO applicant = people.get(app.getId().getPersonId());
EditionDetailsDTO edition = editions.get(app.getJobOffer().getEditionId());
String[] row = new String[(specificJobOffer ? 6 : 7) + trainingTypes.size()];
String[] row = new String[(specificJobOffer ? 7 : 8) + trainingTypes.size()];
int i = 0;
row[i++] = applicant.getNumber().toString();
row[i++] = applicant.getEmail();
row[i++] = applicant.getDisplayName();
row[i++] = profileService.findByIdOrCreate(applicant.getId()).getPayScale().toString();
if (specificJobOffer) {
String taedBefore = hasTAedBefore(applicant.getId(), app.getJobOffer().getId()) ? "YES"
: "NO";
Loading