Merge branch 'fix-prototypage-details' into deploy/quick-fixes

composer.json

@@ -16,8 +16,7 @@
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
-            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle"
+            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"
         }
     },
     "autoload-dev": {

package.json.txt

@@ -1,3 +0,0 @@
-add npm/yarn dependency in package.json :
-
-"select2-bootstrap-theme": "0.1.0-beta.10",

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -72,7 +72,6 @@ class ActivityController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
         $view = null;
-        // TODO: add pagination
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
@@ -81,9 +80,10 @@ class ActivityController extends AbstractController
                 ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
                     $person->getCenter());
 
-            $activities = $em->getRepository(Activity::class)
-                ->findByPersonImplied($person, $reachableScopes)
-                ;
+            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
+                ['person' => $person, 'scope' => $reachableScopes],
+                ['date' => 'DESC'],
+            );
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -282,7 +282,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->socialIssues;
     }
 
-    public function addSocialIssue(SocialIssue $socialIssue): self
+    public function addSocialIssue(?SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
             $this->socialIssues[] = $socialIssue;
@@ -303,7 +303,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->socialActions;
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    public function addSocialAction(?SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -224,8 +224,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('comment')) {
             $builder->add('comment', CommentType::class, [
-                'label' => empty($activityType->getLabel('comment')) 
-                    ? 'activity.comment' : $activityType->getLabel('comment'),
+                'label' => $activityType->getLabel('comment'),
                 'required' => $activityType->isRequired('comment'),
             ]);
         }

src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php

@@ -0,0 +1,88 @@
+<?php
+/*
+ * 
+ */
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class MenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     *
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+    
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+    
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+    
+    public function __construct(
+        TokenStorageInterface $tokenStorage, 
+        TranslatorInterface $translator, 
+        AuthorizationHelper $authorizationHelper
+    ) {
+        $this->tokenStorage = $tokenStorage;
+        $this->translator = $translator;
+        $this->authorizationHelper = $authorizationHelper;
+    }
+
+    
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /* @var $person \Chill\PersonBundle\Entity\Person */
+        $person  = $parameters['person'];
+        $user    = $this->tokenStorage->getToken()->getUser();
+        $roleSee = new Role(ActivityVoter::SEE);
+        $roleAdd = new Role(ActivityVoter::CREATE);
+        
+        if ($this->authorizationHelper->userHasAccess($user, $person, $roleSee)) {
+            $menu->addChild($this->translator->trans('Activity list'), [
+                    'route' => 'chill_activity_activity_list',
+                    'routeParameters' => [
+                        'person_id' => $person->getId()
+                    ]
+                ])
+                ->setExtras([
+                    'order' => 201
+                ]);
+        }
+        
+        if ($this->authorizationHelper->userHasAccess($user, $person, $roleAdd)) {
+            $menu->addChild($this->translator->trans('Add a new activity'), [
+                    'route' => 'chill_activity_activity_new',
+                    'routeParameters' => [
+                        'person_id' => $person->getId()
+                    ]
+                ])
+                ->setExtras([
+                    'order' => 200
+                ]);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return [ 'person' ];
+    }
+}

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -15,7 +15,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace Chill\ActivityBundle\Menu; 
+namespace Chill\ActivityBundle\Menu;
+
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -54,15 +55,26 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'];
-        
-        if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
-            $menu->addChild(
-                $this->translator->trans('Activity list'), [
-                    'route' => 'chill_activity_activity_list',
-                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ])
-                ->setExtra('order', 201)
-                ;
+
+        if (false) {
+            if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
+                $menu->addChild(
+                    $this->translator->trans('Activity list'), [
+                        'route' => 'chill_activity_activity_list',
+                        'routeParameters' => [ 'person_id' => $person->getId() ],
+                    ])
+                    ->setExtra('order', 201)
+                    ;
+            }
+            if ($this->authorizationChecker->isGranted(ActivityVoter::CREATE, $person)) {
+                $menu->addChild(
+                    $this->translator->trans('Add a new activity'), [
+                        'route' => 'chill_activity_activity_new',
+                        'routeParameters' => [ 'person_id' => $person->getId() ],
+                    ])
+                    ->setExtra('order', 200)
+                    ;
+            }
         }
     }
 

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -38,30 +38,5 @@ class ActivityRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Activity::class);
     }
-
-    public function findByPersonImplied($person, array $scopes, $orderBy = [ 'date' => 'DESC'], $limit = 100, $offset = 0)
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        $qb
-            // TODO add acl
-            //->where($qb->expr()->in('a.scope', ':scopes'))
-            //->setParameter('scopes', $scopes)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->eq('a.person', ':person'),
-                    ':person MEMBER OF a.persons'
-                )
-            )
-            ->setParameter('person', $person)
-            ;
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        return $qb->getQuery()
-            ->getResult();
-    }    
+    
 }

src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss

@@ -1,9 +1,9 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
-//@import '~ChillMainSass/custom/mixins/entity';
+@import '~ChillMainSass/custom/config/colors';
+@import '~ChillMainSass/custom/mixins/entity';
 
