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
!228
Add TA Training + PayScale Import
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Add TA Training + PayScale Import
31-add-import-option-for-ta-training-completions
into
dev
Overview
7
Commits
8
Pipelines
20
Changes
20
Merged
Add TA Training + PayScale Import
Radu Gaghi
requested to merge
31-add-import-option-for-ta-training-completions
into
dev
Oct 25, 2022
Overview
7
Commits
8
Pipelines
20
Changes
20
Description
Adds a bulk import feature for both payscales and ta training
Related Issues
Resolves
#125 (closed)
Resolves
#31 (closed)
Checklist
I have added a changelog entry to reflect the significant changes I made.
Edited
Nov 19, 2022
by
Timur Oberhuber
0
0
Merge request reports
Compare
dev
version 6
c8113e5a
Dec 16, 2022
version 5
c8113e5a
Dec 16, 2022
version 4
a1ed4785
Dec 16, 2022
version 3
a850df11
Dec 13, 2022
version 2
715e1982
Nov 19, 2022
version 1
6b5178c2
Nov 19, 2022
dev (base)
and
latest version
latest version
2a92c111
8 commits,
Dec 20, 2022
version 6
c8113e5a
7 commits,
Dec 16, 2022
version 5
c8113e5a
7 commits,
Dec 16, 2022
version 4
a1ed4785
6 commits,
Dec 16, 2022
version 3
a850df11
5 commits,
Dec 13, 2022
version 2
715e1982
4 commits,
Nov 19, 2022
version 1
6b5178c2
3 commits,
Nov 19, 2022
20 files
+
1222
−
49
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
20
src/main/java/nl/tudelft/tam/controller/PersonController.java
+
26
−
0
View file @ 2a92c111
Edit in single-file editor
Open in Web IDE
Show full file
@@ -17,10 +17,12 @@
*/
package
nl.tudelft.tam.controller
;
import
java.util.AbstractMap
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
nl.tudelft.labracore.api.dto.PersonSummaryDTO
;
import
nl.tudelft.tam.model.Profile
;
import
nl.tudelft.tam.service.ApplicationService
;
import
nl.tudelft.tam.service.PersonService
;
@@ -66,4 +68,28 @@ public class PersonController {
return
"redirect:/job-offer/"
+
offerId
;
}
/**
* Search for people based on one or a list of identifiers.
*
* @param returnPage The page to be redirected to after the request is completed
* @param identifiers The identifiers to identify the people searched for
* @param redirectAttrs The model attributes to keep when redirecting
* @return A redirect to the specified page
*/
@GetMapping
(
"find-people"
)
@PreAuthorize
(
"@authorisationService.isManagerOfAny()"
)
public
String
findPeople
(
@RequestParam
String
returnPage
,
@RequestParam
String
identifiers
,
@RequestParam
String
newValue
,
RedirectAttributes
redirectAttrs
)
{
List
<
AbstractMap
.
SimpleEntry
<
PersonSummaryDTO
,
Profile
>>
people
=
personService
.
findPersonProfilePairs
(
identifiers
);
redirectAttrs
.
addFlashAttribute
(
"foundPeople"
,
people
);
redirectAttrs
.
addFlashAttribute
(
"searchQuery"
,
identifiers
);
redirectAttrs
.
addFlashAttribute
(
"newValue"
,
newValue
);
return
"redirect:"
+
returnPage
;
}
}
Loading