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
!224
Update Models for Job Offers + Extra Work
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Update Models for Job Offers + Extra Work
108-110-113-modifiying-models
into
dev
Overview
2
Commits
7
Pipelines
11
Changes
48
Merged
Update Models for Job Offers + Extra Work
Timur Oberhuber
requested to merge
108-110-113-modifiying-models
into
dev
Oct 24, 2022
Overview
2
Commits
7
Pipelines
11
Changes
48
Description
Removes Contract Start/End Date from Extra Work
Adds Max Hours to Job Offers + Extra Work
Also enforces the max hours when declaring
Adds a rejection message to Job Offers
Update Dependencies:
Hibernate: 5.6.10.Final => 5.6.12.Final
Liquibase: 4.15.0 => 4.17.0
Jackson: 2.13.3 => 2.13.4
FuncJ: 0.6.16 => 0.6.18
jQuery: 3.6.0 => 3.6.1
FontAwesome: 6.1.2 => 6.2.0
OpenCSV: 5.6 => 5.7.0
Related Issues
Resolves
#108 (closed)
Resolves
#110 (closed)
Resolves
#113 (closed)
Checklist
I have added a changelog entry to reflect the significant changes I made.
Edited
Oct 25, 2022
by
Timur Oberhuber
0
0
Merge request reports
Compare
dev
version 4
81813d9f
Oct 26, 2022
version 3
a7806cbe
Oct 25, 2022
version 2
fa06bf50
Oct 25, 2022
version 1
6fe34487
Oct 24, 2022
dev (base)
and
latest version
latest version
1ff7c8e6
7 commits,
Oct 27, 2022
version 4
81813d9f
6 commits,
Oct 26, 2022
version 3
a7806cbe
5 commits,
Oct 25, 2022
version 2
fa06bf50
4 commits,
Oct 25, 2022
version 1
6fe34487
3 commits,
Oct 24, 2022
48 files
+
416
−
290
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
48
src/main/java/nl/tudelft/tam/controller/CoordinatorController.java
+
0
−
3
View file @ 1ff7c8e6
Edit in single-file editor
Open in Web IDE
Show full file
@@ -88,9 +88,6 @@ public class CoordinatorController {
ExtraWorkDefaultPatchDTO
.
builder
()
.
contractName
(
defaultObj
.
getExtraWorkDefault
().
getContractName
())
.
contractBaanCode
(
defaultObj
.
getExtraWorkDefault
().
getContractBaanCode
())
.
contractStartDate
(
defaultObj
.
getExtraWorkDefault
().
getContractStartDate
())
.
contractEndDate
(
defaultObj
.
getExtraWorkDefault
().
getContractEndDate
())
.
build
())
.
build
();
Loading