Merge remote-tracking branch 'origin/master' into features/improve-activity

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -4,6 +4,7 @@ namespace Chill\ActivityBundle\Menu;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -34,21 +35,13 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
     {
         $period = $parameters['accompanyingCourse'];
 
-        $menu->addChild($this->translator->trans('Activity list'), [
+        if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
-            'route' => 'chill_activity_activity_list',
+            $menu->addChild($this->translator->trans('Activity list'), [
-            'routeParameters' => [
+                'route' => 'chill_activity_activity_list',
-                'accompanying_period_id' => $period->getId(),
+                'routeParameters' => [
-            ]])
+                    'accompanying_period_id' => $period->getId(),
-            ->setExtras(['order' => 40]);
+                ]])
-
+                ->setExtras(['order' => 40]);
-        $menu->addChild($this->translator->trans('Add a new activity'), [
+        }
-            'route' => 'chill_activity_activity_select_type',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ]])
-            ->setExtras(['order' => 41]);
-
-
-
     }
 }

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -132,6 +132,7 @@ class Address
     /**
      * True if the address is a "no address", aka homeless person, ...
      * @groups({"write"})
+     * @ORM\Column(type="boolean")
      *
      * @var bool
      */
@@ -298,7 +299,7 @@ class Address
      * @param bool $isNoAddress
      * @return $this
      */
-    public function setIsNoAddress(bool $isNoAddress)
+    public function setIsNoAddress(bool $isNoAddress): self
     {
         $this->isNoAddress = $isNoAddress;
         return $this;

src/Bundle/ChillMainBundle/Resources/public/modules/scratch/custom/config/_variables.scss

@@ -35,6 +35,7 @@ $table-body-td-text-align: left;
 // Tabs
 $tabs-nav-margin-bottom: 0.2em;
 $tabs-nav-bg-color: $yellow;
+$tabs-nav-bg-color-light: lighten($yellow, 10%);
 $tabs-nav-text-color: $blue;
 $tabs-new-border: none;
 $tabs-nav-hover-border: none;

src/Bundle/ChillMainBundle/Resources/public/modules/scratch/modules/_tabs.scss

@@ -26,7 +26,13 @@ $global-bg-color: $yellow;
          color: $tabs-nav-title-text-color;
       }
 
-      > a  {
+      &.sub-menu {
+         padding-left: 20px;
+         > a {
+            background-color: $tabs-nav-bg-color-light;
+         }
+      }
+      > a {
          display: block;
          width: auto;
          padding: $tabs-nav-padding;
@@ -38,11 +44,11 @@ $global-bg-color: $yellow;
          @include border-top-radius($base-border-radius);
          @include border-bottom-radius($base-border-radius);
 
-         &:hover, &:active {  
+         &:hover, &:active {
             border: $tabs-nav-hover-border;
             color: $tabs-nav-hover-text-color;
             text-decoration: none;
          }
       }
    }
-}
+}

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue

@@ -46,6 +46,7 @@
 
                      <city-selection
                         v-bind:address="address"
+                        v-bind:focusOnAddress="focusOnAddress"
                         v-bind:getReferenceAddresses="getReferenceAddresses">
                      </city-selection>
 
@@ -173,6 +174,14 @@ export default {
          //   this.$refs.search.focus(); // positionner le curseur à l'ouverture de la modale
          //})
       },
+      focusOnCity() {
+          const citySelector = document.getElementById('citySelector');
+          citySelector.focus();
+      },
+      focusOnAddress() {
+          const addressSelector = document.getElementById('addressSelector');
+          addressSelector.focus();
+      },
       getCountries() {
          console.log('getCountries');
          this.loading = true;

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/AddressSelection.vue

@@ -1,6 +1,7 @@
 <template>
    <div class="container">
       <VueMultiselect
+         id="addressSelector"
          v-model="value"
          @select="selectAddress"
          name="field"
@@ -70,7 +71,7 @@ export default {
    },
    methods: {
       transName(value) {
-         return value.streetNumber === undefined ? value.street : `${value.street}, ${value.streetNumber}`
+         return value.streetNumber === undefined ? value.street : `${value.streetNumber}, ${value.street}`
       },
       selectAddress(value) {
          this.address.selected.address = value;

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CitySelection.vue

@@ -1,6 +1,7 @@
 <template>
    <div class="container">
       <VueMultiselect
+         id="citySelector"
          v-model="value"
          @select="selectCity"
          name="field"
@@ -35,7 +36,7 @@ import VueMultiselect from 'vue-multiselect';
 export default {
    name: 'CitySelection',
    components: { VueMultiselect },
-   props: ['address', 'getReferenceAddresses'],
+   props: ['address', 'getReferenceAddresses', 'focusOnAddress'],
    data() {
       return {
          value: null
@@ -74,6 +75,7 @@ export default {
          this.address.newPostalCode.name = value.name;
          this.address.newPostalCode.code = value.code;
          this.getReferenceAddresses(value);
+         this.focusOnAddress();
       },
       addPostalCode() {
          this.address.writeNewPostalCode = true;

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress/CountrySelection.vue

@@ -40,7 +40,6 @@ export default {
          return name.fr //TODO multilang
       },
       selectCountry(value) {
-         console.log(value);
          this.address.selected.country = value;
          this.getCities(value);
       },

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -14,7 +14,7 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
     public function normalize($address, string $format = null, array $context = [])
     {
         $data['address_id'] = $address->getId();
-        $data['text'] = $address->getStreet().', '.$address->getStreetNumber();
+        $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
         $data['street'] = $address->getStreet();
         $data['streetNumber'] = $address->getStreetNumber();
         $data['postcode']['name'] = $address->getPostCode()->getName();

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -7,6 +7,7 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
 use Chill\PersonBundle\Privacy\AccompanyingPeriodPrivacyEvent;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -35,14 +36,18 @@ class AccompanyingCourseController extends Controller
 
     protected ValidatorInterface $validator;
 
+    private AccompanyingPeriodWorkRepository $workRepository;
+
     public function __construct(
         SerializerInterface $serializer,
         EventDispatcherInterface $dispatcher,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
+        AccompanyingPeriodWorkRepository $workRepository
     ) {
         $this->serializer = $serializer;
         $this->dispatcher = $dispatcher;
         $this->validator = $validator;
+        $this->workRepository = $workRepository;
     }
 
     /**
@@ -102,9 +107,16 @@ class AccompanyingCourseController extends Controller
             ['date' => 'DESC'],
         );
 
+        $works = $this->workRepository->findByAccompanyingPeriod(
+            $accompanyingCourse,
+            ['startDate' => 'DESC', 'endDate' => 'DESC'],
+            3
+        );
+
         return $this->render('@ChillPerson/AccompanyingCourse/index.html.twig', [
             'accompanyingCourse' => $accompanyingCourse,
             'withoutHousehold' => $withoutHousehold,
+            'works' => $works,
             'activities' => $activities
         ]);
     }

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -47,12 +47,12 @@ class AccompanyingPeriodController extends AbstractController
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-    
+
     /**
      * @var ValidatorInterface
      */
     protected $validator;
-    
+
     /**
      * AccompanyingPeriodController constructor.
      *
@@ -64,23 +64,25 @@ class AccompanyingPeriodController extends AbstractController
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
     }
-    
+
     public function listAction(int $person_id): Response
     {
         $person = $this->_getPerson($person_id);
-    
+
         $event = new PrivacyEvent($person, [
             'element_class' => AccompanyingPeriod::class,
             'action' => 'list'
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
+        $accompanyingPeriods = $person->getAccompanyingPeriodsOrdered();
+
         return $this->render('ChillPersonBundle:AccompanyingPeriod:list.html.twig', [
-            'accompanying_periods' => $person->getAccompanyingPeriodsOrdered(),
+            'accompanying_periods' => $accompanyingPeriods,
             'person' => $person
         ]);
     }
-    
+
     public function createAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -90,17 +92,17 @@ class AccompanyingPeriodController extends AbstractController
 
         $accompanyingPeriod = new AccompanyingPeriod(new \DateTime('now'));
         $accompanyingPeriod->setClosingDate(new \DateTime('now'));
-        
+
         $accompanyingPeriod->addPerson($person);
         //or $person->addAccompanyingPeriod($accompanyingPeriod);
-        
+
         $form = $this->createForm(
             AccompanyingPeriodType::class,
             $accompanyingPeriod, [
                 'period_action' => 'create',
                 'center' => $person->getCenter()
             ]);
-        
+
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
@@ -120,7 +122,7 @@ class AccompanyingPeriodController extends AbstractController
                     $this->generateUrl('chill_person_accompanying_period_list', [
                         'person_id' => $person->getId()
                     ]));
-                
+
             } else {
                 $flashBag->add('error', $this->get('translator')
                         ->trans('Error! Period not created!'));
@@ -137,7 +139,7 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-    
+
     /**
      * @throws Exception
      */
@@ -154,7 +156,7 @@ class AccompanyingPeriodController extends AbstractController
 
         /** @var Person $person */
         $person = $this->_getPerson($person_id);
-        
+
         // CHECK
         if (! $accompanyingPeriod->containsPerson($person)) {
             throw new Exception("Accompanying period " . $period_id . " does not contain person " . $person_id);
@@ -176,7 +178,7 @@ class AccompanyingPeriodController extends AbstractController
 
             if ($form->isValid(['Default', 'closed'])
                     && count($errors) === 0) {
-                
+
                 $em->flush();
 
                 $flashBag->add('success',
@@ -186,9 +188,9 @@ class AccompanyingPeriodController extends AbstractController
                     $this->generateUrl('chill_person_accompanying_period_list', [
                         'person_id' => $person->getId()
                 ]));
-                
+
             } else {
-                
+
                 $flashBag->add('error', $this->get('translator')
                         ->trans('Error when updating the period'));
 
@@ -204,19 +206,19 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-    
+
     /**
      * @throws \Exception
      */
     public function closeAction(int $person_id, Request $request): Response
     {
-        
+
         $person = $this->_getPerson($person_id);
 
         $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person, 'You are not allowed to update this person');
 
         if ($person->isOpen() === false) {
-            
+
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
                     ->trans('Beware period is closed', ['%name%' => $person->__toString()]
@@ -229,7 +231,7 @@ class AccompanyingPeriodController extends AbstractController
         }
 
         $current = $person->getCurrentAccompanyingPeriod();
-        
+
         $form = $this->createForm(AccompanyingPeriodType::class, $current, [
             'period_action' => 'close',
             'center' => $person->getCenter()
@@ -256,7 +258,7 @@ class AccompanyingPeriodController extends AbstractController
                             'person_id' => $person->getId()
                         ])
                     );
-                    
+
                 } else {
                     $this->get('session')->getFlashBag()
                             ->add('error', $this->get('translator')
@@ -267,7 +269,7 @@ class AccompanyingPeriodController extends AbstractController
                             ->add('info', $error->getMessage());
                     }
                 }
-                
+
             } else { //if form is not valid
                 $this->get('session')->getFlashBag()
                     ->add('error',
@@ -288,7 +290,7 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $current
         ]);
     }
-    
+
     private function _validatePerson(Person $person): ConstraintViolationListInterface
     {
         $errors = $this->validator->validate($person, null,
@@ -296,10 +298,10 @@ class AccompanyingPeriodController extends AbstractController
 
         // Can be disabled with config
         if (false === $this->container->getParameter('chill_person.allow_multiple_simultaneous_accompanying_periods')) {
-            
+
             $errors_accompanying_period = $this->validator->validate($person, null,
                 ['accompanying_period_consistent']);
-    
+
             foreach($errors_accompanying_period as $error ) {
                 $errors->add($error);
             }
@@ -307,7 +309,7 @@ class AccompanyingPeriodController extends AbstractController
 
         return $errors;
     }
-    
+
     public function openAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -384,7 +386,7 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-    
+
     public function reOpenAction(int $person_id, int $period_id, Request $request): Response
     {
         /** @var Person $person */
@@ -392,7 +394,7 @@ class AccompanyingPeriodController extends AbstractController
 
         /* @var $period AccompanyingPeriod */
         $period = \array_filter(
-            $person->getAccompanyingPeriods(), 
+            $person->getAccompanyingPeriods(),
             function (AccompanyingPeriod $p) use ($period_id) {
                 return $p->getId() === ($period_id);
             }
@@ -417,13 +419,13 @@ class AccompanyingPeriodController extends AbstractController
             return $this->redirectToRoute('chill_person_accompanying_period_list', [
                 'person_id' => $person->getId()
             ]);
-            
+
         } elseif ($confirm === false && $period->canBeReOpened($person)) {
             return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
                 'period' => $period,
                 'person' => $person
             ]);
-            
+
         } else {
             return (new Response())
                 ->setStatusCode(Response::HTTP_BAD_REQUEST)

src/Bundle/ChillPersonBundle/Controller/HouseholdController.php

@@ -30,7 +30,7 @@ class HouseholdController extends AbstractController
         $this->translator = $translator;
         $this->positionRepository = $positionRepository;
     }
-    
+
     /**
      * @Route(
      *      "/{household_id}/summary",
@@ -47,7 +47,7 @@ class HouseholdController extends AbstractController
             ->findByActiveOrdered()
             ;
 
-        // little performance improvement: 
+        // little performance improvement:
         // initialize members collection, which will avoid
         // some queries
         $household->getMembers()->initialize();
@@ -67,6 +67,31 @@ class HouseholdController extends AbstractController
         );
     }
 
+    /**
+     * @Route(
+     *      "/{household_id}/accompanying-period",
+     *      name="chill_person_household_accompanying_period",
+     *      methods={"GET", "HEAD"}
+     *  )
+     *  @ParamConverter("household", options={"id" = "household_id"})
+     */
+    public function accompanyingPeriod(Request $request, Household $household)
+    {
+        // TODO ACL
+
+        $members = $household->getMembers();
+        foreach($members as $m) {
+            $accompanyingPeriods = $m->getPerson()->getAccompanyingPeriods();
+        }
+
+        return $this->render('@ChillPerson/Household/accompanying_period.html.twig',
+            [
+                'household' => $household,
+                'accompanying_periods' => $accompanyingPeriods
+            ]
+        );
+    }
+
     /**
      * @Route(
      *      "/{household_id}/addresses",

src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php

@@ -9,22 +9,22 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HouseholdMenuBuilder implements LocalMenuBuilderInterface
 {
-    
+
     /**
      * @var TranslatorInterface
      */
     protected $translator;
-    
+
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
-    
+
     public static function getMenuIds(): array
     {
         return [ 'household' ];
     }
-    
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
         $household = $parameters['household'];
@@ -35,15 +35,22 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
                 'household_id' => $household->getId()
         ]])
         ->setExtras(['order' => 10]);
-        
+
+        $menu->addChild($this->translator->trans('household.Accompanying period'), [
+            'route' => 'chill_person_household_accompanying_period',
+            'routeParameters' => [
+                'household_id' => $household->getId()
+        ]])
+        ->setExtras(['order' => 20]);
+
         $menu->addChild($this->translator->trans('household.Addresses'), [
             'route' => 'chill_person_household_addresses',
             'routeParameters' => [
                 'household_id' => $household->getId()
         ]])
         ->setExtras(['order' => 30]);
-        
+
     }
-    
+
-    
+
 }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue

@@ -118,11 +118,12 @@ export default {
          modal.showModal = false;
       },
       addToHousehold() {
-        this.$store.dispatch('addDateToAddressAndAddressToHousehold', {
+         this.$store.dispatch('addDateToAddressAndAddressToHousehold', {
-           householdId: this.householdId,
+            householdId: this.householdId,
-           addressId: this.$store.state.newAddress.address_id,
+            addressId: this.$store.state.newAddress.address_id,
-           body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}}
+            body: { validFrom: {datetime: `${this.validFrom}T00:00:00+0100`}}
-        })
+         })
+         window.location.assign(this.backUrl);
       }
    }
 };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js

