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
!280
Add various UI improvements
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Add various UI improvements
various-ui-improvements
into
dev
Overview
0
Commits
1
Pipelines
5
Changes
30
Merged
Add various UI improvements
Ruben Backx
requested to merge
various-ui-improvements
into
dev
May 25, 2023
Overview
0
Commits
1
Pipelines
5
Changes
30
coordinator edit
tooltips for edition create
remove enrollability for edition create
add bigger text fields for job messages
Edited
May 25, 2023
by
Ruben Backx
0
0
Merge request reports
Compare
dev
version 1
425cbd71
May 25, 2023
dev (base)
and
latest version
latest version
7bb90499
1 commit,
May 25, 2023
version 1
425cbd71
1 commit,
May 25, 2023
30 files
+
628
−
178
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
30
src/main/java/nl/tudelft/tam/controller/CoordinatorController.java
+
13
−
0
View file @ 7bb90499
Edit in single-file editor
Open in Web IDE
Show full file
@@ -26,6 +26,7 @@ import nl.tudelft.labracore.api.dto.ProgramDetailsDTO;
import
nl.tudelft.labracore.lib.security.user.AuthenticatedPerson
;
import
nl.tudelft.labracore.lib.security.user.Person
;
import
nl.tudelft.tam.dto.patch.CoordinatorDefaultPatchDTO
;
import
nl.tudelft.tam.model.Coordinator
;
import
nl.tudelft.tam.model.CoordinatorDefault
;
import
nl.tudelft.tam.model.TrainingType
;
import
nl.tudelft.tam.service.*
;
@@ -43,9 +44,15 @@ public class CoordinatorController {
@Autowired
CoordinatorDefaultService
coordinatorDefaultService
;
@Autowired
CoordinatorService
coordinatorService
;
@Autowired
ProgramService
programService
;
@Autowired
PersonService
personService
;
@Autowired
TrainingTypeService
trainingTypeService
;
@@ -73,6 +80,12 @@ public class CoordinatorController {
}
model
.
addAttribute
(
"coordinatingPrograms"
,
coordinatingPrograms
);
model
.
addAttribute
(
"coordinators"
,
coordinatingPrograms
.
stream
()
.
collect
(
Collectors
.
toMap
(
ProgramDetailsDTO:
:
getId
,
p
->
personService
.
getPeopleById
(
coordinatorService
.
getCoordinatorsByProgram
(
p
.
getId
())
.
stream
().
map
(
Coordinator:
:
getPersonId
).
toList
()))));
return
"coordinator/manage"
;
}
Loading