Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Portal
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
Portal
Merge requests
!43
Add division import
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Add division import
division-import
into
development
Overview
0
Commits
1
Pipelines
3
Changes
10
Merged
Add division import
Ruben Backx
requested to merge
division-import
into
development
Oct 11, 2021
Overview
0
Commits
1
Pipelines
3
Changes
10
0
0
Merge request reports
Compare
development
development (base)
and
latest version
latest version
abe4e42d
1 commit,
Oct 11, 2021
10 files
+
432
−
13
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
10
src/main/java/nl/tudelft/portal/controller/DivisionController.java
+
32
−
0
View file @ abe4e42d
Edit in single-file editor
Open in Web IDE
Show full file
@@ -25,12 +25,17 @@ import nl.tudelft.labracore.api.ModuleControllerApi;
import
nl.tudelft.labracore.api.ModuleDivisionControllerApi
;
import
nl.tudelft.labracore.api.StudentGroupControllerApi
;
import
nl.tudelft.labracore.api.dto.*
;
import
nl.tudelft.portal.enums.DivisionImportError
;
import
nl.tudelft.portal.helper.ImportErrorMap
;
import
nl.tudelft.portal.service.DivisionService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.Model
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.servlet.mvc.support.RedirectAttributes
;
@Controller
@RequestMapping
(
"division"
)
@@ -45,6 +50,9 @@ public class DivisionController {
@Autowired
private
StudentGroupControllerApi
groupApi
;
@Autowired
private
DivisionService
divisionService
;
/**
* Gets a dvision.
*
@@ -108,4 +116,28 @@ public class DivisionController {
return
"redirect:/module/"
+
moduleId
;
}
/**
* Imports people to a division from a file.
*
* @param moduleId The id of the module
* @param file The file from which to import
* @param createUsers Whether to create non-existent users
* @param redirectAttributes The attributes passed to the redirected page
* @return The page to be loaded
*/
@PostMapping
(
"import/{moduleId}"
)
@PreAuthorize
(
"@authorisationService.hasModuleEditionAccess(#moduleId)"
)
public
String
importDivision
(
@PathVariable
Long
moduleId
,
@RequestParam
(
"file"
)
MultipartFile
file
,
@RequestParam
(
value
=
"createUsers"
,
required
=
false
,
defaultValue
=
"false"
)
boolean
createUsers
,
RedirectAttributes
redirectAttributes
)
{
ImportErrorMap
<
DivisionImportError
>
errors
=
divisionService
.
importDivision
(
moduleId
,
file
,
createUsers
);
if
(!
errors
.
isEmpty
())
{
redirectAttributes
.
addAttribute
(
"error"
,
String
.
join
(
"\n"
,
errors
.
toErrorDescriptions
()));
}
return
"redirect:/module/{moduleId}"
;
}
}
Loading