@@ -4,7 +4,7 @@ const appMessages = {
    fr: {
       select_a_existing_address: 'Sélectionner une adresse existante',
       create_a_new_address: 'Créer une nouvelle adresse',
-      add_an_address_to_household: 'Déménager le ménage',
+      add_an_address_to_household: 'Enregistrer',
       validFrom: 'Date du déménagement',
       move_date: 'Date du déménagement',
       back_to_the_list: 'Retour à la liste',

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -222,11 +222,107 @@
 
     <h2>{{ 'Social actions'|trans }}</h2>
 
-    {% set person = null %}
+    <div id="accompanying_course_work_list">
+      {% for w in works %}
+      <div class="item">
+          <div class="title">
+            <h2 class="action_title">
+              {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
+            </h2>
+          </div>
+
+          <div class="timeline">
+            <ul class="timeline">
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.createdAt|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="completed">
+                <div class="date">
+                  <span>{{ w.startDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
+                </div>
+              </li>
+              <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
+                <div class="date">
+                  <span>{{ w.endDate|format_date('long') }}</span>
+                </div>
+                <div class="label">
+                  <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+
+          {% if w.results|length > 0 %}
+            <div class="objective_results objective_results__without-objectives">
+              <div class="obj without_objective">
+                <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+              </div>
+              <div class="res results">
+                <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                <ul class="result_list">
+                  {% for r in w.results %}
+                    <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                  {% endfor %}
+                </ul>
+              </div>
+            </div>
+          {% endif %}
+
+          {% if w.goals|length > 0 %}
+            {% for g in w.goals %}
+              <div class="objective_results objective_results--with-objectives">
+                <div class="objective obj">
+                  <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
+                  <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+                </div>
+                <div class="results res">
+                  {% if g.results|length == 0 %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
+                  {% else %}
+                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
+                    <ul class="result_list">
+                      {% for r in g.results %}
+                        <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
+                      {% endfor %}
+                    </ul>
+                  {% endif %}
+                </div>
+              </div>
+            {% endfor %}
+          {% endif %}
+
+          <div class="updatedBy">
+            {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
+          </div>
+
+      </div>
+      {% else %}
+        <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>    
+      {% endfor %}
+    </div>
+
+
     {% block contentActivity %}
+        {% set person = null %}
         {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse', 'context': 'person'} %}
     {% endblock %}
 
     {#  ==> insert accompanyingCourse vue component  #}
     <div id="accompanying-course"></div>
 {% endblock %}
+
+
+{% block css %}
+  {{ parent() }}
+  {{ encore_entry_link_tags('accompanying_course_work_list') }}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig

@@ -102,7 +102,7 @@
         </div>
       </div>
     {% else %}
-      <p class="chill-no-data-statement">{{ 'accompanying_course_work.No work'|trans }}</p>
+      <p class="chill-no-data-statement">{{ 'accompanying_course_work.Any work'|trans }}</p>
     {% endfor %}
    </div>
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig

@@ -0,0 +1,136 @@
+{% block content %}
+
+    {% for accompanying_period in accompanying_periods %}
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <div class="item-col">
+                    {{'period'|trans}} <b>#{{ accompanying_period.id }}</b>
+                    {% if accompanying_period.emergency %}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Emergency'|trans|upper -}}
+                    </span>
+                    {% endif %}
+                    {% if accompanying_period.confidential %}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Confidential'|trans|upper -}}
+                    </span>
+                    {% endif %}
+                    {% if accompanying_period.step == 'DRAFT' %}
+                    &nbsp;
+                    <span class="badge badge-primary">
+                        {{- 'Draft'|trans|upper -}}
+                    </span>
+                    {% else %}
+                    <span class="badge badge-primary">
+                        {{- 'Confirmed'|trans|upper -}}
+                    </span>
+                    {% endif %}
+                </div>
+
+                <div class="item-col">
+                {% if chill_accompanying_periods.fields.user == 'visible'  %}
+                    {% if accompanying_period.user %}
+                    {{ accompanying_period.user.username }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
+                    {% endif %}
+                {% endif %}
+                </div>
+
+            </div>
+            <div class="item-row">
+                {% if accompanying_period.closingDate == null %}
+                    {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
+                {% else %}
+                    {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
+                        '%opening_date%': accompanying_period.openingDate|format_date('long'),
+                        '%closing_date%': accompanying_period.closingDate|format_date('long')}
+                    ) }}
+
+                    {% if accompanying_period.isOpen == false %}
+                        <dl class="chill_view_data">
+                            <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
+                            <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
+                        </dl>
+                    {% endif %}
+
+                {% endif %}
+            </div>
+
+                <div class="item-col">
+                    <h3>{{ 'Participants'|trans }}</h3>
+                    {% if accompanying_period.participations.count > 0 %}
+                        {% for p in accompanying_period.participations %}
+                        <p>
+                            <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
+                                {{ p.person.firstname ~ ' ' ~ p.person.lastname }}
+                            </a>
+                        </p>
+                        {% endfor %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                </div>
+                <div class="item-col">
+                    <h3>{{ 'Requestor'|trans }}</h3>
+                    {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
+                        {% if accompanying_period.requestorPerson is not null %}
+                        <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                        {% endif %}
+                        {% if accompanying_period.requestorThirdParty is not null %}
+                        <p>{{ accompanying_period.requestorThirdParty.name }}</p>
+                        {% endif %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                </div>
+
+                <div class="item-col">
+                    <h3>{{ 'Social issues'|trans }}</h3>
+                    {% if accompanying_period.socialIssues.count > 0 %}
+                        {% for si in accompanying_period.socialIssues %}
+                        <p>{{ si.title|localize_translatable_string }}</p>
+                        {% endfor %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                </div>
+
+            <div class="item-row">
+                <ul class="record_actions">
+                    {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
+                    <li>
+                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="sc-button bt-show"></a>
+                    </li>
+                    {#
+                    <li>
+                        <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-update no-content"></a>
+                    </li>
+                    {% if accompanying_period.isOpen == true %}
+                    <li>
+                        <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="sc-button bt-update has-hidden change-icon">
+                            <i class="fa fa-lock" aria-hidden="true"></i><span class="show-on-hover">{{'Close accompanying period'|trans }}</span>
+                        </a>
+                    </li>
+                    {% endif %}
+                    {% if accompanying_period.canBeReOpened(person) == true %}
+                    <li>
+                        <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-create change-icon has-hidden">
+                            <i class="fa fa-unlock" aria-hidden="true"></i><span class="show-on-hover">{{'Re-open accompanying period'|trans }}</span>
+                        </a>
+                    </li>
+                    {% endif %}
+                    #}
+                </ul>
+            </div>
+
+        </div>
+    </div>
+    <p></p>
+    {% endfor %}
+
+
+{% endblock content %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -5,92 +5,9 @@
 {% block title %}{{ 'Person accompanying period - %name%'|trans({ '%name%' : person.__toString}) }}{% endblock title %}
 
 {% block personcontent %}
-
 <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-<table class="rounded">
+{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
-    <thead>
-        <tr>
-            <th class="chill-red">{{ 'accompanying_period.dates'|trans }}</th>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
-                <th class="chill-blue">{{ 'Accompanying user'|trans }}</th>
-            {% endif %}
-            <th class="chill-orange">{{ 'Remark'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
-
-    </thead>
-    <tbody>
-        {% for accompanying_period in accompanying_periods %}
-        <tr>
-            <td>
-                {% if accompanying_period.closingDate == null %}
-                    {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
-                {% else %}
-                    {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({
-                        '%opening_date%': accompanying_period.openingDate|format_date('long'),
-                        '%closing_date%': accompanying_period.closingDate|format_date('long')}
-                    ) }}
-
-                {% if accompanying_period.isOpen == false %}
-                    <dl class="chill_view_data">
-                        <dt>{{ 'Closing motive'|trans }}&nbsp;:</dt>
-                        <dd>{{ accompanying_period.closingMotive|chill_entity_render_box }}</dd>
-                    </dl>
-                {% endif %}
-
-                {% endif %}
-            </td>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
-            <td>
-                {% if accompanying_period.user %}
-                {{ accompanying_period.user.username }}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
-                {% endif %}
-            </td>
-            {% endif %}
-            <td>
-                {% if accompanying_period is not empty %}
-                    <blockquote class="chill-user-quote">
-                    {{ accompanying_period.remark|chill_markdown_to_html }}
-                    </blockquote>
-                {% else %}
-                    {{ null|chill_print_or_message('No remark', 'blockquote') }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
-
-                    {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="sc-button bt-show"></a>
-                    </li>
-
-                    <li>
-                        <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-update no-content"></a>
-                    </li>
-                    {% if accompanying_period.isOpen == true %}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_period_close', {'person_id' : person.id}) }}" class="sc-button bt-update has-hidden change-icon">
-                            <i class="fa fa-lock" aria-hidden="true"></i><span class="show-on-hover">{{'Close accompanying period'|trans }}</span>
-                        </a>
-                    </li>
-                    {% endif %}
-                    {% if accompanying_period.canBeReOpened(person) == true %}
-                    <li>
-                        <a href="{{ path('chill_person_accompanying_period_re_open', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}" class="sc-button bt-create change-icon has-hidden">
-                            <i class="fa fa-unlock" aria-hidden="true"></i><span class="show-on-hover">{{'Re-open accompanying period'|trans }}</span>
-                        </a>
-                    </li>
-                    {% endif %}
-                </ul>
-
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
 
 <div class="form_control">
     <ul class="record_actions">
@@ -99,6 +16,12 @@
                 {{ 'Person details'|trans }}
             </a>
         </li>
+        <li>
+            <a href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" class="sc-button bt-create">
+              {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>
+        {#
         <li>
             <a href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}" class="sc-button bt-create has-hidden">
                 <span class="show-on-hover">{{ 'Add an accompanying period in the past'|trans }}</span>
@@ -112,7 +35,8 @@
             </a>
         </li>
         {% endif %}
+        #}
     </ul>
 </div>
 
-{% endblock personcontent %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig

@@ -0,0 +1,25 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'Household accompanying period'|trans %}
+
+{% block content %}
+<h1>{{ block('title') }}</h1>
+
+{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+
+<div class="form_control">
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path ('chill_person_household_summary', {'household_id' : household.id } ) }}" class="sc-button bt-cancel">
+                {{ 'Household summary'|trans }}
+            </a>
+        </li>
+        {#<li>
+            <a href="{{ path ('chill_person_household_accompanying_course_new', {'household_id' : [ household.id ] } ) }}" class="sc-button bt-create">
+              {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>#}
+    </ul>
+</div>
+
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -12,11 +12,11 @@
     {% else %}
         <div class="top"><i class="fa fa-caret-up fa-3x"></i></div>
     {% endif %}
-    
+
     {% for address in household.addresses %}
 
         <div class="col-b"></div>
-    
+
         <div class="col-c content{{ ' row' ~ loop.index }}">
             <div class="address">
                 {% if address.isNoAddress == true %}
@@ -39,22 +39,22 @@
 
                 {% endif %}
             </div>
-            
+
-            <ul class="record_actions">
+            {#<ul class="record_actions">
                 <li>
                     <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="sc-button bt-edit"></a>
                 </li>
-            </ul>
+            </ul> #}
         </div>
-        
+
         <div class="date">
             {% if address.validFrom is not empty %}
                 {{ address.validFrom|format_date('long') }}
             {% endif %}
         </div>
-        
+
     {% endfor %}
-    
+
 </div>
 
 <ul class="record_actions">

src/Bundle/ChillPersonBundle/Resources/views/menu.html.twig

@@ -16,8 +16,8 @@
 #}
 <ul class="tab-nav">
     {% for menu in menus %}
-        <li class="">
+        <li class="{{ menu.extra('class') }}">
             <a href="{{ menu.uri }}" >{{ menu.label|upper }}</a>
         </li>
     {% endfor %}
-</ul>
+</ul>

src/Bundle/ChillPersonBundle/config/services/controller.yaml

@@ -46,6 +46,7 @@ services:
             $serializer: '@Symfony\Component\Serializer\SerializerInterface'
             $dispatcher: '@Symfony\Contracts\EventDispatcher\EventDispatcherInterface'
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
+            $workRepository: '@Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository'
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingCourseApiController:

src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml

@@ -38,12 +38,13 @@ household:
     Edit member household: Modifier l'appartenance au ménage
     Current household members: Membres actuels
     Household summary: Résumé
+    Accompanying period: Parcours d'accompagnement
     Addresses: Adresses
     Current address: Adresse actuelle
     Household does not have any address currently: Le ménage n'a pas d'adresse renseignée actuellement
     Edit household members: Modifier l'appartenance au ménage
     and x other persons: >-
-        {x, plural, 
+        {x, plural,
             one {et une autre personne}
             many {et # autres personnes}
             other {et # autres personnes}
@@ -59,7 +60,7 @@ household:
     data_saved: Données enregistrées
     Household history for %name%: Historique des ménages pour {name}
     Household shared: Ménages domiciliés
-    Household not shared: Ménage non domiciliés 
+    Household not shared: Ménage non domiciliés
     Never in any household: Membre d'aucun ménage
     Membership currently running: En cours
     from: Depuis

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -165,6 +165,8 @@ An accompanying period starts: Une période d'accompagnement est ouverte
 Any accompanying periods are open: Aucune période d'accompagnement ouverte
 An accompanying period is open: Une période d'accompagnement est ouverte
 Accompanying period list: Périodes d'accompagnement
+Accompanying period: Parcours d'accompagnement
+period: Parcours
 New accompanying course: Nouveau parcours d'accompagnement
 Choose a motive: Motif de fermeture
 Re-open accompanying period: Ré-ouvrir
@@ -189,6 +191,8 @@ See accompanying period: Voir cette période d'accompagnement
 Referrer: Référent
 Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible.
 Add to household now: Ajouter à un ménage
+Requestor: Demandeur
+
 
 # pickAPersonType
 Pick a person: Choisir une personne
@@ -320,6 +324,9 @@ accompanying_period:
     dates_from_%opening_date%_to_%closing_date%: Ouvert du %opening_date% au %closing_date%
 occasional: ponctuel
 regular: régulier
+Confidential: confidentiel
+Draft: brouillon
+Confirmed: en file active
 
 # Accompanying Course
 Accompanying Course: Parcours d'accompagnement
@@ -337,6 +344,8 @@ Members: Membres
 Addresses: Adresses
 Move household: Nouveau déménagement
 Addresses history for household: Historique des adresses
+Household accompanying period: Parcours d'accompagnement du ménage
+Household summary: Résumé du ménage
 
 # accompanying course work
 Accompanying Course Actions: Actions d'accompagnements
@@ -353,4 +362,5 @@ accompanying_course_work:
     no_results: Aucun résultat - orientation
     results: Résultats - orientations
     goal: Objectif - motif - dispositif
-    
+    Any work: Aucune action d'accompagnement
+