complete previous commit (+dirty auto corrections from IDE)

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

@@ -1,4 +1,4 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 //@import '~ChillMainSass/custom/mixins/entity';
 
 //.chill-entity.chill-entity__activity-reason {
@@ -71,7 +71,7 @@ div.flex-table.list-records {
             &:nth-child(2) {
                flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
             }
-            
+
             &:only-child {
                flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
                & > div.concerned-groups {
@@ -80,11 +80,11 @@ div.flex-table.list-records {
                   flex-direction: column; // TODO pas fini
                   div.group {
                      flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
-                     h4 {} 
+                     h4 {}
                      ul.list-content {
-                        li { 
+                        li {
                            display: inline;
-                        } 
+                        }
                      }
                   }
                }

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -6,7 +6,7 @@
  * when possible, try to use bootstrap html class
 */
 
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 
 /*
  * Specific rules
@@ -20,12 +20,12 @@
 // styles communs pour tous les bandeaux
 div.banner {
    .id-number {
-      font-weight: lighter; 
+      font-weight: lighter;
       font-size: 50%;
       &:before { content: '(n°'; }
       &:after { content: ')'; }
    }
-   a.phone, 
+   a.phone,
    a.email {
       color: white;
    }
@@ -69,14 +69,14 @@ div.flex-table {
    }
    div.item-bloc {
       // We use box-shadow instead of border
-      // to avoid to manage border double-width 
+      // to avoid to manage border double-width
       // when blocs are resized for small screen !
       // Then we can simulate border-collapse: collapse (table)
-      box-shadow: 
+      box-shadow:
-          1px 0 0 0 var(--bs-dark), 
+          1px 0 0 0 var(--bs-dark),
-          0 1px 0 0 var(--bs-dark), 
+          0 1px 0 0 var(--bs-dark),
           1px 1px 0 0 var(--bs-dark),   /* fix the corner */
-          1px 0 0 0 var(--bs-dark) inset, 
+          1px 0 0 0 var(--bs-dark) inset,
           0 1px 0 0 var(--bs-dark) inset;
    }
 }

src/Bundle/ChillMainBundle/Resources/public/chill/css/pikaday.css

@@ -1,173 +0,0 @@
-@charset "UTF-8";
-
-/*!
- * Pikaday
- * Copyright © 2014 David Bushell | BSD & MIT license | http://dbushell.com/
- */
-
-.pika-single {
-    z-index: 9999;
-    display: block;
-    position: relative;
-    width: 240px;
-    padding: 8px;
-    color: #333;
-    background: #fff;
-    border: 1px solid #ccc;
-    border-bottom-color: #bbb;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.pika-single.is-hidden {
-    display: none;
-}
-
-.pika-single.is-bound {
-    position: absolute;
-    box-shadow: 0 5px 15px -5px rgba(0,0,0,.5);
-}
-
-.pika-title {
-    position: relative;
-    text-align: center;
-}
-
-.pika-label {
-    display: inline-block;
-    *display: inline;
-    position: relative;
-    z-index: 9999;
-    overflow: hidden;
-    margin: 0;
-    padding: 5px 3px;
-    font-size: 14px;
-    line-height: 20px;
-    font-weight: bold;
-    background-color: #fff;
-}
-.pika-title select {
-    cursor: pointer;
-    position: absolute;
-    z-index: 9998;
-    margin: 0;
-    left: 0;
-    top: 5px;
-    filter: alpha(opacity=0);
-    opacity: 0;
-}
-
-.pika-prev,
-.pika-next {
-    display: block;
-    cursor: pointer;
-    position: relative;
-    outline: none;
-    border: 0;
-    padding: 0;
-    width: 20px;
-    height: 30px;
-    /* hide text using text-indent trick, using width value (it's enough) */
-    text-indent: 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    background-color: transparent;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: 75% 75%;
-    opacity: .5;
-    *position: absolute;
-    *top: 0;
-}
-
-.pika-prev:hover,
-.pika-next:hover {
-    opacity: 1;
-}
-
-.pika-prev,
-.is-rtl .pika-next {
-    float: left;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAUklEQVR42u3VMQoAIBADQf8Pgj+OD9hG2CtONJB2ymQkKe0HbwAP0xucDiQWARITIDEBEnMgMQ8S8+AqBIl6kKgHiXqQqAeJepBo/z38J/U0uAHlaBkBl9I4GwAAAABJRU5ErkJggg==');
-    *left: 0;
-}
-
-.pika-next,
-.is-rtl .pika-prev {
-    float: right;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAeCAYAAAAsEj5rAAAAU0lEQVR42u3VOwoAMAgE0dwfAnNjU26bYkBCFGwfiL9VVWoO+BJ4Gf3gtsEKKoFBNTCoCAYVwaAiGNQGMUHMkjGbgjk2mIONuXo0nC8XnCf1JXgArVIZAQh5TKYAAAAASUVORK5CYII=');
-    *right: 0;
-}
-
-.pika-prev.is-disabled,
-.pika-next.is-disabled {
-    cursor: default;
-    opacity: .2;
-}
-
-.pika-select {
-    display: inline-block;
-    *display: inline;
-}
-
-.pika-table {
-    width: 100%;
-    border-collapse: collapse;
-    border-spacing: 0;
-    border: 0;
-}
-
-.pika-table th,
-.pika-table td {
-    width: 14.285714285714286%;
-    padding: 0;
-}
-
-.pika-table th {
-    color: #999;
-    font-size: 12px;
-    line-height: 25px;
-    font-weight: bold;
-    text-align: center;
-}
-
-.pika-button {
-    cursor: pointer;
-    display: block;
-    outline: none;
-    border: 0;
-    margin: 0;
-    width: 100%;
-    padding: 5px;
-    color: #666;
-    font-size: 12px;
-    line-height: 15px;
-    text-align: right;
-    background: #f5f5f5;
-}
-
-.is-today .pika-button {
-    color: #33aaff;
-    font-weight: bold;
-}
-
-.is-selected .pika-button {
-    color: #fff;
-    font-weight: bold;
-    background: #33aaff;
-    box-shadow: inset 0 1px 3px #178fe5;
-    border-radius: 3px;
-}
-
-.is-disabled .pika-button {
-    pointer-events: none;
-    cursor: default;
-    color: #999;
-    opacity: .3;
-}
-
-.pika-button:hover {
-    color: #fff !important;
-    background: #ff8000 !important;
-    box-shadow: none !important;
-    border-radius: 3px !important;
-}

src/Bundle/ChillMainBundle/Resources/public/chill/index.js

@@ -21,13 +21,11 @@ require('select2-bootstrap-theme/dist/select2-bootstrap.css');
 require('./chillmain.scss');
 require('./css/chillmain.css');
 
-/// still used ?
-//require('./css/pickaday.css');
-//require('./js/date.js');
-
 import { chill } from './js/chill.js';
 global.chill = chill;
 
+require('./js/date.js');
+
 /// Load fonts
 require('./fonts/OpenSans/OpenSans.scss')
 

src/Bundle/ChillMainBundle/Resources/public/page/login/login.scss

@@ -1,4 +1,4 @@
-@import './../../fonts/OpenSans/OpenSans';
+@import 'ChillMainAssets/chill/fonts/OpenSans/OpenSans';
 
 html, body {
     height: 100%;

src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss

@@ -1,4 +1,4 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 
 /*
 *  PERSON CONTEXT
@@ -104,7 +104,7 @@ div#header-accompanying_course-details {
  *  HOUSEHOLD CONTEXT
  *  Header custom for Household
  */
- 
+
 div#header-household-name {
    background: none repeat scroll 0 0 #929d69; //#b97a7a;
    color: #FFF;
@@ -138,11 +138,11 @@ div.address-timeline.grid {
    display: grid;
    grid-template-rows: auto auto auto;
    grid-template-columns: auto 120px auto;
-   
+
    @media only screen and (max-width: 750px) {
       grid-template-columns: auto 1em auto;
    }
-   
+
    div.top {
       grid-column: 2;
       text-align: center;
@@ -153,7 +153,7 @@ div.address-timeline.grid {
       grid-column: 1;
       text-align: right;
    }
-   div.col-b, 
+   div.col-b,
    div.date {
       grid-column: 2;
       position: relative;
@@ -184,23 +184,23 @@ div.address-timeline.grid {
       border: 1px dashed #00000045;
       &.row1 { // current address
          border: 1px solid #000;
-      }   
+      }
       div.address {
          font-variant: small-caps;
       }
-   }   
+   }
    div.date {
       text-align: center;
       background-color: lightgrey;
       padding: 0.5em;
       border-radius: 0.3em;
    }
-   
+
    div.span2 { grid-row: span 3; }
    div.span3 { grid-row: span 5; }
    div.span4 { grid-row: span 7; }
    div.span5 { grid-row: span 9; }
-   
+
    ul.record_actions {
       margin: 0;
    }

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

@@ -1,4 +1,4 @@
-import { ShowHide } from 'ShowHide/show_hide.js';
+import { ShowHide } from 'ShowHide';
 
   let
     k = document.getElementById('waitingForBirthContainer'),

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

@@ -1,4 +1,4 @@
-import { ShowHide } from 'ShowHide/show_hide.js';
+import { ShowHide } from 'ShowHide';
 
 const maritalStatus = document.getElementById("maritalStatus");
 const maritalStatusDate = document.getElementById("maritalStatusDate");

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

@@ -7,13 +7,13 @@
 
     <div id="picking">
       <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
-        
+
       <div v-for="si in socialIssues">
         <input type="radio" v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"> {{ si.title.fr }}
       </div>
 
       <div v-if="hasSocialIssuePicked">
-        <h2>{{ $t('pick_an_action') }}</h2> 
+        <h2>{{ $t('pick_an_action') }}</h2>
         <vue-multiselect
           v-model="socialActionPicked"
           label="text"
@@ -22,7 +22,7 @@
           :close-on-select="true"
           :show-labels="true"
           track-by="id"
-        ></vue-multiselect> 
+        ></vue-multiselect>
       </div>
 
       <div v-if="isLoadingSocialActions">
@@ -86,7 +86,7 @@
 
 #awc_create_form {
   display: grid;
-  grid-template-areas: 
+  grid-template-areas:
     "picking picking"
     "start_date end_date"
     "confirm confirm"
@@ -123,7 +123,7 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
 import VueMultiselect from 'vue-multiselect';
-import { dateToISO, ISOToDate } from 'ChillMainAssets/js/date.js';
+import { dateToISO, ISOToDate } from 'ChillMainAssets/chill/js/date.js';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 
 const i18n = {
@@ -175,7 +175,7 @@ export default {
         return s;
       },
       set(v) {
-        console.log('persons picked', v); 
+        console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js

@@ -1,6 +1,6 @@
 
 import { createStore } from 'vuex';
-import { datetimeToISO } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 
@@ -143,7 +143,7 @@ const store = createStore({
     },
     submit({ commit, getters, state }) {
       console.log('submit');
-      let 
+      let
         payload = getters.buildPayloadCreate,
         errors = [];
 
@@ -169,7 +169,7 @@ const store = createStore({
         });
     },
   },
- 
+
 });
 
 export { store };

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

@@ -14,7 +14,7 @@
     </div>
     <div id="comment">
       <label>Commentaire</label>
-      <ckeditor 
+      <ckeditor
         :editor="editor"
         v-model="note"
         tag-name="textarea"
@@ -32,9 +32,9 @@
           {{ $t('results_without_objective') }}
         </div>
         <div>
-          <add-result :availableResults="resultsForAction" destination="action"></add-result>  
+          <add-result :availableResults="resultsForAction" destination="action"></add-result>
         </div>
-      </div> 
+      </div>
 
       <!-- results which **are** attached to an objective -->
       <div v-for="g in goalsPicked">
@@ -42,10 +42,10 @@
           <div @click="removeGoal(g)" class="objective-title">
             <i class="fa fa-times"></i>
             {{ g.goal.title.fr }}
-          </div> 
+          </div>
         </div>
         <div>
-          <add-result destination="goal" :goal="g.goal"></add-result>  
+          <add-result destination="goal" :goal="g.goal"></add-result>
         </div>
       </div>
 
@@ -59,7 +59,7 @@
             <ul class="list-objectives">
               <li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge bg-primary">
                 <i class="fa fa-plus"></i>
-                {{ g.title.fr }} 
+                {{ g.title.fr }}
               </li>
             </ul>
           </div>
@@ -163,7 +163,7 @@
       <p>Veuillez corriger les erreurs suivantes:</p>
       <ul>
         <li v-for="e in errors">{{ e }}</li>
-      </ul> 
+      </ul>
     </div>
   </div>
 
@@ -192,7 +192,7 @@
 
 #workEditor {
   display: grid;
-  grid-template-areas: 
+  grid-template-areas:
     "title title"
     "startDate endDate"
     "comment comment"
@@ -205,7 +205,7 @@
 
   grid-template-columns: 50%;
   column-gap: 1rem;
-  
+
   #title {
     grid-area: title;
 
@@ -330,9 +330,9 @@
 <script>
 
 import { mapState, mapGetters, } from 'vuex';
-import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import AddResult from './components/AddResult.vue';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
@@ -440,7 +440,7 @@ export default {
         return s;
       },
       set(v) {
-        console.log('persons picked', v); 
+        console.log('persons picked', v);
         this.$store.commit('setPersonsPickedIds', v);
       }
     },

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
 import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
 
@@ -42,7 +42,7 @@ const store = createStore({
     },
     resultsPickedForGoal: (state) => (goal) => {
       let found = state.goalsPicked.find(g => g.goal.id === goal.id);
-      
+
       return found === undefined ? [] : found.results;
     },
     hasHandlingThirdParty(state) {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue

@@ -48,10 +48,10 @@
             <p class="move_hint">{{ $t('household_members_editor.concerned.move_to') }}:</p>
 
             <template
-              v-for="position in positions" 
+              v-for="position in positions"
             >
 
-              <button 
+              <button
                 class="btn btn-outline-primary"
                 @click="moveToPosition(conc.person.id, position.id)"
               >
@@ -82,7 +82,7 @@
 
 
   <div v-if="needsPositionning" class="positions">
-    <div 
+    <div
       v-for="position in positions"
     >
       <h3>{{ position.label.fr }}</h3>
@@ -128,7 +128,7 @@ import { mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import MemberDetails from './MemberDetails.vue';
-import { ISOToDatetime } from 'ChillMainAssets/js/date.js';
+import { ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
 
 export default {
   name: 'Concerned',

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue

@@ -75,7 +75,7 @@ div.participation-details {
 import { mapGetters } from 'vuex';
 import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 
 export default {
   name: 'MemberDetails',
@@ -112,7 +112,7 @@ export default {
    },
    methods: {
     toggleHolder() {
-      this.$store.dispatch('toggleHolder', this.conc); 
+      this.$store.dispatch('toggleHolder', this.conc);
     },
     removePosition() {
       this.$store.dispatch('removePosition', this.conc);

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/store/index.js

@@ -1,6 +1,6 @@
 import { createStore } from 'vuex';
 import { householdMove, fetchHouseholdSuggestionByAccompanyingPeriod } from './../api.js';
-import { datetimeToISO } from 'ChillMainAssets/js/date.js';
+import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 
 const debug = process.env.NODE_ENV !== 'production';
 
@@ -72,7 +72,7 @@ const store = createStore({
       return getters.needsPositionning === false
         || (getters.persons.length > 0 && getters.concUnpositionned.length === 0);
     },
-    persons(state) { 
+    persons(state) {
       return state.concerned.map(conc => conc.person);
     },
     concUnpositionned(state) {
@@ -85,7 +85,7 @@ const store = createStore({
     },
     personByPosition: (state) => (position_id) => {
       return state.concerned
-        .filter(conc => 
+        .filter(conc =>
           conc.position !== null ? conc.position.id === position_id : false
         )
         .map(conc => conc.person)
@@ -93,7 +93,7 @@ const store = createStore({
     },
     concByPosition: (state) => (position_id) => {
       return state.concerned
-        .filter(conc => 
+        .filter(conc =>
           conc.position !== null ? conc.position.id === position_id : false
         )
       ;
@@ -117,7 +117,7 @@ const store = createStore({
       ;
 
       if (state.forceLeaveWithoutHousehold === false) {
-        payload.destination = { 
+        payload.destination = {
             id: state.household.id,
             type: state.household.type
           };
@@ -154,9 +154,9 @@ const store = createStore({
     addConcerned(state, person) {
       let persons = state.concerned.map(conc => conc.person.id);
       if (!persons.includes(person.id)) {
-        state.concerned.push({ 
+        state.concerned.push({
           person,
-          position: null, 
+          position: null,
           allowRemove: true,
           holder: false,
           comment: "",
@@ -182,7 +182,7 @@ const store = createStore({
       conc.position = null;
     },
     removeConcerned(state, conc) {
-      state.concerned = state.concerned.filter(c => 
+      state.concerned = state.concerned.filter(c =>
         c.person.id !== conc.person.id
       )
     },
@@ -309,7 +309,7 @@ const store = createStore({
               error = household;
               for (let i in error.violations) {
                 let e = error.violations[i];
-                errors.push(e.title); 
+                errors.push(e.title);
               }
 
               commit('setErrors', errors);

src/Bundle/ChillTaskBundle/Resources/public/sass/_task.scss

@@ -1,4 +1,4 @@
-@import '~ChillMainAssets/modules/bootstrap/bootstrap';
+@import '~ChillMainAssets/module/bootstrap/bootstrap';
 
 @import "_task-statuses.scss";
 @import "_task-list.scss";