-//.chill-entity.chill-entity__activity-reason {
-//    @include entity($chill-pink, white);
-//}
+.chill-entity.chill-entity__activity-reason {
+    @include entity($chill-pink, white);
+}
 
 .activity {
     color: $chill-green;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -65,7 +65,7 @@ export default {
          addPersons: {
             key: 'activity',
             options: {
-               type: ['person', 'thirdparty', 'user'], // TODO add 'user'
+               type: ['person', 'thirdparty'], // TODO add 'user'
                priority: null,
                uniq: false,
             }

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,6 +1,6 @@
 <template>
    <li>
-      <span class="badge bg-primary" :title="person.text">
+      <span class="badge badge-primary" :title="person.text">
          <span class="chill_denomination">
             {{ textCutted }}
          </span>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -1,11 +1,11 @@
 <template>
    <teleport to="#social-issues-acc">
       
-      <div class="mb-3 row">
-         <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_issues') }}</label>
          </div>
-         <div class="col-8">
+         <div class="grid-8">
             
             <check-social-issue
                v-for="issue in socialIssuesList"
@@ -41,11 +41,11 @@
          </div>
       </div>
 
-      <div class="mb-3 row">
-         <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_actions') }}</label>
          </div>
-         <div class="col-8">
+         <div class="grid-8">
             
             <div v-if="actionIsLoading === true">
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -1,20 +1,18 @@
 <template>
    <span class="inline-choice">
-      <div class="form-check">
-   
-         <input class="form-check-input"
-            type="checkbox" 
-            v-model="selected"
-            name="action"
-            v-bind:id="action.id" 
-            v-bind:value="action"
-            />
-         <label class="form-check-label" v-bind:for="action.id">
-            {{ action.text }}
-         </label>
-         
-      </div>
-   </span>
+      
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="action"
+         v-bind:id="action.id" 
+         v-bind:value="action"
+         />
+      <label class="inline" v-bind:for="action.id">
+         {{ action.text }}
+      </label>
+      
+   </span><br>
 </template>
 
 <script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue

@@ -1,20 +1,18 @@
 <template>
    <span class="inline-choice">
-      <div class="form-check">
       
-         <input class="form-check-input"
-            type="checkbox" 
-            v-model="selected"
-            name="issue"
-            v-bind:id="issue.id" 
-            v-bind:value="issue"
-            />
-         <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
-         </label>
-         
-      </div>
-   </span>
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="issue"
+         v-bind:id="issue.id" 
+         v-bind:value="issue"
+         />
+      <label class="inline" v-bind:for="issue.id">
+         {{ issue.text }}
+      </label>
+      
+   </span><br>
 </template>
 
 <script>

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -59,7 +59,7 @@
                     {% for item in bloc.items %}
                     <li>
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="badge bg-primary">
+                            <span class="badge badge-primary">
                                 {{ item|chill_entity_render_box({'only_denomination': true}) }}
                             </span>
                         </a>
@@ -83,7 +83,7 @@
                 {% for item in bloc.items %}
                 <li>
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="badge bg-primary">
+                        <span class="badge badge-primary">
                             {{ item|chill_entity_render_box({'only_denomination': true}) }}
                         </span>
                     </a>

src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 {% set person = activity.person %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -1,5 +1,8 @@
-<h1>{{ "Update activity"|trans }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>{{ "Update activity"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -91,12 +94,12 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="sc-button bt-cancel">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         <li>
-            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
         </li>
     </ul>
 {{ form_end(edit_form) }}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -5,20 +5,11 @@
 {% block title  'Update activity'|trans %}
 
 {% block content %}
-<div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-        </div>
-    </div>
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
 {% endblock %}
 
 {% block js %}
-    {{ parent() }}
     {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
@@ -31,7 +22,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ parent() }}
     {{ encore_entry_link_tags('async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -14,23 +14,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
 {% block title  'Update activity'|trans %}
 
 {% block personcontent %}
-<div class="activity-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-        </div>
-    </div>
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -13,11 +13,11 @@
 {% if activities|length == 0 %}
     <p class="chill-no-data-statement">
         {{ "There isn't any activities."|trans }}
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
+        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create button-small"></a>
     </p>
 {% else %}
 
-<div class="flex-table list-records context-{{ context }}">
+<div class="flex-table list-records {{ context }}">
     <!--
     <thead>
         <tr>
@@ -54,20 +54,6 @@
                         </p>
                         {% endif %}
                     </div>
-
-                    {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
-                        <a 
-                           href="{{ chill_path_add_return_path(
-                            "chill_person_accompanying_course_index",
-                            { 'accompanying_period_id': activity.accompanyingPeriod.id }
-                            ) }}"
-                           >
-                          <i class="fa fa-random"></i>
-                          {{ activity.accompanyingPeriod.id }}
-                        </a>
-                      </div>
-                    {% endif %}
                     
                 </div>
                 <div class="item-col">
@@ -128,7 +114,7 @@
                                     <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
                                 {%- else -%}
                                     {% for r in activity.socialActions %}
-                                        <span class="badge bg-primary">{{ r.title|localize_translatable_string }}</span>
+                                        <span class="badge badge-primary">{{ r.title|localize_translatable_string }}</span>
                                     {% endfor %}
                                 {%- endif -%}
                             </li>
@@ -138,20 +124,20 @@
                     </ul>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-show "></a>
                         </li>
                         {# TOOD
                         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-update "></a>
                         </li>
                         {# TOOD
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         #}
                         <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete "></a>
                         </li>
                         {#
                         {% endif %}
@@ -161,14 +147,13 @@
             </div>
             
             {%  
-                if activity.comment.comment is not empty
+                if activity.comment.comment is not empty 
                 or activity.persons|length > 0
                 or activity.thirdParties|length > 0
                 or activity.users|length > 0 
             %}
             <div class="item-row details">
                 <div class="item-col">
-
                     {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
                 </div>
                 
@@ -185,13 +170,10 @@
 </div>
 {% endif %}
 
-{% if context != 'person' %}
-{# TODO set this condition in configuration #}
-  <ul class="record_actions">
-      <li>
-          <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-              {{ 'Add a new activity' | trans }}
-          </a>
-      </li>
-  </ul>
-{% endif %}
+<ul class="record_actions">
+    <li>
+        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
+            {{ 'Add a new activity' | trans }}
+        </a>
+    </li>
+</ul>

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig

@@ -1,5 +1,8 @@
-<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>{{ "Activity creation"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(form) }}
 {{ form_errors(form) }}
@@ -83,7 +86,7 @@
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
     <a 
-      class="btn btn-cancel"
+      class="sc-button bt-cancel"
       {%- if context == 'person' -%} 
       href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
       {%- else -%}
@@ -94,8 +97,8 @@
     </a>
   </li>
   <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
+    <button class="sc-button bt-create" type="submit">
+      {{ 'Add a new activity'|trans }}
     </button>
   </li>
 </ul>

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -5,20 +5,11 @@
 {% block title 'Activity creation' |trans %}
 
 {% block content %}
-<div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div>            
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
 {% endblock %}
 
 {% block js %}
-    {{ parent() }}
     {{ encore_entry_script_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
@@ -31,7 +22,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ parent() }}
     <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -1,20 +1,12 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 
 {% block title 'Activity creation' |trans %}
 
 {% block personcontent %}
-<div class="activity-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
-            
-        </div>
-    </div>
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -4,7 +4,7 @@
 <h1>
   {{ "Activity"|trans }}
   {%- if t.emergencyVisible and entity.emergency -%}
-  <span class="badge bg-secondary">
+  <span class="badge badge-secondary">
     {{- 'Emergency'|trans -}}
   </span>
 {%- endif -%}
@@ -109,28 +109,25 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-<ul class="record_actions sticky-form-buttons">
+<ul class="record_actions">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
+        <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
+    <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+        {{ 'Edit the activity'|trans }}
+    </a>
     </li>
-    
     {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     #}
-    
     <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-    
     {#
     {% endif %}
     #}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

@@ -7,13 +7,5 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
-<div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div> 
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 {% endblock content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
@@ -7,13 +7,5 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
-<div class="activity-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-            
-        </div>
-    </div>
-</div>                
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 {% endblock personcontent %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig

@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_presence_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity presence'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-orange' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

@@ -33,10 +33,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -47,7 +47,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
+            <a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity reason'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig

@@ -40,12 +40,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig

@@ -25,12 +25,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

@@ -34,10 +34,10 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -48,7 +48,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
+            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity category reason'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig

@@ -25,10 +25,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
+            {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
         </li>
     </ul>
     {{ form_end(form) }}

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig

@@ -39,12 +39,12 @@
     </table>
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig

@@ -41,7 +41,7 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -52,7 +52,7 @@
 
         <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_type_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity type'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig

@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity type category'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig

@@ -29,13 +29,13 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-view">
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
                 {{ 'Show the activity'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
                 {{ 'Edit the activity'|trans }}
             </a>
         </li>

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

@@ -74,7 +74,6 @@ Users concerned: T(M)S
 activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
-    comment: Commentaire
 
 
 #timeline

src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}

src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Edit Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -18,12 +18,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
        

src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -18,12 +18,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        

src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
@@ -39,13 +39,13 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
         <li>
-            <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>

src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -68,17 +68,17 @@
                 <ul class="record_actions">
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::SHOW'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="sc-button bt-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="sc-button bt-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::DELETE'), f) %}
                         <li>
-                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
+                            <a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="sc-button bt-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -161,10 +161,10 @@
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
     <ul class="record_actions">
         <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+            <a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
         </li>
         <li>
-            <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+            <a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
         </li>
     </ul>
     {% endif %}
@@ -215,10 +215,10 @@
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
         <ul class="record_actions">
             <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
+                <a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
             </li>
             <li>
-                <a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
+                <a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
             </li>
         </ul>
     {% endif %}

src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}

src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -17,12 +17,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
     </li>
 </ul>
        

src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -17,12 +17,12 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        

src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = element.person %}
@@ -39,13 +39,13 @@
 
 <ul class="record_actions sticky-form-buttons">
     <li class="cancel">
-        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
+        <a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
            {{ 'Back to the list'|trans }}
         </a>
     </li>
     {% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
         <li>
-            <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>

src/Bundle/ChillCalendarBundle/.gitignore

@@ -1,11 +0,0 @@
-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
-

src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class ChillCalendarBundle extends Bundle
-{
-}

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -1,390 +0,0 @@
-<?php
-
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\CalendarBundle\Controller;
-
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Form;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Form\CalendarType;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Routing\Annotation\Route;
-
-/**
- * Class CalendarController
- *
- * @package Chill\CalendarBundle\Controller
- */
-class CalendarController extends AbstractController
-{
-    protected EventDispatcherInterface $eventDispatcher;
-
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected LoggerInterface $logger;
-
-    protected SerializerInterface $serializer;
-
-    public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger,
-        SerializerInterface $serializer
-    ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->logger = $logger;
-        $this->serializer = $serializer;
-    }
-
-    /**
-     * Lists all Calendar entities.
-     * @Route("/{_locale}/calendar/", name="chill_calendar_calendar")
-     */
-    public function listAction(Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $view = null;
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($user instanceof User) {
-
-            // $calendar = $em->getRepository(Calendar::class)
-            //     ->findByUser($user)
-            //     ;
-
-            // $view = 'ChillCalendarBundle:Calendar:listByUser.html.twig';
-        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $calendarItems = $em->getRepository(Calendar::class)->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod]
-            );
-
-            $view = 'ChillCalendarBundle:Calendar:listByAccompanyingCourse.html.twig';
-        }
-
-        return $this->render($view, [
-            'calendarItems' => $calendarItems,
-            'user' => $user,
-            'accompanyingCourse' => $accompanyingPeriod,
-        ]);
-    }
-
-    /**
-     * Create a new calendar item
-     * @Route("/{_locale}/calendar/new", name="chill_calendar_calendar_new")
-     */
-    public function newAction(Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:newAccompanyingCourse.html.twig';
-        } 
-        // elseif ($user instanceof User) {
-        //     $view = 'ChillCalendarBundle:Calendar:newUser.html.twig';
-        // }
-
-        $entity = new Calendar();
-        $entity->setUser($this->getUser());
-        $entity->setStatus($entity::STATUS_VALID);
-
-        // if ($user instanceof User) {
-        //     $entity->setPerson($user);
-        // }
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $entity->setAccompanyingPeriod($accompanyingPeriod);
-        }
-
-        $form = $this->createForm(CalendarType::class, $entity, [
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item created!'));
-
-            $params = $this->buildParamsToUrl($user, $accompanyingPeriod); //TODO useful?
-            $params['id'] = $entity->getId();
-
-            return $this->redirectToRoute('chill_calendar_calendar_show', $params);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
-        }
-
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-        
-        return $this->render($view, [
-            'user' => $user,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity' => $entity,
-            'form' => $form->createView(),
-            'entity_json' => $entity_array
-        ]);
-    }
-
-    /**
-     * Show a calendar item
-     * @Route("/{_locale}/calendar/{id}/show", name="chill_calendar_calendar_show")
-     */
-    public function showAction(Request $request, $id): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:showAccompanyingCourse.html.twig';
-        } 
-        // elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:showPerson.html.twig';
-        // }
-
-        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Calendar entity.');
-        }
-        
-        if (null !== $accompanyingPeriod) {
-           $entity->personsAssociated = $entity->getPersonsAssociated();
-           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
-        }
-
-        // $deleteForm = $this->createDeleteForm($id, $accompanyingPeriod);
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-            //'person'      => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity'      => $entity,
-            //'delete_form' => $deleteForm->createView(),
-        ]);
-    }
-
-
-
-     /**
-     * Edit a calendar item
-     * @Route("/{_locale}/calendar/{id}/edit", name="chill_calendar_calendar_edit")
-     */
-    public function editAction($id, Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:editAccompanyingCourse.html.twig';
-        }
-        //  elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:editPerson.html.twig';
-        // }
-
-        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Calendar entity.');
-        }
-
-        $form = $this->createForm(CalendarType::class, $entity, [
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : calendar item updated!'));
-
-            $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-            $params['id'] = $id;
-            return $this->redirectToRoute('chill_calendar_calendar_show', $params);
-        } elseif ($form->isSubmitted() and !$form->isValid()) {
-            $this->addFlash('error', $this->get('translator')->trans('This form contains errors'));
-        }
-
-        $deleteForm = $this->createDeleteForm($id, $user, $accompanyingPeriod);
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $entity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-        
-        return $this->render($view, [
-            'entity' => $entity,
-            'form' => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity_json' => $entity_array
-        ]);
-    }
-
-     /**
-     * Delete a calendar item
-     * @Route("/{_locale}/calendar/{id}/delete", name="chill_calendar_calendar_delete")
-     */
-    public function deleteAction(Request $request, $id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillCalendarBundle:Calendar:confirm_deleteAccompanyingCourse.html.twig';
-        } 
-        // elseif ($person instanceof Person) {
-        //     $view = 'ChillCalendarBundle:Calendar:confirm_deletePerson.html.twig';
-        // }
-
-        /* @var $entity Calendar */
-        $entity = $em->getRepository('ChillCalendarBundle:Calendar')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Calendar entity.');
-        }
-
-        $form = $this->createDeleteForm($id, $user, $accompanyingPeriod);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-
-                $this->logger->notice("A calendar event has been removed", [
-                   'by_user' => $this->getUser()->getUsername(),
-                   'calendar_id' => $entity->getId()
-                ]);
-
-                $em->remove($entity);
-                $em->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                      ->trans("The calendar has been successfully removed."));
-
-                $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
-                return $this->redirectToRoute('chill_calendar_calendar', $params);
-            }
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-           'calendar' => $entity,
-           'delete_form' => $form->createView(),
-           'accompanyingCourse' => $accompanyingPeriod,
-        ]);
-    }
-
-    /**
-     * Creates a form to delete a Calendar entity by id.
-     */
-    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
-    {
-        $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-        $params['id'] = $id;
-
-        return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_calendar_calendar_delete', $params))
-            ->setMethod('DELETE')
-            ->add('submit', SubmitType::class, ['label' => 'Delete'])
-            ->getForm()
-        ;
-    }
-
-    private function getEntity(Request $request): array
-    {
-        $em = $this->getDoctrine()->getManager();
-        $user = $accompanyingPeriod = null;
-
-        if ($request->query->has('user_id')) {
-            $user_id = $request->get('user_id');
-            $user = $em->getRepository(User::class)->find($user_id);
-
-            if ($user === null) {
-                throw $this->createNotFoundException('User not found');
-            }
-
-            $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $user);
-        } elseif ($request->query->has('accompanying_period_id')) {
-            $accompanying_period_id = $request->get('accompanying_period_id');
-            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
-
-            if ($accompanyingPeriod === null) {
-                throw $this->createNotFoundException('Accompanying Period not found');
-            }
-
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        } else {
-            throw $this->createNotFoundException("Person or Accompanying Period not found");
-        }
-
-        return [
-            $user, $accompanyingPeriod
-        ];
-    }
-
-    private function buildParamsToUrl(
-        ?User $user,
-        ?AccompanyingPeriod $accompanyingPeriod
-    ): array {
-        $params = [];
-
-        if ($user) {
-            $params['user_id'] = $user->getId();
-        }
-
-        if ($accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
-        }
-
-        return $params;
-    }
-}

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\DataFixtures\ORM;
-
-use Chill\CalendarBundle\Entity\CancelReason;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
-use Doctrine\Persistence\ObjectManager;
-
-
-class LoadCancelReason extends Fixture implements FixtureGroupInterface
-{
-    public function getOrder(): int
-    {
-        return 40001;
-    }
-
-    public static function getGroups(): array
-    {
-        return ['calendar'];
-    }
-
-    public static $references = [];
-
-    public function load(ObjectManager $manager): void
-    {
-        $arr = [
-            ['name' => CancelReason::CANCELEDBY_USER],
-            ['name' => CancelReason::CANCELEDBY_PERSON],
-            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
-        ];
-
-        foreach ($arr as $a) {
-            print "Creating calendar cancel reason : " . $a['name'] . "\n";
-            $cancelReason= (new CancelReason())
-                ->setCanceledBy($a['name'])
-                ->setActive(true);
-            $manager->persist($cancelReason);
-            $reference = 'CancelReason_'.$a['name'];
-            $this->addReference($reference, $cancelReason);
-            static::$references[] = $reference;
-        }
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\DataFixtures\ORM;
-
-use Chill\CalendarBundle\Entity\Invite;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
-use Doctrine\Persistence\ObjectManager;
-
-
-class LoadInvite extends Fixture implements FixtureGroupInterface
-{
-    public function getOrder(): int
-    {
-        return 40002;
-    }
-
-    public static function getGroups(): array
-    {
-        return ['calendar'];
-    }
-
-    public static $references = [];
-
-    public function load(ObjectManager $manager): void
-    {
-        $arr = [
-            ['name' => ['fr' => 'Rendez-vous décliné']],
-            ['name' => ['fr' => 'Rendez-vous accepté']],
-        ];
-
-        foreach ($arr as $a) {
-            print "Creating calendar invite : " . $a['name']['fr'] . "\n";
-            $invite= (new Invite())
-                ->setStatus($a['name']);
-            $manager->persist($invite);
-            $reference = 'Invite_'.$a['name']['fr'];
-            $this->addReference($reference, $invite);
-            static::$references[] = $reference;
-        }
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-
-/**
- * This is the class that loads and manages your bundle configuration.
- *
- * @link http://symfony.com/doc/current/cookbook/bundles/extension.html
- */
-class ChillCalendarExtension extends Extension implements PrependExtensionInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->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);
-    }
-    
-    protected function preprendRoutes(ContainerBuilder $container)
-    {
-
-        $container->prependExtensionConfig('chill_main', [
-           'routing' => [
-              'resources' => [
-                 '@ChillCalendarBundle/Resources/config/routing.yml'
-              ]
-           ]
-        ]);
-    }
-    
-
-}

src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-/**
- * This is the class that validates and merges configuration from your app/config files.
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
- */
-class Configuration implements ConfigurationInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder('chill_calendar');
-        $rootNode = $treeBuilder->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;
-    }
-}

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -1,401 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Entity;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
-use Symfony\Component\Serializer\Annotation\Groups;
-use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\CalendarBundle\Entity\CancelReason;
-use Chill\CalendarBundle\Entity\CalendarRange;
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\CalendarBundle\Repository\CalendarRepository;
-use DateInterval;
-use DateTimeImmutable;
-use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\Range;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * @ORM\Table(name="chill_calendar.calendar")
- * @ORM\Entity(repositoryClass=CalendarRepository::class)
- */
-class Calendar
-{
-    const STATUS_VALID = 'valid';
-    const STATUS_CANCELED = 'canceled';
-    const STATUS_MOVED = 'moved';
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private User $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
-     * @Groups({"read"})
-     */
-    private AccompanyingPeriod $accompanyingPeriod;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private ?User $mainUser;
-
-    /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\PersonBundle\Entity\Person",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_persons")
-     * @Groups({"read"})
-     */
-    private Collection $persons;
-
-    /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_thirdparties")
-     * @Groups({"read"})
-     */
-    private Collection $professionals;
-
-    /**
-     *
-     * @ORM\ManyToMany(
-     *     targetEntity="Invite",
-     *     cascade={"persist", "remove", "merge", "detach"})
-     * @ORM\JoinTable(name="chill_calendar.calendar_to_invites")
-     * @Groups({"read"})
-     */
-    private Collection $invites;
-
-    /**
-     * @ORM\Embedded(class=CommentEmbeddable::class, columnPrefix="comment_")
-     */
-    private CommentEmbeddable $comment;
-
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     */
-    private \DateTimeImmutable $startDate;
-
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     */
-    private \DateTimeImmutable $endDate;
-
-    //TODO Lieu
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    private string $status;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="CancelReason")
-     */
-    private ?CancelReason $cancelReason = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="CalendarRange")
-     */
-    private ?CalendarRange $calendarRange = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\Activity")
-     */
-    private Activity $activity;
-
-    /**
-     * @ORM\Column(type="boolean", nullable=true)
-     */
-    private ?bool $sendSMS;
-
-    public function __construct()
-    {
-        $this->comment = new CommentEmbeddable();
-        $this->persons = new ArrayCollection();
-        $this->professionals = new ArrayCollection();
-        $this->invites = new ArrayCollection();
-    }
-
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getSendSMS(): ?bool
-    {
-        return $this->sendSMS;
-    }
-
-    public function setSendSMS(?bool $sendSMS): self
-    {
-        $this->sendSMS = $sendSMS;
-
-        return $this;
-    }
-
-    public function getComment(): CommentEmbeddable
-    {
-        return $this->comment;
-    }
-
-    public function setComment(CommentEmbeddable $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(\DateTimeImmutable $endDate): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function getStatus(): ?string
-    {
-        return $this->status;
-    }
-
-    public function setStatus(string $status): self
-    {
-        $this->status = $status;
-
-        return $this;
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function setUser(?User $user): self
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
-    {
-        return $this->accompanyingPeriod;
-    }
-
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
-    {
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
-        return $this;
-    }
-
-    public function getMainUser(): ?User
-    {
-        return $this->mainUser;
-    }
-
-    public function setMainUser(?User $mainUser): self
-    {
-        $this->mainUser = $mainUser;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Person[]
-     */
-    public function getPersons(): Collection
-    {
-        return $this->persons;
-    }
-
-    public function addPerson(?Person $person): self
-    {
-        if (null !== $person) {
-            $this->persons[] = $person;
-        }
-
-        return $this;
-    }
-
-    public function removePerson(Person $person): self
-    {
-        $this->persons->removeElement($person);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|ThirdParty[]
-     */
-    public function getProfessionals(): Collection
-    {
-        return $this->professionals;
-    }
-
-    public function addProfessional(?ThirdParty $professional): self
-    {
-        if (null !== $professional) {
-            $this->professionals[] = $professional;
-        }
-
-        return $this;
-    }
-
-    public function removeProfessional(ThirdParty $professional): self
-    {
-        $this->professionals->removeElement($professional);
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|Invite[]
-     */
-    public function getInvites(): Collection
-    {
-        return $this->invites;
-    }
-
-    public function addInvite(?Invite $invite): self
-    {
-        if (null !== $invite) {
-            $this->invites[] = $invite;
-        }
-
-        return $this;
-    }
-
-    public function removeInvite(Invite $invite): self
-    {
-        $this->invites->removeElement($invite);
-
-        return $this;
-    }
-
-    public function getCancelReason(): ?CancelReason
-    {
-        return $this->cancelReason;
-    }
-
-    public function setCancelReason(?CancelReason $cancelReason): self
-    {
-        $this->cancelReason = $cancelReason;
-
-        return $this;
-    }
-
-    public function getCalendarRange(): ?CalendarRange
-    {
-        return $this->calendarRange;
-    }
-
-    public function setCalendarRange(?CalendarRange $calendarRange): self
-    {
-        $this->calendarRange = $calendarRange;
-
-        return $this;
-    }
-
-    public function getActivity(): ?Activity
-    {
-        return $this->activity;
-    }
-
-    public function setActivity(?Activity $activity): self
-    {
-        $this->activity = $activity;
-
-        return $this;
-    }
-
-    public function getPersonsAssociated(): array 
-    {
-        if (null !== $this->accompanyingPeriod) {
-            $personsAssociated = [];
-            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
-                if ($this->persons->contains($participation->getPerson())) {
-                    $personsAssociated[] = $participation->getPerson();
-                }
-            }
-            return $personsAssociated; 
-        }
-        return [];
-    }
-    
-    public function getPersonsNotAssociated(): array
-    {
-        if (null !== $this->accompanyingPeriod) {
-            $personsNotAssociated = [];
-            foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
-                     $personsNotAssociated[] = $person;
-                }
-            }
-            return $personsNotAssociated;
-        }
-        return [];
-    }
-
-
-    public function getThirdParties(): Collection
-    {
-        return $this->getProfessionals();
-    }
-
-    public function getusers(): Collection
-    {
-        return $this->getInvites(); //TODO get users of the invite
-    }
-
-    public static function loadValidatorMetadata(ClassMetadata $metadata): void
-    {
-        $metadata->addPropertyConstraint('startDate', new NotBlank());
-        $metadata->addPropertyConstraint('startDate', new Range([
-            'min' => '2 years ago',
-            'max' => '+ 2 years',
-        ]));
-        $metadata->addPropertyConstraint('endDate', new NotBlank());
-        $metadata->addPropertyConstraint('endDate', new Range([
-            'min' => '2 years ago',
-            'max' => '+ 2 years',
-        ]));
-    }
-
-}

src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Entity;
-
-use Chill\CalendarBundle\Repository\CalendarRangeRepository;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Table(name="chill_calendar.calendar_range")
- * @ORM\Entity(repositoryClass=CalendarRangeRepository::class)
- */
-class CalendarRange
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private User $user;
-
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     */
-    private \DateTimeImmutable $startDate;
-
-    /**
-     * @ORM\Column(type="datetimetz_immutable")
-     */
-    private \DateTimeImmutable $endDate;
-
-    //TODO Lieu
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getStartDate(): ?\DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    public function setStartDate(\DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-
-    public function getEndDate(): ?\DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function setEndDate(\DateTimeImmutable $endDate): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function setUser(?User $user): self
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-
-
-}

src/Bundle/ChillCalendarBundle/Entity/CancelReason.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Entity;
-
-use Chill\CalendarBundle\Repository\CancelReasonRepository;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Table(name="chill_calendar.cancel_reason")
- * @ORM\Entity(repositoryClass=CancelReasonRepository::class)
- */
-class CancelReason
-{
-
-    const CANCELEDBY_USER = 'CANCELEDBY_USER';
-    const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
-    const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private $active;
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    private $canceledBy;
-
-    /**
-     * @ORM\Column(type="json_array")
-     */
-    private $name = [];
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getActive(): ?bool
-    {
-        return $this->active;
-    }
-
-    public function setActive(bool $active): self
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
-    public function getCanceledBy(): ?string
-    {
-        return $this->canceledBy;
-    }
-
-    public function setCanceledBy(string $canceledBy): self
-    {
-        $this->canceledBy = $canceledBy;
-
-        return $this;
-    }
-
-    public function getName(): ?array
-    {
-        return $this->name;
-    }
-
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-}

src/Bundle/ChillCalendarBundle/Entity/Invite.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Entity;
-
-use Chill\CalendarBundle\Repository\InviteRepository;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Table(name="chill_calendar.invite")
- * @ORM\Entity(repositoryClass=InviteRepository::class)
- */
-class Invite
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private User $user;
-
-    /**
-     * @ORM\Column(type="json_array")
-     */
-    private array $status = [];
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getStatus(): ?array
-    {
-        return $this->status;
-    }
-
-    public function setStatus(array $status): self
-    {
-        $this->status = $status;
-
-        return $this;
-    }
-
-    public function getUser(): ?User
-    {
-        return $this->user;
-    }
-
-    public function setUser(?User $user): self
-    {
-        $this->user = $user;
-
-        return $this;
-    }
-}

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -1,194 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Form;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-
-use Chill\MainBundle\Form\Type\CommentType;
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Entity\CancelReason;
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
-
-class CalendarType extends AbstractType
-{
-
-    protected TranslatableStringHelper $translatableStringHelper;
-    protected ObjectManager $om;
-
-    public function __construct(
-        TranslatableStringHelper $translatableStringHelper,
-        ObjectManager $om
-    )
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->om = $om;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('mainUser', EntityType::class, [
-                'required' => true,
-                'class' => User::class,
-                'choice_label' => function (User $entity) {
-                    return $entity->getUsernameCanonical();
-                },
-                // TODO 'empty_data' => 
-            ])
-            ->add('comment', CommentType::class, [
-                'required' => false
-            ])
-            ->add('cancelReason', EntityType::class, [
-                'required' => false,
-                'class' => CancelReason::class,
-                'choice_label' => function (CancelReason $entity) {
-                    return $entity->getCanceledBy();
-                },
-            ])
-            ->add('sendSMS', ChoiceType::class, [
-                'required' => false,
-                'choices' => [
-                    'Oui' => true,
-                    'Non' => false
-                ],
-                'expanded' => true
-            ])
-            ;
-
-        $builder->add('startDate', HiddenType::class);
-        $builder->get('startDate')
-            ->addModelTransformer(new CallbackTransformer(
-                function (?DateTimeImmutable $dateTimeImmutable): string {
-                    if (NULL !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
-                    } else {
-                        $res = '';
-                    }
-                    return $res;
-                },
-                function (?string $dateAsString): DateTimeImmutable {
-                    dump($dateAsString);
-                    return new DateTimeImmutable($dateAsString);
-                }
-            ))
-        ;
-
-        $builder->add('endDate', HiddenType::class);
-        $builder->get('endDate')
-            ->addModelTransformer(new CallbackTransformer(
-                function (?DateTimeImmutable $dateTimeImmutable): string {
-                    if (NULL !== $dateTimeImmutable) {
-                        $res = date_format($dateTimeImmutable, 'Y-m-d H:i:s');
-                    } else {
-                        $res = '';
-                    }
-                    return $res;
-                },
-                function (?string $dateAsString): DateTimeImmutable {
-                    return new DateTimeImmutable($dateAsString);
-                }
-            ))
-        ;
-
-        $builder->add('persons', HiddenType::class);
-        $builder->get('persons')
-            ->addModelTransformer(new CallbackTransformer(
-                function (iterable $personsAsIterable): string {
-                    $personIds = [];
-                    foreach ($personsAsIterable as $value) {
-                        $personIds[] = $value->getId();
-                    }
-                    return implode(',', $personIds);
-                },
-                function (?string $personsAsString): array {
-                    return array_map(
-                        fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
-                        explode(',', $personsAsString)
-                    );
-                }
-            ))
-        ;
-
-        $builder->add('professionals', HiddenType::class);
-        $builder->get('professionals')
-            ->addModelTransformer(new CallbackTransformer(
-                function (iterable $thirdpartyAsIterable): string {
-                    $thirdpartyIds = [];
-                    foreach ($thirdpartyAsIterable as $value) {
-                        $thirdpartyIds[] = $value->getId();
-                    }
-                    return implode(',', $thirdpartyIds);
-                },
-                function (?string $thirdpartyAsString): array {
-                    return array_map(
-                        fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
-                        explode(',', $thirdpartyAsString)
-                    );
-                }
-            ))
-        ;
-    
-    //     $builder->add('invites', HiddenType::class);
-    //     $builder->get('invites')
-    //        ->addModelTransformer(new CallbackTransformer(
-    //            function (iterable $usersAsIterable): string {
-    //                $userIds = [];
-    //                foreach ($usersAsIterable as $value) {
-    //                    $userIds[] = $value->getId();
-    //                }
-    //                return implode(',', $userIds);
-    //            },
-    //            function (?string $usersAsString): array {
-    //                return array_map(
-    //                    fn(string $id): ?Invite => $this->om->getRepository(Invite::class)->findOneBy(['id' => (int) $id]),
-    //                    explode(',', $usersAsString)
-    //                );
-    //            }
-    //        ))
-    //    ;
-
-
-    }/**
-     * {@inheritdoc}
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => Calendar::class
-        ]);
-
-        $resolver
-            ->setRequired(['accompanyingPeriod'])
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBlockPrefix()
-    {
-        return 'chill_calendarbundle_calendar';
-    }
-
-
-}
-
-

src/Bundle/ChillCalendarBundle/LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <http://www.gnu.org/licenses/>.
-
-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
-<http://www.gnu.org/licenses/>.

src/Bundle/ChillCalendarBundle/README.md

@@ -1,6 +0,0 @@
-Calendar bundle
-===============
-
-This bundle adds a calendar to chill.
-
-

src/Bundle/ChillCalendarBundle/Repository/CalendarRangeRepository.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\CalendarRange;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @method CalendarRange|null find($id, $lockMode = null, $lockVersion = null)
- * @method CalendarRange|null findOneBy(array $criteria, array $orderBy = null)
- * @method CalendarRange[]    findAll()
- * @method CalendarRange[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class CalendarRangeRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, CalendarRange::class);
-    }
-
-    // /**
-    //  * @return CalendarRange[] Returns an array of CalendarRange objects
-    //  */
-    /*
-    public function findByExampleField($value)
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->orderBy('c.id', 'ASC')
-            ->setMaxResults(10)
-            ->getQuery()
-            ->getResult()
-        ;
-    }
-    */
-
-    /*
-    public function findOneBySomeField($value): ?CalendarRange
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
-    */
-}

