diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86e65c390..295eb3e0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,11 +5,13 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4 cache: paths: - tests/app/vendor/ + - .composer before_script: # add extensions to postgres - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;" # Install and run Composer + - mkdir -p $COMPOSER_HOME - curl -sS https://getcomposer.org/installer | php - php -d memory_limit=2G composer.phar install - php tests/app/bin/console doctrine:migrations:migrate -n @@ -34,6 +36,10 @@ variables: REDIS_HOST: redis REDIS_PORT: 6379 REDIS_URL: redis://redis:6379 + # change vendor dir to make the app install into tests/apps + COMPOSER_VENDOR_DIR: tests/app/vendor + # cache some composer data + COMPOSER_HOME: .composer # Run our tests diff --git a/composer.json b/composer.json index 64d9dca22..f5f1a2806 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle", "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle", - "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src" + "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src", + "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle" } }, "autoload-dev": { @@ -90,4 +91,4 @@ "config": { "bin-dir": "bin" } -} \ No newline at end of file +} diff --git a/docs/source/development/pagination.rst b/docs/source/development/pagination.rst index c0cec9639..1a2c91ff0 100644 --- a/docs/source/development/pagination.rst +++ b/docs/source/development/pagination.rst @@ -28,7 +28,7 @@ Then, render the pagination using the dedicated twig function. .. code-block:: html+twig - {% extends "ChillPersonBundle::layout.html.twig" %} + {% extends "@ChillPerson/Person/layout.html.twig" %} {% block title 'Item list'|trans %} diff --git a/docs/source/development/user-interface/layout-template-usage.rst b/docs/source/development/user-interface/layout-template-usage.rst index 2b7a7764c..69848c650 100644 --- a/docs/source/development/user-interface/layout-template-usage.rst +++ b/docs/source/development/user-interface/layout-template-usage.rst @@ -149,7 +149,7 @@ It proposes a new block : * where to display the admin content -ChillPersonBundle::layout.html.twig +@ChillPersonBundle/Person/layout.html.twig ----------------------------------- This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the person details in the block `top_banner`, set the menu `person` as the vertical menu. diff --git a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss index 1d271abfe..fc492c7bc 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss +++ b/src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss @@ -1,14 +1,105 @@ // Access to Bootstrap variables and mixins @import '~ChillMainAssets/module/bootstrap/shared'; -//@import '~ChillMainSass/custom/mixins/entity'; +// activity creation first step: select type page +div.new-activity-select-type { + div.activity-row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + gap: 12px; -//.chill-entity.chill-entity__activity-reason { -// @include entity($chill-pink, white); -//} + div.bloc { + width: 200px; + align-self: flex-end; + height: 140px; + display: flex; + justify-content: center; + align-items: center; + } + } +} -.activity { - //color: $chill-green; +// exceptions for flex-table in list-records +div.activity-list { + div.flex-table { + div.item-bloc { + div.item-row.main { + div.item-col { + &:first-child { + flex-basis: 27%; + } + ul.list-content { + li.social-issues, li.social-actions { + .badge-primary { + font-variant: small-caps; + font-weight: bold; + font-size: 88%; + margin-bottom: 0.2em; + } + } + li.social-issues .badge-primary { + background-color: $orange; + } + li.social-actions .badge-primary { + background-color: $green; + } + } + } + } + div.item-row.details { + flex-direction: row; + & > div.item-col { + justify-content: flex-start; + align-self: center; + &:nth-child(1) { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + } + &:nth-child(2) { + flex-grow: 0; flex-shrink: 1; flex-basis: 70%; + } + + &:only-child { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + & > div.concerned-groups { + flex-grow: 0; flex-shrink: 0; flex-basis: 100%; + display: flex; + flex-direction: column; // TODO pas fini + div.group { + flex-grow: 1; flex-shrink: 0; flex-basis: 30%; + h4 {} + ul.list-content { + li { + display: inline; + } + } + } + } + } + } + div.concerned-groups { + font-size: 85%; + h4 { + text-transform: uppercase; + } + } + } + ul.list-content { + list-style-type: none; + padding-left: 1em; + margin: 0 0; + li { + margin-bottom: 0.2em; + } + } + } + div.duration { + font-size: smaller; + padding-left: 1em; + margin-top: 1em; + } + } } // exceptions for flex-bloc in concerned-groups @@ -22,7 +113,7 @@ div.flex-bloc.concerned-groups { li { margin-bottom: 0.2em; a { - color: white; + color: $white; cursor: pointer; &:hover { color: #ffffffab; @@ -36,97 +127,3 @@ div.flex-bloc.concerned-groups { } } -// exceptions for flex-table in list-records -div.flex-table.list-records { - div.item-bloc { - div.item-row.main { - div.item-col { - &:first-child { - flex-basis: 27%; - } - ul.list-content { - li.social-issues, li.social-actions { - .badge-primary { - font-variant: small-caps; - font-weight: bold; - font-size: 88%; - margin-bottom: 0.2em; - } - } - li.social-issues .badge-primary { - background-color: var(--chill-orange); - } - li.social-actions .badge-primary { - background-color: var(--chill-green); - } - } - } - } - div.item-row.details { - flex-direction: row; - & > div.item-col { - justify-content: flex-start; - align-self: center; - &:nth-child(1) { - flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - } - &:nth-child(2) { - flex-grow: 0; flex-shrink: 1; flex-basis: 70%; - } - - &:only-child { - flex-grow: 0; flex-shrink: 0; flex-basis: 100%; - & > div.concerned-groups { - flex-grow: 0; flex-shrink: 0; flex-basis: 100%; - display: flex; - flex-direction: column; // TODO pas fini - div.group { - flex-grow: 1; flex-shrink: 0; flex-basis: 30%; - h4 {} - ul.list-content { - li { - display: inline; - } - } - } - } - } - } - div.concerned-groups { - font-size: 85%; - h4 { - text-transform: uppercase; - } - } - } - ul.list-content { - list-style-type: none; - padding-left: 1em; - margin: 0 0; - li { - margin-bottom: 0.2em; - } - } - } - div.duration { - font-size: smaller; - padding-left: 1em; - margin-top: 1em; - } -} - -div.activity-row { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - gap: 12px; - div.bloc { - width: 200px; - align-self: flex-end; - height: 140px; - display: flex; - justify-content: center; - align-items: center; - } -} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index 92b1b3ff4..2ee9eeba0 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -60,7 +60,10 @@
  • - {{ item|chill_entity_render_box({'render': 'raw'}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
    • @@ -72,7 +75,7 @@ {% endfor %} {% endif %} - + {% if (with_display == 'row') %}
    {% for bloc in blocs %} @@ -84,7 +87,10 @@
  • - {{ item|chill_entity_render_box({'only_denomination': true}) }} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }}
    • diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig index 35f681064..10b1add9a 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig @@ -54,7 +54,7 @@ {{ form_row(edit_form.date) }} {% endif %} -.. location +{# TODO .. location #} {%- if edit_form.durationTime is defined -%} {{ form_row(edit_form.durationTime) }} @@ -65,7 +65,7 @@ {% endif %} {%- if edit_form.comment is defined -%} - .. public and private + {# TODO .. public and private #} {{ form_row(edit_form.comment) }} {% endif %} @@ -77,7 +77,7 @@ {{ form_row(edit_form.attendee) }} {% endif %} -.. status +{# TODO .. status #} {% set person_id = null %} {% if entity.person %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig index f7c0d12b2..35d39f609 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig @@ -1,184 +1,163 @@ -{% set person_id = null %} -{% if person %} - {% set person_id = person.id %} -{% endif %} +
    -{% set accompanying_course_id = null %} -{% if accompanyingCourse %} - {% set accompanying_course_id = accompanyingCourse.id %} -{% endif %} + {% if activities|length == 0 %} +

    + {{ "There isn't any activities."|trans }} + +

    -

    {{ 'Activity list' |trans }}

    + {% else %} +
    + {% for activity in activities %} + {% set t = activity.type %} +
    +
    +
    -{% if activities|length == 0 %} -

    - {{ "There isn't any activities."|trans }} - -

    -{% else %} - -
    - - {% for activity in activities %} - {% set t = activity.type %} -
    -
    -
    - - {% if activity.date %} -

    {{ activity.date|format_date('long') }}

    - {% endif %} - -
    - {% if t.durationTimeVisible > 0 %} -

    - - {{ activity.durationTime|date('H:i') }} -

    - {% endif %} - {% if activity.travelTime and t.travelTimeVisible %} -

    - - {{ activity.travelTime|date('H:i') }} -

    - {% endif %} -
    - - {% if context == 'person' and activity.accompanyingPeriod is not empty %} -
    - - - {{ activity.accompanyingPeriod.id }} - -
    - {% endif %} - -
    -
    -
      - {% if activity.user and t.userVisible %} -
    • - {{ 'by'|trans }}{{ activity.user.usernameCanonical }} -
      • - {% endif %} - -
    • - {{ activity.type.name | localize_translatable_string }} - - {% if activity.attendee is not null and t.attendeeVisible %} - {% if activity.attendee %} - {{ '→ ' ~ 'present'|trans|capitalize }} - {% else %} - {{ '→ ' ~ 'not present'|trans|capitalize }} - {% endif %} + {% if activity.date %} +

      {{ activity.date|format_date('long') }}

      {% endif %} -
      • -
    • - {{ 'location'|trans ~ ': ' }} - Domicile de l'usager - {# - {% if activity.location %}{{ activity.location }}{% endif %} - #} -
      • +
      + {% if t.durationTimeVisible > 0 %} +

      + + {{ activity.durationTime|date('H:i') }} +

      + {% endif %} + {% if activity.travelTime and t.travelTimeVisible %} +

      + + {{ activity.travelTime|date('H:i') }} +

      + {% endif %} +
      - {%- if t.reasonsVisible -%} -
    • - {%- if activity.reasons is empty -%} - {{ 'No reason associated'|trans }} - {%- else -%} - {% for r in activity.reasons %} - {{ r|chill_entity_render_box }} - {% endfor %} - {%- endif -%} -
      • - {% endif %} + {% if context == 'person' and activity.accompanyingPeriod is not empty %} +
      + + + {{ activity.accompanyingPeriod.id }} + +
      + {% endif %} - {%- if t.socialIssuesVisible %} - - {% endif %} +
    +
    +
      + {% if activity.user and t.userVisible %} +
    • + {{ 'by'|trans }}{{ activity.user.usernameCanonical }} +
      • + {% endif %} - {%- if t.socialActionsVisible -%} - - {% endif %} +
    • + {{ activity.type.name | localize_translatable_string }} + + {% if activity.attendee is not null and t.attendeeVisible %} + {% if activity.attendee %} + {{ '→ ' ~ 'present'|trans|capitalize }} + {% else %} + {{ '→ ' ~ 'not present'|trans|capitalize }} + {% endif %} + {% endif %} +
      • + +
    • + {{ 'location'|trans ~ ': ' }} + Domicile de l'usager + {# + {% if activity.location %}{{ activity.location }}{% endif %} + #} +
      • + + {%- if t.reasonsVisible -%} +
    • + {%- if activity.reasons is not empty -%} + {% for r in activity.reasons %} + {{ r|chill_entity_render_box }} + {% endfor %} + {%- endif -%} +
      • + {% endif %} + + {%- if t.socialIssuesVisible %} + + {% endif %} + + {%- if t.socialActionsVisible -%} + + {% endif %} -
    -
      -
    • - -
      • - {# TOOD +
    +
      +
    • + +
      • + {# TOOD {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %} - #} -
    • - -
      • - {# TOOD + #} +
    • + +
      • + {# TOOD {% endif %} {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %} - #} -
    • - -
      • - {# - {% endif %} - #} -
    + #} +
  • + +
    • + {# + {% endif %} + #} + +
    +
    + + {% if activity.comment.comment is not empty + or activity.persons|length > 0 + or activity.thirdParties|length > 0 + or activity.users|length > 0 + %} +
    +
    + {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %} +
    + + {% if activity.comment.comment is not empty %} +
    + {{ activity.comment|chill_entity_render_box({ + 'disable_markdown': false, + 'limit_lines': 3, + 'metadata': false, + }) }} +
    + {% endif %} +
    + {% endif %} +
    -
    - - {% - if activity.comment.comment is not empty - or activity.persons|length > 0 - or activity.thirdParties|length > 0 - or activity.users|length > 0 - %} -
    -
    - - {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %} -
    - - {% if activity.comment.comment is not empty %} -
    - {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }} -
    - {% endif %} -
    - {% endif %} - + {% endfor %}
    - {% endfor %} -
    -{% endif %} + {% endif %} -{% if context != 'person' %} -{# TODO set this condition in configuration #} - -{% endif %} +
    diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig index 53e7ec86e..a988debfd 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig @@ -5,5 +5,27 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} {% block content %} + + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} + + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} + +

    {{ 'Activity list' |trans }}

    + {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %} + + + {% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig index 649821dc7..5a9f0125f 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig @@ -21,5 +21,27 @@ {% block title %}{{ 'Activity list' |trans }}{% endblock title %} {% block personcontent %} + + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} + + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} + +

    {{ 'Activity list' |trans }}

    + {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %} + + + {% endblock %} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig index 1c2fb5123..f502c74a9 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig @@ -55,7 +55,7 @@ {{ form_row(form.date) }} {% endif %} -.. location +{# TODO .. location #} {%- if form.durationTime is defined -%} {{ form_row(form.durationTime) }} @@ -66,7 +66,7 @@ {% endif %} {%- if form.comment is defined -%} - .. public and private + {# TODO .. public and private #} {{ form_row(form.comment) }} {% endif %} @@ -78,13 +78,13 @@ {{ form_row(form.attendee) }} {% endif %} -.. status +{# TODO .. status #}
    • - {{ "Activity creation"|trans }} +
      +

      {{ "Activity creation"|trans }}

      -{# TODO: refaire l'html css des tuilles #} + {# TODO: refaire l'html css des tuilles #} -{% for row in data %} -

      {{ row.activityTypeCategory.name|localize_translatable_string }}

      -
      - {% for activityType in row.activityTypes %} + {% for row in data %} +

      {{ row.activityTypeCategory.name|localize_translatable_string }}

      +
      + {% for activityType in row.activityTypes %} - {% set person_id = null %} - {% if person %} - {% set person_id = person.id %} - {% endif %} + {% set person_id = null %} + {% if person %} + {% set person_id = person.id %} + {% endif %} - {% set accompanying_course_id = null %} - {% if accompanyingCourse %} - {% set accompanying_course_id = accompanyingCourse.id %} - {% endif %} + {% set accompanying_course_id = null %} + {% if accompanyingCourse %} + {% set accompanying_course_id = accompanyingCourse.id %} + {% endif %} - + -
      - {{ activityType.name|localize_translatable_string }} -
      -       - {% endfor %} -
      -{% endfor %} +
      + {{ activityType.name|localize_translatable_string }} +
      + + {% endfor %} +
      + {% endfor %} +
      diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index c486df909..679004e2e 100644 --- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml @@ -81,9 +81,9 @@ activity: '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"' #controller -'Success : activity created!': Bravo ! L'activité a été créée. +'Success : activity created!': L'activité a été créée. 'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée. -'Success : activity updated!': Bravo ! L'activité a été mise à jour. +'Success : activity updated!': L'activité a été mise à jour. 'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour. # ROLES diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php index 8a0e98b9a..4135bb4a2 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210804082249.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php index f05da8643..62b568407 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140343.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php index e71cd50d2..92320e639 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210806140710.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php index 51e9c0571..29d6be7f3 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php +++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20210810084456.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\AsideActivity; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -43,6 +43,6 @@ final class Version20210810084456 extends AbstractMigration $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.createdat IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.updatedat IS \'(DC2Type:datetime_immutable)\''); $this->addSql('COMMENT ON COLUMN chill_asideactivity.AsideActivity.date IS \'(DC2Type:datetime_immutable)\''); - + } } diff --git a/src/Bundle/ChillDocGeneratorBundle/.gitignore b/src/Bundle/ChillDocGeneratorBundle/.gitignore new file mode 100644 index 000000000..f443cb81e --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/.gitignore @@ -0,0 +1,11 @@ +composer.lock +vendor/* +parameters.yml +*~ +*.DS_Store +*.sass-cache +Resources/node_modules/ +Tests/Fixtures/App/app/config/parameters.yml +/nbproject/private/ +Resources/test/Fixtures/App/bootstrap.php.cache + diff --git a/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php new file mode 100644 index 000000000..350290b08 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/ChillDocGeneratorBundle.php @@ -0,0 +1,9 @@ + $entity]; + } elseif(get_class($entity) == SocialAction::class) { + $ret = ['SocialAction' => $entity]; + } + + // TODO AJOUTER LES DONNES DU FORMULAIRE + + return $ret; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php new file mode 100644 index 000000000..0b870a34e --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php @@ -0,0 +1,9 @@ +setContent('Test'); + } + + /** + * @Route( + * "{_locale}/doc/gen/test", + * name="chill_docgenerator_test" + * ) + * + * @param Request $request + * @return \Symfony\Component\HttpFoundation\Response + */ + public function getDoc(Request $request, TempUrlOpenstackGenerator $tempUrlGenerator) + { + $p = $tempUrlGenerator->generate( + 'GET', + 'FORMULAIRE_AEB.docx', + $request->query->has('expires_delay') ? $request->query->getInt('expires_delay', 0) : null + ); + + $tmpfname = tempnam(sys_get_temp_dir(), 'DOC_TEMPLATE'); + file_put_contents($tmpfname, file_get_contents($p->{"url"})); + + $templateProcessor = new TemplateProcessor($tmpfname); + $templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe')); + + $tmpfname2 = tempnam(sys_get_temp_dir(), 'DOC_GENERATED'); + $templateProcessor->saveAs($tmpfname2); + + unlink($tmpfname); + + $fileContent = fopen($tmpfname2, 'r'); // the generated file content + $response = new Response(fread($fileContent, filesize($tmpfname2))); + + $disposition = HeaderUtils::makeDisposition( + HeaderUtils::DISPOSITION_ATTACHMENT, + 'foo.docx' + ); + + $response->headers->set('Content-Disposition', $disposition); + unlink($tmpfname2); + + return $response; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php new file mode 100644 index 000000000..ade47e307 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php @@ -0,0 +1,55 @@ + ['fr' => 'FORMULAIRE AEB'], + 'desc' => 'stocké sur openstack comedienbe', + 'file' => 'FORMULAIRE_AEB.docx', + 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext', + 'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'], + ], [ + 'name' => ['fr' => 'AIDE ALIMENTAIRE'], + 'desc' => 'stocké sur openstack comedienbe', + 'file' => 'AIDE_ALIMENTAIRE.docx', + 'context' => 'Chill\DocGeneratorBundle\Context\HouseholdMemberSelectionContext', + 'entities' => ['Chill\PersonBundle\Entity\AccompanyingPeriod', 'Chill\PersonBundle\Entity\SocialWork\SocialAction'], + ], + ]; + + foreach ($templates as $template) { + + print('Adding doc generator templates '.$template['file'].")\n"); + + $newTemplate = (new DocGeneratorTemplate()) + ->setName($template['name']) + ->setDescription($template['desc']) + ->setFile($template['file']) + ->setContext($template['context']) + ->setEntities($template['entities']) + ; + + $manager->persist($newTemplate); + + $manager->flush(); + } + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php new file mode 100644 index 000000000..24f3a2d01 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/ChillDocGeneratorExtension.php @@ -0,0 +1,81 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.yml'); + $loader->load('services/controller.yml'); + $loader->load('services/fixtures.yml'); + $loader->load('services/form.yml'); + } + + public function prepend(ContainerBuilder $container) + { + $this->preprendRoutes($container); + $this->prependCruds($container); + } + + protected function preprendRoutes(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', array( + 'routing' => array( + 'resources' => array( + '@ChillDocGeneratorBundle/Resources/config/routes.yml' + ) + ) + )); + } + + /** + * @param ContainerBuilder $container + */ + protected function prependCruds(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', [ + 'cruds' => [ + [ + 'class' => \Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate::class, + 'name' => 'docgen_template', + 'base_path' => '/admin/docgen/template', + 'form_class' => \Chill\DocGeneratorBundle\Form\DocGeneratorTemplateType::class, + 'controller' => \Chill\DocGeneratorBundle\Controller\AdminDocGeneratorTemplateController::class, + 'actions' => [ + 'index' => [ + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/index.html.twig', + 'role' => 'ROLE_ADMIN' + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillDocGenerator/Admin/DocGeneratorTemplate/edit.html.twig', + ] + ] + ] + ] + ]); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php new file mode 100644 index 000000000..def8043a4 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php @@ -0,0 +1,29 @@ +getRootNode('chill_calendar'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php new file mode 100644 index 000000000..bf9c89839 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php @@ -0,0 +1,123 @@ +id; + } + + public function getName(): ?array + { + return $this->name; + } + + public function setName(array $name): self + { + $this->name = $name; + + return $this; + } + + public function getDescription(): ?string + { + return $this->description; + } + + public function setDescription(?string $description): self + { + $this->description = $description; + + return $this; + } + + public function getFile(): ?string + { + return $this->file; + } + + public function setFile(string $file): self + { + $this->file = $file; + + return $this; + } + + public function getEntities(): ?array + { + return $this->entities; + } + + public function setEntities(array $entities): self + { + $this->entities = $entities; + + return $this; + } + + public function getContext(): ?string + { + return $this->context; + } + + public function setContext(string $context): self + { + $this->context = $context; + + return $this; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php new file mode 100644 index 000000000..a0f36da0a --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Form/DocGeneratorTemplateType.php @@ -0,0 +1,38 @@ +add('name', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + ->add('description') + ->add('file') + ; + } + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', DocGeneratorTemplate::class) + ; + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/LICENSE b/src/Bundle/ChillDocGeneratorBundle/LICENSE new file mode 100644 index 000000000..2def0e883 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/src/Bundle/ChillDocGeneratorBundle/README.md b/src/Bundle/ChillDocGeneratorBundle/README.md new file mode 100644 index 000000000..8739b5395 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/README.md @@ -0,0 +1,5 @@ +Doc generator bundle +==================== + +This bundle generates documents (from templates) + diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php new file mode 100644 index 000000000..83f206d4b --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepository.php @@ -0,0 +1,21 @@ +{{ 'Title'|trans }} + {{ 'File'|trans }} + {% endblock %} + + {% block table_entities_tbody %} + {% for entity in entities %} + + {{ entity.name | localize_translatable_string }} + {{ entity.file }} + + {% endfor %} + {% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html b/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html new file mode 100644 index 000000000..f31ac39c9 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/Resources/view/Admin/DocGeneratorTemplate/new.twig.html @@ -0,0 +1,11 @@ +{% extends '@ChillPerson/Admin/layout.html.twig' %} + +{% block title %} + {% include('@ChillMain/CRUD/_new_title.html.twig') %} +{% endblock %} + +{% block layout_wvm_content %} + {% embed '@ChillMain/CRUD/_new_content.html.twig' %} + {% block content_form_actions_save_and_show %}{% endblock %} + {% endembed %} +{% endblock %} diff --git a/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js new file mode 100644 index 000000000..d894be9b0 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/chill.webpack.config.js @@ -0,0 +1,6 @@ +// this file loads all assets from the Chill DocGenerator bundle +module.exports = function(encore, entries) { + encore.addAliases({ + ChillDocGeneratorAssets: __dirname + '/Resources/public' + }); +}; diff --git a/src/Bundle/ChillDocGeneratorBundle/composer.json b/src/Bundle/ChillDocGeneratorBundle/composer.json new file mode 100644 index 000000000..4ae119636 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/composer.json @@ -0,0 +1,30 @@ +{ + "name": "chill-project/docgen", + "description": "This bundle extends chill for generation of documents", + "type": "symfony-bundle", + "license": "AGPL-3.0-or-later", + "keywords" : ["chill", "social work"], + "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/", + "autoload": { + "psr-4": { "Chill\\DocGeneratorBundle\\": "" } + }, + "autoload-dev": { + "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ] + }, + "authors": [ + { + "name": "Champs-Libres", + "email": "info@champs-libres.coop" + } + ], + "require": { + }, + "require-dev": { + }, + "extra": { + "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations", + "symfony-app-dir": "Test/Fixtures/App/app/" + }, + "minimum-stability": "dev", + "prefer-stable": true +} diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php new file mode 100644 index 000000000..26a6c3d56 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210805162522.php @@ -0,0 +1,31 @@ +addSql('CREATE SEQUENCE chill_docgen_template_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_docgen_template (id INT NOT NULL, name JSON NOT NULL, description TEXT DEFAULT NULL, file VARCHAR(255) NOT NULL, PRIMARY KEY(id))'); + } + + public function down(Schema $schema): void + { + $this->addSql('DROP SEQUENCE chill_docgen_template_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_docgen_template'); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php new file mode 100644 index 000000000..c055bf428 --- /dev/null +++ b/src/Bundle/ChillDocGeneratorBundle/migrations/Version20210812214310.php @@ -0,0 +1,34 @@ +addSql('ALTER TABLE chill_docgen_template ADD entities TEXT'); + $this->addSql('ALTER TABLE chill_docgen_template ADD context VARCHAR(255)'); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.entities IS \'(DC2Type:simple_array)\''); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS \'(DC2Type:json_array)\''); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_docgen_template DROP entities'); + $this->addSql('ALTER TABLE chill_docgen_template DROP context'); + $this->addSql('COMMENT ON COLUMN chill_docgen_template.name IS NULL'); + } +} diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml new file mode 100644 index 000000000..e69de29bb diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php index 7c88d24fe..4ecc215f7 100644 --- a/src/Bundle/ChillMainBundle/Controller/SearchController.php +++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php @@ -22,7 +22,9 @@ namespace Chill\MainBundle\Controller; +use Chill\MainBundle\Search\SearchApiNoQueryException; use Chill\MainBundle\Serializer\Model\Collection; +use GuzzleHttp\Psr7\Response; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Chill\MainBundle\Search\UnknowSearchDomainException; @@ -33,6 +35,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType; use Symfony\Component\Form\Extension\Core\Type\FormType; use Symfony\Component\HttpFoundation\JsonResponse; use Chill\MainBundle\Search\SearchProvider; +use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; use Symfony\Contracts\Translation\TranslatorInterface; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Search\SearchApi; @@ -46,15 +49,15 @@ use Symfony\Component\HttpFoundation\Exception\BadRequestException; class SearchController extends AbstractController { protected SearchProvider $searchProvider; - + protected TranslatorInterface $translator; - + protected PaginatorFactory $paginatorFactory; protected SearchApi $searchApi; - + function __construct( - SearchProvider $searchProvider, + SearchProvider $searchProvider, TranslatorInterface $translator, PaginatorFactory $paginatorFactory, SearchApi $searchApi @@ -65,14 +68,14 @@ class SearchController extends AbstractController $this->searchApi = $searchApi; } - + public function searchAction(Request $request, $_format) { $pattern = $request->query->get('q', ''); - + if ($pattern === ''){ switch($_format) { - case 'html': + case 'html': return $this->render('@ChillMain/Search/error.html.twig', array( 'message' => $this->translator->trans("Your search is empty. " @@ -86,16 +89,16 @@ class SearchController extends AbstractController ]); } } - + $name = $request->query->get('name', NULL); - + try { if ($name === NULL) { if ($_format === 'json') { return new JsonResponse('Currently, we still do not aggregate results ' . 'from different providers', JsonResponse::HTTP_BAD_REQUEST); } - + // no specific search selected. Rendering result in "preview" mode $results = $this->searchProvider ->getSearchResults( @@ -119,7 +122,7 @@ class SearchController extends AbstractController ), $_format )]; - + if ($_format === 'json') { return new JsonResponse(\reset($results)); } @@ -141,8 +144,8 @@ class SearchController extends AbstractController 'pattern' => $pattern )); } - - + + return $this->render('@ChillMain/Search/list.html.twig', array('results' => $results, 'pattern' => $pattern) ); @@ -159,29 +162,33 @@ class SearchController extends AbstractController ." one type"); } - $collection = $this->searchApi->getResults($query, $types, []); + try { + $collection = $this->searchApi->getResults($query, $types, []); + } catch (SearchApiNoQueryException $e) { + throw new BadRequestHttpException($e->getMessage(), $e); + } - return $this->json($collection); + return $this->json($collection, \Symfony\Component\HttpFoundation\Response::HTTP_OK, [], [ "groups" => ["read"]]); } - + public function advancedSearchListAction(Request $request) { /* @var $variable Chill\MainBundle\Search\SearchProvider */ $searchProvider = $this->searchProvider; $advancedSearchProviders = $searchProvider ->getHasAdvancedFormSearchServices(); - + if(\count($advancedSearchProviders) === 1) { \reset($advancedSearchProviders); - + return $this->redirectToRoute('chill_main_advanced_search', [ 'name' => \key($advancedSearchProviders) ]); } - + return $this->render('@ChillMain/Search/choose_list.html.twig'); } - + public function advancedSearchAction($name, Request $request) { try { @@ -190,22 +197,22 @@ class SearchController extends AbstractController /* @var $variable Chill\MainBundle\Search\HasAdvancedSearchFormInterface */ $search = $this->searchProvider ->getHasAdvancedFormByName($name); - + } catch (\Chill\MainBundle\Search\UnknowSearchNameException $e) { throw $this->createNotFoundException("no advanced search for " . "$name"); } - + if ($request->query->has('q')) { $data = $search->convertTermsToFormData($searchProvider->parse( $request->query->get('q'))); } - + $form = $this->createAdvancedSearchForm($name, $data ?? []); - + if ($request->isMethod(Request::METHOD_POST)) { $form->handleRequest($request); - + if ($form->isValid()) { $pattern = $this->searchProvider ->getHasAdvancedFormByName($name) @@ -215,8 +222,8 @@ class SearchController extends AbstractController 'q' => $pattern, 'name' => $name ]); } - } - + } + return $this->render('@ChillMain/Search/advanced_search.html.twig', [ 'form' => $form->createView(), @@ -224,15 +231,15 @@ class SearchController extends AbstractController 'title' => $search->getAdvancedSearchTitle() ]); } - + protected function createAdvancedSearchForm($name, array $data = []) { $builder = $this ->get('form.factory') ->createNamedBuilder( null, - FormType::class, - $data, + FormType::class, + $data, [ 'method' => Request::METHOD_POST ] ); @@ -240,12 +247,12 @@ class SearchController extends AbstractController ->getHasAdvancedFormByName($name) ->buildForm($builder) ; - + $builder->add('submit', SubmitType::class, [ 'label' => 'Search' ]); - + return $builder->getForm(); } - + } diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php index 071f67497..629b6657e 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php @@ -15,6 +15,7 @@ trait LoadAbstractNotificationsTrait { public function load(ObjectManager $manager) { + return; foreach ($this->notifs as $notif) { $entityId = $this->getReference($notif['entityRef'])->getId(); diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php index 6826f854c..1637ee098 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -32,9 +32,8 @@ use Chill\MainBundle\Doctrine\DQL\JsonAggregate; use Chill\MainBundle\Doctrine\DQL\JsonbExistsInArray; use Chill\MainBundle\Doctrine\DQL\Similarity; use Chill\MainBundle\Doctrine\DQL\OverlapsI; -use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\Reference; use Chill\MainBundle\Doctrine\DQL\Replace; +use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator; use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType; use Chill\MainBundle\Doctrine\Type\PointType; use Symfony\Component\HttpFoundation\Request; @@ -186,6 +185,9 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface, 'OVERLAPSI' => OverlapsI::class, ], ], + 'hydrators' => [ + 'chill_flat_hierarchy_list' => FlatHierarchyEntityHydrator::class, + ], ], ], ); diff --git a/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php new file mode 100644 index 000000000..c389b543d --- /dev/null +++ b/src/Bundle/ChillMainBundle/Doctrine/ORM/Hydration/FlatHierarchyEntityHydrator.php @@ -0,0 +1,47 @@ +flatListGenerator($this->buildChildrenHashmap(parent::hydrateAllData())))); + } + + private function flatListGenerator(array $hashMap, ?object $parent = null): Generator + { + $parent = null === $parent ? null : spl_object_id($parent); + $hashMap += [$parent => []]; + + foreach ($hashMap[$parent] as $node) { + yield spl_object_id($node) => $node; + yield from $this->flatListGenerator($hashMap, $node); + } + } + + private function buildChildrenHashmap(array $nodes): array + { + return array_reduce( + $nodes, + static function (array $collect, $node): array { + $parentId = (null === $parent = $node->getParent()) ? + null : + spl_object_id($parent); + + $collect[$parentId][] = $node; + + return $collect; + }, + [] + ); + } + +} diff --git a/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php new file mode 100644 index 000000000..2cfb45d4a --- /dev/null +++ b/src/Bundle/ChillMainBundle/Pagination/ChillItemsPerPageTwig.php @@ -0,0 +1,67 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\MainBundle\Pagination; + +use Twig\Environment; +use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; + +/** + * add twig function to render pagination + * + * @author Mathieu Jaumotte + * @author Champs Libres + */ +class ChillItemsPerPageTwig extends AbstractExtension +{ + public function getName() + { + return 'chill_items_per_page'; + } + + public function getFunctions() + { + return array( + new TwigFunction( + 'chill_items_per_page', + array($this, 'paginationRender'), + array( + 'needs_environment' => true, + 'is_safe' => ['html'] + ) + ) + ); + } + + public function paginationRender( + Environment $env, + PaginatorInterface $paginator, + $template = '@ChillMain/Pagination/items_per_page.html.twig' + ) { + + return $env->render($template, array( + 'paginator' => $paginator, + 'current' => $paginator->getItemsPerPage() + )); + } +} diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php index 0e8338da3..c386a9757 100644 --- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php +++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php @@ -61,7 +61,7 @@ class PaginatorFactory public function __construct( RequestStack $requestStack, RouterInterface $router, - $itemPerPage = 50 + $itemPerPage = 20 ) { $this->itemPerPage = $itemPerPage; $this->requestStack = $requestStack; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 97c5e3cc9..1d7cd5db8 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -4,23 +4,153 @@ // Chill mixins @import './scss/mixins'; +// Chill buttons +@import './scss/buttons'; + +// Chill forms +@import './scss/forms'; + +// Chill record_actions +@import './scss/record_actions'; + // Chill entity render box system @import './scss/render_box'; // Chill flex responsive table/block presentation @import './scss/flex_table'; + /* - * Specific rules + * BASE LAYOUT POSITION */ -.custom_field_no_data, -.chill-no-data-statement { - font-style: italic; +body { + display: flex; + flex-direction: column; + min-height: 100vh; + footer { + margin-top: auto; + } +} + +header { + nav.navbar { + padding: 0; + a.navbar-brand img { + height: 50px; + margin: 8px 0; + } + div.navbar-collapse { + float: right; + } + ul.navbar-nav { + display: flex; + align-items: stretch; + li.nav-item { + display: flex; + &.btn { + padding-top: 0; + padding-bottom: 0; + } + & > a { + align-self: center; + } + form.form-inline { + align-self: center; + display: flex; + input.form-control { + align-self: center; + height: 32px; + } + } + } + } + div.dropdown-menu { + margin: 0; + padding: 0; + border-radius: 0; + a.dropdown-item { + width: 120%; + border: 0; + border-bottom: 1px solid $gray-200; + font-size: smaller; + i { + float: right; } + &:hover { + color: $gray-500 !important; } + } + } + + // fullwidth menu when navbar is collapsed + @media (max-width: 767px) { + & { + position: relative; + } + button.navbar-toggler { + float: right; + } + div.navbar-collapse { + float: none; + position: absolute; + top: 4em; + left: 0; + right: 0; + z-index: 2; + padding: 1em; + border-top: 1px solid shade-color($primary, 25%); + ul.navbar-nav { + display: grid; + grid-template-areas: + "sear sear sear" + "sect user lang"; + li.nav-item { + flex-direction: column; + border: 0; + a.nav-link {} + &.navigation-search { + grid-area: sear; + margin-bottom: 1em; + form { + width: 100%; + input.form-control {} + button.btn {} + } + } + &.nav-section { grid-area: sect; } + &.nav-user { grid-area: user; } + &.nav-language { grid-area: lang; } + } + li.dropdown { + &, & > * { + background-color: transparent !important; + } + a.dropdown-toggle {} + div.dropdown-menu { + display: block; + border: 0; + a.dropdown-item { + width: 100%; + border: 0; + border-top: 1px dotted $gray-200; + background-color: transparent !important; + } + } + } + } + } + } + + } } -// styles communs pour tous les bandeaux div.banner { + a { + text-decoration: none; + &.phone, + &.email { + color: $white; + } + } .id-number { font-weight: lighter; font-size: 50%; @@ -28,17 +158,230 @@ div.banner { &:before { content: '(n°'; } &:after { content: ')'; } } - a.phone, - a.email { - color: white; - } - ul.list-content { - //margin: 0 auto; - } span.age { margin-left: 0.5em; &:before { content: '('; } &:after { content: ')'; } } - +} + +div.vertical-menu { + border-radius: 0; + margin-top: 0.5rem; + a.list-group-item { + background-color: $chill-yellow; + border: 0; + margin-bottom: 0.25rem; + &:hover { + background-color: tint-color($chill-yellow, 20%) + } + } +} + +footer.footer { + background: $dark; + padding-top: 10px; + padding-bottom: 10px; + width: 100%; + p { + font-family: Open Sans; + font-weight: 300; + clear: both; + color: $white; + font-size: 0.9em; + line-height: 1.5em; + margin: auto; + max-width: 35em; + text-align: center; + a, a:hover { + text-decoration: underline; + } + } +} + + +/* + * SPECIFIC RULES + */ + +/// titles +h1, h2, +.h1, .h2 { + font-weight: $headings-font-weight + 200; +} + +/// typography +.open_sansbold { + font-weight: bold; +} + +/// no borders on head table +table.table-bordered { + thead, thead * { + border: 0 !important; + text-align: center; + } +} + +/// comments quotes +.chill-user-quote { + border-left: 10px solid $yellow; + margin: 1.5em 10px; + padding: 0.5em 15px; + background-color: $gray-200; + color: $gray-800; + font-size: 90%; + + // test a bottom right decoration (to be confirmed) + &.test { + position: relative; + &:after { + content: ''; + position: absolute; + width: 0px; height: 0px; + bottom: 0; right: 0; + background: $white; + border-top: 10px solid $gray-200; + border-left: 10px solid $gray-200; + border-right: 10px solid $white; + border-bottom: 10px solid $white; + } + } + + // ckeditor citation + blockquote p { + font-style: italic; + padding-left: 2em; + quotes: "“" "„"; + position: relative; + &:before { + content: open-quote; + font-size: 400%; + color: $gray-400; + position: absolute; + top: -25px; + left: 0; + } + } +} + +div.metadata { + font-size: smaller; + color: $gray-600; + span.user, span.date { + text-decoration: underline dotted; + &:hover { + color: $gray-700; + } + } +} + +/// display definition list +// with dt and dd on same line + +dl.definition-inline { + dd { + display: inline; + margin: 0; + &:after{ + display: block; + content: ''; + } + } + dt{ + display: inline-block; + min-width: 200px; + } +} + +/// when there is no data +.custom_field_no_data, +.chill-no-data-statement { + font-style: italic; +} + +//// still used ? +// move from chillmain.css, converted to sass + +div#usefulbar { + background-color: $yellow; + z-index: 1000; + padding-right: 15px; + + form { + margin: 0; + } + i.menu { + font-size: 2em; + } + ul { + display: flex; + justify-content: flex-end; + margin: 0; + padding-top: 5px; + padding-right: 10px; + } + li { + color: $white; + margin-left: 10px; + a { + color: $white; + text-shadow: 0px 0px 1px $gray-600; + } + i.icon-user-add { + &:before { + vertical-align: -5px; + } + } + &#search_element { + text-align: right; + div#search_form { + margin: 0; + padding: 0; + div, .field { + margin: 0; + } + button { + color: $white; + border: none; + bottom: -2px; + height: 35px; + } + } + } + } +} + +div#flashMessages { + margin-top: 20px; + .flash-notice { + margin-top: 10px; + margin-bottom: 10px; + } +} + +.personName { + font-variant: small-caps; + text-transform: capitalize; +} + +// probably used in client chill. +// think to rename like above +input.belgian_national_number_inversed_date { + width: 7em; + margin-right: 1em; +} +input.belgian_national_number_daily_counter { + width: 4em; + margin-right: 1em; +} +input.belgian_national_number_control_digit { + width: 3em; +} + +// +input.belgian_national_number { + &.inversed_date {} + &.daily_counter {} + &.control_digit {} } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css b/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css deleted file mode 100644 index 85c247173..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/css/chillmain.css +++ /dev/null @@ -1,25 +0,0 @@ -div#usefulbar { background-color: #fbba3a; z-index: 1000; padding-right: 15px; } -div#usefulbar form { margin: 0; } -div#usefulbar i.menu { font-size: 2em; } -div#usefulbar ul { display: flex; justify-content: flex-end; margin: 0; padding-top: 5px; padding-right: 10px; } -div#usefulbar li { color: white; margin-left: 10px; } -div#usefulbar li a { color: white; text-shadow: 0px 0px 1px #555; } -div#usefulbar li i.icon-user-add:before { vertical-align: -5px; } -div#usefulbar li#search_element { text-align: right; } -div#usefulbar li#search_element div#search_form { margin: 0; padding: 0; } -div#usefulbar li#search_element div#search_form div { margin: 0; } -div#usefulbar li#search_element div#search_form .field { margin: 0; } -div#usefulbar li#search_element div#search_form button { color: white; border: none; bottom: -2px; height: 35px; } - -div#flashMessages { margin-top: 20px; } -div#flashMessages .flash-notice { margin-top: 10px; margin-bottom: 10px; } - -.personName { font-variant: small-caps; text-transform: capitalize; } - -.personName { text-transform: capitalize; } - -input.belgian_national_number_inversed_date { width: 7em; margin-right: 1em; } - -input.belgian_national_number_daily_counter { width: 4em; margin-right: 1em; } - -input.belgian_national_number_control_digit { width: 3em; } \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js index cf7365631..2e13bcc06 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/index.js @@ -14,12 +14,12 @@ global.select2 = select2; require('select2/dist/css/select2.css'); require('select2-bootstrap-theme/dist/select2-bootstrap.css'); + /* * Load Chill themes assets */ require('./chillmain.scss'); -require('./css/chillmain.css'); import { chill } from './js/chill.js'; global.chill = chill; @@ -34,6 +34,7 @@ require('./img/favicon.ico'); require('./img/logo-chill-sans-slogan_white.png'); require('./img/logo-chill-outil-accompagnement_white.png'); + /* * Load local libs * Some libs are only used in a few pages, they are loaded on a case by case basis @@ -45,7 +46,6 @@ require('../lib/breadcrumb/index.js'); require('../lib/download-report/index.js'); require('../lib/select_interactive_loading/index.js'); require('../lib/export-list/index.js'); -require('../lib/entity/index.js'); //require('../lib/show_hide/index.js'); //require('../lib/tabs/index.js'); diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss similarity index 86% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss rename to src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index 6264a3a95..fde222a23 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -62,10 +62,10 @@ $chill-theme-buttons: ( &.btn-view::before, &.btn-save::before, &.btn-duplicate::before, - &.btn-not-duplicate::before, - &.btn-submit::before, - &.btn-reset::before, - &.btn-action::before, + // &.btn-not-duplicate::before, + // &.btn-submit::before, + // &.btn-reset::before, + // &.btn-action::before, &.btn-delete::before, &.btn-remove::before, &.btn-cancel::before { @@ -101,3 +101,18 @@ $chill-theme-buttons: ( color: $light; } } + +/// allow to hide icon (herited from scratch) +.btn { + &.change-icon { + &::before { + content: ''; + margin-right: 0; + } + } +} + +// fix min-width on small pictos buttons +.btn-sm, .btn-group-sm > .btn { + min-width: 36px; +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index c01ebc41d..259a23055 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -1,59 +1,81 @@ /* * FLEX RESPONSIVE TABLE/BLOCK PRESENTATION */ + div.flex-bloc, div.flex-table { + display: flex; + align-items: stretch; + align-content: stretch; + box-sizing: border-box; + margin: 1.5em 0; + + div.item-bloc { + display: flex; + @include border-collapse; + padding: 1em; + + div.item-row { + display: flex; + + div.item-col:last-child { + display: flex; + } + } + } + h2, h3, h4, dl, p { margin: 0; } h2, h3, h4 { - color: var(--bs-chill-blue); + color: $blue; } - div.item-bloc { - @include border-collapse; + + ul.record_actions { + margin: 0; + li { + margin-right: 5px; + } } } /* * Bloc appearance */ + div.flex-bloc { - box-sizing: border-box; - display: flex; flex-direction: row; flex-wrap: wrap; - align-items: stretch; - align-content: stretch; div.item-bloc { flex-grow: 0; flex-shrink: 1; flex-basis: auto; - margin: 0; - padding: 1em; - display: flex; flex-direction: column; + margin: 0; + hyphens: auto; div.item-row { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; flex-direction: column; div.item-col { + &.separator { + margin-top: 0.5em; + border-top: 1px dotted $gray-900; + padding-top: 0.5em; + } + &:first-child { flex-grow: 0; flex-shrink: 0; flex-basis: auto; - padding-bottom: 0.5em; - border-bottom: 1px dotted #0000004f; - margin-bottom: 0.5em; } + &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; - .list-content { // ul, dl, or div - } ul.record_actions { - margin: 0; align-self: flex-end; flex-grow: 1; flex-shrink: 0; flex-basis: auto; + margin: 0; + li { margin-right: 5px; } @@ -67,51 +89,47 @@ div.flex-bloc { /* * Table appearance */ + div.flex-table { - display: flex; flex-direction: column; - align-items: stretch; - align-content: stretch; div.item-bloc { - display: flex; flex-direction: column; - padding: 1em; + &:nth-child(even) { background-color: $gray-200; + + .chill-user-quote { + background-color: shade-color($gray-200, 5%) + } } div.item-row { - display: flex; flex-direction: row; - &:not(:first-child) { + + &.separator { margin-top: 0.5em; - border-top: 1px dotted #0000004f; + border-top: 1px dotted $gray-900; padding-top: 0.5em; - flex-direction: column; + //flex-direction: column; } div.item-col { &:first-child { - flex-grow: 0; flex-shrink: 0; flex-basis: 33%; + flex-grow: 0; flex-shrink: 0; flex-basis: auto; } + &:last-child { flex-grow: 1; flex-shrink: 1; flex-basis: auto; - display: flex; justify-content: flex-end; - .list-content { // ul, dl, or div - } ul.record_actions { - margin: 0; - align-self: flex-start; flex-grow: 1; flex-shrink: 0; flex-basis: auto; - li { - margin-right: 5px; - } + align-self: flex-start; } } } + @media only screen and (max-width: 900px) { flex-direction: column; div.item-col { @@ -122,9 +140,6 @@ div.flex-table { } } } - - // neutralize - div.chill_address div.chill_address_address p { text-indent: 0; } } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss new file mode 100644 index 000000000..0ae568244 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss @@ -0,0 +1,44 @@ +/// forms +form { + + /* avoid useless html in first level of the custom fields row loop in forms + * (better should to improve the loop) + */ + & > div.container-fluid { + & > div.row > .parent { + padding: 0; + & div.cf-fields span.cf-title { + margin: 1em -15px 0; + width: calc(100% + 30px); + @include title_in_form; + } + } + } + + fieldset { + margin-top: 1em; + & > legend { + @include title_in_form; + } + } + + // customfields titles in form + span.cf-title { + @include title_in_form; + } + + label { + display: inline; + &.required:after { + content: " *"; + color: $red; + } + } +} + +.col-form-label { + padding-top: .5em; + padding-bottom: .5em; + font-weight: 700; + margin-bottom: .375em; +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss index 22e1d310e..cccb01502 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/mixins.scss @@ -1,4 +1,18 @@ +// +// Titles in forms +// + +@mixin title_in_form { + font-size: 1.438em; + font-weight: 700; + width: 100%; + border-bottom: 3px solid $gray-200; + margin-bottom: 1em; + display: block; +} + + // We use box-shadow instead of border // to avoid to manage border double-width // Then we can simulate border-collapse: collapse (table) diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss similarity index 70% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss rename to src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss index 8ddc1b009..bdb3c60a6 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_record_actions.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/record_actions.scss @@ -1,13 +1,22 @@ -ul.record_actions, -ul.record_actions_column { +ul.record_actions { display: flex; + flex-direction: row; + flex-wrap: wrap-reverse; justify-content: flex-end; + padding: 0.5em 0; - &.record_actions--left { + &.column { + flex-direction: column; + } + + &.left { justify-content: flex-start; } - padding: 0.5em 0; - flex-wrap: wrap-reverse; + + &.sticky-form-buttons { + padding-left: 1em; + padding-right: 1em; + } li { display: inline-block; @@ -18,37 +27,34 @@ ul.record_actions_column { &:last-child { margin-right: 0; } - } - li.cancel { - order: 1; - margin-right: auto; + &.cancel { + order: 1; + margin-right: auto; + } } } - -ul.record_actions { - flex-direction: row; -} - -ul.record_actions_column { - flex-direction: column; -} - -ul.record_actions.sticky-form-buttons { - padding-left: 1em; - padding-right: 1em; +.sticky-form-buttons { + margin-top: 4em; + background-color: $beige; + position: sticky; + bottom: 0.3em; + text-align: center; + display: flex; + padding: 0.8em 1.6em; + border-radius: 0; + z-index: 1000; } +/// EXCEPTIONS // inside table exceptions table { - td ul.record_actions, ul.record_actions_small { li { margin-right: 0.2em; } } - ul.record_actions { margin: 0; padding: 0.5em; diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss index dd1dc12c5..31d2c8d09 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/render_box.scss @@ -13,12 +13,18 @@ section.chill-entity { } // specific rules +// all render box doesn't use a section tag ! .chill-entity { // used for: entity-person, entity-thirdparty &.entity-person, &.entity-thirdparty { + span.entity-raw { + & > span:not(:first-child):before { + content: " "; + } + } div.entity-label { div.denomination { &.h3 { @@ -87,9 +93,25 @@ section.chill-entity { font-style: italic; } - span.address-valid { - &.address-since {} - &.address-until {} + .address-valid { + margin-top: 2em; + &.date-since {} + &.date-until {} + } + } + + // used for comment-embeddable + &.entity-comment-embeddable { + width: 100%; + div.metadata { + font-size: smaller; + color: $gray-600; + span.user, span.date { + text-decoration: underline dotted; + &:hover { + color: $gray-700; + } + } } } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss deleted file mode 100644 index e45173e56..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/comment_embeddable.scss +++ /dev/null @@ -1,6 +0,0 @@ -.chill-entity__comment-embeddable { - .chill-entity__comment-embeddable__metadata { - font-size: smaller; - color: var(--chill-light-gray); - } -} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js deleted file mode 100644 index c739899a5..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// css classes to render entities -require('./comment_embeddable.scss'); diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss index 17ca68d49..9d632026f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_custom.scss @@ -1,284 +1,6 @@ /* * These custom styles will override bootstrap enabled stylesheets + * in mod_bootstrap entrypoint */ -/// chill buttons -@import 'custom/_buttons'; -// chill record_actions -@import 'custom/_record_actions'; - -/// titles -h1, h2, .h1, .h2 { - font-weight: $headings-font-weight + 200; -} - -/// typography -.open_sansbold { - font-weight: bold; -} - -/// forms - -@mixin title_in_form { - font-size: 1.438em; - font-weight: 700; - width: 100%; - border-bottom: 3px solid $gray-200; - margin-bottom: 1em; - display: block; -} - -.col-form-label { - padding-top: .5em; - padding-bottom: .5em; - font-weight: 700; - margin-bottom: .375em; -} - -form { - /* avoid useless html in first level of the custom fields row loop in forms - * (better should to improve the loop) - */ - & > div.container-fluid { - & > div.row > .parent { - padding: 0; - & div.cf-fields span.cf-title { - margin: 1em -15px 0; - width: calc(100% + 30px); - @include title_in_form; - } - } - } - fieldset { - margin-top: 1em; - & > legend { - @include title_in_form; - } - } - label { - display: inline; - &.required:after { - content: " *"; - color: $red; - } - } -} - -/// table - -table.table-bordered { - thead, thead * { - border: 0 !important; - text-align: center; - } -} - -/// chill elements of design - -.sticky-form-buttons { - margin-top: 4em; - background-color: $beige; - position: sticky; - bottom: 0.3em; - text-align: center; - display: flex; - padding: 0.8em 1.6em; - border-radius: 0; -} - -.chill-user-quote { - border-left: 10px solid $yellow; - margin: 1.5em 10px; - padding: 0.5em 15px; - quotes: "\201C" "\201D" "\2018" "\2019"; - background-color: $gray-200; - blockquote { - border-left: 0.4em solid $gray-400; - padding-left: 0.9em; - margin-left: 0.9em; - font-style: italic; - } -} - -div.chill_address { - div.chill_address_address { - margin: 0.7em 0; - font-size: 98%; - font-variant: small-caps; - p { - display: inline-block; - margin: 0 0 0 1.5em; - text-indent: -1.5em; - } - } -} - -/// base layout positions - -body { - display: flex; - flex-direction: column; - min-height: 100vh; - footer { - margin-top: auto; - } -} - -header { - nav.navbar { - padding: 0; - a.navbar-brand img { - height: 50px; - margin: 8px 0; - } - div.navbar-collapse { - float: right; - } - ul.navbar-nav { - display: flex; - align-items: stretch; - li.nav-item { - display: flex; - &.btn { - padding-top: 0; - padding-bottom: 0; - } - & > a { - align-self: center; - } - form.form-inline { - align-self: center; - display: flex; - input.form-control { - align-self: center; - height: 32px; - } - } - } - } - div.dropdown-menu { - margin: 0; - padding: 0; - border-radius: 0; - a.dropdown-item { - width: 120%; - border: 0; - border-bottom: 1px solid $gray-200; - font-size: smaller; - i { - float: right; } - &:hover { - color: $gray-500 !important; } - } - } - - // fullwidth menu when navbar is collapsed - @media (max-width: 767px) { - & { - position: relative; - } - button.navbar-toggler { - float: right; - } - div.navbar-collapse { - float: none; - position: absolute; - top: 4em; - left: 0; - right: 0; - z-index: 2; - padding: 1em; - border-top: 1px solid shade-color($primary, 25%); - ul.navbar-nav { - display: grid; - grid-template-areas: - "sear sear sear" - "sect user lang"; - li.nav-item { - flex-direction: column; - border: 0; - a.nav-link {} - &.navigation-search { - grid-area: sear; - margin-bottom: 1em; - form { - width: 100%; - input.form-control {} - button.btn {} - } - } - &.nav-section { grid-area: sect; } - &.nav-user { grid-area: user; } - &.nav-language { grid-area: lang; } - } - li.dropdown { - &, & > * { - background-color: transparent !important; - } - a.dropdown-toggle {} - div.dropdown-menu { - display: block; - border: 0; - a.dropdown-item { - width: 100%; - border: 0; - border-top: 1px dotted $gray-200; - background-color: transparent !important; - } - } - } - } - } - } - - } -} - -div.banner { - div.header-name, - div.header-details { - div.row > div:first-child { - @media (min-width: 576px) { - //margin-left: 1.5em; - } - } - } - a { - text-decoration: none; - } -} - -div.vertical-menu { - border-radius: 0; - margin-top: 0.5rem; - a.list-group-item { - background-color: $chill-yellow; - border: 0; - margin-bottom: 0.25rem; - &:hover { - background-color: tint-color($chill-yellow, 20%) - } - } -} - -footer.footer { - background: $dark; - padding-top: 10px; - padding-bottom: 10px; - width: 100%; - p { - font-family: Open Sans; - font-weight: 300; - clear: both; - color: $white; - font-size: 0.9em; - line-height: 1.5em; - margin: auto; - max-width: 35em; - text-align: center; - a, a:hover { - text-decoration: underline; - } - } -} diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/shared.scss rename to src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss index dc2a722cf..04cf765e0 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss @@ -14,7 +14,7 @@ $gray-400: #ced4da !default; $gray-500: #b2b2b2 !default; $gray-600: #6c757d !default; $gray-700: #495057 !default; -$gray-800: #333333 !default; +$gray-800: #2c2d2f !default; $gray-900: #212529 !default; $black: #111 !default; // scss-docs-end gray-color-variables @@ -160,7 +160,7 @@ $chill-pink: $pink; $chill-gray: $gray-600; $chill-dark-gray: $gray-800; $chill-light-gray: $gray-200; -$chill-llight-gray: $gray-100; +$chill-llight-gray: $gray-100; // scss-docs-end theme-color-variables // scss-docs-start theme-colors-map @@ -176,7 +176,7 @@ $theme-colors: ( ) !default; // scss-docs-end theme-colors-map -$chill-colors: ( +$chill-colors: ( "chill-blue": $chill-blue, "chill-green": $chill-green, "chill-green-dark": $chill-green-dark, @@ -382,7 +382,7 @@ $border-color: $gray-300 !default; // scss-docs-end border-variables // scss-docs-start border-radius-variables -$border-radius: .25rem !default; // <== +$border-radius: .25rem !default; // <== $border-radius-sm: .2rem !default; $border-radius-lg: .3rem !default; $border-radius-pill: 50rem !default; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue index 72b46c3ab..0ae6fc578 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue @@ -1,147 +1,86 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js index 0f078a2d9..e4ed78f35 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/api.js @@ -4,7 +4,7 @@ * @returns {Promise} a promise containing all Country object */ const fetchCountries = () => { - console.log('<<< fetching countries'); + //console.log('<<< fetching countries'); const url = `/api/1.0/main/country.json?item_per_page=1000`; return fetch(url) @@ -20,7 +20,7 @@ const fetchCountries = () => { * @returns {Promise} a promise containing all Postal Code objects filtered with country */ const fetchCities = (country) => { - console.log('<<< fetching cities for', country); + //console.log('<<< fetching cities for', country); const url = `/api/1.0/main/postal-code.json?item_per_page=1000&country=${country.id}`; return fetch(url) .then(response => { @@ -35,7 +35,7 @@ const fetchCities = (country) => { * @returns {Promise} a promise containing all AddressReference objects filtered with postal code */ const fetchReferenceAddresses = (postalCode) => { - console.log('<<< fetching references addresses for', postalCode); + //console.log('<<< fetching references addresses for', postalCode); const url = `/api/1.0/main/address-reference.json?item_per_page=1000&postal_code=${postalCode.id}`; return fetch(url) .then(response => { @@ -50,7 +50,7 @@ const fetchReferenceAddresses = (postalCode) => { * @returns {Promise} a promise containing all AddressReference objects filtered with postal code */ const fetchAddresses = () => { - console.log('<<< fetching addresses'); + //console.log('<<< fetching addresses'); //TODO deal with huge number of addresses... we should do suggestion... const url = `/api/1.0/main/address.json?item_per_page=1000`; return fetch(url) @@ -125,31 +125,6 @@ const postPostalCode = (postalCode) => { }); }; -/* -* Endpoint chill_api_single_person_address -* method POST, post Person instance -* -* @id integer - id of Person -* @body Object - dictionary with changes to post -*/ -const postAddressToPerson = (personId, addressId) => { - console.log(personId); - console.log(addressId); - const body = { - 'id': addressId - }; - const url = `/api/1.0/person/person/${personId}/address.json` - return fetch(url, { - method: 'POST', - headers: {'Content-Type': 'application/json;charset=utf-8'}, - body: JSON.stringify(body) - }) - .then(response => { - if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); - }); -}; - /* * Endpoint chill_api_single_address__index * method GET, get Address Object @@ -157,7 +132,7 @@ const postAddressToPerson = (personId, addressId) => { * @returns {Promise} a promise containing a Address object */ const getAddress = (id) => { - console.log('<<< get address'); + //console.log('<< get address'); const url = `/api/1.0/main/address/${id}.json`; return fetch(url) .then(response => { @@ -174,6 +149,5 @@ export { postAddress, patchAddress, postPostalCode, - postAddressToPerson, getAddress }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue index ead092802..fa4ff4773 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -1,273 +1,618 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue index 978862d82..c6abd92d5 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue @@ -13,16 +13,18 @@ let marker; export default { name: 'AddressMap', - props: ['address'], + props: ['entity'], computed: { center() { - return this.address.addressMap.center; + return this.entity.selected.addressMap.center; }, }, methods:{ init() { map = L.map('address_map').setView([46.67059, -1.42683], 12); + map.scrollWheelZoom.disable(); + L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' }).addTo(map); @@ -36,9 +38,9 @@ export default { }, update() { - console.log('update map with : ', this.address.addressMap.center) - marker.setLatLng(this.address.addressMap.center); - map.setView(this.address.addressMap.center, 15); + //console.log('update map with : ', this.address.addressMap.center) + marker.setLatLng(this.entity.addressMap.center); + map.setView(this.entity.addressMap.center, 15); } }, mounted(){ diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue index 11c25b318..1216871ab 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue @@ -74,69 +74,62 @@ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/components/SelectHouseholdAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/components/SelectHouseholdAddress.vue rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/SelectHouseholdAddress.vue diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue new file mode 100644 index 000000000..017e6fd24 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditAddressPane.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue index 786f0dce6..056d1044f 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddress.vue @@ -1,64 +1,62 @@ diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue new file mode 100644 index 000000000..14ca059c0 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue @@ -0,0 +1,101 @@ + + + diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js new file mode 100644 index 000000000..9cfd05a3e --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -0,0 +1,55 @@ +const addressMessages = { + fr: { + add_an_address_title: 'Créer une adresse', + edit_an_address_title: 'Modifier une adresse', + create_a_new_address: 'Créer une nouvelle adresse', + edit_address: 'Modifier l\'adresse', + select_an_address_title: 'Sélectionner une adresse', + fill_an_address: 'Compléter l\'adresse', + select_country: 'Choisir le pays', + country: 'Pays', + select_city: 'Choisir une localité', + city: 'Localité', + other_city: 'Autre localité', + select_address: 'Choisir une adresse', + address: 'Adresse', + other_address: 'Autre adresse', + create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse', + isNoAddress: 'Pas d\'adresse complète', + street: 'Nom de rue', + streetNumber: 'Numéro', + floor: 'Étage', + corridor: 'Couloir', + steps: 'Escalier', + flat: 'Appartement', + buildingName: 'Nom du bâtiment', + extra: 'Complément d\'adresse', + distribution: 'Service particulier de distribution', + create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité', + postalCode_name: 'Nom', + postalCode_code: 'Code postal', + date: 'Date de la nouvelle adresse', + validFrom: 'Date de la nouvelle adresse', + back_to_the_list: 'Retour à la liste', + loading: 'chargement en cours...', + address_new_success: 'La nouvelle adresse est enregistrée', + address_edit_success: 'L\'adresse a été mise à jour', + + // person specific + add_an_address_to_person: 'Ajouter l\'adresse à la personne', + person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée', + person_address_edit_success: 'L\'adresse de la personne a été mise à jour', + + // household specific + move_date: 'Date du déménagement', + select_a_existing_address: 'Sélectionner une adresse existante', + add_an_address_to_household: 'Enregistrer', + household_address_move_success: 'La nouvelle adresse du ménage est enregistrée', + household_address_edit_success: 'L\'adresse du ménage a été mise à jour', + + } +}; + +export { + addressMessages +}; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js index 27676369e..bb2dd6543 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js @@ -1,16 +1,13 @@ -import { createApp } from 'vue' -import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n' -import { addressMessages } from './js/i18n' -import { store } from './store' - +import { createApp } from 'vue'; import App from './App.vue'; +import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'; +import { addressMessages } from './i18n'; -const i18n = _createI18n(addressMessages); +const i18n = _createI18n( addressMessages ); const app = createApp({ - template: ``, + template: ``, }) -.use(store) .use(i18n) .component('app', App) .mount('#address'); diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js deleted file mode 100644 index f8a7ea4d2..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/js/i18n.js +++ /dev/null @@ -1,42 +0,0 @@ -const addressMessages = { - fr: { - add_an_address_title: 'Créer une adresse', - edit_an_address_title: 'Modifier une adresse', - create_a_new_address: 'Créer une nouvelle adresse', - edit_address: 'Modifier l\'adresse', - select_an_address_title: 'Sélectionner une adresse', - fill_an_address: 'Compléter l\'adresse', - select_country: 'Choisir le pays', - country: 'Pays', - select_city: 'Choisir une localité', - city: 'Localité', - other_city: 'Autre localité', - select_address: 'Choisir une adresse', - address: 'Adresse', - other_address: 'Autre adresse', - create_address: 'Adresse inconnue. Cliquez ici pour créer une nouvelle adresse', - isNoAddress: 'Pas d\'adresse complète', - street: 'Nom de rue', - streetNumber: 'Numéro', - floor: 'Étage', - corridor: 'Couloir', - steps: 'Escalier', - flat: 'Appartement', - buildingName: 'Nom du bâtiment', - extra: 'Complément d\'adresse', - distribution: 'Service particulier de distribution', - create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité', - postalCode_name: 'Nom', - postalCode_code: 'Code postal', - date: 'Date de la nouvelle adresse', - add_an_address_to_person: 'Ajouter l\'adresse à la personne', - validFrom: 'Date de la nouvelle adresse', - back_to_the_list: 'Retour à la liste', - person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée', - loading: 'chargement en cours...' - } -}; - -export { - addressMessages -}; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js new file mode 100644 index 000000000..392d033f5 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store.js @@ -0,0 +1,14 @@ +import 'es6-promise/auto'; +import { createStore } from 'vuex'; + +const debug = process.env.NODE_ENV !== 'production'; + +const store = createStore({ + strict: debug, + state: {}, + getters: {}, + mutations: {}, + actions: {}, +}); + +export { store }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js deleted file mode 100644 index 967675c8f..000000000 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/store/index.js +++ /dev/null @@ -1,158 +0,0 @@ -import 'es6-promise/auto'; -import { createStore } from 'vuex'; - -import { patchAddress, postAddress, postPostalCode, postAddressToPerson, getAddress } from '../api' - -const debug = process.env.NODE_ENV !== 'production'; - -const store = createStore({ - strict: debug, - state: { - address: {}, - editAddress: {}, //TODO or should be address? - person: {}, - errorMsg: [], - loading: false, - success: false - }, - getters: { - }, - mutations: { - catchError(state, error) { - state.errorMsg.push(error); - }, - addAddress(state, address) { - console.log('@M addAddress address', address); - state.address = address; - }, - updateAddress(state, address) { - console.log('@M updateAddress address', address); - state.address = address; - }, - addAddressToPerson(state, person) { - console.log('@M addAddressToPerson person', person); - state.person = person; - }, - addDateToAddress(state, validFrom) { - console.log('@M addDateToAddress address.validFrom', validFrom); - state.validFrom = validFrom; - }, - getEditAddress(state, address) { - console.log('@M getEditAddress address', address); - state.editAddress = address; - }, - setLoading(state, b) { - state.loading = b; - }, - setSuccess(state, b) { - state.success = b; - } - }, - actions: { - addAddress({ commit }, payload) { - console.log('@A addAddress payload', payload); - commit('setLoading', true); - if('newPostalCode' in payload){ - let postalCodeBody = payload.newPostalCode; - postalCodeBody = Object.assign(postalCodeBody, {'origin': 3}); - postPostalCode(postalCodeBody) - .then(postalCode => { - let body = payload; - body.postcode = {'id': postalCode.id}, - postAddress(body) - .then(address => new Promise((resolve, reject) => { - commit('addAddress', address); - resolve(); - commit('setLoading', false); - })) - .catch((error) => { - commit('catchError', error); - commit('setLoading', false); - }); - }) - - } else { - postAddress(payload) - .then(address => new Promise((resolve, reject) => { - commit('addAddress', address); - resolve(); - commit('setLoading', false); - })) - .catch((error) => { - commit('catchError', error); - commit('setLoading', false); - }); - } - }, - addDateToAddressAndAddressToPerson({ commit }, payload) { - console.log('@A addDateToAddressAndAddressToPerson payload', payload); - commit('setLoading', true); - patchAddress(payload.addressId, payload.body) - .then(address => new Promise((resolve, reject) => { - commit('addDateToAddress', address.validFrom); - resolve(); - }).then( - postAddressToPerson(payload.personId, payload.addressId) - .then(person => new Promise((resolve, reject) => { - commit('addAddressToPerson', person); - commit('setLoading', false); - commit('setSuccess', true); - window.location.assign(payload.backUrl); - resolve(); - })) - .catch((error) => { - commit('catchError', error); - commit('setLoading', false); - }) - )) - .catch((error) => { - commit('catchError', error); - commit('setLoading', false); - }); - }, - updateAddress({ commit }, payload) { - console.log('@A updateAddress payload', payload); - - if('newPostalCode' in payload.newAddress){ // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode - let postalCodeBody = payload.newAddress.newPostalCode; - postalCodeBody = Object.assign(postalCodeBody, {'origin': 3}); - postPostalCode(postalCodeBody) - .then(postalCode => { - let body = payload.newAddress; - body.postcode = {'id': postalCode.id }, - patchAddress(payload.addressId, body) - .then(address => new Promise((resolve, reject) => { - commit('updateAddress', address); - resolve(); - })) - .catch((error) => { - commit('catchError', error); - }); - }) - - } else { - patchAddress(payload.addressId, payload.newAddress) - .then(address => new Promise((resolve, reject) => { - commit('updateAddress', address); - resolve(); - })) - .catch((error) => { - commit('catchError', error); - }); - } - }, - getEditAddress({ commit }, payload) { - console.log('@A getEditAddress payload', payload); - - getAddress(payload).then(address => new Promise((resolve, reject) => { - commit('getEditAddress', address); - resolve(); - })) - .catch((error) => { - commit('catchError', error); - }); - }, - } -}); - -export { store }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue index 44d444247..b806c4b3e 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue @@ -24,16 +24,16 @@
    - + diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 140557d69..3b1fe5041 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -53,23 +53,30 @@ {% block sublayout_content %}
    - {% for flashMessage in app.session.flashbag.get('success') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {# Flash messages ! #} + {% if app.session.flashbag.keys()|length > 0 %} +
    - {% for flashMessage in app.session.flashbag.get('error') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('success') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('error') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + +
    + {% endif %} {% block content %}
    diff --git a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig index e11e5f51c..be582ab3b 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layoutWithVerticalMenu.html.twig @@ -27,23 +27,30 @@
    - {% for flashMessage in app.session.flashbag.get('success') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {# Flash messages ! #} + {% if app.session.flashbag.keys()|length > 0 %} +
    - {% for flashMessage in app.session.flashbag.get('error') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('success') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
    - {{ flashMessage|raw }} -
    - {% endfor %} + {% for flashMessage in app.session.flashbag.get('error') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +
    + {{ flashMessage|raw }} +
    + {% endfor %} + +
    + {% endif %} {% block layout_wvm_content %} {% endblock %} diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php new file mode 100644 index 000000000..e4061cea1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php @@ -0,0 +1,59 @@ +userRepository = $userRepository; + } + + public function provideQuery(string $pattern, array $parameters): SearchApiQuery + { + $query = new SearchApiQuery(); + $query + ->setSelectKey("user") + ->setSelectJsonbMetadata("jsonb_build_object('id', u.id)") + ->setSelectPertinence("GREATEST(SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical), + SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical))", [ $pattern, $pattern ]) + ->setFromClause("users AS u") + ->setWhereClause("SIMILARITY(LOWER(UNACCENT(?)), u.usernamecanonical) > 0.15 + OR + SIMILARITY(LOWER(UNACCENT(?)), u.emailcanonical) > 0.15 + ", [ $pattern, $pattern ]); + + return $query; + } + + public function supportsTypes(string $pattern, array $types, array $parameters): bool + { + return \in_array('user', $types); + } + + public function prepare(array $metadatas): void + { + $ids = \array_map(fn($m) => $m['id'], $metadatas); + + $this->userRepository->findBy([ 'id' => $ids ]); + } + + public function supportsResult(string $key, array $metadatas): bool + { + return $key === 'user'; + } + + public function getResult(string $key, array $metadata, float $pertinence) + { + return $this->userRepository->find($metadata['id']); + } +} diff --git a/src/Bundle/ChillMainBundle/Search/SearchApi.php b/src/Bundle/ChillMainBundle/Search/SearchApi.php index 677286f1f..d59193114 100644 --- a/src/Bundle/ChillMainBundle/Search/SearchApi.php +++ b/src/Bundle/ChillMainBundle/Search/SearchApi.php @@ -2,6 +2,7 @@ namespace Chill\MainBundle\Search; +use Chill\MainBundle\Search\Entity\SearchUserApiProvider; use Chill\MainBundle\Serializer\Model\Collection; use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\PersonBundle\Search\SearchPersonApiProvider; @@ -25,12 +26,14 @@ class SearchApi EntityManagerInterface $em, SearchPersonApiProvider $searchPerson, ThirdPartyApiSearch $thirdPartyApiSearch, + SearchUserApiProvider $searchUser, PaginatorFactory $paginator ) { $this->em = $em; $this->providers[] = $searchPerson; $this->providers[] = $thirdPartyApiSearch; + $this->providers[] = $searchUser; $this->paginator = $paginator; } @@ -41,6 +44,10 @@ class SearchApi { $queries = $this->findQueries($pattern, $types, $parameters); + if (0 === count($queries)) { + throw new SearchApiNoQueryException($pattern, $types, $parameters); + } + $total = $this->countItems($queries, $types, $parameters); $paginator = $this->paginator->create($total); @@ -49,9 +56,7 @@ class SearchApi $this->prepareProviders($rawResults); $results = $this->buildResults($rawResults); - $collection = new Collection($results, $paginator); - - return $collection; + return new Collection($results, $paginator); } private function findQueries($pattern, array $types, array $parameters): array @@ -77,7 +82,7 @@ class SearchApi $rsmCount->addScalarResult('count', 'count'); $countNq = $this->em->createNativeQuery($countQuery, $rsmCount); $countNq->setParameters($parameters); - + return $countNq->getSingleScalarResult(); } @@ -130,7 +135,7 @@ class SearchApi $nq = $this->em->createNativeQuery($union, $rsm); $nq->setParameters($parameters); - + return $nq->getResult(); } @@ -142,7 +147,7 @@ class SearchApi if ($p->supportsResult($r['key'], $r['metadata'])) { $metadatas[$k][] = $r['metadata']; break; - } + } } } @@ -161,7 +166,7 @@ class SearchApi $p->getResult($r['key'], $r['metadata'], $r['pertinence']) ); break; - } + } } } diff --git a/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php new file mode 100644 index 000000000..765650074 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php @@ -0,0 +1,23 @@ +pattern = $pattern; + $this->types = $types; + $this->parameters = $parameters; + + parent::__construct($message, $code, $previous); + } +} diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml index 775407847..3dd8c8736 100644 --- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml +++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml @@ -127,8 +127,6 @@ paths: - person - thirdparty description: > - **Warning**: This is currently a stub (not really implemented - The search is performed across multiple entities. The entities must be listed into `type` parameters. @@ -152,6 +150,7 @@ paths: enum: - person - thirdparty + - user responses: 200: description: "OK" diff --git a/src/Bundle/ChillMainBundle/config/services/pagination.yaml b/src/Bundle/ChillMainBundle/config/services/pagination.yaml index e85352728..cb0855a3d 100644 --- a/src/Bundle/ChillMainBundle/config/services/pagination.yaml +++ b/src/Bundle/ChillMainBundle/config/services/pagination.yaml @@ -15,3 +15,8 @@ services: class: Chill\MainBundle\Pagination\ChillPaginationTwig tags: - { name: twig.extension } + + chill_main.paginator.items_per_page.twig_extensions: + class: Chill\MainBundle\Pagination\ChillItemsPerPageTwig + tags: + - { name: twig.extension } diff --git a/src/Bundle/ChillMainBundle/config/services/search.yaml b/src/Bundle/ChillMainBundle/config/services/search.yaml index 672c956c5..38e421eaf 100644 --- a/src/Bundle/ChillMainBundle/config/services/search.yaml +++ b/src/Bundle/ChillMainBundle/config/services/search.yaml @@ -7,3 +7,8 @@ services: Chill\MainBundle\Search\SearchApi: autowire: true autoconfigure: true + + Chill\MainBundle\Search\Entity\: + autowire: true + autoconfigure: true + resource: '../../Search/Entity' diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml index dc282ec52..b230b6ac1 100644 --- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml @@ -85,6 +85,7 @@ Search %pattern%: Recherche de "%pattern%" Results %start%-%end% of %total%: Résultats %start%-%end% sur %total% See all results: Voir tous les résultats Advanced search: Recherche avancée +results: résultats # timeline Global timeline: Historique global diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php index 1e15490dc..0bb804689 100644 --- a/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php @@ -6,10 +6,12 @@ use Chill\MainBundle\CRUD\Controller\ApiController; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Serializer\Model\Collection; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Repository\Household\HouseholdRepository; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; +use Symfony\Component\Routing\Annotation\Route; class HouseholdApiController extends ApiController { @@ -50,4 +52,45 @@ class HouseholdApiController extends ApiController return $this->json($collection, Response::HTTP_OK, [], [ "groups" => ["read"]]); } + + /** + * @Route("/api/1.0/person/address/suggest/by-household/{household_id}.{_format}", + * name="chill_person_address_suggest_by_household", + * requirements={ + * "_format"="json" + * } + * ) + * @ParamConverter("household", options={"id" = "household_id"}) + */ + public function suggestAddressByHousehold(Household $household, string $_format) + { + // TODO add acl + + $addresses = []; + // collect addresses from location in courses + foreach ($household->getCurrentPersons() as $person) { + foreach ($person->getAccompanyingPeriodParticipations() as $participation) { + if (null !== $participation->getAccompanyingPeriod()->getAddressLocation()) { + $a = $participation->getAccompanyingPeriod()->getAddressLocation(); + $addresses[$a->getId()] = $a; + } + if (null !== $personLocation = $participation + ->getAccompanyingPeriod()->getPersonLocation()) { + $a = $personLocation->getCurrentHouseholdAddress(); + if (null !== $a) { + $addresses[$a->getId()] = $a; + } + } + } + } + + // remove the actual address + $actual = $household->getCurrentAddress(); + if (null !== $actual) { + $addresses = \array_filter($addresses, fn($a) => $a !== $actual); + } + + return $this->json(\array_values($addresses), Response::HTTP_OK, [], + [ 'groups' => [ 'read' ] ]); + } } diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php index 9db1854fc..b3f4087eb 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonApiController.php @@ -18,12 +18,15 @@ namespace Chill\PersonBundle\Controller; use Chill\PersonBundle\Security\Authorization\PersonVoter; +use Chill\PersonBundle\Entity\Person; use Chill\MainBundle\Security\Authorization\AuthorizationHelper; use Symfony\Component\Security\Core\Role\Role; use Chill\MainBundle\CRUD\Controller\ApiController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Chill\MainBundle\Entity\Address; +use Symfony\Component\Routing\Annotation\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; class PersonApiController extends ApiController { @@ -54,4 +57,41 @@ class PersonApiController extends ApiController return $this->addRemoveSomething('address', $id, $request, $_format, 'address', Address::class, [ 'groups' => [ 'read' ] ]); } + /** + * @Route("/api/1.0/person/address/suggest/by-person/{person_id}.{_format}", + * name="chill_person_address_suggest_by_person", + * requirements={ + * "_format"="json" + * } + * ) + * @ParamConverter("person", options={"id" = "person_id"}) + */ + public function suggestAddress(Person $person, Request $request, string $_format): Response + { + $this->denyAccessUnlessGranted(PersonVoter::SEE, $person); + + $addresses = []; + // collect addresses from location in courses + foreach ($person->getAccompanyingPeriodParticipations() as $participation) { + if (null !== $participation->getAccompanyingPeriod()->getAddressLocation()) { + $a = $participation->getAccompanyingPeriod()->getAddressLocation(); + $addresses[$a->getId()] = $a; + } + if (null !== $personLocation = $participation + ->getAccompanyingPeriod()->getPersonLocation()) { + $a = $personLocation->getCurrentHouseholdAddress(); + if (null !== $a) { + $addresses[$a->getId()] = $a; + } + } + } + + // remove the actual address + $actual = $person->getCurrentHouseholdAddress(); + if (null !== $actual) { + $addresses = \array_filter($addresses, fn($a) => $a !== $actual); + } + + return $this->json(\array_values($addresses), Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]); + } } diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php index 40d7068ce..c1d251efb 100644 --- a/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php +++ b/src/Bundle/ChillPersonBundle/Controller/SocialIssueApiController.php @@ -3,8 +3,12 @@ namespace Chill\PersonBundle\Controller; use Chill\MainBundle\CRUD\Controller\ApiController; +use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator; use Chill\MainBundle\Pagination\PaginatorInterface; +use DateTimeImmutable; +use Doctrine\ORM\Query; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; class SocialIssueApiController extends ApiController { @@ -16,6 +20,25 @@ class SocialIssueApiController extends ApiController $query->expr()->isNull('e.desactivationDate') ) ); - $query->setParameter('now', new \DateTimeImmutable()); + $query->setParameter('now', new DateTimeImmutable()); + } + + protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query) + { + // In order to work, this hydrator only works with + // entities having the field "children" set up. + return $query + ->getQuery() + ->setHint(Query::HINT_INCLUDE_META_COLUMNS, true) + ->getResult(FlatHierarchyEntityHydrator::LIST); + } + + protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response + { + $query + ->orderBy("GET_JSON_FIELD_BY_KEY(e.title, :locale)", 'ASC') + ->setParameter(':locale', $request->getLocale()); + + return null; } } diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php new file mode 100644 index 000000000..134cedc74 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php @@ -0,0 +1,33 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\Controller\SocialWork; + +use Chill\MainBundle\CRUD\Controller\CRUDController; + +/** + * Class AdminSocialIssueController + * Controller for social issues + * + * @package Chill\PersonBundle\Controller + */ +class AdminEvaluationController extends CRUDController +{ +} diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php new file mode 100644 index 000000000..18e1c9f3b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php @@ -0,0 +1,33 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\Controller\SocialWork; + +use Chill\MainBundle\CRUD\Controller\CRUDController; + +/** + * Class AdminSocialIssueController + * Controller for social issues + * + * @package Chill\PersonBundle\Controller + */ +class AdminGoalController extends CRUDController +{ +} diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php new file mode 100644 index 000000000..80d552282 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php @@ -0,0 +1,33 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\Controller\SocialWork; + +use Chill\MainBundle\CRUD\Controller\CRUDController; + +/** + * Class AdminSocialIssueController + * Controller for social issues + * + * @package Chill\PersonBundle\Controller + */ +class AdminResultController extends CRUDController +{ +} diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php new file mode 100644 index 000000000..695ec75a1 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php @@ -0,0 +1,33 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\Controller\SocialWork; + +use Chill\MainBundle\CRUD\Controller\CRUDController; + +/** + * Class AdminSocialIssueController + * Controller for social issues + * + * @package Chill\PersonBundle\Controller + */ +class AdminSocialActionController extends CRUDController +{ +} diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php new file mode 100644 index 000000000..35b0df4a2 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php @@ -0,0 +1,33 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Chill\PersonBundle\Controller\SocialWork; + +use Chill\MainBundle\CRUD\Controller\CRUDController; + +/** + * Class AdminSocialIssueController + * Controller for social issues + * + * @package Chill\PersonBundle\Controller + */ +class AdminSocialIssueController extends CRUDController +{ +} diff --git a/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php new file mode 100644 index 000000000..24b919978 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Controller/SocialWorkEvaluationApiController.php @@ -0,0 +1,46 @@ +paginatorFactory = $paginatorFactory; + } + + /** + * @Route("/api/1.0/person/social-work/evaluation/by-social-action/{action_id}.json", + * name="chill_person_evaluation_index_by_social_action", + * requirements={ + * "_format": "json" + * } + * ) + * @ParamConverter("action", options={"id": "action_id"}) + * @param SocialAction $action + * @return Response + */ + public function listEvaluationBySocialAction(SocialAction $action): Response + { + $pagination = $this->paginatorFactory->create($action->getEvaluations()->count()); + + $evaluations = $action->getEvaluations()->slice($pagination->getCurrentPageFirstItemNumber(), + $pagination->getItemsPerPage()); + $collection = new Collection($evaluations, $pagination); + + return $this->json($collection, Response::HTTP_OK, [], [ 'groups' => [ 'read' ]]); + } +} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php deleted file mode 100644 index a30943bcb..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php +++ /dev/null @@ -1,88 +0,0 @@ -, - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; - -use Chill\PersonBundle\Entity\AccompanyingPeriod; -use Chill\PersonBundle\Entity\Person; - -/** - * Description of LoadAccompanyingPeriod - * - * @author Champs-Libres Coop - */ -class LoadAccompanyingPeriod extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface -{ - use \Symfony\Component\DependencyInjection\ContainerAwareTrait; - - - public const ACCOMPANYING_PERIOD = 'parcours 1'; - - public function getOrder() - { - return 10004; - } - - public static $references = array(); - - public function load(ObjectManager $manager) - { - - $centerA = $this->getReference('centerA'); - $centerAId = $centerA->getId(); - - $personIds = $this->container->get('doctrine.orm.entity_manager') - ->createQueryBuilder() - ->select('p.id') - ->from('ChillPersonBundle:Person', 'p') - ->where('p.center = :centerAId') - ->orderBy('p.id', 'ASC') - ->setParameter('centerAId', $centerAId) - ->getQuery() - ->getScalarResult(); - - $openingDate = new \DateTime('2020-04-01'); - - $person1 = $manager->getRepository(Person::class)->find($personIds[0]); - $person2 = $manager->getRepository(Person::class)->find($personIds[1]); - - $socialScope = $this->getReference('scope_social'); - - $a = new AccompanyingPeriod($openingDate); - $a->addPerson($person1); - $a->addPerson($person2); - $a->addScope($socialScope); - $a->setStep(AccompanyingPeriod::STEP_CONFIRMED); - - $manager->persist($a); - - $this->addReference(self::ACCOMPANYING_PERIOD, $a); - echo "Adding one AccompanyingPeriod\n"; - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php index d1c6f4da7..e96bf44e6 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php @@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait; -use Chill\PersonBundle\DataFixtures\ORM\LoadAccompanyingPeriod; /** * Load notififications into database @@ -19,7 +18,7 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep [ 'message' => 'Hello !', 'entityClass' => AccompanyingPeriod::class, - 'entityRef' => LoadAccompanyingPeriod::ACCOMPANYING_PERIOD, + 'entityRef' => null, 'sender' => 'center a_social', 'addressees' => [ 'center a_social', @@ -30,10 +29,15 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep ] ]; + protected function getEntityRef() + { + return null; + } + public function getDependencies() { return [ - LoadAccompanyingPeriod::class, + LoadPeople::class, ]; } } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php new file mode 100644 index 000000000..82e232e8d --- /dev/null +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodWork.php @@ -0,0 +1,140 @@ +periodRepository = $periodRepository; + $this->evaluationRepository = $evaluationRepository; + } + + /** + * @inheritDoc + */ + public function getDependencies() + { + return [ + LoadPeople::class + ]; + } + + private function getRandomAction(SocialIssue $socialIssue): ?SocialAction + { + $actions = $socialIssue->getRecursiveSocialActions()->toArray(); + + if (0 === count($actions)) { + return null; + } + + return $actions[\array_rand($actions)]; + } + + private function getRandomEvaluation(): Evaluation + { + if (0 === count($this->cacheEvaluations)) { + $this->cacheEvaluations = $this->evaluationRepository + ->findAll(); + } + + return $this->cacheEvaluations[\array_rand($this->cacheEvaluations)]; + } + + /** + * @inheritDoc + */ + public function load(ObjectManager $manager) + { + // load all the period which are confirmed + $periods = $this->periodRepository + ->findBy(['step' => AccompanyingPeriod::STEP_CONFIRMED]) + ; + + $i = 0; + while (null !== $period = \array_pop($periods)) { + /** @var AccompanyingPeriod $period */ + $i++; + if (0 === $i % 15) { + $manager->flush(); + } + if (0 === $period->getSocialIssues()->count()) { + continue; + } + $work = new AccompanyingPeriod\AccompanyingPeriodWork(); + $action = $this->getRandomAction($period->getSocialIssues()->first()); + + if (null !== $action) { + $work + ->setAccompanyingPeriod($period) + ->setSocialAction($action) + ->setStartDate(new \DateTimeImmutable('today')) + ->addPerson($period->getPersons()->first()) + ->setCreatedAt(new \DateTimeImmutable()) + ->setCreatedBy($this->getReference('center a_social')) + ->setUpdatedAt(new \DateTimeImmutable()) + ->setUpdatedBy($this->getReference('center a_social')); + $manager->persist($work); + + if ($action->getEvaluations()->count() > 0) { + $ev = $action->getEvaluations()->first(); + $evaluation = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation(); + $evaluation->setAccompanyingPeriodWork($work) + ->setEvaluation($ev); + $manager->persist($evaluation); + } + } + + // 1 of 10, force an evaluation + if (0 === $i % 10) { + $evaluation = $this->getRandomEvaluation(); + $action = $evaluation->getSocialAction(); + $issue = $action->getIssue(); + + $period->addSocialIssue($issue); + $work + ->setAccompanyingPeriod($period) + ->setSocialAction($action) + ->setStartDate(new \DateTimeImmutable('today')) + ->addPerson($period->getPersons()->first()) + ->setCreatedAt(new \DateTimeImmutable()) + ->setCreatedBy($this->getReference('center a_social')) + ->setUpdatedAt(new \DateTimeImmutable()) + ->setUpdatedBy($this->getReference('center a_social')) + ; + $manager->persist($work); + $ev = new AccompanyingPeriod\AccompanyingPeriodWorkEvaluation(); + $ev->setAccompanyingPeriodWork($work) + ->setEvaluation($evaluation); + $manager->persist($ev); + } + + } + + $manager->flush(); + } +} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php index 812f2bb07..24a5bbb7f 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php @@ -33,7 +33,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface public function load(ObjectManager $manager) { - // generate two times the participation. This will lead to + // generate two times the participation. This will lead to // some movement in participation (same people in two differents // households) @@ -110,7 +110,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface $i = 0; while ($i < $nb) { $address = $this->createAddress(); - $address->setValidFrom(\DateTime::createFromImmutable($date)); + $address->setValidFrom(\DateTime::createFromImmutable($date)); if (\random_int(0, 20) < 1) { $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W')); @@ -157,6 +157,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface ->setParameter('center', 'Center A') ->getScalarResult() ; + \shuffle($this->personIds); } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php index 556d832c1..d6bdce233 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php @@ -21,54 +21,91 @@ namespace Chill\PersonBundle\DataFixtures\ORM; +use Chill\MainBundle\Entity\Center; +use Chill\MainBundle\Entity\Country; +use Chill\MainBundle\Entity\PostalCode; +use Chill\MainBundle\Repository\CenterRepository; +use Chill\MainBundle\Repository\CountryRepository; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\MaritalStatus; +use Chill\PersonBundle\Entity\SocialWork\SocialIssue; +use Chill\PersonBundle\Repository\MaritalStatusRepository; +use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Persistence\ObjectManager; use Chill\PersonBundle\Entity\Person; +use Faker\Factory; +use Faker\Generator; +use Nelmio\Alice\Faker\GeneratorFactory; +use Nelmio\Alice\Loader\NativeLoader; +use Nelmio\Alice\ObjectSet; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Doctrine\Model\Point; +use Symfony\Component\Workflow\Registry; +use Symfony\Component\Workflow\Workflow; +use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository; /** * Load people into database * - * @author Julien Fastré - * @author Marc Ducobu */ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface { - use \Symfony\Component\DependencyInjection\ContainerAwareTrait; - protected $faker; + protected Generator $faker; - public function __construct() - { - $this->faker = \Faker\Factory::create('fr_FR'); - } + protected Registry $workflowRegistry; - public function prepare() - { - //prepare days, month, years - $y = 1950; - do { - $this->years[] = $y; - $y = $y +1; - } while ($y >= 1990); + protected SocialIssueRepository $socialIssueRepository; - $m = 1; - do { - $this->month[] = $m; - $m = $m +1; - } while ($m >= 12); + protected CountryRepository $countryRepository; + + protected NativeLoader $loader; + + /** + * @var array|SocialIssue[] + */ + protected array $cacheSocialIssues = []; + + /** + * @var array|Country[] + */ + protected array $cacheCountries = []; + + /** + * @var array|Center[] + */ + protected array $cacheCenters = []; + + protected CenterRepository $centerRepository; + + /** + * @var array|MaritalStatus[] + */ + protected array $cacheMaritalStatuses = []; + + protected MaritalStatusRepository $maritalStatusRepository; + + public function __construct( + Registry $workflowRegistry, + SocialIssueRepository $socialIssueRepository, + CenterRepository $centerRepository, + CountryRepository $countryRepository, + MaritalStatusRepository $maritalStatusRepository + ) { + $this->faker = Factory::create('fr_FR'); + $this->faker->addProvider($this); + $this->workflowRegistry = $workflowRegistry; + $this->socialIssueRepository = $socialIssueRepository; + $this->centerRepository = $centerRepository; + $this->countryRepository = $countryRepository; + $this->maritalStatusRepository = $maritalStatusRepository; + $this->loader = new NativeLoader($this->faker); - $d = 1; - do { - $this->day[] = $d; - $d = $d + 1; - } while ($d <= 28); } public function getOrder() @@ -78,8 +115,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con public function load(ObjectManager $manager) { - $this->loadRandPeople($manager); $this->loadExpectedPeople($manager); + $this->loadRandPeople($manager); $manager->flush(); } @@ -88,153 +125,148 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con { echo "loading expected people...\n"; - foreach ($this->peoples as $person) { - $this->addAPerson($this->fillWithDefault($person), $manager); + + foreach ($this->peoples as $personDef) { + $person = $this->createExpectedPerson($personDef); + $this->addAPerson($person, $manager); } } - public function loadRandPeople(ObjectManager $manager) + protected function loadRandPeople(ObjectManager $manager) { echo "loading rand people...\n"; + $persons = $this->createRandPerson()->getObjects(); - $this->prepare(); - - $chooseLastNameOrTri = array('tri', 'tri', 'name', 'tri'); - - $i = 0; - - do { - $i++; - - $sex = $this->genders[array_rand($this->genders)]; - - if ($chooseLastNameOrTri[array_rand($chooseLastNameOrTri)] === 'tri' ) { - $length = rand(2, 3); - $lastName = ''; - for ($j = 0; $j <= $length; $j++) { - $lastName .= $this->lastNamesTrigrams[array_rand($this->lastNamesTrigrams)]; - } - $lastName = ucfirst($lastName); - } else { - $lastName = $this->lastNames[array_rand($this->lastNames)]; - } - - if ($sex === Person::MALE_GENDER) { - $firstName = $this->firstNamesMale[array_rand($this->firstNamesMale)]; - } else { - $firstName = $this->firstNamesFemale[array_rand($this->firstNamesFemale)]; - } - - // add an address on 80% of the created people - if (rand(0,100) < 80) { - $address = $this->getRandomAddress(); - // on 30% of those person, add multiple addresses - if (rand(0,10) < 4) { - $address = array( - $address, - $this->getRandomAddress() - ); - } - } else { - $address = null; - } - - $person = array( - 'FirstName' => $firstName, - 'LastName' => $lastName, - 'Gender' => $sex, - 'Nationality' => (rand(0,100) > 50) ? NULL: 'BE', - 'center' => (rand(0,1) == 0) ? 'centerA': 'centerB', - 'Address' => $address, - 'maritalStatus' => $this->maritalStatusRef[array_rand($this->maritalStatusRef)] - ); - - $this->addAPerson($this->fillWithDefault($person), $manager); - - } while ($i <= 100); + foreach ($persons as $person) { + $this->addAPerson($person, $manager); + } } - /** - * fill a person array with default value - * - * @param string[] $specific - */ - private function fillWithDefault(array $specific) + private function createRandPerson(): ObjectSet { - return array_merge(array( - 'Birthdate' => "1960-10-12", - 'PlaceOfBirth' => "Ottignies Louvain-La-Neuve", - 'Gender' => Person::MALE_GENDER, - 'Email' => "Email d'un ami: roger@tt.com", - 'CountryOfBirth' => 'BE', - 'Nationality' => 'BE', - 'CFData' => array(), - 'Address' => null - ), $specific); + return $this->loader->loadData([ + Person::class => [ + 'persons{1..300}' => [ + 'firstName' => '', + 'lastName' => '', + 'gender' => '', + 'nationality' => '', + 'center' => '', + 'maritalStatus' => '', + 'birthdate' => '', + 'placeOfBirth' => '', + 'email' => '', + 'countryOfBirth' => '', + ] + ] + ]); + } + + private function createExpectedPerson($default): Person + { + $person = $this->loader->loadData([ + Person::class => [ + "person" => [ + 'firstName' => $default['firstName'] ?? '', + 'lastName' => $default['lastName'] ?? '', + 'gender' => '', + 'nationality' => '', + 'center' => '', + 'maritalStatus' => '', + 'birthdate' => '', + 'placeOfBirth' => '', + 'email' => '', + 'countryOfBirth' => '', + ], + ] + ])->getObjects()['person']; + + // force some values + foreach ($default as $key => $value) { + switch ($key) { + case 'birthdate': + $person->setBirthdate(new \DateTime($value)); + break; + case 'center': + $person->setCenter($this->centerRepository + ->findOneBy(['name' => $value])); + break; + case 'countryOfBirth': + case 'nationality': + $country = $this->countryRepository + ->findOneBy(['countryCode' => $value]); + $person->{'set'.\ucfirst($key)}($country); + break; + case 'maritalStatus': + $person->setMaritalStatus($this->maritalStatusRepository + ->find($value)); + break; + } + } + + return $person; } /** * create a new person from array data * - * @param array $person - * @param ObjectManager $manager * @throws \Exception */ - private function addAPerson(array $person, ObjectManager $manager) + private function addAPerson(Person $person, ObjectManager $manager) { - $p = new Person(); - $p->addAccompanyingPeriod( - new AccompanyingPeriod( - (new \DateTime()) - ->sub( - new \DateInterval('P'.\random_int(0, 180).'D') - ) - ) + $accompanyingPeriod = new AccompanyingPeriod( + (new \DateTime()) + ->sub( + new \DateInterval('P' . \random_int(0, 180) . 'D') + ) ); + $person->addAccompanyingPeriod($accompanyingPeriod); + $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue()); - foreach ($person as $key => $value) { - switch ($key) { - case 'CountryOfBirth': - case 'Nationality': - $value = $this->getCountry($value); - break; - case 'Birthdate': - $value = new \DateTime($value); - break; - case 'center': - case 'maritalStatus': - $value = $this->getReference($value); - break; - case 'accompanyingPeriods': - $this->addAccompanyingPeriods($p, $value, $manager); - break; - } - - //try to add the data using the setSomething function, - // if not possible, fallback to addSomething function - if (method_exists($p, 'set'.$key)) { - call_user_func(array($p, 'set'.$key), $value); - } elseif (method_exists($p, 'add'.$key)) { - // if we have a "addSomething", we may have multiple items to add - // so, we set the value in an array if it is not an array, and - // will call the function addSomething multiple times - if (!is_array($value)) { - $value = array($value); - } - - foreach($value as $v) { - if ($v !== NULL) { - call_user_func(array($p, 'add'.$key), $v); - } - } - - } + if (\random_int(0, 10) > 3) { + $accompanyingPeriod->setAddressLocation($this->createAddress()); + $manager->persist($accompanyingPeriod->getAddressLocation()); + $workflow = $this->workflowRegistry->get($accompanyingPeriod); + $workflow->apply($accompanyingPeriod, 'confirm'); } - $manager->persist($p); - echo "add person'".$p->__toString()."'\n"; + $manager->persist($person); + echo "add person'".$person->__toString()."'\n"; } + private function createAddress(): Address + { + $objectSet = $this->loader->loadData([ + Address::class => [ + 'address' => [ + 'street' => '', + 'streetNumber' => '', + 'validFrom' => '', + 'postCode' => $this->getPostalCode() + ], + ], + ]); + + return $objectSet->getObjects()['address']; + } + + + + private function getRandomSocialIssue(): SocialIssue + { + if (0 === count($this->cacheSocialIssues)) { + $this->cacheSocialIssues = $this->socialIssueRepository->findAll(); + } + + return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)]; + } + + private function getPostalCode(): PostalCode + { + $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)]; + + return $this->getReference($ref); + } /** * Create a random point @@ -250,7 +282,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con return Point::fromLonLat($lon, $lat); } - /** * Create a random address * @@ -273,53 +304,77 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con ; } - private function getCountry($countryCode) + /** + * @internal This method is public and called by faker as a custom generator + * @return Center + */ + public function getRandomCenter(): Center { - if ($countryCode === NULL) { - return NULL; + if (0 === count($this->cacheCenters)) { + $this->cacheCenters = $this->centerRepository->findAll(); } - return $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Country') - ->findOneByCountryCode($countryCode); + + return $this->cacheCenters[\array_rand($this->cacheCenters)]; } - private $maritalStatusRef = ['ms_single', 'ms_married', 'ms_widow', 'ms_separat', - 'ms_divorce', 'ms_legalco', 'ms_unknown']; + /** + * @internal This method is public and called by faker as a custom generator + * @param int $nullPercentage + * @return Country|null + * @throws \Exception + */ + public function getRandomCountry(int $nullPercentage = 20): ?Country + { + if (0 === count($this->cacheCountries)) { + $this->cacheCountries = $this->countryRepository->findAll(); + } - private $firstNamesMale = array("Jean", "Mohamed", "Alfred", "Robert", "Justin", "Brian", - "Compère", "Jean-de-Dieu", "Charles", "Pierre", "Luc", "Mathieu", "Alain", "Etienne", "Eric", - "Corentin", "Gaston", "Spirou", "Fantasio", "Mahmadou", "Mohamidou", "Vursuv", "Youssef" ); + if ($nullPercentage < \random_int(0, 100)) { + return NULL; + } - private $firstNamesFemale = array("Svedana", "Sevlatina", "Irène", "Marcelle", - "Corentine", "Alfonsine", "Caroline", "Solange", "Gostine", "Fatoumata", "Nicole", - "Groseille", "Chana", "Oxana", "Ivana", "Julie", "Tina", "Adèle" ); + return $this->cacheCountries [\array_rand($this->cacheCountries)]; + } - private $lastNames = array("Diallo", "Bah", "Gaillot", "Martin"); + /** + * @internal This method is public and called by faker as a custom generator + * @return string + */ + public function getRandomGender(): string + { + return $this->genders[array_rand($this->genders)]; + } - private $lastNamesTrigrams = array("fas", "tré", "hu", 'blart', 'van', 'der', 'lin', 'den', - 'ta', 'mi', 'net', 'gna', 'bol', 'sac', 'ré', 'jo', 'du', 'pont', 'cas', 'tor', 'rob', 'al', - 'ma', 'gone', 'car',"fu", "ka", "lot", "no", "va", "du", "bu", "su", "jau", "tte", 'sir', - "lo", 'to', "cho", "car", 'mo','zu', 'qi', 'mu'); + /** + * @internal This method is public and called by faker as a custom generator + * @param int $nullPercentage + * @return MaritalStatus|null + * @throws \Exception + */ + public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus + { + if (0 === count($this->cacheMaritalStatuses)) { + $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll(); + } - private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER); + if ($nullPercentage < \random_int(0, 100)) { + return NULL; + } - private $years = array(); + return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)]; + } - private $month = array(); - - private $day = array(); + private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER); private $peoples = array( array( - 'LastName' => "Depardieu", - 'FirstName' => "Gérard", - 'Birthdate' => "1948-12-27", - 'PlaceOfBirth' => "Châteauroux", - 'Gender' => Person::MALE_GENDER, - 'CountryOfBirth' => 'FR', - 'Nationality' => 'RU', - 'center' => 'centerA', - 'maritalStatus' => 'ms_divorce', + 'lastName' => "Depardieu", + 'firstName' => "Gérard", + 'birthdate' => "1948-12-27", + 'placeOfBirth' => "Châteauroux", + 'nationality' => 'RU', + 'gender' => Person::MALE_GENDER, + 'center' => 'Center A', 'accompanyingPeriods' => [ [ 'from' => '2015-02-01', @@ -338,67 +393,123 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con ), array( //to have a person with same firstname as Gérard Depardieu - 'LastName' => "Depardieu", - 'FirstName' => "Jean", - 'Birthdate' => "1960-10-12", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jean", + 'birthdate' => "1960-10-12", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_divorce' ), array( //to have a person with same birthdate of Gérard Depardieu - 'LastName' => 'Van Snick', - 'FirstName' => 'Bart', - 'Birthdate' => '1948-12-27', - 'center' => 'centerA', + 'lastName' => 'Van Snick', + 'firstName' => 'Bart', + 'birthdate' => '1948-12-27', + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), array( //to have a woman with Depardieu as FirstName - 'LastName' => 'Depardieu', - 'FirstName' => 'Charline', - 'Gender' => Person::FEMALE_GENDER, - 'center' => 'centerA', + 'lastName' => 'Depardieu', + 'firstName' => 'Charline', + 'gender' => Person::FEMALE_GENDER, + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), array( //to have a special character in lastName - 'LastName' => 'Manço', - 'FirstName' => 'Étienne', - 'center' => 'centerA', + 'lastName' => 'Manço', + 'firstName' => 'Étienne', + 'center' => 'Center A', 'maritalStatus' => 'ms_unknown' ), array( //to have true duplicate person - 'LastName' => "Depardieu", - 'FirstName' => "Jean", - 'Birthdate' => "1960-10-12", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jean", + 'birthdate' => "1960-10-12", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_divorce' ), array( //to have false duplicate person - 'LastName' => "Depardieu", - 'FirstName' => "Jeanne", - 'Birthdate' => "1966-11-13", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jeanne", + 'birthdate' => "1966-11-13", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), + [ + 'lastName' => 'Diallo', + 'firstName' => "Fatoumata Binta" + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Abdoulaye', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Diakite', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Mohamed', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Fatou', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Fanta', + ], + [ + 'lastName' => 'Bah', + 'firstName' => "Fatoumata Binta" + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Abdoulaye', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Diakite', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Mohamed', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Fatou', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Fanta', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Gaston', + ], + [ + 'lastName' => 'Gaillot', + 'firstName' => 'Adèle', + ], ); - +/* private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager) { foreach ($periods as $period) { echo "adding new past Accompanying Period..\n"; - /** @var AccompanyingPeriod $accompanyingPeriod */ + /** @var AccompanyingPeriod $accompanyingPeriod $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from'])); $accompanyingPeriod ->setClosingDate(new \DateTime($period['to'])) @@ -408,4 +519,5 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con $person->addAccompanyingPeriod($accompanyingPeriod); } } + */ } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialActions.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialActions.php deleted file mode 100644 index ec47c6e0b..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialActions.php +++ /dev/null @@ -1,82 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; - -use Chill\PersonBundle\Entity\SocialWork\SocialAction; - -/** - * Create social actions - * - */ -class LoadSocialActions extends AbstractFixture implements OrderedFixtureInterface -{ - public function getOrder() - { - return 10020; - } - - public static $socialActions = [ - 'social_action_info_conseil' => [ - 'title' => [ - 'fr' => 'Informer, conseiller' - ], - 'issue' => 'social_issue_prev_prot' - ], - 'social_action_instruire' => [ - 'title' => [ - 'fr' => 'Instruire l\'imprime unique pour des impayés' - ], - 'issue' => 'social_issue_prev_prot' - ], - 'social_action_MASP' => [ - 'title' => [ - 'fr' => 'MASP' - ], - 'issue' => 'social_issue_diff_fin' - ], - 'social_action_protection_enfant' => [ - 'title' => [ - 'fr' => 'Protection Enfant confié dans le cadre judiciaire' - ], - 'issue' => 'social_issue_enfant_protection' - ], - ]; - - public function load(ObjectManager $manager) - { - foreach (static::$socialActions as $ref => $new) { - $socialAction = new SocialAction(); - $socialAction->setTitle($new['title']); - $socialAction->setIssue($this->getReference($new['issue'])); - $socialAction->setDefaultNotificationDelay(new \DateInterval('P5D')); - - $manager->persist($socialAction); - $this->addReference($ref, $socialAction); - print("Adding SocialAction '".$new['title']['fr']."'\n"); - } - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialGoals.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialGoals.php deleted file mode 100644 index a6c2b0ef0..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialGoals.php +++ /dev/null @@ -1,70 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; - -use Chill\PersonBundle\Entity\SocialWork\Goal; - - -/** - * Create social goals - * - */ -class LoadSocialGoals extends AbstractFixture implements OrderedFixtureInterface -{ - public function getOrder() - { - return 10030; - } - - public static $socialGoals = [ - 'social_goal_instuire_dossier' => [ - 'title' => [ - 'fr' => 'Instruire le dossier de surendettement' - ], - 'action' => 'social_action_MASP' - ], - 'social_goal_proteger' => [ - 'title' => [ - 'fr' => 'Protéger via une assistance educative placement' - ], - 'action' => 'social_action_protection_enfant' - ], - ]; - - public function load(ObjectManager $manager) - { - foreach (static::$socialGoals as $ref => $new) { - $socialGoal = new Goal(); - $socialGoal->setTitle($new['title']); - $socialGoal->addSocialAction($this->getReference($new['action'])); - - $manager->persist($socialGoal); - $this->addReference($ref, $socialGoal); - print("Adding SocialGoal '".$new['title']['fr']."'\n"); - } - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialIssues.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialIssues.php deleted file mode 100644 index eb9c303ed..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialIssues.php +++ /dev/null @@ -1,90 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; - -use Chill\PersonBundle\Entity\SocialWork\SocialIssue; - -/** - * Create social issues - * - */ -class LoadSocialIssues extends AbstractFixture implements OrderedFixtureInterface -{ - public function getOrder() - { - return 10010; - } - - public static $socialIssues = [ - 'social_issue_diff_fin_or_admin' => [ - 'title' => [ - 'fr' => 'ADULTE - DIFFICULTES FINANCIERES ET/OU ADMINISTRATIVES' - ] - ], - 'social_issue_prev_prot' => [ - 'title' => [ - 'fr' => 'ADULTE PREVENTION/PROTECTION' - ], - 'parent' => 'social_issue_diff_fin_or_admin' - ], - 'social_issue_diff_fin' => [ - 'title' => [ - 'fr' => 'Difficulté financière' - ], - 'parent' => 'social_issue_diff_fin_or_admin' - ], - 'social_issue_enfant_famille' => [ - 'title' => [ - 'fr' => 'Enfant / famille' - ] - ], - 'social_issue_enfant_protection' => [ - 'title' => [ - 'fr' => 'enfant - protection' - ], - 'parent' => 'social_issue_enfant_famille' - ], - ]; - - public function load(ObjectManager $manager) - { - foreach (static::$socialIssues as $ref => $new) { - $socialIssue = new SocialIssue(); - $socialIssue->setTitle($new['title']); - - if ( array_key_exists('parent', $new)) { - $parentRef = $new['parent']; - $parent = $this->getReference($parentRef); - $socialIssue->setParent($parent); - } - - $manager->persist($socialIssue); - $this->addReference($ref, $socialIssue); - print("Adding SocialIssue '".$new['title']['fr']."'\n"); - } - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialResults.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialResults.php deleted file mode 100644 index 573313573..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialResults.php +++ /dev/null @@ -1,94 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; - -use Chill\PersonBundle\Entity\SocialWork\Result; - - -/** - * Create social results - * - */ -class LoadSocialResults extends AbstractFixture implements OrderedFixtureInterface -{ - public function getOrder() - { - return 10040; - } - - public static $socialResults = [ - 'social_result_FSL_acces' => [ - 'title' => [ - 'fr' => 'FSL - accès cautionnement' - ], - 'action' => 'social_action_instruire' - ], - 'social_result_FSL_maintien' => [ - 'title' => [ - 'fr' => 'FSL maintien - impayés de loyer' - ], - 'action' => 'social_action_MASP' - ], - 'social_result_soutien_parental' => [ - 'title' => [ - 'fr' => 'Soutien parental' - ], - // 'action' => 'social_action_protection_enfant', (via le goal) - 'goal' => 'social_goal_proteger' - ], - '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) - { - foreach (static::$socialResults as $ref => $new) { - $socialResult = new Result(); - $socialResult->setTitle($new['title']); - - if ( array_key_exists('action', $new)) { - $action = $this->getReference($new['action']); - $socialResult->addSocialAction($action); - } - - if ( array_key_exists('goal', $new)) { - $goal = $this->getReference($new['goal']); - $socialResult->addGoal($goal); - } - - - $manager->persist($socialResult); - $this->addReference($ref, $socialResult); - print("Adding SocialResult '".$new['title']['fr']."'\n"); - } - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php new file mode 100644 index 000000000..f96fb5fc2 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php @@ -0,0 +1,44 @@ +importer = $importer; + } + + /** + * @inheritDoc + */ + public function load(ObjectManager $manager) + { + try { + $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv'); + } catch (Throwable $e) { + throw new Exception('Error while loading CSV.',0, $e); + } + + $csv->setDelimiter(";"); + + $this->importer->import($csv); + } + + /** + * @inheritDoc + */ + public function getOrder() + { + return 9500; + } +} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/data/social_work_metadata.csv b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/data/social_work_metadata.csv new file mode 100644 index 000000000..6257b904b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/data/social_work_metadata.csv @@ -0,0 +1,420 @@ +AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Informer, conseiller;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Aider à l'inclusion numérique;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Demander une aide juridictionnelle;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Aider à l'ouverture aux droits;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;ACCES AUX DROITS;Demander une aide alimentaire;;;;Demande aide alimentaire +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Informer, conseiller;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Centre Communal d’Action Sociale;;Demande aide impayé CCAS +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : CAF/MSA - Secours d’urgence;;Demande aide impayé CAF +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : CAF/MSA - Aide financière;;Demande aide impayé CAF +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Caisse Primaire d’Assurance Maladie;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés de loyer;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Énergie / Fluides;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés télécommunication;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : FSL Maintien - Lié à la COVID;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une aide pour des impayés;;Objectif : Secours exceptionnels;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire le dossier de surendettement;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Sauvegarde de justice;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Signalement personne vulnérable;;Formulaire signalement personne vulnérable +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander une mesure de protection adulte;;Objectif : Mesure de protection personne majeure (tutelle, curatelle);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Faire une demande auprès des associations caritatives;;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire des formulaires auprès d'autres organismes (Locapass, Fastt, …);;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire une première demande d'AEB;;;;Demande AEB +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement d'AEB;;Objectif : Dans l'attente d'une mesure de protection ;;Renouvellement AEB +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement d'AEB;;Objectif : Pour poursuivre les objectifs engagés;;Renouvellement AEB +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Instruire une première demande de MASP;;;;Demande MAPS +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement MASP;;Objectif : Dans l'attente d'une mesure de protection ;;Renouvellement MASP +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Demander un renouvellement MASP;;Objectif : Pour poursuivre les objectifs engagés;;Renouvellement MASP +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir dans les démarches administratives;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider au tri, au classement et à l’archivage des documents administratifs;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans l’apurement des dettes, accompagner les ménages endettées, surendettées;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Accompagner les ménages dans leur gestion budgétaire;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider les ménages à se questionner sur leur mode de consommation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Assurer une fonction de médiation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans les démarches liées au logement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider à l'accès aux droits;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Aider à l'inclusion numérique;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Instruire des formulaires d'autres organismes non référencés…;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Instruire le dossier de surendettement ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Cibler des objectifs avec l'usager;Objectif : Demander ou renouveler la couverture santé (ACS);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide alimentaire;;;Demande aide alimentaire +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Centre Communal d’Action Sociale;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Secours d’urgence;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Aide financière;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Caisse Primaire d’Assurance Maladie ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Cautionnement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Dépôt de garantie;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - 1er loyer;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Frais d’agence;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Assurances;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Déménagement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Aide à l’installation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Facture résiliation énergie (nv logement);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés de loyer;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Énergie / Fluides;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés télécommunication;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Lié à la COVID;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Secours exceptionnels;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une aide pour des impayés ou accès logement;Objectif : Mesure ASLL;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Faire une demande auprès de Association caritative;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Sauvegarde de justice;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Signalement personne vulnérable;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure de protection personne majeure (tutelle, curatelle);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Demander une mesure de protection ;Objectif : Mesure Judiciaire d'Aide à la Gestion du Budget Familial (MJAGBF);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du ménage pour déménagement; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Suspension momentanée de l'accompagnement par le ménage ou le professionnel; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt pour absence d'adhésion; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du ménage pour séparation; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Arrêt à l'initiative du professionnel pour absence d'avancée ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Retour à l'autonomie; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Transmission pour mesure judiciaire d'aide à la gestion du budget familial; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Orientation vers une MASP; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Transmission pour une mesure d'accompagnement judiciaire ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Renouvellement de l'AEB dans l'attente d'une mesure de protection ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer un AEB;Conclure l'AEB;;Résultat : Renouvellement de l'AEB pour poursuivre les objectifs engagés; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir dans les démarches administratives;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider au tri, au classement et à l’archivage des documents administratifs;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans l’apurement des dettes, accompagner les ménages endettées, surendettées;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Accompagner les ménages dans leur gestion budgétaire;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider les ménages à se questionner sur leur mode de consommation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Assurer une fonction de médiation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Soutenir les ménages dans les démarches liées au logement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider à l'accès aux droits;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Aider à l'inclusion numérique;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Instruire des formulaires d'autres organismes non référencés…;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Instruire le dossier de surendettement ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Cibler des objectifs avec l'usager;Objectif : Demander ou renouveler la couverture santé (ACS);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide alimentaire;;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Centre Communal d’Action Sociale;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Secours d’urgence;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : CAF/MSA - Aide financière;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Caisse Primaire d’Assurance Maladie ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Cautionnement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Dépôt de garantie;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - 1er loyer;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Frais d’agence;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Assurances;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Déménagement;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Aide à l’installation;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Accès - Facture résiliation énergie (nv logement);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés de loyer;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Énergie / Fluides;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés télécommunication;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Impayés aire d'accueil GDV ;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : FSL Maintien - Lié à la COVID;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Secours exceptionnels;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une aide pour des impayés ou accès logement;Objectif : Mesure ASLL;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Sauvegarde de justice;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Signalement personne vulnérable;; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure de protection personne majeure (tutelle, curatelle);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure d'Accompagnement Judiciaire (MAJ);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Demander une mesure de protection adulte;Objectif : Mesure Judiciaire d'Aide à la Gestion du Budget Familial (MJAGBF);; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du ménage pour déménagement; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Suspension momentanée de l'accompagnement par le ménage ou le professionnel; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt pour absence d'adhésion; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du ménage pour séparation; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Arrêt à l'initiative du professionnel pour absence d'avancée ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Retour à l'autonomie; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Transmission pour mesure judiciaire d'aide à la gestion du budget familial; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Transmission pour une mesure d'accompagnement judiciaire ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Renouvellement de MASP dans l'attente d'une mesure de protection ; +AD - PREVENTION, ACCES AUX DROITS, BUDGET;SOUTIEN EQUILIBRE BUDGET;Exercer une MASP;Conclure la MASP;;Résultat : Renouvellement de MASP pour poursuivre les objectifs engagés; +AD - LOGEMENT;ACCES LOGEMENT (RE);Informer, conseiller;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Cautionnement;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Dépôt de garantie;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - 1er loyer;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Frais d’agence;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Assurances;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Déménagement;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Aide à l’installation;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Facture résiliation énergie (nv logement);; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander une aide pour l'accès;;Objectif : FSL Accès - Mesure ASLL;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Demander auprès des Bailleurs sociaux, mairies, partenaires;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande DALO, DAHO;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande SIAO;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande ASLL;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande au Contingent préfectoral;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Instruire une demande au 115;;;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Intervenir au commandement de payer;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire la fiche Assignation;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Répondre au commandement de quitter les lieux;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Répondre au concours de la force publique;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Demander une aide financière FSL pour impayé de loyer;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Déposer un dossier de surendettement;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Demander auprès des Bailleurs sociaux, mairies, partenaires;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande DALO, DAHO;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande SIAO;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande ASLL;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande au Contingent préfectoral;; +AD - LOGEMENT;ACCES LOGEMENT (RE);Prévenir de l'expulsion;;Objectif : Instruire une demande au 115;; +AD - LOGEMENT;HABITAT INDIGNE;Informer, conseiller;;;; +AD - LOGEMENT;HABITAT INDIGNE;Demander une aide pour incurie;;Objectif : FSL maintien - aide incurie;; +AD - LOGEMENT;HABITAT INDIGNE;Instruire la grille de signalement;;;; +AD - LOGEMENT;HABITAT INDIGNE;Faire intervenir d'autres partenaires;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Informer, conseiller;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander un accompagnement psychologue insertion;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement psychologue insertion;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement psychologue insertion;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Réorienter l'usager vers autres structures pour un accompagnement psychologique;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander l'accompagnement global;;Objectif : Axe 2;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement global;;Objectif : Axe 2;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement global;;Objectif : Axe 2;; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Demander l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Exercer l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Renouveller l'accompagnement global;;Objectif : Axe 3 (agent d'insertion);; +AD - INSERTION SOCIALE PROFESSIONNELLE;ACCOMPAGNEMENT INSERTION;Instruire une demande MOVEA;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Informer, conseiller;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;"Aider à l'ouverture de droits +";;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renseigner la plateforme INCLUSION@COM pour les chantiers d'insertion;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Initier ou maintenir un parcours santé (cure, hospitalisation, CMP, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire le 1er Contrat d'Engagement Réciproque;;Objectif : Autre;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Initier ou maintenir un parcours santé;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Renouveler le Contrat d'Engagement Réciproque;;Objectif : Autre;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir le parcours professionnel (emploi, formation, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement global Axe 2 (orientation Pôle Emploi);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Orienter vers une structure de l'insertion (chantier, AI, ETTI, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander la médiation emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Création d'entreprise;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement travailleur non salarié;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander l'accompagnement ASR CEIDRE;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier MDPH;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Déposer un dossier retraite;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir l'accès au logement;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Accompagner le budget;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Soutenir la mobilité (MOVEA, transport solidaire, PST, …);; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander le psychologue insertion;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Etre accompagné dans la parentalité;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Initié ou maintenir un parcours santé;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Solliciliter un FAII;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Demander un réorientation Pôle Emploi;; +AD - INSERTION SOCIALE PROFESSIONNELLE;RSA;Faire un avenant au Contrat d'Engagement Réciproque;;Objectif : Autre;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Informer, conseiller;;;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons alimentaires;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons hygiène;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU bons carburant;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Demander une aide FAJ;;Objectif : SU virement;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Solliciter le comité FAJ;;Objectif : Aide financière;; +AD - INSERTION SOCIALE PROFESSIONNELLE;JEUNES 16/25 AIDE FINANCIERE INSERTION;Solliciter le comité FAJ;;Objectif : Action d’accompagnement;; +AD - SANTE;;Informer, conseiller;;;; +AD - SANTE;;Orienter vers une structure de soins (CMP, psychologue, cure, …);;;; +AD - SANTE;;Instruire un dossier MDPH;;;; +AD - SANTE;;Accompagner le dépôt de dossier de pension d'invalidité;;;; +AD - SANTE;;Instruire le dossier Complémentaire santé ACS;;;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Informer, conseiller;;;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Procéder à une élection de domicile;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une aide financière;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander un interprète;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Prendre contact avec le CADA;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Aider à la constitution de dossier auprès de la préfecture;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Faire le lien avec les associations;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une aide médicale d'état;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Demander une carte mobilité;; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Accompagner pour la scolarité des enfants (crèches, collège, péri scolaire, cantine…);; +AD – ACCOMPAGNEMENT SPECIFIQUE;;Accompagner des publics spécifiques;;Objectif : Aider à la compréhension du français;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Informer, conseiller;;;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Orienter vers une autre structure;;;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Instruire une première demande d'Accompagnement Educatif de Prevention;;;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Demander le renouvellement de l'Accompagnement Educatif de Prévention;;;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : : Conduite à risque / Passage à l'acte isolé de l'enfant/adolescent;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Comportement de l'enfant/adolescent en difficulté avec les limites, les interdits, les règles sociales;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Difficultés de l'enfant en milieu scolaire ou extra-scolaire;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Difficultés liées à la prise d'autonomie;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Evènement - Traumatisme qui affecte l'équilibre familial;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Problème de communication intrafamiliale;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : Parents démunis sur le plan éducatif;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Problèmatique : conflits parentaux ayant des résonnances sur l'enfant/l'adolescent;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : travailler la place de chacun;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Conseiller et soutenir le positionnement éducatif;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner la relation parent-enfant;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner les parents en lien avec les lieux de scolarisation et de socialisation de leurs enfants;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagner/orienter les parents en lien avec les lieux de soins ;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : Accompagnement d’un jeune majeur;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Objectif : évaluation / Orientation;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : mise en place TISF;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place AED;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place CJM;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Mise en place d'un AP;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Transmission judiciaire pour AEMO;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Tramsmission judiciaire pour MJIE;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Excercer un Accompagnement Educatif de Prévention;;Dispositif : Transmission judiciaire pour une mesure de protection;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Arrêt à l’initiative de la famille; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Souhait interruption momentanée de l’accompagnement par la famille ; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Orientation vers un partenaire extérieur; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Relais avec AS et/ou Puér; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Arrêt à échéance; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Transmission à l’ASE pour une mesure administrative; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Transmission à l’ASE pour une mesure judiciaire; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Renouvellement de l’AEP dans l’attente d’une mesure ASE; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Conclure un Accompagnement Educatif de Prévention;;;Résultat : Renouvellement de l’AEP pour poursuivre les objectifs engagés; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Réaliser une permanence éducative;;;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Médiatiser les relations familiales;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander le passage en IRCP;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place TISF;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander le renouvellement TISF;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place AED;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place AESF;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mise en place d'un AP (accueil provisoire);; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une mesure ASMI;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en centre maternelle;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en centre parental;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une entrée en Unité Mère Enfant (UME);; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une MJAGBF;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une AED TDC;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander la désignation un TDC;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander un CAP ASE;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une AMAE (allocation mensuelle d'aide éducative);; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une allocation socio-éducatif spécifique;; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander un CAFI (aides fi);; +ENFANT / FAMILLE;SOUTIEN A LA PARENTALITE;Solliciter les moyens dans le cadre d'un accompagnement à la parentalité ;;Demander une autre aide (associations…);; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : arrêt de l'adhésion des parents à l'accompagnement du soutien à la parentalité;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : violence intra-familiale;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;Motif : suite à une ISG;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Faire une FRIP; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander une MJIE; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander une mesure de protection; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander un OPP; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter la CRIP;;;Demander un placement; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : arrêt de l'adhésion des parents à l'accompagnement du soutien à la parentalité;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : violence intra-familiale;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;Motif : suite à une ISG;; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander une MJIE; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander une mesure de protection; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander un OPP; +ENFANT / FAMILLE;ENFANT PREVENTION;Alerter l'ASE (RJA) pour situation connue;;;Demander un placement; +ENFANT / FAMILLE;ENFANT PREVENTION;Répondre à Eléments en votre possession;;;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation sans suite; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation demande d'accompagnement médico-sociale; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pur demande de MJIE; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande d'AEMO; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande de placement; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Evaluation pour demande d'OPP; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation IP pour la CRIP;;;Note complémentaire actualisation; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation sans suite; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation demande d'accompagnement médico-sociale; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pur demande de MJIE; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande d'AEMO; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande de placement; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Evaluation pour demande d'OPP; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Réaliser une Evaluation pour l'ASE;;;Note complémentaire actualisation; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander un AEP;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander une mise en place AED;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander une mise en place TISF;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander la mise en place d'un Accueil Provisoire;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'orientation vers d'autres structures (soins, MDA, …);; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'entrée en centre maternel ;; +ENFANT / FAMILLE;INFORMATIONS PREOCCUPANTES;Mettre en place un accompagnement médicosocial suite à une IP;;Demander l'entrée unité mère / enfant;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Informer, conseiller;;;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Orienter vers SOS femme;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Proposer un conseiller ou une thérapie conjugale;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Proposer une médiation familiale;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Aider au dépôt de plainte;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Signaler un adulte vulnérable au procureur ;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Demander une mesure de protection majeur;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Faire une FRIP pour enfant en danger;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Protéger des violences intra familiales;;Instruire la fiche VIF;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Conseiller ;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : VIF;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Difficultés éducatives;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Protection de l’enfance;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Violences sexuelles;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Problématique : Information suite à une séparation;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers l'AS de secteur;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers SOS femme;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers un accompagnement CMP/libéral;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Orienter vers un conseiller ou thérapeute conjugal;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Aider au dépôt de plainte;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Signaler un adulte vulnérable au procureur ;; +ENFANT / FAMILLE;VIOLENCES INTRA-FAMILIALES;Réaliser l'intervention sociale en gendarmerie;;Demander une mesure de protection majeur;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le lieu d'accueil;;;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place TISF;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Demande aide financière / SU;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Demande SU;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Participation à des actions collectives;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place d'un loisir familial ;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Mettre en place un soutien parental;;Mise en place d'une aide transport;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Demande mise en place d'un accompagnement psychologique;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Construire le PPE;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Mise en place CJM;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Demande MDPH ;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Accompagner le mineur;;Organiser la mise en place d'un loisir;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Elaborer le lien partenarial;;;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Demander une protection majeur vulnérable;;;; +ENFANT PROTECTION;ACCUEIL PROVISOIRE;Demande de MJIE (mesure judiciaire d'investigation éducative);;;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Accompagner le lieu d'accueil;;;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Mise en place TISF;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande aide financière;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande SU;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Mettre en place un soutien parental;;Demande de protection majeur vulnérable;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Accompagner le mineur;;;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT DANS UN LIEU D'ACCUEIL;Elaborer le lien partenarial;;;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Mettre en place un soutien parental;;;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Construire le PPE;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Mise en place CJM;; +ENFANT PROTECTION;ASSISTANCE EDUCATIVE DE PLACEMENT CHEZ LE PARENT;Accompagner le mineur;;Organiser la participation à un camp de vacances;; +ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Accompagner le lieu d'accueil;;;; +ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Accompagner le mineur;;;; +ENFANT PROTECTION;DELEGATION D'AUTORITE PARENTALE;Elaborer le lien partenarial;;;; +ENFANT PROTECTION;TUTELLE DEPARTEMENTALE;;;;; +ENFANT PROTECTION;TUTELLE D'ETAT;Accompagner le lieu d'accueil;;;; +ENFANT PROTECTION;TUTELLE D'ETAT;Accompagner le mineur;;;; +ENFANT PROTECTION;TUTELLE D'ETAT;Elaborer le lien partenarial;;;; +ENFANT PROTECTION;AEMO TDC;Accompagner le lieu d'accueil;;;; +ENFANT PROTECTION;AEMO TDC;Mettre en place un soutien parental;;;; +ENFANT PROTECTION;AEMO TDC;Accompagner le mineur;;;; +ENFANT PROTECTION;AEMO TDC;Elaborer le lien partenarial;;;; +ENFANT PROTECTION;AEMO FAMILLE;Mettre en place un soutien parental;;;; +ENFANT PROTECTION;AEMO FAMILLE;Accompagner le mineur;;;; +ENFANT PROTECTION;AEMO FAMILLE;Elaborer le lien partenarial;;;; +AGREMENT;ASSISTANT MATERNEL;Instruire une première demande;;;; +AGREMENT;ASSISTANT MATERNEL;Instruire un renouvellement;;;; +AGREMENT;ASSISTANT MATERNEL;Instruire une modification;;;; +AGREMENT;ASSISTANT MATERNEL;Suivre un(e) ASSMAT;;;; +AGREMENT;ASSISTANT MATERNEL;Contrôler un(e) ASSMAT;;;; +AGREMENT;ASSISTANT MATERNEL;Accompagner un(e) ASSMAT;;;; +AGREMENT;ASSISTANT FAMILIAL;Instruire une première demande;;;; +AGREMENT;ASSISTANT FAMILIAL;Instruire un renouvellement;;;; +AGREMENT;ASSISTANT FAMILIAL;Instruire une modification;;;; +AGREMENT;ASSISTANT FAMILIAL;Suivre un(e) ASSFAM;;;; +AGREMENT;ASSISTANT FAMILIAL;Contrôler un(e) ASSFAM;;;; +AGREMENT;ASSISTANT FAMILIAL;Accompagner un(e) ASSFAM;;;; +AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Première demande;; +AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Renouvellement;; +AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Modification;; +AGREMENT;FAMILLE D'ACCUEIL PA/PH;Contribuer à l'évaluation si Famille d'Accueil connue;;Suivi;; diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php index c9ad36319..9cc026909 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php @@ -345,6 +345,111 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac ] ] ], + [ + 'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class, + 'name' => 'social_issue', + 'base_path' => '/admin/social-work/social-issue', + 'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialIssueType::class, + 'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialIssueController::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/SocialIssue/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/edit.html.twig', + ] + ] + ], + [ + 'class' => \Chill\PersonBundle\Entity\SocialWork\SocialAction::class, + 'name' => 'social_action', + 'base_path' => '/admin/social-work/social-action', + 'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialActionType::class, + 'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialActionController::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/SocialAction/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/edit.html.twig', + ] + ] + ], + [ + 'class' => \Chill\PersonBundle\Entity\SocialWork\Goal::class, + 'name' => 'social_goal', + 'base_path' => '/admin/social-work/goal', + 'form_class' => \Chill\PersonBundle\Form\SocialWork\GoalType::class, + 'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminGoalController::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/Goal/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/edit.html.twig', + ] + ] + ], + [ + 'class' => \Chill\PersonBundle\Entity\SocialWork\Result::class, + 'name' => 'social_result', + 'base_path' => '/admin/social-work/result', + 'form_class' => \Chill\PersonBundle\Form\SocialWork\ResultType::class, + 'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminResultController::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/Result/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/edit.html.twig', + ] + ] + ], + [ + 'class' => \Chill\PersonBundle\Entity\SocialWork\Evaluation::class, + 'name' => 'social_evaluation', + 'base_path' => '/admin/social-work/evaluation', + 'form_class' => \Chill\PersonBundle\Form\SocialWork\EvaluationType::class, + 'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminEvaluationController::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/Evaluation/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_ADMIN', + 'template' => '@ChillPerson/SocialWork/edit.html.twig', + ] + ] + ], ], 'apis' => [ [ diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php index b2de73651..830a9e48e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php @@ -25,6 +25,7 @@ namespace Chill\PersonBundle\Entity; use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface; use Chill\MainBundle\Doctrine\Model\TrackCreationInterface; use Chill\MainBundle\Entity\Scope; +use Chill\MainBundle\Entity\Address; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive; use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment; @@ -291,6 +292,22 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface */ private Collection $works; + /** + * @ORM\ManyToOne( + * targetEntity=Person::class, + * inversedBy="periodLocatedOn" + * ) + */ + private ?Person $personLocation = null; + + + /** + * @ORM\ManyToOne( + * targetEntity=Address::class + * ) + */ + private ?Address $addressLocation = null; + /** * AccompanyingPeriod constructor. * @@ -824,7 +841,9 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface public function addSocialIssue(SocialIssue $socialIssue): self { - $this->socialIssues[] = $socialIssue; + if (!$this->socialIssues->contains($socialIssue)) { + $this->socialIssues[] = $socialIssue; + } return $this; } @@ -931,4 +950,67 @@ class AccompanyingPeriod implements TrackCreationInterface, TrackUpdateInterface return $this; } + + public function getAddressLocation(): ?Address + { + return $this->addressLocation; + } + + /** + * @Groups({"write"}) + */ + public function setAddressLocation(?Address $addressLocation = null): self + { + $this->addressLocation = $addressLocation; + + return $this; + } + + /** + * @Groups({"read"}) + */ + public function getPersonLocation(): ?Person + { + return $this->personLocation; + } + + /** + * @Groups({"write"}) + */ + public function setPersonLocation(?Person $person = null): self + { + $this->personLocation = $person; + + return $this; + } + + /** + * Get the location, taking precedence into account + * + * @Groups({"read"}) + */ + public function getLocation(\DateTimeImmutable $at = null): ?Address + { + if ($this->getPersonLocation() instanceof Person) { + return $this->getPersonLocation()->getCurrentHouseholdAddress($at); + } + + return $this->getAddressLocation(); + } + + /** + * Get where the location is + * + * @Groups({"read"}) + */ + public function getLocationStatus(): string + { + if ($this->getPersonLocation() instanceof Person) { + return 'person'; + } elseif ($this->getAddressLocation() instanceof Address) { + return 'address'; + } else { + return 'none'; + } + } } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php index e80f37364..f97f8a243 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -160,12 +160,26 @@ use Symfony\Component\Validator\Constraints as Assert; */ private Collection $persons; + /** + * @var Collection + * @ORM\OneToMany( + * targetEntity=AccompanyingPeriodWorkEvaluation::class, + * mappedBy="accompanyingPeriodWork", + * cascade={"persist"}, + * orphanRemoval=true + * ) + * @Serializer\Groups({"read"}) + * @internal /!\ the serialization for read / write evaluations is handled in `AccompanyingPeriodWorkDenormalizer` + */ + private Collection $accompanyingPeriodWorkEvaluations; + public function __construct() { $this->goals = new ArrayCollection(); $this->results = new ArrayCollection(); $this->thirdParties = new ArrayCollection(); $this->persons = new ArrayCollection(); + $this->accompanyingPeriodWorkEvaluations = new ArrayCollection(); } public function getId(): ?int @@ -388,6 +402,11 @@ use Symfony\Component\Validator\Constraints as Assert; return $this->thirdParties; } + public function getThirdPartys(): Collection + { + return $this->getThirdParties(); + } + public function addThirdParty(ThirdParty $thirdParty): self { if (!$this->thirdParties->contains($thirdParty)) { @@ -424,4 +443,31 @@ use Symfony\Component\Validator\Constraints as Assert; return $this; } + + /** + * @return Collection + */ + public function getAccompanyingPeriodWorkEvaluations() + { + return $this->accompanyingPeriodWorkEvaluations; + } + + public function addAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self + { + if (!$this->accompanyingPeriodWorkEvaluations->contains($evaluation)) { + $this->accompanyingPeriodWorkEvaluations[] = $evaluation; + $evaluation->setAccompanyingPeriodWork($this); + } + + return $this; + } + + public function removeAccompanyingPeriodWorkEvaluation(AccompanyingPeriodWorkEvaluation $evaluation): self + { + $this->accompanyingPeriodWorkEvaluations + ->removeElement($evaluation); + $evaluation->setAccompanyingPeriodWork(null); + + return $this; + } } diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php new file mode 100644 index 000000000..cd4bb3ac4 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php @@ -0,0 +1,369 @@ +documents = new ArrayCollection(); + } + + /** + * @return int|null + */ + public function getId(): ?int + { + return $this->id; + } + + /** + * @return AccompanyingPeriodWork|null + */ + public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork + { + return $this->accompanyingPeriodWork; + } + + /** + * @param AccompanyingPeriodWork|null $accompanyingPeriodWork + * @return AccompanyingPeriodWorkEvaluation + */ + public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): AccompanyingPeriodWorkEvaluation + { + if ( + $accompanyingPeriodWork instanceof AccompanyingPeriodWork + && $this->accompanyingPeriodWork instanceof AccompanyingPeriodWork + && $this->accompanyingPeriodWork->getId() !== $accompanyingPeriodWork->getId()) { + throw new \RuntimeException("Changing the ". + "accompanyingPeriodWork is not allowed"); + } + + $this->accompanyingPeriodWork = $accompanyingPeriodWork; + return $this; + } + + /** + * @return Evaluation|null + */ + public function getEvaluation(): ?Evaluation + { + return $this->evaluation; + } + + /** + * @param Evaluation|null $evaluation + * @return AccompanyingPeriodWorkEvaluation + */ + public function setEvaluation(?Evaluation $evaluation): AccompanyingPeriodWorkEvaluation + { + if ( + ($evaluation instanceof Evaluation + && $this->evaluation instanceof Evaluation + && $evaluation->getId() !== $this->evaluation->getId()) + || + ($this->evaluation instanceof Evaluation + && null === $evaluation) + ) { + throw new \LogicException("once set, an ${self::class} cannot + change or remove the linked Evaluation::class"); + } + + $this->evaluation = $evaluation; + + return $this; + } + + /** + * @return DateTimeImmutable|null + */ + public function getStartDate(): ?DateTimeImmutable + { + return $this->startDate; + } + + /** + * @param DateTimeImmutable|null $startDate + * @return AccompanyingPeriodWorkEvaluation + */ + public function setStartDate(?DateTimeImmutable $startDate): AccompanyingPeriodWorkEvaluation + { + $this->startDate = $startDate; + return $this; + } + + /** + * @return DateTimeImmutable|null + */ + public function getEndDate(): ?DateTimeImmutable + { + return $this->endDate; + } + + /** + * @param DateTimeImmutable|null $endDate + * @return AccompanyingPeriodWorkEvaluation + */ + public function setEndDate(?DateTimeImmutable $endDate): AccompanyingPeriodWorkEvaluation + { + $this->endDate = $endDate; + return $this; + } + + /** + * @return DateTimeImmutable|null + */ + public function getMaxDate(): ?DateTimeImmutable + { + return $this->maxDate; + } + + /** + * @param DateTimeImmutable|null $maxDate + * @return AccompanyingPeriodWorkEvaluation + */ + public function setMaxDate(?DateTimeImmutable $maxDate): AccompanyingPeriodWorkEvaluation + { + $this->maxDate = $maxDate; + return $this; + } + + /** + * @return DateInterval|null + */ + public function getWarningInterval(): ?DateInterval + { + return $this->warningInterval; + } + + /** + * @param DateInterval|null $warningInterval + * @return AccompanyingPeriodWorkEvaluation + */ + public function setWarningInterval(?DateInterval $warningInterval): AccompanyingPeriodWorkEvaluation + { + $this->warningInterval = $warningInterval; + return $this; + } + + /** + * @return string + */ + public function getComment(): string + { + return $this->comment; + } + + /** + * @param string $comment + * @return AccompanyingPeriodWorkEvaluation + */ + public function setComment(string $comment): AccompanyingPeriodWorkEvaluation + { + $this->comment = $comment; + return $this; + } + + /** + * @return User|null + */ + public function getCreatedBy(): ?User + { + return $this->createdBy; + } + + /** + * @param User|null $createdBy + * @return AccompanyingPeriodWorkEvaluation + */ + public function setCreatedBy(?User $createdBy): AccompanyingPeriodWorkEvaluation + { + $this->createdBy = $createdBy; + return $this; + } + + /** + * @return DateTimeImmutable|null + */ + public function getCreatedAt(): ?DateTimeImmutable + { + return $this->createdAt; + } + + /** + * @param DateTimeImmutable|null $createdAt + * @return AccompanyingPeriodWorkEvaluation + */ + public function setCreatedAt(\DateTimeInterface $createdAt): self + { + $this->createdAt = $createdAt; + return $this; + } + + /** + * @return User|null + */ + public function getUpdatedBy(): ?User + { + return $this->updatedBy; + } + + /** + * @param User|null $updatedBy + * @return AccompanyingPeriodWorkEvaluation + */ + public function setUpdatedBy(?User $updatedBy): AccompanyingPeriodWorkEvaluation + { + $this->updatedBy = $updatedBy; + return $this; + } + + /** + * @return DateTimeImmutable|null + */ + public function getUpdatedAt(): ?DateTimeImmutable + { + return $this->updatedAt; + } + + /** + * @param DateTimeImmutable|null $updatedAt + * @return AccompanyingPeriodWorkEvaluation + */ + public function setUpdatedAt(\DateTimeInterface $updatedAt): self + { + $this->updatedAt = $updatedAt; + return $this; + } + + /** + * @return Collection + */ + public function getDocuments() + { + return $this->documents; + } + + +} diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php new file mode 100644 index 000000000..f61955e1d --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -0,0 +1,175 @@ +accompanyingPeriodWorkEvaluation; + } + + /** + * @param AccompanyingPeriodWorkEvaluation|null $accompanyingPeriodWorkEvaluation + * @return AccompanyingPeriodWorkEvaluationDocument + */ + public function setAccompanyingPeriodWorkEvaluation(?AccompanyingPeriodWorkEvaluation $accompanyingPeriodWorkEvaluation): AccompanyingPeriodWorkEvaluationDocument + { + $this->accompanyingPeriodWorkEvaluation = $accompanyingPeriodWorkEvaluation; + return $this; + } + + /** + * @return StoredObject|null + */ + public function getStoredObject(): ?StoredObject + { + return $this->storedObject; + } + + /** + * @param StoredObject|null $storedObject + * @return AccompanyingPeriodWorkEvaluationDocument + */ + public function setStoredObject(?StoredObject $storedObject): AccompanyingPeriodWorkEvaluationDocument + { + $this->storedObject = $storedObject; + return $this; + } + + public function setCreatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface + { + $this->createdBy = $user; + return $this; + } + + public function setCreatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackCreationInterface + { + $this->createdAt = $datetime; + return $this; + } + + public function setUpdatedBy(User $user): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface + { + $this->updatedBy = $user; + return $this; + } + + public function setUpdatedAt(\DateTimeInterface $datetime): \Chill\MainBundle\Doctrine\Model\TrackUpdateInterface + { + $this->updatedAt = $datetime; + return $this; + } + + /** + * @return int|null + */ + public function getId(): ?int + { + return $this->id; + } + + /** + * @return User|null + */ + public function getCreatedBy(): ?User + { + return $this->createdBy; + } + + /** + * @return \DateTimeImmutable|null + */ + public function getCreatedAt(): ?\DateTimeInterface + { + return $this->createdAt; + } + + /** + * @return User|null + */ + public function getUpdatedBy(): ?User + { + return $this->updatedBy; + } + + /** + * @return DateTimeImmutable|null + */ + public function getUpdatedAt(): ?\DateTimeInterface + { + return $this->updatedAt; + } + +} diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index f59fc567e..edf94bd67 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -99,6 +99,22 @@ class Household return $this; } + /** + * Force an address starting at the current day + * on the Household. + * + * This will force the startDate's address on today. + * + * Used on household creation. + * + * @Serializer\Groups({"create"}) + */ + public function setForceAddress(Address $address) + { + $address->setValidFrom(new \DateTime('today')); + $this->addAddress($address); + } + /** * @param Address $address */ @@ -128,7 +144,7 @@ class Household $at = $at === null ? new \DateTime('today') : $at; $addrs = $this->getAddresses()->filter(function (Address $a) use ($at) { - return $a->getValidFrom() < $at && ( + return $a->getValidFrom() <= $at && ( NULL === $a->getValidTo() || $at < $a->getValidTo() ); }); diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 695970bfa..cf00eb9f1 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -30,6 +30,7 @@ use Chill\MainBundle\Entity\Country; use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\MaritalStatus; +use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\Household\HouseholdMember; use Chill\MainBundle\Entity\HasCenterInterface; use Chill\MainBundle\Entity\Address; @@ -379,6 +380,19 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI */ private Collection $householdAddresses; + /** + * @ORM\OneToMany( + * targetEntity=AccompanyingPeriod::class, + * mappedBy="personLocation" + * ) + */ + private Collection $periodLocatedOn; + + /** + * Person constructor. + * + * @param \DateTime|null $opening + */ public function __construct() { $this->accompanyingPeriodParticipations = new ArrayCollection(); diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php index e08a6de77..f01b2a4c1 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php @@ -3,10 +3,14 @@ namespace Chill\PersonBundle\Entity\SocialWork; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation as Serializer; /** * @ORM\Entity * @ORM\Table(name="chill_person_social_work_evaluation") + * @Serializer\DiscriminatorMap(typeProperty="type", mapping={ + * "social_work_evaluation"=Evaluation::class + * }) */ class Evaluation { @@ -14,26 +18,33 @@ class Evaluation * @ORM\Id * @ORM\GeneratedValue * @ORM\Column(type="integer") + * @Serializer\Groups({"read"}) */ private $id; /** * @ORM\Column(type="json") + * @Serializer\Groups({"read"}) */ private $title = []; /** - * @ORM\Column(type="dateinterval", nullable=true) + * @ORM\Column(type="dateinterval", nullable=true, options={"default": null}) + * @Serializer\Groups({"read"}) */ private $delay; /** - * @ORM\Column(type="dateinterval") + * @ORM\Column(type="dateinterval", nullable=true, options={"default": null}) + * @Serializer\Groups({"read"}) */ private $notificationDelay; /** - * @ORM\ManyToOne(targetEntity=SocialAction::class) + * @ORM\ManyToOne( + * targetEntity=SocialAction::class, + * inversedBy="evaluations" + * ) */ private $socialAction; diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index 506a736d8..bb05c900e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -68,6 +68,15 @@ class SocialAction */ private $results; + /** + * @var Collection + * @ORM\OneToMany( + * targetEntity=Evaluation::class, + * mappedBy="socialAction" + * ) + */ + private Collection $evaluations; + public function __construct() { $this->children = new ArrayCollection(); @@ -257,4 +266,12 @@ class SocialAction return $this; } + + /** + * @return Collection + */ + public function getEvaluations(): Collection + { + return $this->evaluations; + } } diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php new file mode 100644 index 000000000..b45cd327e --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php @@ -0,0 +1,71 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +namespace Chill\PersonBundle\Form\SocialWork; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Chill\MainBundle\Form\Type\TranslatableStringFormType; +use Symfony\Component\Form\Extension\Core\Type\DateType; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; +use Chill\PersonBundle\Entity\SocialWork\Evaluation; + +/** + * Class EvaluationType + * + * @package Chill\PersonBundle\Form + */ +class EvaluationType extends AbstractType +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) { + $this->translatableStringHelper = $translatableStringHelper; + } + + /** + * @param FormBuilderInterface $builder + * @param array $options + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('title', TranslatableStringFormType::class, [ + 'label' => 'Nom', + ]) + ->add('delay') + + ->add('notificationDelay'); + } + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', Evaluation::class) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php new file mode 100644 index 000000000..c86a7d6b9 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php @@ -0,0 +1,85 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +namespace Chill\PersonBundle\Form\SocialWork; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Chill\MainBundle\Form\Type\TranslatableStringFormType; +use Symfony\Component\Form\Extension\Core\Type\DateType; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; +use Chill\PersonBundle\Entity\SocialWork\Goal; +use Chill\PersonBundle\Entity\SocialWork\SocialAction; + +/** + * Class GoalType + * + * @package Chill\PersonBundle\Form + */ +class GoalType extends AbstractType +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) { + $this->translatableStringHelper = $translatableStringHelper; + } + + /** + * @param FormBuilderInterface $builder + * @param array $options + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('title', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + + ->add('socialActions', EntityType::class, [ + 'class' => SocialAction::class, + 'required' => false, + 'multiple' => true, + 'choice_label' => function (SocialAction $issue) { + return $this->translatableStringHelper->localize($issue->getTitle()); + } + ]) + + ->add('desactivationDate', DateType::class, [ + 'attr' => array('class' => 'datepicker'), + 'widget'=> 'single_text', + 'format' => 'dd-MM-yyyy', + 'required' => false, + ]); +} + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', Goal::class) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php new file mode 100644 index 000000000..ee2cefe48 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php @@ -0,0 +1,76 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +namespace Chill\PersonBundle\Form\SocialWork; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Chill\MainBundle\Form\Type\TranslatableStringFormType; +use Symfony\Component\Form\Extension\Core\Type\DateType; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; +use Chill\PersonBundle\Entity\SocialWork\Result; + +/** + * Class ResultType + * + * @package Chill\PersonBundle\Form + */ +class ResultType extends AbstractType +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) { + $this->translatableStringHelper = $translatableStringHelper; + } + + /** + * @param FormBuilderInterface $builder + * @param array $options + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('title', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + ->add('accompanyingPeriodWorks') + ->add('accompanyingPeriodWorkGoals') + ->add('desactivationDate', DateType::class, [ + 'attr' => array('class' => 'datepicker'), + 'widget'=> 'single_text', + 'format' => 'dd-MM-yyyy', + 'required' => false, + ]); +} + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', Result::class) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php new file mode 100644 index 000000000..7613bc2c7 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php @@ -0,0 +1,90 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +namespace Chill\PersonBundle\Form\SocialWork; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Chill\MainBundle\Form\Type\TranslatableStringFormType; +use Symfony\Component\Form\Extension\Core\Type\DateType; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; +use Chill\PersonBundle\Entity\SocialWork\SocialAction; +use Chill\PersonBundle\Entity\SocialWork\SocialIssue; + + +/** + * Class SocialActionType + * + * @package Chill\PersonBundle\Form + */ +class SocialActionType extends AbstractType +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) { + $this->translatableStringHelper = $translatableStringHelper; + } + + /** + * @param FormBuilderInterface $builder + * @param array $options + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('title', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + ->add('issue', EntityType::class, [ + 'class' => SocialIssue::class, + 'choice_label' => function (SocialIssue $issue) { + return $this->translatableStringHelper->localize($issue->getTitle()); + } + ]) + ->add('parent', EntityType::class, [ + 'class' => SocialAction::class, + 'required' => false, + 'choice_label' => function (SocialAction $issue) { + return $this->translatableStringHelper->localize($issue->getTitle()); + } + ]) + ->add('defaultNotificationDelay') + ->add('desactivationDate', DateType::class, [ + 'attr' => array('class' => 'datepicker'), + 'widget'=> 'single_text', + 'format' => 'dd-MM-yyyy', + 'required' => false, + ]); +} + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', SocialIssue::class) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php new file mode 100644 index 000000000..1f21defd9 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php @@ -0,0 +1,83 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +namespace Chill\PersonBundle\Form\SocialWork; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Chill\MainBundle\Form\Type\TranslatableStringFormType; +use Symfony\Component\Form\Extension\Core\Type\DateType; +use Chill\MainBundle\Templating\TranslatableStringHelper; +use Symfony\Bridge\Doctrine\Form\Type\EntityType; +use Chill\PersonBundle\Entity\SocialWork\SocialIssue; + +/** + * Class SocialIssueType + * + * @package Chill\PersonBundle\Form + */ +class SocialIssueType extends AbstractType +{ + /** + * + * @var TranslatableStringHelper + */ + protected $translatableStringHelper; + + public function __construct(TranslatableStringHelper $translatableStringHelper) { + $this->translatableStringHelper = $translatableStringHelper; + } + + /** + * @param FormBuilderInterface $builder + * @param array $options + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('title', TranslatableStringFormType::class, [ + 'label' => 'Nom' + ]) + + ->add('parent', EntityType::class, [ + 'class' => SocialIssue::class, + 'required' => false, + 'choice_label' => function (SocialIssue $issue) { + return $this->translatableStringHelper->localize($issue->getTitle()); + } + ]) + + ->add('desactivationDate', DateType::class, [ + 'attr' => ['class' => 'datepicker'], + 'widget'=> 'single_text', + 'format' => 'dd-MM-yyyy', + 'required' => false, + ]); +} + + /** + * @param OptionsResolver $resolver + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefault('class', SocialIssue::class) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php index b0578c994..f9d1b060f 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php @@ -25,6 +25,7 @@ namespace Chill\PersonBundle\Repository; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; +use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ObjectRepository; final class AccompanyingPeriodRepository implements ObjectRepository @@ -48,7 +49,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository return $this->repository->findAll(); } - public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): ?AccompanyingPeriod + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array { return $this->repository->findBy($criteria, $orderBy, $limit, $offset); } @@ -62,5 +63,4 @@ final class AccompanyingPeriodRepository implements ObjectRepository { return AccompanyingPeriod::class; } - } diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php new file mode 100644 index 000000000..1a69d1319 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php @@ -0,0 +1,43 @@ +repository = $entityManager->getRepository(MaritalStatus::class); + } + public function find($id): ?MaritalStatus + { + return $this->repository->find($id); + } + + public function findAll(): array + { + return $this->repository->findAll(); + } + + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?MaritalStatus + { + return $this->findOneBy($criteria); + } + + public function getClassName(): string + { + return MaritalStatus::class; + } +} diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php index d99ab590e..6686b55b7 100644 --- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php @@ -18,11 +18,13 @@ namespace Chill\PersonBundle\Repository; + use Chill\PersonBundle\Entity\Person; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\QueryBuilder; + final class PersonRepository { private EntityRepository $repository; @@ -113,11 +115,20 @@ final class PersonRepository $qb->setParameter('phonenumber', '%'.$phonenumber.'%'); } + + /** + * @param $phonenumber + * @return string + */ protected function parsePhoneNumber(string $phonenumber): string { return \str_replace(' ', '', $phonenumber); } + /** + * @param QueryBuilder $qb + * @param array $centers + */ protected function addByCenters(QueryBuilder $qb, array $centers): void { if (count($centers) > 0) { diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php index b0324ba33..51ced6976 100644 --- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php @@ -1,6 +1,25 @@ , + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ namespace Chill\PersonBundle\Repository\SocialWork; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss index dace93340..e0a63e982 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss @@ -4,29 +4,24 @@ /* * PERSON CONTEXT */ - -div#header-person-name { - background: none repeat scroll 0 0 $chill-green-dark; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; -} - -div#header-person-details { - background: none repeat scroll 0 0 $chill-green; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; - div.contact { - & > * { - margin-right: 1em; - } - } -} - -div#person_details_container { - padding-top: 20px; - padding-bottom: 20px; +div.banner { + div#header-person-name { + background: none repeat scroll 0 0 $chill-green-dark; + color: $white; + padding-top: 1em; + padding-bottom: 1em; + } + div#header-person-details { + background: none repeat scroll 0 0 $chill-green; + color: $white; + padding-top: 1em; + padding-bottom: 1em; + div.contact { + & > * { + margin-right: 1em; + } + } + } } div.person-view { @@ -83,80 +78,77 @@ div.person-view { * ACCOMPANYING_COURSE CONTEXT * Header custom for Accompanying Course */ +$chill-accourse-context: #718596; -div#header-accompanying_course-name { - background: none repeat scroll 0 0 #718596; - color: #FFF; - h1 { - margin: 0.4em 0; - } - span { - a { - color: white; +div.banner { + div#header-accompanying_course-name { + background: none repeat scroll 0 0 $chill-accourse-context; + color: $white; + h1 { + margin: 0.4em 0; + } + span { + a { + color: $white; + } + a:hover { + text-decoration: underline; + } + } } - a:hover { - text-decoration: underline; + div#header-accompanying_course-details { + background: none repeat scroll 0 0 tint-color($chill-accourse-context, 20%); + color: $white; + padding-top: 1em; + padding-bottom: 1em; } - } -} -div#header-accompanying_course-details { - background: none repeat scroll 0 0 #718596ab; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; } /* * HOUSEHOLD CONTEXT * Header custom for Household */ +$chill-household-context: #929d69; -div#header-household-name { - background: none repeat scroll 0 0 #929d69; //#b97a7a; - color: #FFF; - - h1 { - margin: 0.4em 0; - } - span { - a { - color: white; - } - a:hover { - text-decoration: underline; - } - } +div.banner { + div#header-household-name { + background: none repeat scroll 0 0 $chill-household-context; + color: $white; + h1 { + margin: 0.4em 0; + } + span { + a { + color: $white; + } + a:hover { + text-decoration: underline; + } + } + div.household-members { + display: flex; + flex-direction: row; + flex-wrap: wrap; + span.badge-member { + flex-shrink: 0; flex-grow: 0; flex-basis: auto; + color: $white; + border: 1px solid #ffffff3b; + border-radius: 8px; + padding: 0.4em 0.8em; + margin-bottom: 0.2em; + margin-right: 0.3em; + &.holder { order: -1; } + &.child { order: 2; } + } + } + } + div#header-household-details { + background: none repeat scroll 0 0 tint-color($chill-household-context, 15%); + color: $white; + padding-top: 1em; + padding-bottom: 1em; + span.current-members-explain { + font-weight: bold; + } + } } -div#header-household-details { - background: none repeat scroll 0 0 #b0b984; //#d29791; - color: #FFF; - padding-top: 1em; - padding-bottom: 1em; - span.current-members-explain { - font-weight: bold; - } -} - -div.household-members { - display: flex; - flex-direction: row; - flex-wrap: wrap; - //justify-content: flex-end; - span.badge-member { - flex-shrink: 0; flex-grow: 0; flex-basis: auto; - border: 1px solid #ffffff3b; - color: #ffffff; - padding: 0.4em 0.8em; - margin-bottom: 0.2em; - margin-right: 0.3em; - border-radius: 8px; - &.holder { - order: -1; - } - &.child { - order: 2; - } - } -} - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js b/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js index 0e38c7d18..b2329a7f3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/index.js @@ -8,6 +8,7 @@ require('./scss/household_banner.scss'); require('./scss/accompanying_period_work.scss'); require('./scss/person_by_phonenumber.scss'); require('./scss/render_box.scss'); +require('./scss/flex_table.scss'); require('./scss/address_history.scss'); require('./svg/phone-alt-solid.svg'); diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss new file mode 100644 index 000000000..b2a6a345b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/flex_table.scss @@ -0,0 +1,31 @@ +/* + * flex-table overwrite: precision and exceptions + */ + +/// +div.accompanyingcourse-resume { + div.associated-persons { + .flex-table .item-row .item-col:first-child { + flex-basis: 33%; + } + } +} + +/// +div.accompanyingcourse-list, div.household-members { + .flex-table .item-bloc .item-row { + &:nth-child(2) { + flex-direction: row; + } + &:last-child { + flex-direction: column; + } + } +} + +/// +div.list-with-period { + div.flex-table div.item-row div.item-col:first-child { + flex-basis: 33%; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss index 6be613ea3..b2ab06c2c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss +++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/person_with_period.scss @@ -1,10 +1,7 @@ -/// complete and overwrite flex-table in chillmain.scss -div.list-with-period, -div.list-household-members { - div.comment { - // for the comment for household-members - } +/// +div.list-with-period, div.list-household-members { + div.periods { div.header, div.list-content { @@ -13,7 +10,7 @@ div.list-household-members { } div.header { position: relative; - a.sc-button { + a.btn { position: absolute; width: 30px; height: 30px; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/< b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/< new file mode 100644 index 000000000..f2917b463 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/< @@ -0,0 +1,374 @@ +import { createStore } from 'vuex'; +import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod, fetchAddressSuggestionByPerson} from './../api.js'; +import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js'; + +const debug = process.env.NODE_ENV !== 'production'; + +const concerned = window.household_members_editor_data.persons.map(p => { + return { + person: p, + position: null, + allowRemove: false, + holder: false, + comment: "", + }; +}); + +console.log('expand suggestions', window.household_members_editor_expand_suggestions === 1); + +const store = createStore({ + strict: debug, + state: { + concerned, + household: window.household_members_editor_data.household, + positions: window.household_members_editor_data.positions.sort((a, b) => { + if (a.ordering < b.ordering) { + return -1; + } + if (a.ordering > b.ordering) { + return 1; + } + return 0; + }), + startDate: new Date(), + allowHouseholdCreate: window.household_members_editor_data.allowHouseholdCreate, + allowHouseholdSearch: window.household_members_editor_data.allowHouseholdSearch, + allowLeaveWithoutHousehold: window.household_members_editor_data.allowLeaveWithoutHousehold, + forceLeaveWithoutHousehold: false, + householdSuggestionByAccompanyingPeriod: [], + showHouseholdSuggestion: window.household_members_editor_expand_suggestions === 1, + addressesSuggestion: [], + warnings: [], + errors: [] + }, + getters: { + isHouseholdNew(state) { + if (state.household === null) { + return false; + } + return !Number.isInteger(state.household.id); + }, + hasHousehold(state) { + return state.household !== null; + }, + hasHouseholdOrLeave(state) { + return state.household !== null || state.forceLeaveWithoutHousehold; + }, + hasHouseholdSuggestion(state, getters) { + return getters.filterHouseholdSuggestionByAccompanyingPeriod.length > 0; + }, + countHouseholdSuggestion(state, getters) { + return getters.filterHouseholdSuggestionByAccompanyingPeriod.length; + }, + filterHouseholdSuggestionByAccompanyingPeriod(state) { + if (state.household === null) { + return state.householdSuggestionByAccompanyingPeriod; + } + + return state.householdSuggestionByAccompanyingPeriod + .filter(h => h.id !== state.household.id) + ; + }, + hasPersonsWellPositionnated(state, getters) { + return getters.needsPositionning === false + || (getters.persons.length > 0 && getters.concUnpositionned.length === 0); + }, + persons(state) { + return state.concerned.map(conc => conc.person); + }, + concUnpositionned(state) { + return state.concerned + .filter(conc => conc.position === null) + ; + }, + positions(state) { + return state.positions; + }, + personByPosition: (state) => (position_id) => { + return state.concerned + .filter(conc => + conc.position !== null ? conc.position.id === position_id : false + ) + .map(conc => conc.person) + ; + }, + concByPosition: (state) => (position_id) => { + return state.concerned + .filter(conc => + conc.position !== null ? conc.position.id === position_id : false + ) + ; + }, + concByPersonId: (state) => (person_id) => { + return state.concerned + .find(conc => conc.person.id === person_id) + ; + }, + needsPositionning(state) { + return state.forceLeaveWithoutHousehold === false; + }, + buildPayload: (state) => { + let + conc, + payload_conc, + payload = { + concerned: [], + destination: null + } + ; + + if (state.forceLeaveWithoutHousehold === false) { + payload.destination = { + id: state.household.id, + type: state.household.type + }; + } + + for (let i in state.concerned) { + conc = state.concerned[i]; + payload_conc = { + person: { + id: conc.person.id, + type: conc.person.type + }, + start_date: { + datetime: datetimeToISO(state.startDate) + } + }; + + if (state.forceLeaveWithoutHousehold === false) { + payload_conc.position = { + id: conc.position.id, + type: conc.position.type + }; + payload_conc.holder = conc.holder; + payload_conc.comment = conc.comment; + } + + payload.concerned.push(payload_conc); + } + + return payload; + }, + }, + mutations: { + addConcerned(state, person) { + let persons = state.concerned.map(conc => conc.person.id); + if (!persons.includes(person.id)) { + state.concerned.push({ + person, + position: null, + allowRemove: true, + holder: false, + comment: "", + }); + } else { + console.err("person already included"); + } + }, + markPosition(state, { person_id, position_id}) { + let + position = state.positions.find(pos => pos.id === position_id), + conc = state.concerned.find(c => c.person.id === person_id); + conc.position = position; + }, + setComment(state, {conc, comment}) { + conc.comment = comment; + }, + toggleHolder(state, conc) { + conc.holder = !conc.holder; + }, + removePosition(state, conc) { + conc.holder = false; + conc.position = null; + }, + removeConcerned(state, conc) { + state.concerned = state.concerned.filter(c => + c.person.id !== conc.person.id + ) + }, + createHousehold(state) { + state.household = { type: 'household', members: [], current_address: null, + current_members_id: [] }; + state.forceLeaveWithoutHousehold = false; + }, + removeHousehold(state) { + state.household = null; + state.forceLeaveWithoutHousehold = false; + }, + setHouseholdAddress(state, address) { + if (null === state.household) { + console.error("no household"); + throw new Error("No household"); + } + + state.household.current_address = address; + state.household.force_new_address = address; + }, + forceLeaveWithoutHousehold(state) { + state.household = null; + state.forceLeaveWithoutHousehold = true; + }, + selectHousehold(state, household) { + state.household = household; + state.forceLeaveWithoutHousehold = false; + }, + setHouseholdSuggestionByAccompanyingPeriod(state, households) { + let existingIds = state.householdSuggestionByAccompanyingPeriod + .map(h => h.id); + for (let i in households) { + if (!existingIds.includes(households[i].id)) { + state.householdSuggestionByAccompanyingPeriod.push(households[i]); + } + } + }, + setStartDate(state, dateI) { + state.startDate = dateI; + }, + toggleHouseholdSuggestion(state) { + state.showHouseholdSuggestion = !state.showHouseholdSuggestion; + }, + setWarnings(state, warnings) { + state.warnings = warnings; + // reset errors, which should come from servers + state.errors.splice(0, state.errors.length); + }, + setErrors(state, errors) { + state.errors = errors; + }, + addAddressesSuggestion(state, addresses) { + let existingIds = state.addressesSuggestion + .map(a => a.id); + + for (let i in addresses) { + if (!existingIds.includes(addresses[i].id)) { + state.addressesSuggestion.push(addresses[i]); + } + } + } + }, + actions: { + addConcerned({ commit, dispatch }, person) { + commit('addConcerned', person); + dispatch('computeWarnings'); + dispatch('fetchAddressSuggestions'); + }, + markPosition({ commit, state, dispatch }, { person_id, position_id }) { + commit('markPosition', { person_id, position_id }); + dispatch('computeWarnings'); + }, + toggleHolder({ commit, dispatch }, conc) { + commit('toggleHolder', conc); + dispatch('computeWarnings'); + }, + removePosition({ commit, dispatch }, conc) { + commit('removePosition', conc); + dispatch('computeWarnings'); + }, + removeConcerned({ commit, dispatch }, conc) { + commit('removeConcerned', conc); + dispatch('computeWarnings'); + dispatch('fetchAddressSuggestions'); + }, + removeHousehold({ commit, dispatch }) { + commit('removeHousehold'); + dispatch('computeWarnings'); + }, + createHousehold({ commit, dispatch }) { + commit('createHousehold'); + dispatch('computeWarnings'); + }, + forceLeaveWithoutHousehold({ commit, dispatch }) { + commit('forceLeaveWithoutHousehold'); + dispatch('computeWarnings'); + }, + selectHousehold({ commit }, h) { + commit('selectHousehold', h); + dispatch('computeWarnings'); + }, + setStartDate({ commit, dispatch }, date) { + commit('setStartDate', date); + dispatch('computeWarnings'); + }, + setComment({ commit }, payload) { + commit('setComment', payload); + }, + fetchHouseholdSuggestionForConcerned({ commit, state }, person) { + fetchHouseholdSuggestionByAccompanyingPeriod(person.id) + .then(households => { + commit('setHouseholdSuggestionByAccompanyingPeriod', households); + }); + }, + fetchAddressSuggestions({ commit, state }) { + for (let i in state.concerned) { + fetchAddressSuggestionByPerson(state.concerned[i].person.id) + .then(addresses => { + commit('addAddressesSuggestion', addresses); + }) + .catch(e => { + console.log(e); + }); + } + }, + computeWarnings({ commit, state, getters }) { + let warnings = [], + payload; + + if (!getters.hasHousehold && !state.forceLeaveWithoutHousehold) { + warnings.push({ m: 'household_members_editor.add_destination', a: {} }); + } + + if (state.concerned.length === 0) { + warnings.push({ m: 'household_members_editor.add_at_least_onePerson', a: {} }); + } + + if (getters.concUnpositionned.length > 0 + && !state.forceLeaveWithoutHousehold) { + warnings.push({ m: 'household_members_editor.give_a_position_to_every_person', a: {} }) + } + + commit('setWarnings', warnings); + }, + confirm({ getters, state, commit }) { + let payload = getters.buildPayload, + errors = [], + person_id, + household_id, + error + ; + + householdMove(payload).then(household => { + if (household === null) { + person_id = getters.persons[0].id; + window.location.replace(`/fr/person/${person_id}/general`); + } else { + if (household.type === 'household') { + household_id = household.id; + // nothing to do anymore here, bye-bye ! + window.location.replace(`/fr/person/household/${household_id}/summary`); + } else { + // we assume the answer was 422... + error = household; + for (let i in error.violations) { + let e = error.violations[i]; + errors.push(e.title); + } + + commit('setErrors', errors); + } + } + }); + }, + } +}); + +store.dispatch('computeWarnings'); +store.dispatch('fetchAddressSuggestions'); + +if (concerned.length > 0) { + concerned.forEach(c => { + store.dispatch('fetchHouseholdSuggestionForConcerned', c.person); + }); +} + +export { store }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 8f6a92584..e8d7dd192 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -6,6 +6,7 @@

    {{ $t('course.title.active') }}

    + @@ -14,6 +15,12 @@ +
    +

    + {{ error.sta }} {{ error.txt }}
    + {{ $t(error.msg) }} +

    +
    diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js index d315a3db7..52e253ac1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js @@ -4,12 +4,12 @@ * * @id integer - id of accompanyingCourse */ -const getAccompanyingCourse = (id) => { +const getAccompanyingCourse = (id) => { const url = `/api/1.0/person/accompanying-course/${id}.json`; return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -20,8 +20,8 @@ const getAccompanyingCourse = (id) => { * @id integer - id of accompanyingCourse * @body Object - dictionary with changes to post */ -const patchAccompanyingCourse = (id, body) => { - console.log('body', body); +const patchAccompanyingCourse = (id, body) => { + //console.log('body', body); const url = `/api/1.0/person/accompanying-course/${id}.json`; return fetch(url, { method: 'PATCH', @@ -32,7 +32,8 @@ const patchAccompanyingCourse = (id, body) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + console.log(response); + throw { msg: 'Error while updating AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -47,24 +48,24 @@ const confirmAccompanyingCourse = (id) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while confirming AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; /* -* Endpoint +* Endpoint */ const getSocialIssues = () => { const url = `/api/1.0/person/social-work/social-issue.json`; return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving Social Issues.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; /* -* Endpoint v.2 chill_api_single_accompanying_course_participation, +* Endpoint v.2 chill_api_single_accompanying_course_participation, * method POST/DELETE, add/close a participation to the accompanyingCourse * * @id integer - id of accompanyingCourse @@ -83,12 +84,12 @@ const postParticipation = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course participation.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; /* -* Endpoint v.2 chill_api_single_accompanying_course_requestor, +* Endpoint v.2 chill_api_single_accompanying_course_requestor, * method POST/DELETE, add/close a requestor to the accompanyingCourse * * @id integer - id of accompanyingCourse @@ -109,12 +110,12 @@ const postRequestor = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course requestor', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; /* -* Endpoint v.2 chill_api_single_accompanying_course_resource, +* Endpoint v.2 chill_api_single_accompanying_course_resource, * method POST/DELETE, add/remove a resource to the accompanyingCourse * * @id integer - id of accompanyingCourse @@ -126,11 +127,11 @@ const postResource = (id, payload, method) => { const body = { type: "accompanying_period_resource" }; switch (method) { case 'DELETE': - body['id'] = payload.id; + body['id'] = payload.id; break; default: body['resource'] = { type: payload.type, id: payload.id }; - } + } //console.log('body', body); const url = `/api/1.0/person/accompanying-course/${id}/resource.json`; return fetch(url, { @@ -142,7 +143,7 @@ const postResource = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course resource.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -150,7 +151,7 @@ const postResource = (id, payload, method) => { * Endpoint to Add/remove SocialIssue */ const postSocialIssue = (id, body, method) => { - //console.log('api body and method', body, method); + //console.log('api body and method', body, method); const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`; return fetch(url, { method: method, @@ -161,7 +162,7 @@ const postSocialIssue = (id, body, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while updating SocialIssue.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -170,7 +171,7 @@ const getUsers = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving users.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -179,7 +180,7 @@ const whoami = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while getting whoami.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -188,11 +189,11 @@ const getListOrigins = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); } -export { +export { getAccompanyingCourse, patchAccompanyingCourse, confirmAccompanyingCourse, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue index eda06b285..9fe6fe87c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue @@ -5,7 +5,8 @@ - + {{ $t('course.step.draft') }} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue new file mode 100644 index 000000000..08b608d89 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue @@ -0,0 +1,68 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue index 90c52ceb0..b64d46103 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue @@ -1,57 +1,65 @@ - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue index 7beb7b029..44479831c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -1,26 +1,45 @@ - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue new file mode 100644 index 000000000..3c4d79521 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue @@ -0,0 +1,158 @@ + + + diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue index f55eb39d7..af0fcf2b7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue @@ -1,8 +1,8 @@