Merge remote-tracking branch 'origin/master' into add-api-for-person

This commit is contained in:
Julien Fastré 2021-05-21 20:19:38 +02:00
commit 080a54231f
5 changed files with 312 additions and 312 deletions

View File

@ -590,7 +590,7 @@ class CRUDController extends AbstractController
if (NULL === $entity) {
throw $this->createNotFoundException(sprintf("The %s with id %s "
. "is not found"), $this->getCrudName(), $id);
. "is not found", $this->getCrudName(), $id));
}
$response = $this->checkACL($action, $entity);

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)
{