🐛 Affichage des aides lors de la saisie du total chargé

pull/279/head
Mael 2018-08-29 18:38:14 +02:00
parent b31b650e27
commit 343c5998e4
2 changed files with 23 additions and 27 deletions

View File

@ -75,13 +75,7 @@
#targetSelection .targetInputOrValue {
font-size: 135%;
display: flex;
justify-content: flex-end;
align-items: flex-end;
margin-left: 0.6em;
}
#targetSelection .targetValue {
text-align: right;
}

View File

@ -218,12 +218,16 @@ let TargetInputOrValue = withLanguage(
}}
/>
)}
{target.dottedName.includes('rémunération . total') && <AidesGlimpse />}
</span>
)
)
@connect(dispatch => ({
setFormValue: (field, name) => dispatch(change('conversation', field, name))
}))
@connect(
null,
dispatch => ({
setFormValue: (field, name) => dispatch(change('conversation', field, name))
})
)
class TargetValue extends Component {
render() {
let { targets, target, noUserInput, blockingInputControls } = this.props
@ -233,20 +237,17 @@ class TargetValue extends Component {
value = targetWithValue && targetWithValue.nodeValue
return (
<span className="targetValue">
<div
className={classNames({
editable: target.question,
attractClick:
target.question && (noUserInput || blockingInputControls)
})}
tabIndex="0"
onClick={this.showField(value)}
onFocus={this.showField(value)}>
<AnimatedTargetValue value={value} />
</div>
{target.dottedName.includes('rémunération . total') && <AidesGlimpse />}
</span>
<div
className={classNames({
editable: target.question,
attractClick:
target.question && (noUserInput || blockingInputControls)
})}
tabIndex="0"
onClick={this.showField(value)}
onFocus={this.showField(value)}>
<AnimatedTargetValue value={value} />
</div>
)
}
showField(value) {
@ -265,10 +266,11 @@ class TargetValue extends Component {
@connect(state => ({ analysis: analysisWithDefaultsSelector(state) }))
class AidesGlimpse extends Component {
render() {
let aides = this.props.analysis.targets.find(
t => t.dottedName === 'contrat salarié . aides employeur'
)
if (!aides.nodeValue) return null
let targets = this.props.analysis.targets,
aides =
targets &&
targets.find(t => t.dottedName === 'contrat salarié . aides employeur')
if (!aides || !aides.nodeValue) return null
return (
<div id="aidesGlimpse">
{' '}