Skip to content
This repository has been archived by the owner on Aug 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #58 from navikt/bugfix/behandlingsdager
Browse files Browse the repository at this point in the history
Bugfix/behandlingsdager
  • Loading branch information
heyvard authored Feb 24, 2020
2 parents 23e2502 + f92228e commit 39feaf1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { soknadPt } from '../../../propTypes/index';
import { EttersendDialogConnected } from './EttersendingDialog';
import { ettersendSoknadTilNavNullstill } from '../../data/ettersending/ettersendingNav';
import { ettersendSoknadTilArbeidsgiverNullstill } from '../../data/ettersending/ettersendingArbeidsgiver';
import { ARBEIDSTAKERE } from '../../enums/soknadtyper';
import { ARBEIDSTAKERE, BEHANDLINGSDAGER } from '../../enums/soknadtyper';

const sendtTilNAVDato = 'sendtTilNAVDato';
const sendtTilArbeidsgiverDato = 'sendtTilArbeidsgiverDato';
Expand Down Expand Up @@ -107,7 +107,11 @@ export class Ettersending extends Component {
return (
<div className="verktoylinje__element">
{
(sykepengesoknad.soknadstype === ARBEIDSTAKERE || manglendeDato === sendtTilNAVDato) &&
(sykepengesoknad.soknadstype === ARBEIDSTAKERE
|| manglendeDato === sendtTilNAVDato
|| (sykepengesoknad.soknadstype === BEHANDLINGSDAGER &&
sykepengesoknad.arbeidssituasjon === 'ARBEIDSTAKER')
) &&
<React.Fragment>
<Knapp
type="standard"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const AvbruttSoknadBehandlingsdager = ({ soknad, sykmelding }) => {
<div>
<SoknadHeader soknad={soknad} />
<AvbruttSoknadBehandlingsdagerStatuspanel soknad={soknad} />
<SykmeldingUtdragForBehandlingsdager sykmelding={sykmelding} erApen />
<SykmeldingUtdragForBehandlingsdager soknad={soknad} sykmelding={sykmelding} erApen />
</div>
);
};
Expand Down

0 comments on commit 39feaf1

Please sign in to comment.