Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
2f91cf2d
Commit
2f91cf2d
authored
3 years ago
by
Andreas Ellewsen
Browse files
Options
Downloads
Plain Diff
Merge branch 'GREG-184-guestinfo-fetch-info' into 'master'
Add quickfix for role info page See merge request
!257
parents
b87b4569
03b31c73
No related branches found
No related tags found
1 merge request
!257
Add quickfix for role info page
Pipeline
#112294
passed
3 years ago
Stage: venv update
Stage: tests and linting
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
+31
-14
31 additions, 14 deletions
frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
with
31 additions
and
14 deletions
frontend/src/routes/sponsor/guest/guestRoleInfo/index.tsx
+
31
−
14
View file @
2f91cf2d
import
{
useEffect
,
useState
}
from
'
react
'
import
format
from
'
date-fns/format
'
import
{
addDays
}
from
'
date-fns/fp
'
import
{
Button
,
Table
,
TableBody
,
TextField
,
Typography
}
from
'
@mui/material
'
...
...
@@ -8,13 +9,13 @@ import TableRowMui from '@mui/material/TableRow'
import
TableCellMui
from
'
@mui/material/TableCell
'
import
Page
from
'
components/page
'
import
{
Guest
}
from
'
interfaces
'
import
{
Guest
,
Role
}
from
'
interfaces
'
import
{
useTranslation
}
from
'
react-i18next
'
import
{
useParams
}
from
'
react-router-dom
'
import
SponsorInfoButtons
from
'
routes/components/sponsorInfoButtons
'
import
{
DatePicker
}
from
'
@mui/lab
'
import
{
Controller
,
SubmitHandler
,
useForm
}
from
'
react-hook-form
'
import
{
submitJsonOpts
}
from
'
../../../../
utils
'
import
{
submitJsonOpts
}
from
'
utils
'
interface
GuestRoleInfoProps
{
guest
:
Guest
...
...
@@ -94,17 +95,31 @@ const TableContainer = styled(TableContainerMui)({
export
default
function
GuestRoleInfo
({
guest
}:
GuestRoleInfoProps
)
{
const
{
pid
,
id
}
=
useParams
<
GuestRoleInfoParams
>
()
const
[
t
,
i18n
]
=
useTranslation
(
'
common
'
)
const
[
role
,
setRole
]
=
useState
<
Role
>
({
id
:
''
,
name_nb
:
''
,
name_en
:
''
,
ou_nb
:
''
,
ou_en
:
''
,
start_date
:
new
Date
(),
end_date
:
new
Date
(),
max_days
:
365
,
contact_person_unit
:
null
,
})
// Find the role info relevant for this page
const
roleInfo
=
guest
.
roles
.
filter
((
role
)
=>
role
.
id
.
toString
()
===
id
)[
0
]
const
getRoleInfo
=
()
=>
{
const
roleInfo
=
guest
.
roles
.
filter
((
ro
)
=>
ro
.
id
.
toString
()
===
id
)[
0
]
if
(
roleInfo
)
{
setRole
(
roleInfo
)
}
}
// Prepare min and max date values
const
today
=
new
Date
()
const
todayPlusMaxDays
=
addDays
(
role
Info
.
max_days
)(
today
)
const
todayPlusMaxDays
=
addDays
(
role
.
max_days
)(
today
)
// Make a function for use with onClick of the end role button
const
endPeriod
=
()
=>
()
=>
{
role
Info
.
end_date
=
today
role
.
end_date
=
today
endPeriodPost
(
id
,
{
end_date
:
today
})
}
...
...
@@ -139,6 +154,10 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
formState
:
{
isDirty
,
isValid
},
}
=
useForm
({
mode
:
'
onChange
'
})
const
onSubmit
=
handleSubmit
(
submit
)
useEffect
(()
=>
{
getRoleInfo
()
},
[
guest
])
return
(
<
Page
>
<
SponsorInfoButtons
...
...
@@ -163,7 +182,7 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
{
t
(
'
common:role
'
)
}
</
TableCell
>
<
TableCell
>
{
i18n
.
language
===
'
en
'
?
role
Info
.
name_en
:
role
Info
.
name_nb
}
{
i18n
.
language
===
'
en
'
?
role
.
name_en
:
role
.
name_nb
}
</
TableCell
>
</
TableRow
>
<
TableRow
>
...
...
@@ -174,7 +193,7 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
<
Controller
name
=
"start_date"
control
=
{
control
}
defaultValue
=
{
role
Info
.
start_date
}
defaultValue
=
{
role
.
start_date
}
render
=
{
({
field
:
{
onChange
,
value
}
})
=>
(
<
DatePicker
mask
=
"____-__-__"
...
...
@@ -192,7 +211,7 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
<
Controller
name
=
"end_date"
control
=
{
control
}
defaultValue
=
{
role
Info
.
end_date
}
defaultValue
=
{
role
.
end_date
}
render
=
{
({
field
:
{
onChange
,
value
}
})
=>
(
<
DatePicker
mask
=
"____-__-__"
...
...
@@ -212,7 +231,7 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
{
t
(
'
common:ou
'
)
}
</
TableCell
>
<
TableCell
align
=
"left"
>
{
i18n
.
language
===
'
en
'
?
role
Info
.
ou_en
:
role
Info
.
ou_nb
}
{
i18n
.
language
===
'
en
'
?
role
.
ou_en
:
role
.
ou_nb
}
</
TableCell
>
<
TableCell
align
=
"left"
/>
</
TableRow
>
...
...
@@ -220,9 +239,7 @@ export default function GuestRoleInfo({ guest }: GuestRoleInfoProps) {
<
TableCell
align
=
"left"
sx
=
{
{
fontWeight
:
'
bold
'
}
}
>
{
t
(
'
sponsor.contactPerson
'
)
}
</
TableCell
>
<
TableCell
align
=
"left"
>
{
roleInfo
.
contact_person_unit
}
</
TableCell
>
<
TableCell
align
=
"left"
>
{
role
.
contact_person_unit
}
</
TableCell
>
<
TableCell
align
=
"left"
/>
</
TableRow
>
</
TableBody
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment