@@ -80,6 +84,7 @@ export const PdlVisning = ({
tpsMessagingData={fagsystemData?.tpsMessaging}
tpsMessagingLoading={loading?.tpsMessaging}
/>
+
@@ -87,7 +92,6 @@ export const PdlVisning = ({
-
-}
-
-const Omraader = styled(TitleValue)`
- && {
- margin-bottom: 20px;
- }
-`
-
-export const Visning = ({ data }: Data) => {
- const omraader = data.omraader
- ?.map((omraade) => showKodeverkLabel(FullmaktKodeverk.Tema, omraade))
- ?.join(', ')
-
- return (
- <>
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export const PdlFullmakt = ({ data }: DataListe) => {
- if (!data || data.length === 0) {
- return null
- }
- return (
-
-
- {/* @ts-ignore */}
-
- {(fullmakt: FullmaktData) => }
-
-
- )
-}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
index ea3e83b1d49..3d41db54faf 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/initialValues.tsx
@@ -353,7 +353,7 @@ export const getInitialNyIdent = (master = 'FREG') => ({
export const initialFullmakt = {
omraade: [{ tema: '', handling: [] }] as any,
- gyldigFraOgMed: null as unknown as string,
+ gyldigFraOgMed: new Date(),
gyldigTilOgMed: null as unknown as string,
fullmektig: null as unknown as string,
}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx
index 10ee5c4e453..89c68f9dbf1 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson.tsx
@@ -13,6 +13,7 @@ import { usePdlOptions } from '@/utils/hooks/useSelectOptions'
interface PdlEksisterendePersonValues {
nyPersonPath?: string
eksisterendePersonPath: string
+ fullmektigsNavnPath?: string
label: string
formMethods: UseFormReturn
idx: number
@@ -29,11 +30,12 @@ export const PdlEksisterendePerson = ({
formMethods,
idx,
disabled = false,
- nyIdentValg = null,
- eksisterendeNyPerson = null,
+ nyIdentValg = null as unknown as NyIdent,
+ eksisterendeNyPerson = null as unknown as Option,
+ fullmektigsNavnPath = null as unknown as string,
ident,
}: PdlEksisterendePersonValues) => {
- const opts = useContext(BestillingsveilederContext)
+ const opts: any = useContext(BestillingsveilederContext)
const antall = opts?.antall || 1
const gruppeId = opts?.gruppeId || opts?.gruppe?.id || window.location.pathname.split('/')?.[2]
@@ -169,7 +171,11 @@ export const PdlEksisterendePerson = ({
{
+ const navn = person?.label?.match(/-\s(.*?)\s\(/)
formMethods.setValue(eksisterendePersonPath, person?.value || null)
+ if (fullmektigsNavnPath) {
+ formMethods.setValue(fullmektigsNavnPath, navn?.[1] || person?.label || null)
+ }
formMethods.trigger('pdldata.person')
}}
label={label}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
index 533ccfeb7fa..e54ce2f853a 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx
@@ -10,6 +10,7 @@ interface PdlPersonValues {
path: string
nyPersonPath: string
eksisterendePersonPath: string
+ fullmektigsNavnPath?: string
eksisterendeNyPerson?: Option
label: string
formMethods: UseFormReturn
@@ -22,6 +23,7 @@ export const PdlPersonExpander = ({
path,
nyPersonPath,
eksisterendePersonPath,
+ fullmektigsNavnPath,
eksisterendeNyPerson = null,
label,
formMethods,
@@ -55,6 +57,7 @@ export const PdlPersonExpander = ({
path={path}
nyPersonPath={nyPersonPath}
eksisterendePersonPath={eksisterendePersonPath}
+ fullmektigsNavnPath={fullmektigsNavnPath}
label={label}
formMethods={formMethods}
nyIdentValg={nyIdentValg}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
index ff078ba01d1..4152e35ef2d 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonForm.tsx
@@ -17,6 +17,7 @@ interface PdlPersonValues {
path: string
nyPersonPath: string
eksisterendePersonPath: string
+ fullmektigsNavnPath?: string
label: string
formMethods: UseFormReturn
nyIdentValg?: NyIdent
@@ -46,6 +47,7 @@ export const PdlPersonForm = ({
path,
nyPersonPath,
eksisterendePersonPath,
+ fullmektigsNavnPath,
label,
formMethods,
nyIdentValg = null,
@@ -131,6 +133,7 @@ export const PdlPersonForm = ({
formMethods={formMethods}
nyIdentValg={nyIdentValg}
eksisterendeNyPerson={eksisterendeNyPerson}
+ fullmektigsNavnPath={fullmektigsNavnPath}
disabled={opts?.antall > 1}
/>
)}
diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
index 64c7fe39517..aaa93c85f12 100644
--- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
+++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/PdlfVisning.tsx
@@ -22,6 +22,7 @@ import { Persondetaljer } from '@/components/fagsystem/pdlf/visning/partials/Per
import { PdlSikkerhetstiltak } from '@/components/fagsystem/pdl/visning/partials/PdlSikkerhetstiltak'
import { TpsMBankkonto } from '@/components/fagsystem/pdl/visning/partials/tpsMessaging/TpsMBankkonto'
import { ForeldreansvarVisning } from '@/components/fagsystem/pdlf/visning/partials/Foreldreansvar'
+import { FullmaktVisning } from '@/components/fagsystem'
export const getBankkontoData = (data) => {
if (data?.kontoregister) {
@@ -89,6 +90,7 @@ export const PdlfVisning = ({ fagsystemData, loading, tmpPersoner, erRedigerbar
skjermingData={skjermingData}
erRedigerbar={erRedigerbar}
/>
+
- tmpPersoner?: Array
- ident?: string
- relasjoner: Array
-}
-
-type DataListe = {
- data: Array
- tmpPersoner?: Array
- ident?: string
- relasjoner: Array
- erRedigerbar?: boolean
-}
-
-const Omraader = styled(TitleValue)`
- && {
- margin-bottom: 20px;
- }
-`
-
-const FullmaktLes = ({ fullmaktData, relasjoner, redigertRelatertePersoner = null, idx }) => {
- if (!fullmaktData) {
- return null
- }
-
- const fullmektigIdent = fullmaktData.motpartsPersonident
- const fullmektig = relasjoner?.find(
- (relasjon) => relasjon.relatertPerson?.ident === fullmektigIdent,
- )
- const fullmektigRedigert = redigertRelatertePersoner?.find(
- (item) => item.relatertPerson?.ident === fullmektigIdent,
- )
-
- const omraader = fullmaktData.omraader
- ?.map((omraade) => showKodeverkLabel(FullmaktKodeverk.Tema, omraade))
- ?.join(', ')
-
- return (
- <>
-
-
-
-
-
- {!fullmektig && !fullmektigRedigert && (
-
- )}
-
-
-
-
-
-
- {(fullmakt: FullmaktData, idx: number) =>
- erRedigerbar ? (
-
- ) : (
-
- )
- }
-
-
-
-