Update ChillPersonBundle - Move files in src/

composer.json

@@ -13,7 +13,7 @@
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
             "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
-            "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
+            "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle/src",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"

src/Bundle/ChillPersonBundle/Resources/public/css/person.css

@@ -1,78 +0,0 @@
-.chill-blue, div.person-view div.custom-fields figure.person-details div.cf_title_box:nth-child(4n+4) h2 {
-  color: #334d5c; }
-
-.chill-green, div.person-view div.custom-fields figure.person-details div.cf_title_box:nth-child(4n+2) h2 {
-  color: #43b29d; }
-
-.chill-green-dark {
-  color: #328474; }
-
-.chill-yellow {
-  color: #eec84a; }
-
-.chill-orange, div.person-view div.custom-fields figure.person-details div.cf_title_box:nth-child(4n+3) h2 {
-  color: #e2793d; }
-
-.chill-red, div.person-view div.custom-fields figure.person-details div.cf_title_box:nth-child(4n+1) h2 {
-  color: #df4949; }
-
-.chill-gray {
-  color: #ececec; }
-
-.chill-beige {
-  color: #cabb9f; }
-
-.chill-pink {
-  color: #dd506d; }
-
-.chill-dark-gray {
-  color: #333333; }
-
-.chill-light-gray {
-  color: #b2b2b2; }
-
-div#header-person-name {
-  background: none repeat scroll 0 0 #328474;
-  color: #FFF;
-  padding-top: 1em;
-  padding-bottom: 1em; }
-
-div#header-person-details {
-  background: none repeat scroll 0 0 #43b29d;
-  color: #FFF;
-  padding-top: 1em;
-  padding-bottom: 1em; }
-
-div#person_details_container {
-  padding-top: 20px;
-  padding-bottom: 20px; }
-
-div.person-view {
-  /* custom fields on the home page */ }
-  div.person-view figure.person-details {
-    /*                    background-color: $black;
-                        padding-top: 0.2em;
-                        padding-bottom: 0.2em;
-                }*/ }
-    div.person-view figure.person-details h2 {
-      font-family: 'Open Sans';
-      font-weight: 600;
-      margin-bottom: 0.3em;
-      font-variant: small-caps; }
-    div.person-view figure.person-details dl {
-      margin-top: 0.3em; }
-    div.person-view figure.person-details dt {
-      font-family: 'Open Sans';
-      font-weight: 600; }
-    div.person-view figure.person-details dd {
-      margin-left: 0; }
-  div.person-view div.custom-fields figure.person-details {
-    display: flex;
-    flex-flow: row wrap; }
-    div.person-view div.custom-fields figure.person-details div.cf_title_box:nth-child(2n+1) {
-      width: 50%;
-      margin-right: 40px; }
-    div.person-view div.custom-fields figure.person-details iv.cf_title_box:nth-child(2n+2) {
-      width: calc(50% - 40px); }
-
-/*# sourceMappingURL=person.css.map */

src/Bundle/ChillPersonBundle/Resources/public/css/person.css.map

@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "AAkBE,wGAA+B;EAC7B,KAAK,EAJI,OAAO;;AAGlB,yGAA+B;EAC7B,KAAK,EAJY,OAAO;;AAG1B,iBAA+B;EAC7B,KAAK,EAJoB,OAAO;;AAGlC,aAA+B;EAC7B,KAAK,EAJ4B,OAAO;;AAG1C,0GAA+B;EAC7B,KAAK,EAJoC,OAAO;;AAGlD,uGAA+B;EAC7B,KAAK,EAJ4C,OAAO;;AAG1D,WAA+B;EAC7B,KAAK,EAJoD,OAAO;;AAGlE,YAA+B;EAC7B,KAAK,EAJ4D,OAAO;;AAG1E,WAA+B;EAC7B,KAAK,EAJoE,OAAO;;AAGlF,gBAA+B;EAC7B,KAAK,EAJ4E,OAAO;;AAG1F,iBAA+B;EAC7B,KAAK,EAJoF,OAAO;;ACZpG,sBAAuB;EACnB,UAAU,EAAE,8BAAwC;EACpD,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;;AAGvB,yBAA0B;EACtB,UAAU,EAAE,8BAAmC;EAC/C,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,GAAG;;AAGvB,4BAA6B;EAC5B,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,IAAI;;AAGrB,eAAgB;EA6BZ,oCAAoC;EA5BpC,qCAAsB;IAsB1B;;;mBAGe;IAxBH,wCAAG;MACC,WAAW,EAAE,WAAW;MACxB,WAAW,EAAE,GAAG;MAChB,aAAa,EAAE,KAAK;MACpB,YAAY,EAAE,UAAU;IAG5B,wCAAG;MACK,UAAU,EAAE,KAAK;IAGzB,wCAAG;MACH,WAAW,EAAE,WAAW;MACxB,WAAW,EAAE,GAAG;IAGhB,wCAAG;MACK,WAAW,EAAE,CAAC;EAY1B,uDAAsB;IAClB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,QAAQ;IAkBnB,wFAAgC;MAC5B,KAAK,EAAE,GAAG;MACV,YAAY,EAAE,IAAI;IAGtB,uFAAgC;MAC5B,KAAK,EAAE,gBAAgB",
-"sources": ["../../../../main/Resources/public/sass/custom/config/_colors.scss","../sass/person.scss"],
-"names": [],
-"file": "person.css"
-}

src/Bundle/ChillPersonBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./sass/person.scss');

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue

@@ -1,45 +0,0 @@
-<template>
-   <accompanying-course v-bind:accompanying_course="accompanying_course"/>
-   <persons-associated v-bind:persons_associated="accompanying_course.persons"/>
-   <requestor v-bind:accompanying_course="accompanying_course"/>
-</template>
-
-<script>
-import AccompanyingCourse from './components/AccompanyingCourse.vue';
-import PersonsAssociated from './components/PersonsAssociated.vue';
-import Requestor from './components/Requestor.vue';
-
-export default {
-   name: 'App',
-   components: { 
-      AccompanyingCourse,
-      PersonsAssociated, 
-      Requestor
-   },
-   data() {
-      return {
-         accompanying_course: {}
-      };
-   },
-   computed: {
-      accompanyingCourseId() {
-         return window.accompanyingCourseId;
-      }
-   },
-   methods: {
-      async getAccompanyingCourse() {
-         let data_;
-         return fetch(`/fr/api/parcours/${accompanyingCourseId}/show`)
-            .then(response => response.json())
-            .then(data => {
-               this.$data.accompanying_course = data;
-            });
-      }
-   },
-   async mounted() {
-      await this.getAccompanyingCourse();
-   }
-};
-</script>
-
-<style scoped></style>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue

@@ -1,26 +0,0 @@
-<template>
-   <div class="vue-component">
-      <h3>Parcours</h3>
-      <dl>
-         <dt>id</dt>
-            <dd>{{ accompanying_course.id }}</dd>
-         <dt>opening_date</dt>
-            <dd>{{ accompanying_course.opening_date }}</dd>
-         <dt>closing_date</dt>
-            <dd>{{ accompanying_course.closing_date }}</dd>
-         <dt>remark</dt>
-            <dd>{{ accompanying_course.remark }}</dd>
-         <dt>closing_motive</dt>
-            <dd>{{ accompanying_course.closing_motive }}</dd>
-      </dl>
-   </div>
-</template>
-
-<script>
-export default {
-   name: 'AccompanyingCourse',
-   props: {
-      accompanying_course: Object
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue

@@ -1,25 +0,0 @@
-<template>
-<tr>
-   <td>{{ person.firstname }}</td>
-   <td>{{ person.lastname }}</td>
-   <td>{{ person.startdate }}</td>
-   <td>{{ person.enddate }}</td>
-   <td>
-      <ul class="record_actions">
-         <li><button class="sc-button bt-show"></button></li>
-         <li><button class="sc-button bt-update"></button></li>
-         <li><button class="sc-button bt-delete" @click.prevent="$emit('remove', person)"></button></li>
-      </ul>
-   </td>
-</tr>
-</template>
-
-<script>
-export default {
-   name: 'PersonItem',
-   props: {
-      person: { type: Object, required: true }
-   },
-   emits: ['remove']
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue

@@ -1,69 +0,0 @@
-<template>
-<div class="vue-component">
-   <h3>Usagers concernés</h3>
-    
-   <label>{{ counter }} usagers</label>
-   
-   <table class="rounded"> 
-      <thead>
-         <tr>
-            <th class="chill-orange">firstname</th>
-            <th class="chill-orange">lastname</th>
-            <th class="chill-orange">startdate</th>
-            <th class="chill-orange">enddate</th>
-            <th class="chill-orange">actions</th>
-         </tr>
-      </thead>
-      <tbody> 
-         <person-item 
-            v-for="person in persons_associated" 
-            v-bind:person="person" 
-            v-bind:key="person.id" 
-            @remove="removePerson" />
-      </tbody>
-   </table>
-   
-   <ul class="record_actions">
-      <li><button class="sc-button bt-create" @click="addPerson">Ajouter un usager</button></li>
-   </ul>
-   
-</div>
-</template>
-
-<script>
-import PersonItem from "./PersonItem.vue"
-
-export default {
-   name: 'PersonsAssociated',
-   components: { 
-      PersonItem 
-   },
-   props: { 
-      persons_associated: Array 
-   },
-   data() {
-      return {
-         persons: this.persons_associated
-      }
-   },
-   computed: {
-      async counter() {
-         // Pourquoi je peux pas compter un tableau avec length ???!!!
-         return this.persons_associated.length //     <= boum !
-      }
-   },
-   methods: {
-      addPerson() {
-         this.persons_associated.push({
-            "firstname": "Lisa",
-            "lastname": "Simpson",
-            "startdate": "1975-09-15",
-            "enddate": "2021-04-20"
-         })
-      },
-      removePerson(item) {
-         this.persons_associated = this.persons_associated.filter(person => person !== item)
-      }
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue

@@ -1,16 +0,0 @@
-<template>
-   <div class="vue-component">
-      <h3>Demandeur</h3>
-      {{ accompanying_course.id }}
-      {{ accompanying_course.remark }}
-   </div>
-</template>
-
-<script>
-export default {
-   name: 'Requestor',
-   props: {
-      accompanying_course: Object
-   }
-}
-</script>

src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js

@@ -1,8 +0,0 @@
-import App from './App.vue';
-import { createApp } from 'vue';
-
-const app = createApp({
-   template: `<app></app>`
-})
-.component('app', App)
-.mount('#accompanying-course');

src/Bundle/ChillPersonBundle/Resources/public/sass/index.js

@@ -1,5 +0,0 @@
-require('./phone-alt-solid.svg');
-require('./mobile-alt-solid.svg');
-require('./person_by_phonenumber.scss');
-
-

src/Bundle/ChillPersonBundle/Resources/public/sass/mobile-alt-solid.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="mobile-alt" class="svg-inline--fa fa-mobile-alt fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M272 0H48C21.5 0 0 21.5 0 48v416c0 26.5 21.5 48 48 48h224c26.5 0 48-21.5 48-48V48c0-26.5-21.5-48-48-48zM160 480c-17.7 0-32-14.3-32-32s14.3-32 32-32 32 14.3 32 32-14.3 32-32 32zm112-108c0 6.6-5.4 12-12 12H60c-6.6 0-12-5.4-12-12V60c0-6.6 5.4-12 12-12h200c6.6 0 12 5.4 12 12v312z"></path></svg>

src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss

@@ -1,88 +0,0 @@
-
-@import '~ChillMainSass/custom/config/colors';
-
-div#header-person-name {
-    background: none repeat scroll 0 0 $chill-green-dark;
-    color: #FFF;
-    padding-top: 1em;
-    padding-bottom: 1em;
-}
-
-div#header-person-details {
-    background: none repeat scroll 0 0 $chill-green;
-    color: #FFF;
-    padding-top: 1em;
-    padding-bottom: 1em;
-}
-
-div#person_details_container {
-	padding-top: 20px;
-	padding-bottom: 20px;
-}
-
-div.person-view {
-    figure.person-details {
-            h2 {
-                font-family: 'Open Sans';
-                font-weight: 600;
-                margin-bottom: 0.3em;
-                font-variant: small-caps;
-            }
-
-            dl {
-                    margin-top: 0.3em;
-            }
-
-            dt {
-            font-family: 'Open Sans';
-            font-weight: 600;
-            }
-
-            dd {
-                    margin-left: 0;
-            }
-
-//            a.sc-button {
-/*                    background-color: $black;
-                    padding-top: 0.2em;
-                    padding-bottom: 0.2em;
-            }*/
-    }
-
-    /* custom fields on the home page */
-    div.custom-fields {
-        figure.person-details {
-            display: flex;
-            flex-flow: row wrap;
-
-            div.cf_title_box:nth-child(4n+1) h2 {
-                @extend .chill-red;
-            }
-
-            div.cf_title_box:nth-child(4n+2) h2 {
-                @extend .chill-green;
-            }
-
-            div.cf_title_box:nth-child(4n+3) h2 {
-                @extend .chill-orange;
-            }
-
-            div.cf_title_box:nth-child(4n+4) h2 {
-                @extend .chill-blue;
-            }
-
-            div.cf_title_box:nth-child(2n+1){
-                width: 50%;
-                margin-right: 40px;
-            }
-
-            iv.cf_title_box:nth-child(2n+2) {
-                width: calc(50% - 40px);
-            }
-
-        }
-
-
-    }
-
-}

src/Bundle/ChillPersonBundle/Resources/public/sass/person_by_phonenumber.scss

@@ -1,25 +0,0 @@
-.person-list__--by-phonenumber {
-    .person-list__--by-phonenumber__phones {
-        ul {
-            list-style: none inside;
-            padding: 0;
-            margin: 0;
-            
-            li {
-                margin: 0.80rem;
-                
-                img {
-                    vertical-align: baseline;
-                    height: 0.90rem;
-                    margin-right: 0.20rem;
-                }
-                    pre {
-                        display: inline;
-                    }
-            }
-        }
-
-        
-    }
-}
-;

src/Bundle/ChillPersonBundle/Resources/public/sass/phone-alt-solid.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="phone-alt" class="svg-inline--fa fa-phone-alt fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M497.39 361.8l-112-48a24 24 0 0 0-28 6.9l-49.6 60.6A370.66 370.66 0 0 1 130.6 204.11l60.6-49.6a23.94 23.94 0 0 0 6.9-28l-48-112A24.16 24.16 0 0 0 122.6.61l-104 24A24 24 0 0 0 0 48c0 256.5 207.9 464 464 464a24 24 0 0 0 23.4-18.6l24-104a24.29 24.29 0 0 0-14.01-27.6z"></path></svg>

src/Bundle/ChillPersonBundle/composer.json

@@ -1,4 +1,4 @@
-{ 
+{
     "name": "chill-project/person",
     "license": "AGPL-3.0",
     "type": "symfony-bundle",
@@ -6,7 +6,7 @@
     "keywords" : ["chill", "social work", "persons"],
     "homepage" : "https://github.com/Chill-project/Person",
     "autoload": {
-        "psr-4": { "Chill\\PersonBundle\\": "" }
+        "psr-4": { "Chill\\PersonBundle\\": "src/" }
     },
     "autoload-dev": {
         "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
@@ -36,6 +36,6 @@
     },
     "extra": {
         "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Tests/Fixtures/App/"
+        "symfony-app-dir": "src/Tests/Fixtures/App/"
     }
 }

src/Bundle/ChillPersonBundle/config/services.yaml

@@ -1,9 +1,4 @@
-parameters:
+services:
-#    cl_chill_person.example.class: Chill\PersonBundle\Example
-
-services:   
-
-
     chill.person.form.type.select2maritalstatus:
         class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType
         arguments:
@@ -35,7 +30,7 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+
     chill.person.birthdate_validation:
         class: Chill\PersonBundle\Validator\Constraints\BirthdateValidator
         arguments:

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

@@ -1,6 +1,6 @@
 services:
     Chill\PersonBundle\DataFixtures\ORM\:
-        resource: ../../DataFixtures/ORM
+        resource: "../../src/DataFixtures/ORM"
         tags: [ 'doctrine.fixture.orm' ]
 
     Chill\PersonBundle\DataFixtures\ORM\LoadCustomFields:

src/Bundle/ChillPersonBundle/src/DependencyInjection/ChillPersonExtension.php

@@ -60,7 +60,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $container->setParameter('chill_person.allow_multiple_simultaneous_accompanying_periods',
                 $config['allow_multiple_simultaneous_accompanying_periods']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__, 2).'/config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
         $loader->load('services/exports.yaml');
@@ -185,7 +185,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                 '@ChillPersonBundle/config/routes.yaml'
+                    dirname(__DIR__, 2) . '/config/routes.yaml'
               )
            )
         ));