Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TAM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
TAM
Merge requests
!322
Deploy
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Deploy
dev
into
master
Overview
0
Commits
4
Pipelines
7
Changes
3
Merged
Deploy
Ruben Backx
requested to merge
dev
into
master
Aug 14, 2023
Overview
0
Commits
4
Pipelines
7
Changes
3
0
0
Merge request reports
Compare
master
version 1
a18afb3f
Aug 14, 2023
master (base)
and
latest version
latest version
e1d1b4c9
4 commits,
Aug 14, 2023
version 1
a18afb3f
2 commits,
Aug 14, 2023
3 files
+
11
−
8
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
src/main/java/nl/tudelft/tam/service/ApplicationService.java
+
4
−
3
View file @ e1d1b4c9
Edit in single-file editor
Open in Web IDE
Show full file
@@ -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