src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\Calendar;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @method Calendar|null find($id, $lockMode = null, $lockVersion = null)
- * @method Calendar|null findOneBy(array $criteria, array $orderBy = null)
- * @method Calendar[]    findAll()
- * @method Calendar[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class CalendarRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, Calendar::class);
-    }
-
-    // /**
-    //  * @return Calendar[] Returns an array of Calendar objects
-    //  */
-    /*
-    public function findByExampleField($value)
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->orderBy('c.id', 'ASC')
-            ->setMaxResults(10)
-            ->getQuery()
-            ->getResult()
-        ;
-    }
-    */
-
-    /*
-    public function findOneBySomeField($value): ?Calendar
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
-    */
-}

src/Bundle/ChillCalendarBundle/Repository/CancelReasonRepository.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\CancelReason;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @method CancelReason|null find($id, $lockMode = null, $lockVersion = null)
- * @method CancelReason|null findOneBy(array $criteria, array $orderBy = null)
- * @method CancelReason[]    findAll()
- * @method CancelReason[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class CancelReasonRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, CancelReason::class);
-    }
-
-    // /**
-    //  * @return CancelReason[] Returns an array of CancelReason objects
-    //  */
-    /*
-    public function findByExampleField($value)
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->orderBy('c.id', 'ASC')
-            ->setMaxResults(10)
-            ->getQuery()
-            ->getResult()
-        ;
-    }
-    */
-
-    /*
-    public function findOneBySomeField($value): ?CancelReason
-    {
-        return $this->createQueryBuilder('c')
-            ->andWhere('c.exampleField = :val')
-            ->setParameter('val', $value)
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
-    */
-}

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\Invite;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @method Invite|null find($id, $lockMode = null, $lockVersion = null)
- * @method Invite|null findOneBy(array $criteria, array $orderBy = null)
- * @method Invite[]    findAll()
- * @method Invite[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class InviteRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, Invite::class);
-    }
-
-    // /**
-    //  * @return Invite[] Returns an array of Invite objects
-    //  */
-    /*
-    public function findByExampleField($value)
-    {
-        return $this->createQueryBuilder('i')
-            ->andWhere('i.exampleField = :val')
-            ->setParameter('val', $value)
-            ->orderBy('i.id', 'ASC')
-            ->setMaxResults(10)
-            ->getQuery()
-            ->getResult()
-        ;
-    }
-    */
-
-    /*
-    public function findOneBySomeField($value): ?Invite
-    {
-        return $this->createQueryBuilder('i')
-            ->andWhere('i.exampleField = :val')
-            ->setParameter('val', $value)
-            ->getQuery()
-            ->getOneOrNullResult()
-        ;
-    }
-    */
-}

