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
!273
Small Bug Fixes
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Small Bug Fixes
small-fixes
into
dev
Overview
0
Commits
2
Pipelines
3
Changes
6
Merged
Small Bug Fixes
Timur Oberhuber
requested to merge
small-fixes
into
dev
Apr 6, 2023
Overview
0
Commits
2
Pipelines
3
Changes
6
Description
Fix bug with duplicate map keys in Applications FlexDelft export
Fix bug with broken links in email
Change Contract Request max hours -> approved hours
Related Issues
Resolves
#165 (closed)
Resolves
#164 (closed)
Checklist
I have added a changelog entry to reflect the significant changes I made.
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
3f89fa45
2 commits,
Apr 6, 2023
6 files
+
38
−
35
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
src/main/java/nl/tudelft/tam/model/records/FlexDelftExport.java
+
5
−
5
View file @ 3f89fa45
Edit in single-file editor
Open in Web IDE
Show full file
@@ -24,21 +24,21 @@ import nl.tudelft.labracore.api.dto.PersonSummaryDTO;
import
nl.tudelft.tam.model.*
;
public
record
FlexDelftExport
(
PersonSummaryDTO
applicant
,
Profile
applicantProfile
,
JobOffer
jobOffer
,
ExtraWork
extraWork
,
EditionDetailsDTO
edition
,
CoordinatorDefault
coordinatorDefault
,
ExtraWork
extraWork
,
EditionDetailsDTO
edition
,
CoordinatorDefault
coordinatorDefault
,
Double
hours
,
PersonSummaryDTO
approver
,
String
batch
,
String
remarks
)
{
public
FlexDelftExport
(
PersonSummaryDTO
applicant
,
Profile
applicantProfile
,
ExtraWork
extraWork
,
EditionDetailsDTO
edition
,
CoordinatorDefault
coordinatorDefault
,
EditionDetailsDTO
edition
,
CoordinatorDefault
coordinatorDefault
,
Double
hours
,
String
batch
,
String
remarks
)
{
this
(
applicant
,
applicantProfile
,
null
,
extraWork
,
edition
,
coordinatorDefault
,
null
,
batch
,
remarks
);
edition
,
coordinatorDefault
,
hours
,
null
,
batch
,
remarks
);
}
public
FlexDelftExport
(
PersonSummaryDTO
applicant
,
Profile
applicantProfile
,
JobOffer
jobOffer
,
EditionDetailsDTO
edition
,
CoordinatorDefault
coordinatorDefault
,
PersonSummaryDTO
approver
,
String
batch
,
String
remarks
)
{
this
(
applicant
,
applicantProfile
,
jobOffer
,
null
,
edition
,
coordinatorDefault
,
approver
,
batch
,
remarks
);
edition
,
coordinatorDefault
,
null
,
approver
,
batch
,
remarks
);
}
private
static
final
DateTimeFormatter
exportDateFormatter
=
DateTimeFormatter
.
ofPattern
(
"dd-MM-yyyy"
);
@@ -72,7 +72,7 @@ public record FlexDelftExport(PersonSummaryDTO applicant, Profile applicantProfi
coordinatorDefault
.
getCoordinatorContractName
(),
coordinatorDefault
.
getCoordinatorContractEmail
(),
coordinatorDefault
.
getCoordinatorContractName
(),
String
.
valueOf
(
extraWork
.
getMaxH
ours
()
),
String
.
valueOf
(
h
ours
),
applicantProfile
.
getPayScale
().
toString
(),
batch
,
remarks
Loading