<commit_before>{% import 'AppBundle:Macros:macros-review.html.twig' as macros %}

{% set visitsCare = ndr.visitsCare %}
<div class="section break-before" id="visits-care-section">
    <h2 class="section-heading">Visits and care</h2>

    {{ macros.answerYesNo({
        question: 'Do you live with the client',
        answer: visitsCare.doYouLiveWithClient,
        moreDetails: visitsCare.howOftenDoYouContactClient,
        moreDetailsLabel: 'How often do you contact the client and how do you make sure others are looking after the client\'s needs if you can\'t ?',
        showMoreDetailsWith: 'no'
    }) }}

    {{ macros.careArrangements(visitsCare) }}

    {{ macros.answerYesNo({
        question: 'form.doesClientHaveACarePlan.label' | trans(transOptions, 'ndr-visits-care'),
        answer: visitsCare.doesClientHaveACarePlan,
        moreDetails: visitsCare.whenWasCarePlanLastReviewed | date("m / Y"),
        moreDetailsLabel: 'Review date',
        showMoreDetailsWith: 'yes'
    }) }}

    {{ macros.answerYesNo({
        question: 'Are there any plans for the client to move to a new residence',
        answer: visitsCare.planMoveNewResidence,
        moreDetails: visitsCare.planMoveNewResidenceDetails,
        showMoreDetailsWith: 'yes'
    }) }}

</div><commit_msg>DDPB-2331 Adjust NDR review visits/care to follow suit Since the Macro for care arrangements has changed, NDR had to also change to pass in the translation variables. Whilst here, I thought I may as well change the NDR side to show clients name as well, since half of it will using the macro.<commit_after>{% set translationDomain = "ndr-visits-care" %}
{% import 'AppBundle:Macros:macros-review.html.twig' as macros %}

{% set visitsCare = ndr.visitsCare %}
<div class="section break-before" id="visits-care-section">
    <h2 class="section-heading">Visits and care</h2>

    {{ macros.answerYesNo({
        question: 'form.doYouLiveWithClient.label' | trans(transOptions, translationDomain),
        answer: visitsCare.doYouLiveWithClient,
        moreDetails: visitsCare.howOftenDoYouContactClient,
        moreDetailsLabel: 'How often do you contact the client and how do you make sure others are looking after the client\'s needs if you can\'t ?',
        showMoreDetailsWith: 'no'
    }) }}

    {{ macros.careArrangements(visitsCare, transOptions, translationDomain) }}

    {{ macros.answerYesNo({
        question: 'form.doesClientHaveACarePlan.label' | trans(transOptions, translationDomain),
        answer: visitsCare.doesClientHaveACarePlan,
        moreDetails: visitsCare.whenWasCarePlanLastReviewed | date("m / Y"),
        moreDetailsLabel: 'Review date',
        showMoreDetailsWith: 'yes'
    }) }}

    {{ macros.answerYesNo({
        question: 'form.planMoveNewResidence.label' | trans(transOptions, translationDomain),
        answer: visitsCare.planMoveNewResidence,
        moreDetails: visitsCare.planMoveNewResidenceDetails,
        showMoreDetailsWith: 'yes'
    }) }}

</div>
{'fraction_non_alphanumeric': 0.10565028418589101, 'fraction_numerical': 0.0026746907388833165, 'mean_word_length': 3.719242902208202, 'pattern_counts': {'":': 0, '<': 11, '<?xml version=': 0, '>': 11, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2892600', 'n_tokens_mistral': 893, 'n_tokens_neox': 843, 'n_words': 229}