src/Bundle/ChillCalendarBundle/Resources/config/routing.yml

@@ -1,3 +0,0 @@
-chill_calendar_controllers:
-    resource: '../../Controller/'
-    type: annotation

src/Bundle/ChillCalendarBundle/Resources/config/services.yml

@@ -1,8 +0,0 @@
----
-services:
-
-    Chill\CalendarBundle\Repository\:
-        autowire: true
-        resource: '../../Repository/'
-        tags:
-            - { name: 'doctrine.repository_service' }

src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml

@@ -1,5 +0,0 @@
-services:
-    Chill\CalendarBundle\Controller\:
-        autowire: true
-        resource: '../../../Controller'
-        tags: ['controller.service_arguments']

src/Bundle/ChillCalendarBundle/Resources/config/services/fixtures.yml

@@ -1,8 +0,0 @@
----
-services:
-  Chill\CalendarBundle\DataFixtures\ORM\LoadCancelReason:
-      tags:
-          - { 'name': doctrine.fixture.orm } 
-  Chill\CalendarBundle\DataFixtures\ORM\LoadInvite:
-    tags:
-        - { 'name': doctrine.fixture.orm } 

src/Bundle/ChillCalendarBundle/Resources/config/services/form.yml

@@ -1,10 +0,0 @@
----
-services:    
-    chill.calendar.form.type.calendar:
-        class: Chill\CalendarBundle\Form\CalendarType
-        arguments:
-            - "@chill.main.helper.translatable_string"
-            - "@doctrine.orm.entity_manager"
-
-        tags:
-            - { name: form.type, alias: chill_calendarbundle_calendar }

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue

