Compare commits

...

7 Commits

Author SHA1 Message Date
Marc Ducobu
5af36d18eb Display data for Usagers concernés & Resources 2021-05-24 11:39:22 +02:00
Marc Ducobu
016baf1ac9 Merge branch '139_demandeur' of gitlab.com:Chill-Projet/chill-bundles into 139_demandeur 2021-05-22 23:39:08 +02:00
220f1ea0eb Merge branch '139_demandeur' into 'master'
139 Demandeur

See merge request Chill-Projet/chill-bundles!43
2021-05-21 12:53:03 +00:00
6bd7a0105d Merge branch 'quick-fix-crud' into 'master'
Crud : fix sprintf pbm

See merge request Chill-Projet/chill-bundles!55
2021-05-19 13:15:35 +00:00
Marc Ducobu
51c2408878 Crud : fix sprintf pbm 2021-05-19 15:00:13 +02:00
912a8d53af Merge branch 'fix_issue_43_add_entities' into 'master'
LoadFixtures, replacing Array() by []

See merge request Chill-Projet/chill-bundles!54
2021-05-18 18:13:41 +00:00
Marc Ducobu
d73fd697dd Array() -> [] 2021-05-18 19:21:52 +02:00
6 changed files with 398 additions and 327 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -37,32 +37,32 @@ class LoadSocialActions extends AbstractFixture implements OrderedFixtureInterfa
return 10020;
}
public static $socialActions = array(
'social_action_info_conseil' => array(
'title' => array(
public static $socialActions = [
'social_action_info_conseil' => [
'title' => [
'fr' => 'Informer, conseiller'
),
],
'issue' => 'social_issue_prev_prot'
),
'social_action_instruire' => array(
'title' => array(
],
'social_action_instruire' => [
'title' => [
'fr' => 'Instruire l\'imprime unique pour des impayés'
),
],
'issue' => 'social_issue_prev_prot'
),
'social_action_MASP' => array(
'title' => array(
],
'social_action_MASP' => [
'title' => [
'fr' => 'MASP'
),
],
'issue' => 'social_issue_diff_fin'
),
'social_action_protection_enfant' => array(
'title' => array(
],
'social_action_protection_enfant' => [
'title' => [
'fr' => 'Protection Enfant confié dans le cadre judiciaire'
),
],
'issue' => 'social_issue_enfant_protection'
),
);
],
];
public function load(ObjectManager $manager)
{

View File

@@ -38,20 +38,20 @@ class LoadSocialGoals extends AbstractFixture implements OrderedFixtureInterface
return 10030;
}
public static $socialGoals = array(
'social_goal_instuire_dossier' => array(
'title' => array(
public static $socialGoals = [
'social_goal_instuire_dossier' => [
'title' => [
'fr' => 'Instruire le dossier de surendettement'
),
],
'action' => 'social_action_MASP'
),
'social_goal_proteger' => array(
'title' => array(
],
'social_goal_proteger' => [
'title' => [
'fr' => 'Protéger via une assistance educative placement'
),
],
'action' => 'social_action_protection_enfant'
),
);
],
];
public function load(ObjectManager $manager)
{

View File

@@ -37,36 +37,36 @@ class LoadSocialIssues extends AbstractFixture implements OrderedFixtureInterfac
return 10010;
}
public static $socialIssues = array(
'social_issue_diff_fin_or_admin' => array(
'title' => array(
public static $socialIssues = [
'social_issue_diff_fin_or_admin' => [
'title' => [
'fr' => 'ADULTE - DIFFICULTES FINANCIERES ET/OU ADMINISTRATIVES'
)
),
'social_issue_prev_prot' => array(
'title' => array(
]
],
'social_issue_prev_prot' => [
'title' => [
'fr' => 'ADULTE PREVENTION/PROTECTION'
),
],
'parent' => 'social_issue_diff_fin_or_admin'
),
'social_issue_diff_fin' => array(
'title' => array(
],
'social_issue_diff_fin' => [
'title' => [
'fr' => 'Difficulté financière'
),
],
'parent' => 'social_issue_diff_fin_or_admin'
),
'social_issue_enfant_famille' => array(
'title' => array(
],
'social_issue_enfant_famille' => [
'title' => [
'fr' => 'Enfant / famille'
)
),
'social_issue_enfant_protection' => array(
'title' => array(
]
],
'social_issue_enfant_protection' => [
'title' => [
'fr' => 'enfant - protection'
),
],
'parent' => 'social_issue_enfant_famille'
),
);
],
];
public function load(ObjectManager $manager)
{

View File

@@ -38,34 +38,34 @@ class LoadSocialResults extends AbstractFixture implements OrderedFixtureInterfa
return 10040;
}
public static $socialResults = array(
'social_result_FSL_acces' => array(
'title' => array(
public static $socialResults = [
'social_result_FSL_acces' => [
'title' => [
'fr' => 'FSL - accès cautionnement'
),
],
'action' => 'social_action_instruire'
),
'social_result_FSL_maintien' => array(
'title' => array(
],
'social_result_FSL_maintien' => [
'title' => [
'fr' => 'FSL maintien - impayés de loyer'
),
],
'action' => 'social_action_MASP'
),
'social_result_soutien_parental' => array(
'title' => array(
],
'social_result_soutien_parental' => [
'title' => [
'fr' => 'Soutien parental'
),
],
// 'action' => 'social_action_protection_enfant', (via le goal)
'goal' => 'social_goal_proteger'
),
'social_result_accompagnement_mineur' => array(
'title' => array(
],
'social_result_accompagnement_mineur' => [
'title' => [
'fr' => 'Accompagnement du mineur'
),
],
// 'action' => 'social_action_protection_enfant', (via le goal)
'goal' => 'social_goal_proteger',
),
);
],
];
public function load(ObjectManager $manager)
{

View File

@@ -5,24 +5,95 @@
{% endblock %}
{% block content %}
<h1>{{ 'Resume Accompanying Course' | trans }}</h1>
{% if 'DRAFT' == accompanyingCourse.step %}
<div class="grid-8 centered error flash_message">
<span>
{{ 'This accompanying course is still a draft'|trans }}
<a href="{{ path('chill_person_accompanying_course_show', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
{{ 'Edit & activate accompanying course'|trans }}
</a>
</span>
</div>
{% endif %}
{% if 'DRAFT' == accompanyingCourse.step %}
<div class="grid-8 centered error flash_message">
<span>
{{ 'This accompanying course is still a draft'|trans }}
<a href="{{ path('chill_person_accompanying_course_show', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
{{ 'Edit & activate accompanying course'|trans }}
</a>
</span>
</div>
{% endif %}
<h1>{{ 'Associated peoples'|trans }}</h1>
<div class="vue-component">
<h2>{{ 'Associated peoples'|trans }}</h2>
<h1>{{ 'Resources'|trans }}</h1>
{% if accompanyingCourse.participations.count > 0 %}
<table class="rounded">
<thead>
<tr>
<th class="chill-orange">{{ 'First name' | trans }}</th>
<th class="chill-orange">{{ 'Last name' | trans }}</th>
<th class="chill-orange">{{ 'Start date' | trans }}</th>
<th class="chill-orange">{{ 'End date' | trans }}</th>
</tr>
</thead>
<tbody>
{% for participation in accompanyingCourse.participations %}
<tr>
<td>{{ participation.person.firstName }}</td>
<td>{{ participation.person.lastName }}</td>
<td>{{ participation.startDate | format_date('short') }}</td>
<td>{{ participation.endDate | format_date('short') }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div class="grid-8 centered error flash_message">
{{ "No Associated peoples recorded" | trans }}
</div>
{% endif %}
</div>
<h1>{{ 'Social actions'|trans }}</h1>
<h1>{{ 'Last events on accompanying course'|trans }}</h1>
<div class="vue-component">
<h2>{{ 'Resources'|trans }}</h2>
{% if accompanyingCourse.resources.count > 0 %}
<table class="rounded">
<thead>
<tr>
<th class="chill-orange">{{ 'First name' | trans }}</th>
<th class="chill-orange">{{ 'Last name' | trans }}</th>
</tr>
</thead>
<tbody>
{% for resource in accompanyingCourse.resources %}
<tr>
<td>{{ resource.person.firstName }}</td>
<td>{{ resource.person.lastName }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<div class="grid-8 centered alert flash_message">
{{ "No resources recorded" | trans }}
</div>
{% endif %}
</div>
<div class="vue-component">
<h2>{{ 'Social actions'|trans }}</h2>
<div class="grid-8 centered notice flash_message">
{{ "Not implemented" | trans }}
</div>
</div>
<div class="vue-component">
<h2>{{ 'Last events on accompanying course'|trans }}</h2>
<div class="grid-8 centered notice flash_message">
{{ "Not implemented" | trans }}
</div>
</div>
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('accompanying_course') }}
{% endblock %}