@@ -1,17 +0,0 @@
-<template>
-   <concerned-groups></concerned-groups>
-   <calendar-range></calendar-range>
-</template>
-
-<script>
-import ConcernedGroups from 'ChillActivityAssets/vuejs/Activity/components/ConcernedGroups.vue';
-import CalendarRange from '../_components/CalendarRange/CalendarRange.vue';
-
-export default {
-   name: "App",
-   components: {
-      ConcernedGroups,
-      CalendarRange
-   }
-}
-</script>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js

@@ -1,22 +0,0 @@
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
-import { calendarRangeMessages } from '../_components/CalendarRange/js/i18n'
-
-const appMessages = {
-   fr: {
-      activity: {
-         add_persons: "Ajouter des personnes concernées",
-         bloc_persons: "Usagers",
-         bloc_persons_associated: "Usagers du parcours",
-         bloc_persons_not_associated: "Tiers non-pro.",
-         bloc_thirdparty: "Tiers professionnels",
-         bloc_users: "T(M)S",
-      }
-   }
-}
-
-Object.assign(appMessages.fr, personMessages.fr);
-Object.assign(appMessages.fr, calendarRangeMessages.fr);
-
-export {
-   appMessages
-};

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js

@@ -1,16 +0,0 @@
-import { createApp } from 'vue';
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './i18n'
-import store from './store'
-
-import App from './App.vue';
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-   template: `<app></app>`,
-})
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#calendar');

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store.js

@@ -1,121 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-const debug = process.env.NODE_ENV !== 'production';
-
-const addIdToValue = (string, id) => {
-   let array = string ? string.split(',') : [];
-   array.push(id.toString());
-   let str = array.join();
-   return str;
-};
-
-const removeIdFromValue = (string, id) => {
-   let array = string.split(',');
-   array = array.filter(el => el !== id.toString());
-   let str = array.join();
-   return str;
-};
-
-/*
-* Assign missing keys for the ConcernedGroups component
-*/
-const mapEntity = (entity) => {
-   Object.assign(entity, {thirdParties: entity.professionals, users: entity.invites});
-   return entity;
-};
-
-const store = createStore({
-   strict: debug,
-   state: {
-     activity: mapEntity(window.entity),
-     events: []
-   },
-   mutations: {
-      
-      // ConcernedGroups
-      addPersonsInvolved(state, payload) {
-         //console.log('### mutation addPersonsInvolved', payload.result.type);
-         switch (payload.result.type) {
-            case 'person':
-               state.activity.persons.push(payload.result);
-               break;
-            case 'thirdparty':
-               state.activity.thirdParties.push(payload.result);
-               break;
-            case 'user':
-               state.activity.users.push(payload.result); 
-               break;
-         };
-      },
-      removePersonInvolved(state, payload) {
-         //console.log('### mutation removePersonInvolved', payload.type);
-         switch (payload.type) {
-            case 'person':
-               state.activity.persons = state.activity.persons.filter(person => person !== payload);
-               break;
-            case 'thirdparty':
-               state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
-               break;
-            case 'user':
-               state.activity.users = state.activity.users.filter(user => user !== payload); 
-               break;
-         };
-      },
-      // Calendar
-      setEvents(state, payload) {
-         console.log(payload)
-         state.events.push( {start: payload.start, end: payload.end})
-      }
-   },
-   actions: {
-      addPersonsInvolved({ commit }, payload) {
-         console.log('### action addPersonsInvolved', payload.result.type);
-         switch (payload.result.type) {
-            case 'person':
-               let aPersons = document.getElementById("chill_calendarbundle_calendar_persons");
-               aPersons.value = addIdToValue(aPersons.value, payload.result.id);
-               break;
-            case 'thirdparty':
-               let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals");
-               aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
-               break;
-            case 'user':
-               let aUsers = document.getElementById("chill_calendarbundle_calendar_invites");
-               aUsers.value = addIdToValue(aUsers.value, payload.result.id);
-               break;
-         };
-         commit('addPersonsInvolved', payload);
-      },
-      removePersonInvolved({ commit }, payload) {
-         //console.log('### action removePersonInvolved', payload);
-         switch (payload.type) {
-            case 'person':
-               let aPersons = document.getElementById("chill_calendarbundle_calendar_persons");
-               aPersons.value = removeIdFromValue(aPersons.value, payload.id);
-               break;
-            case 'thirdparty':
-               let aThirdParties = document.getElementById("chill_calendarbundle_calendar_professionals");
-               aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
-               break;
-            case 'user':
-               let aUsers = document.getElementById("chill_calendarbundle_calendar_invites");
-               aUsers.value = removeIdFromValue(aUsers.value, payload.id);
-               break;
-         };
-         commit('removePersonInvolved', payload);
-      },
-
-      // Calendar
-      setDateRange({ commit }, payload) {
-         console.log('### action setDateRange', payload);
-         let startDateInput = document.getElementById("chill_calendarbundle_calendar_startDate");
-         startDateInput.value = payload.startStr;
-         let endDateInput = document.getElementById("chill_calendarbundle_calendar_endDate");
-         endDateInput.value = payload.endStr;
-         commit('setEvents', payload);
-      }
-  }
-});
-
-export default store;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarRange/CalendarRange.vue

@@ -1,37 +0,0 @@
-<template>
-  <h2 class="chill-red">{{ $t('choose_your_date') }}</h2>
-  <FullCalendar :options="calendarOptions" />
-</template>
-<script>
-import '@fullcalendar/core/vdom' // solves problem with Vite
-import FullCalendar from '@fullcalendar/vue3'
-import dayGridPlugin from '@fullcalendar/daygrid'
-import interactionPlugin from '@fullcalendar/interaction'
-import timeGridPlugin from '@fullcalendar/timegrid'
-
-export default {
-  components: {
-    FullCalendar
-  },
-  data() {
-    return {
-      calendarOptions: {
-        plugins: [ dayGridPlugin, interactionPlugin, timeGridPlugin ],
-        initialView: 'dayGridMonth',
-        selectable: true,
-        select: this.onDateSelect,
-        headerToolbar: {
-          left: 'prev,next today',
-          center: 'title',
-          right: 'dayGridMonth,timeGridWeek,timeGridDay'
-        },
-      }
-    }
-  },
-  methods: {
-    onDateSelect(payload) {
-      this.$store.dispatch('setDateRange', payload);
-    }
-  }
-}
-</script>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarRange/js/i18n.js

@@ -1,10 +0,0 @@
-const calendarRangeMessages = {
-    fr: {
-        choose_your_date: 'Sélectionnez vos dates',
-    }
- };
- 
- export {
-    calendarRangeMessages
- };
- 

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deleteAccompanyingCourse.html.twig

@@ -1,16 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_calendar_calendar' %}
-
-{% block title  'Remove calendar item'|trans %}
-
-{% block content %}
-    {{ include('@ChillMain/Util/confirmation_template.html.twig',
-        {
-            'title'             : 'Remove calendar item'|trans,
-            'confirm_question'  : 'Are you sure you want to remove the calendar item?'|trans,
-            'cancel_route'      : 'chill_calendar_calendar',
-            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : calendar.id },
-            'form'              : delete_form
-        } ) }}
-{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/confirm_deletePerson.html.twig

@@ -1,17 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-{% set person = activity.person %}
-
-{% block title  'Remove activity'|trans %}
-
-{% block personcontent %}
-{{ include('@ChillMain/Util/confirmation_template.html.twig',
-    {
-        'title'             : 'Remove activity'|trans,
-        'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : person.firstname ~ ' ' ~ person.lastname } ),
-        'cancel_route'      : 'chill_activity_activity_list',
-        'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
-        'form'              : delete_form
-    } ) }}
-{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/edit.html.twig

@@ -1,76 +0,0 @@
-<h1>{{ "Update calendar"|trans }}</h1>
-
-{{ form_start(form) }}
-{{ form_errors(form) }}
-
-{%- if form.mainUser is defined -%}
-    {{ form_row(form.mainUser) }}
-{% endif %}
-
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-
-{%- if form.persons is defined -%}
-    {{ form_widget(form.persons) }}
-{% endif %}
-{%- if form.professionals is defined -%}
-    {{ form_widget(form.professionals) }}
-{% endif %}
-{%- if form.nonProfessionals is defined -%}
-    {{ form_widget(form.nonProfessionals) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
-{% endif %}
-
-<div id="add-persons"></div>
-
-<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
-
-{%- if form.startDate is defined -%}
-    {{ form_row(form.startDate) }}
-{% endif %}
-
-{%- if form.endDate is defined -%}
-    {{ form_row(form.endDate) }}
-{% endif %}
-
-.. location
-
-{%- if form.cancelReason is defined -%}
-    {{ form_row(form.cancelReason) }}
-{% endif %}
-
-{%- if form.comment is defined -%}
-    {{ form_row(form.comment) }}
-{% endif %}
-
-{%- if form.sendSMS is defined -%}
-    {{ form_row(form.sendSMS) }}
-{% endif %}
-
-
-..calendarRange
-
-
-
-<ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
-    <a 
-      class="btn btn-cancel"
-      {%- if context == 'person' -%} 
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'person_id': person.id } )}}"
-      {%- else -%}
-      href="{{ chill_return_path_or('chill_calendar_calendar', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Update'|trans }}
-    </button>
-  </li>
-</ul>
-{{ form_end(form) }}
-

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editAccompanyingCourse.html.twig

@@ -1,35 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_list' %}
-
-{% block title  'Update calendar'|trans %}
-
-{% block content %}
-<div class="calendar-edit">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="calendar"></div> {# <=== vue component #}
-            {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block js %}
-    {{ parent() }}
-    <script type="text/javascript">
-        window.addEventListener('DOMContentLoaded', function (e) {
-            chill.displayAlertWhenLeavingModifiedForm('form[name="{{ form.vars.form.vars.name }}"]', 
-            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-        });
-        window.entity = {{ entity_json|json_encode|raw }}; 
-    </script>
-    {{ encore_entry_script_tags('vue_calendar') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('vue_calendar') }}
-{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/list.html.twig

@@ -1,136 +0,0 @@
-{% set user_id = null %}
-{% if user %}
-    {% set user_id = user.id %}
-{% endif %}
-
-{% set accompanying_course_id = null %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
-
-<h2>{{ 'Calendar list' |trans }}</h2>
-
-{% if calendarItems|length == 0 %}
-    <p class="chill-no-data-statement">
-        {{ "There is no calendar items."|trans }}
-        <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
-    </p>
-{% else %}
-
-<div class="flex-table list-records context-{{ context }}">
-
-    {% for calendar in calendarItems %}
-
-        <div class="item-bloc">
-            <div class="item-row main">
-                <div class="item-col">
-                                        
-                    {% if calendar.startDate %}
-                        <h3>{{ calendar.startDate|format_date('long') }} </h3>
-                    {% endif %}
-                   
-                    {% if calendar.endDate %}
-                        <h3>{{ calendar.endDate|format_date('long') }}</h3>
-                    {% endif %}
-                    
-                    <h3>{{ calendar.endDate.diff(calendar.startDate)|date("%Y%m%d%h") }}</h3>
-                    
-                    {% if context == 'user' and calendar.accompanyingPeriod is not empty %}
-                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
-                        <a 
-                           href="{{ chill_path_add_return_path(
-                            "chill_user_accompanying_course_index",
-                            { 'accompanying_period_id': calendar.accompanyingPeriod.id }
-                            ) }}"
-                           >
-                          <i class="fa fa-random"></i>
-                          {{ calendar.accompanyingPeriod.id }}
-                        </a>
-                      </div>
-                    {% endif %}
-                    
-                </div>
-                <div class="item-col">
-                    <ul class="list-content">
-                        {% if calendar.user %}
-                        <li>
-                            <b>{{ 'by'|trans }}{{ calendar.user.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-                        
-                        {% if calendar.mainUser is not empty %}
-                        <li>
-                            <b>{{ 'main user concerned'|trans }}{{ calendar.mainUser.usernameCanonical }}</b>
-                        </li>
-                        {% endif %}
-
-                 
-                        <li>
-                            {%- if calendar.comment.isEmpty -%}
-                                <span class="chill-no-data-statement">{{ 'No comments'|trans }}</span>
-                            {%- else -%}
-                                {{ calendar.comment|chill_entity_render_box }}
-                            {%- endif -%}
-                        </li>
-                        
-                        
-                    </ul>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                        </li>
-                        {# TOOD
-                        {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                        </li>
-                        {# TOOD
-                        {% endif %}
-                        {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
-                        #}
-                        <li>
-                            <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                        </li>
-                        {#
-                        {% endif %}
-                        #}
-                    </ul>
-                </div>
-            </div>
-            
-            {%  
-                if calendar.comment.comment is not empty
-                or calendar.users|length > 0
-                or calendar.thirdParties|length > 0
-                or calendar.users|length > 0 
-            %}
-            <div class="item-row details">
-                <div class="item-col">
-
-                    {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': calendar } %}
-                </div>
-                
-                {% if calendar.comment.comment is not empty %}
-                <div class="item-col comment">
-                    {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                </div>
-                {% endif %}
-            </div>
-            {% endif %}
-            
-        </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-{% if context != 'user' %}
-{# TODO set this condition in configuration #}
-  <ul class="record_actions">
-      <li>
-          <a href="{{ path('chill_calendar_calendar_new', {'user_id': user_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-              {{ 'Add a new calendar' | trans }}
-          </a>
-      </li>
-  </ul>
-{% endif %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig

@@ -1,9 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_list' %}
-
-{% block title %}{{ 'Calendar list' |trans }}{% endblock title %}
-
-{% block content %}
-    {% include 'ChillCalendarBundle:Calendar:list.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/new.html.twig

@@ -1,75 +0,0 @@
-<h1>{{ "Calendar item creation"|trans ~ ' :' }}</h1>
-
-{{ form_start(form) }}
-{{ form_errors(form) }}
-
-{%- if form.mainUser is defined -%}
-    {{ form_row(form.mainUser) }}
-{% endif %}
-
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-
-{%- if form.persons is defined -%}
-    {{ form_widget(form.persons) }}
-{% endif %}
-{%- if form.professionals is defined -%}
-    {{ form_widget(form.professionals) }}
-{% endif %}
-{%- if form.nonProfessionals is defined -%}
-    {{ form_widget(form.nonProfessionals) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
-{% endif %}
-
-<div id="add-persons"></div>
-
-<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
-
-{%- if form.startDate is defined -%}
-    {{ form_row(form.startDate) }}
-{% endif %}
-
-{%- if form.endDate is defined -%}
-    {{ form_row(form.endDate) }}
-{% endif %}
-
-.. location
-
-{%- if form.cancelReason is defined -%}
-    {{ form_row(form.cancelReason) }}
-{% endif %}
-
-{%- if form.comment is defined -%}
-    {{ form_row(form.comment) }}
-{% endif %}
-
-{%- if form.sendSMS is defined -%}
-    {{ form_row(form.sendSMS) }}
-{% endif %}
-
-
-..calendarRange
-
-
-
-<ul class="record_actions sticky-form-buttons">
-  <li class="cancel">
-    <a 
-      class="btn btn-cancel"
-      {%- if context == 'person' -%} 
-      href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
-      {%- else -%}
-      href="{{ chill_return_path_or('chill_activity_activity_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
-    </button>
-  </li>
-</ul>
-{{ form_end(form) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newAccompanyingCourse.html.twig

@@ -1,37 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_new' %}
-
-{% block title 'Calendar item creation' |trans %}
-
-{% block content %}
-<div class="calendar-new">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">
-            
-            <div id="calendar"></div> {# <=== vue component #}
-            {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %}
-            
-        </div>
-    </div>
-</div>            
-{% endblock %}
-
-{% block js %}
-    {{ parent() }}
-    <script type="text/javascript">
-        window.addEventListener('DOMContentLoaded', function (e) {
-            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
-            '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-        });
-        window.entity = {{ entity_json|json_encode|raw }}; 
-    </script>
-    {{ encore_entry_script_tags('vue_calendar') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/vue_calendar.css') }}"/>
-{% endblock %}
-
-

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig

@@ -1,79 +0,0 @@
-<h1>{{ "Calendar"|trans }}</h1>
-
-<dl class="chill_view_data">
-    <dt class="inline">{{ 'main user concerned'|trans }}</dt>
-    <dd>{{ entity.mainUser }}</dd>
-</dl>
-
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
-
-
-<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
-
-    <dt class="inline">{{ 'start date'|trans }}</dt>
-    <dd>{{ entity.startDate|format_datetime('long') }}</dd>
-
-    <dt class="inline">{{ 'end date'|trans }}</dt>
-    <dd>{{ entity.endDate|format_datetime('long') }}</dd>
-
-    <dt class="inline">{{ 'cancel reason'|trans }}</dt>
-    <dd>
-    {% if entity.cancelReason is not null %}
-    {{ entity.cancelReason.canceledBy|localize_translatable_string }}
-    {% else %}
-    <span class="chill-no-data-statement">{{ 'Unknown'|trans }}</span>
-    {% endif %}
-    </dd>
-
-    <dt class="inline">{{ 'status'|trans }}</dt>
-    <dd>{{ entity.status }}</dd>
-
-    {% if not entity.comment.isEmpty %}
-    <dt class="inline">{{ 'calendar comment'|trans }}</dt>
-    <dd>{{ entity.comment|chill_entity_render_box }}</dd>
-    {% endif %}
-
-    <dt class="inline">{{ 'sendSMS'|trans }}</dt>
-    <dd>
-    {% if entity.sendSMS is not null %}
-        {% if entity.sendSMS %}{{ 'Yes'|trans }}{% else %}{{ 'No'|trans }}{% endif %}
-    {% else %}
-        <span class="chill-no-data-statement">{{ 'Unknown'|trans }}</span>
-    {% endif %}
-    </dd>
-
-
-</dl>
-
-{% set accompanying_course_id = null %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
-
-<ul class="record_actions sticky-form-buttons">
-    <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_calendar_calendar', { 'accompanying_period_id': accompanying_course_id } ) }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a class="btn btn-update" href="{{ path('chill_calendar_calendar_edit', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-    
-    {# TODO
-    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
-    #}
-    
-    <li>
-        <a href="{{ path('chill_calendar_calendar_delete', { 'id': entity.id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
-            {{ 'Delete'|trans }}
-        </a>
-    </li>
-    
-    {#
-    {% endif %}
-    #}
-</ul>

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showAccompanyingCourse.html.twig

@@ -1,15 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_list' %}
-
-{% block title 'Calendar'|trans %}
-
-{% block content -%}
-<div class="calendar-show">
-    <div class="row justify-content-center">
-        <div class="col-md-10 col-xxl">           
-            {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %}
-        </div>
-    </div>
-</div> 
-{% endblock content %}

src/Bundle/ChillCalendarBundle/chill.webpack.config.js

@@ -1,10 +0,0 @@
-// this file loads all assets from the Chill calendar bundle
-module.exports = function(encore, entries) {
-    //entries.push(__dirname + '/Resources/public/index.js');
-    
-    encore.addAliases({
-        ChillCalendarAssets: __dirname + '/Resources/public'
-    });
-    
-    encore.addEntry('vue_calendar', __dirname + '/Resources/public/vuejs/Calendar/index.js');
-};

src/Bundle/ChillCalendarBundle/composer.json

@@ -1,30 +0,0 @@
-{
-    "name": "chill-project/calendar",
-    "description": "This bundle extends chill for managing a calendar",
-    "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\\CalendarBundle\\": "" }
-    },
-    "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
-}

src/Bundle/ChillCalendarBundle/migrations/Version20210715141731.php

@@ -1,99 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Create the schema chill_calendar and several calendar entities
- */
-final class Version20210715141731 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Create the schema chill_calendar and several calendar entities';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('CREATE SCHEMA chill_calendar');
-        $this->addSql('CREATE SEQUENCE chill_calendar.calendar_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE SEQUENCE chill_calendar.calendar_range_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE SEQUENCE chill_calendar.cancel_reason_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE SEQUENCE chill_calendar.invite_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
-        $this->addSql('CREATE TABLE chill_calendar.calendar (id INT NOT NULL, user_id INT DEFAULT NULL, activity_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, status VARCHAR(255) NOT NULL, sendSMS BOOLEAN DEFAULT NULL, comment_comment TEXT DEFAULT NULL, comment_userId INT DEFAULT NULL, comment_date TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, accompanyingPeriod_id INT DEFAULT NULL, mainUser_id INT DEFAULT NULL, cancelReason_id INT DEFAULT NULL, calendarRange_id INT DEFAULT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX IDX_712315ACA76ED395 ON chill_calendar.calendar (user_id)');
-        $this->addSql('CREATE INDEX IDX_712315ACD7FA8EF0 ON chill_calendar.calendar (accompanyingPeriod_id)');
-        $this->addSql('CREATE INDEX IDX_712315ACEFCB59C ON chill_calendar.calendar (mainUser_id)');
-        $this->addSql('CREATE INDEX IDX_712315ACE980772F ON chill_calendar.calendar (cancelReason_id)');
-        $this->addSql('CREATE INDEX IDX_712315ACC5CB285D ON chill_calendar.calendar (calendarRange_id)');
-        $this->addSql('CREATE INDEX IDX_712315AC81C06096 ON chill_calendar.calendar (activity_id)');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_persons (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
-        $this->addSql('CREATE INDEX IDX_AEE94715A40A2C8 ON chill_calendar.calendar_to_persons (calendar_id)');
-        $this->addSql('CREATE INDEX IDX_AEE94715217BBB47 ON chill_calendar.calendar_to_persons (person_id)');
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
-        $this->addSql('CREATE INDEX IDX_FADF2C77A40A2C8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
-        $this->addSql('CREATE INDEX IDX_FADF2C77217BBB47 ON chill_calendar.calendar_to_non_professionals (person_id)');
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_thirdparties (calendar_id INT NOT NULL, thirdparty_id INT NOT NULL, PRIMARY KEY(calendar_id, thirdparty_id))');
-        $this->addSql('CREATE INDEX IDX_2BAB7EFDA40A2C8 ON chill_calendar.calendar_to_thirdparties (calendar_id)');
-        $this->addSql('CREATE INDEX IDX_2BAB7EFDC7D3A8E6 ON chill_calendar.calendar_to_thirdparties (thirdparty_id)');
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_invites (calendar_id INT NOT NULL, invite_id INT NOT NULL, PRIMARY KEY(calendar_id, invite_id))');
-        $this->addSql('CREATE INDEX IDX_FCBEAAAA40A2C8 ON chill_calendar.calendar_to_invites (calendar_id)');
-        $this->addSql('CREATE INDEX IDX_FCBEAAAEA417747 ON chill_calendar.calendar_to_invites (invite_id)');
-        $this->addSql('CREATE TABLE chill_calendar.calendar_range (id INT NOT NULL, user_id INT DEFAULT NULL, startDate DATE NOT NULL, endDate DATE NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('CREATE INDEX IDX_38D57D05A76ED395 ON chill_calendar.calendar_range (user_id)');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('CREATE TABLE chill_calendar.cancel_reason (id INT NOT NULL, active BOOLEAN NOT NULL, canceledBy JSON NOT NULL, name JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS \'(DC2Type:json_array)\'');
-        $this->addSql('CREATE TABLE chill_calendar.invite (id INT NOT NULL, user_id INT DEFAULT NULL, status JSON NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.invite.status IS \'(DC2Type:json_array)\'');
-        $this->addSql('CREATE INDEX IDX_F517FFA7A76ED395 ON chill_calendar.invite (user_id)');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACEFCB59C FOREIGN KEY (mainUser_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACE980772F FOREIGN KEY (cancelReason_id) REFERENCES chill_calendar.cancel_reason (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315ACC5CB285D FOREIGN KEY (calendarRange_id) REFERENCES chill_calendar.calendar_range (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ADD CONSTRAINT FK_712315AC81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons ADD CONSTRAINT FK_AEE94715217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77A40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT FK_FADF2C77217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties ADD CONSTRAINT FK_2BAB7EFDC7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAA40A2C8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites ADD CONSTRAINT FK_FCBEAAAEA417747 FOREIGN KEY (invite_id) REFERENCES chill_calendar.invite (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ADD CONSTRAINT FK_38D57D05A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.invite ADD CONSTRAINT FK_F517FFA7A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema): void
-    {        
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_persons DROP CONSTRAINT FK_AEE94715A40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals DROP CONSTRAINT FK_FADF2C77A40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_thirdparties DROP CONSTRAINT FK_2BAB7EFDA40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAA40A2C8');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACC5CB285D');
-        $this->addSql('ALTER TABLE chill_calendar.calendar DROP CONSTRAINT FK_712315ACE980772F');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_invites DROP CONSTRAINT FK_FCBEAAAEA417747');
-        $this->addSql('DROP SEQUENCE chill_calendar.calendar_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.calendar_range_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.cancel_reason_id_seq CASCADE');
-        $this->addSql('DROP SEQUENCE chill_calendar.invite_id_seq CASCADE');
-        $this->addSql('DROP TABLE chill_calendar.calendar');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_persons');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_thirdparties');
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_invites');
-        $this->addSql('DROP TABLE chill_calendar.calendar_range');
-        $this->addSql('DROP TABLE chill_calendar.cancel_reason');
-        $this->addSql('DROP TABLE chill_calendar.invite');
-        $this->addSql('DROP SCHEMA chill_calendar');
-    }
-}

src/Bundle/ChillCalendarBundle/migrations/Version20210723074557.php

@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Adapt calendar entities
- */
-final class Version20210723074557 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Adapt calendar entities';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_calendar.calendar_to_non_professionals');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby TYPE VARCHAR(255)');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledby DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledBy IS NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('CREATE TABLE chill_calendar.calendar_to_non_professionals (calendar_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(calendar_id, person_id))');
-        $this->addSql('CREATE INDEX idx_fadf2c77217bbb47 ON chill_calendar.calendar_to_non_professionals (person_id)');
-        $this->addSql('CREATE INDEX idx_fadf2c77a40a2c8 ON chill_calendar.calendar_to_non_professionals (calendar_id)');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77a40a2c8 FOREIGN KEY (calendar_id) REFERENCES chill_calendar.calendar (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_to_non_professionals ADD CONSTRAINT fk_fadf2c77217bbb47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy TYPE JSON');
-        $this->addSql('ALTER TABLE chill_calendar.cancel_reason ALTER canceledBy DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.cancel_reason.canceledby IS \'(DC2Type:json_array)\'');
-    }
-}

src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php

@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Alter startDate and endDate to datetimetz_immutable
- */
-final class Version20210723142003 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Alter startDate and endDate to datetimetz_immutable';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:datetimetz_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:datetimetz_immutable)\'');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\'');
-    }
-}

src/Bundle/ChillCalendarBundle/migrations/Version20210723142842.php

@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Calendar;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Alter startDate and endDate to datetimetz_immutable on calendarRange
- */
-final class Version20210723142842 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Alter startDate and endDate to datetimetz_immutable on calendarRange';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startdate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER enddate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startDate IS \'(DC2Type:datetimetz_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.endDate IS \'(DC2Type:datetimetz_immutable)\'');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER startDate DROP DEFAULT');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate TYPE DATE');
-        $this->addSql('ALTER TABLE chill_calendar.calendar_range ALTER endDate DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.startdate IS \'(DC2Type:date_immutable)\'');
-        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar_range.enddate IS \'(DC2Type:date_immutable)\'');
-    }
-}

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

@@ -1,17 +0,0 @@
-Calendar: Rendez-vous
-Calendar list: Liste des rendez-vous
-There is no calendar items.: Il n'y a pas de rendez-vous
-Remove calendar item: Supprimer le rendez-vous
-Are you sure you want to remove the calendar item?: Êtes-vous sûr de vouloir supprimer le rendez-vous?
-Concerned groups: Parties concernées
-Calendar data: Données du rendez-vous
-Update calendar: Modifier le rendez-vous
-main user concerned: Utilisateur principal
-Calendar item creation: Création du rendez-vous
-start date: début du rendez-vous
-end date: fin du rendez-vous
-cancel reason: motif d'annulation
-status: Statut du rendez-vous
-calendar comment: Remarque sur le rendez-vous
-sendSMS: Envoi d'un SMS
-

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig

@@ -36,12 +36,12 @@
         {{ form_row(option) }}
     {% endfor %}
     {% endif %}
-    {{ form_row(edit_form.submit, {'attr': { 'class': 'btn btn-update' } } ) }}
+    {{ form_row(edit_form.submit, {'attr': { 'class': 'sc-button btn-update' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
+        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
             {{ 'Back to the group'|trans }}
         </a>
     </li>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig

@@ -37,17 +37,17 @@
         {{ form_row(option) }}
     {% endfor %}
     {% endif %}
-    {{ form_row(form.submit, {'attr': { 'class': 'btn btn-create' } } ) }}
+    {{ form_row(form.submit, {'attr': { 'class': 'sc-button btn-create' } } ) }}
     {{ form_end(form) }}
     
     <ul class="record_actions">
     <li>
         {% if entity.customFieldsGroup is not null %}
-        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
+        <a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
             {{ 'Back to the group'|trans }}
         </a>
         {% else %}
-        <a href="{{ path('customfieldsgroup') }}" class="btn btn-reset">
+        <a href="{{ path('customfieldsgroup') }}" class="sc-button btn-reset">
             {{ 'Back to the list'|trans }}
         </a>
         {% endif %}

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig

@@ -27,17 +27,17 @@
     {% if edit_form.options is defined %}
     {{ form_row(edit_form.options) }}
     {% endif %}
-    {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
+    {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
     {{ form_end(edit_form) }}
 
         <ul class="record_actions">
     <li>
-        <a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
+        <a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        <a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="btn btn-cancel">
+        <a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="sc-button bt-cancel">
             {{ 'show'|trans|capitalize }}
         </a>
     </li>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig

@@ -40,17 +40,17 @@
                         <i class="fa fa-star"></i>
                     {%- else -%}
                         {{ form_start(make_default_forms[entity.id]) }}
-                        {{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'btn btn-action' } } ) }}
+                        {{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'sc-button bt-action' } } ) }}
                         {{ form_end(make_default_forms[entity.id]) }}
                     {%- endif -%}
                 </td>
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'show'|trans|capitalize }}</a>
+                        <a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="sc-button">{{ 'show'|trans|capitalize }}</a>
                     </li>
                     <li>
-                        <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
+                        <a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="sc-button btn-edit">{{ 'edit'|trans|capitalize }}</a>
                     </li>
                 </ul>
                 </td>
@@ -60,7 +60,7 @@
     </table>
 
     <p>
-        <a href="{{ path('customfieldsgroup_new') }}" class="btn btn-create">
+        <a href="{{ path('customfieldsgroup_new') }}" class="sc-button bt-create">
             {{ 'Create a new group'|trans }}
         </a>
     </p>