+
{{ activityType.name|localize_translatable_string }}
diff --git a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
index a2d4058da..e100000c4 100644
--- a/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/ScopeRepository.php
@@ -43,6 +43,11 @@ final class ScopeRepository implements ObjectRepository
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
+
+ public function createQueryBuilder($alias, $indexBy = null)
+ {
+ return $this->repository->createQueryBuilder($alias, $indexBy);
+ }
public function getClassName() {
return Scope::class;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
index 1d0ad253f..c001c31b9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/scss/chillmain.scss
@@ -45,33 +45,6 @@ table {
}
}
-/*
- * ACCOMPANYING_COURSE
- * Header custom for Accompanying Course
- */
-
-div#header-accompanying_course-name {
- background: none repeat scroll 0 0 #718596;
- color: #FFF;
- h1 {
- margin: 0.4em 0;
- }
- span {
- a {
- color: white;
- }
- a:hover {
- text-decoration: underline;
- }
- }
-}
-div#header-accompanying_course-details {
- background: none repeat scroll 0 0 #718596ab;
- color: #FFF;
- padding-top: 1em;
- padding-bottom: 1em;
-}
-
/*
* FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
*/
@@ -109,23 +82,13 @@ div.flex-bloc {
align-content: stretch;
div.item-bloc {
- flex-grow: 0; flex-shrink: 1; flex-basis: 50%;
+ flex-grow: 0; flex-shrink: 1; flex-basis: 33%;
margin: 0;
padding: 1em;
- border-top: 0;
- &:nth-child(1), &:nth-child(2) {
- border-top: 1px solid #000;
- }
- border-left: 0;
- &:nth-child(odd) {
- border-left: 1px solid #000;
- }
-
- //background-color: #e6e6e6;
display: flex;
flex-direction: column;
- & > div.item-row {
+ div.item-row {
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex;
flex-direction: column;
@@ -158,12 +121,6 @@ div.flex-bloc {
@media only screen and (max-width: 900px) {
flex-direction: column;
margin: auto 0;
- div.item-bloc {
- border-left: 1px solid #000;
- &:nth-child(2) {
- border-top: 0;
- }
- }
}
}
@@ -232,8 +189,6 @@ div.flex-table {
}
}
-
-
/*
* Address form
*/
@@ -277,5 +232,3 @@ div.address_form {
}
}
}
-
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index d89470bc4..3964a85fe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -58,9 +58,9 @@ const messages = {
},
create: {
button: "Créer \"{q}\"",
- title: "Créer à la volée…",
+ title: "Création d'un nouvel usager ou d'un tiers professionnel",
person: "un nouvel usager",
- thirdparty: "un nouveau tiers"
+ thirdparty: "un nouveau tiers professionnel"
},
},
}
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 78accf004..b9038efa9 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -56,7 +56,6 @@ module.exports = function(encore, entries)
// Chill2 new assets
encore.addEntry('forkawesome', __dirname + '/Resources/public/modules/forkawesome/index.js');
encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
- //encore.addEntry('vuejs', __dirname + '/Resources/public/modules/vue/index.js');
// CKEditor5
buildCKEditor(encore);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/index.js b/src/Bundle/ChillPersonBundle/Resources/public/index.js
index acdc04579..34d0be7d8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/index.js
@@ -1,3 +1,3 @@
-require('./sass/person.scss');
+require('./sass/chillperson.scss');
require('./sass/person_with_period.scss');
require('./sass/household_banner.scss');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
new file mode 100644
index 000000000..4876f248e
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/sass/chillperson.scss
@@ -0,0 +1,218 @@
+@import '~ChillMainSass/custom/config/colors';
+
+/*
+* PERSON CONTEXT
+*/
+
+div#header-person-name {
+ background: none repeat scroll 0 0 $chill-green-dark;
+ color: #FFF;
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
+
+div#header-person-details {
+ background: none repeat scroll 0 0 $chill-green;
+ color: #FFF;
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
+
+div#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;
+ }
+ div.cf_title_box:nth-child(2n+2) {
+ width: calc(50% - 40px);
+ }
+ }
+ }
+}
+
+/*
+ * ACCOMPANYING_COURSE CONTEXT
+ * Header custom for Accompanying Course
+ */
+
+div#header-accompanying_course-name {
+ background: none repeat scroll 0 0 #718596;
+ color: #FFF;
+ h1 {
+ margin: 0.4em 0;
+ }
+ span {
+ a {
+ color: white;
+ }
+ a:hover {
+ text-decoration: underline;
+ }
+ }
+}
+div#header-accompanying_course-details {
+ background: none repeat scroll 0 0 #718596ab;
+ color: #FFF;
+ padding-top: 1em;
+ padding-bottom: 1em;
+}
+
+/*
+ * HOUSEHOLD CONTEXT
+ * Header custom for Household
+ */
+
+div#header-household-name {
+ background: none repeat scroll 0 0 #929d69; //#b97a7a;
+ color: #FFF;
+ h1 {
+ margin: 0.4em 0;
+ }
+ span {
+ a {
+ color: white;
+ }
+ a:hover {
+ text-decoration: underline;
+ }
+ }
+}
+div#header-household-details {
+ background: none repeat scroll 0 0 #b0b984; //#d29791;
+ color: #FFF;
+ padding-top: 1em;
+ padding-bottom: 1em;
+ span.current-members-explain {
+ font-weight: bold;
+ }
+}
+
+div.household__address,
+div.person__address {
+ div.row {
+ height: 100px;
+ width: 100%;
+ position: relative;
+
+ & > div {
+ position: absolute;
+ display: table;
+ height: 100%;
+ border: 1px dotted #c3c3c3;
+ }
+
+ div.household__address--date,
+ div.person__address--date {
+ width: 30%;
+ background-color: #c3c3c3;
+ height: 100%;
+
+ div.cell {
+ box-sizing: border-box;
+ position: relative;
+ height: 100%;
+ width: 100%;
+ margin-left: 50%;
+
+ div.pill {
+ position: absolute;
+ box-sizing: border-box;
+ width: 120px;
+ height: 40px;
+ bottom: -20px;
+ background-color: white;
+ padding: 10px;
+ border-radius: 30px;
+ left: -60px;
+ text-align: center;
+ z-index: 10;
+ }
+ }
+ }
+
+ div.household__address--content,
+ div.person__address--content {
+ width: 70%;
+ left: 30%;
+ text-align: left;
+ background-color: #ececec;
+ border: 1px solid #888;
+
+ div.cell {
+ display: table-cell;
+ padding: 5px 30px;
+ vertical-align: middle;
+
+ & > div {
+ display: flex;
+ justify-content: space-between;
+ }
+
+ i.dot::after,
+ i.dot::before {
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ content: '';
+ border: 0;
+ background-color: white;
+ border-radius: 50%;
+ border: 5px solid #c3c3c3;
+ z-index: 10;
+ left: -15px;
+ bottom: -15px;
+ }
+ }
+ }
+ }
+}
+
+div.household__address-move {
+ div.household__address-move__create {
+ display: flex;
+ flex-direction: column;
+ }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss b/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss
deleted file mode 100644
index 7ea0d7dfb..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/sass/person.scss
+++ /dev/null
@@ -1,168 +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);
- }
-
- }
-
-
- }
-
-}
-
-
-/*
- * HOUSEHOLD
- */
-
-
-div.household__address, div.person__address {
- div.row {
- height: 100px;
- width: 100%;
- position: relative;
- & > div {
- position: absolute;
- display: table;
- height: 100%;
- border: 1px dotted #c3c3c3;
- }
- div.household__address--date, div.person__address--date {
- width: 30%;
- background-color: #c3c3c3;
- height: 100%;
- div.cell {
- box-sizing: border-box;
- position: relative;
- height: 100%;
- width: 100%;
- margin-left: 50%;
- div.pill {
- position: absolute;
- box-sizing: border-box;
- width: 120px;
- height: 40px;
- bottom: -20px;
- background-color: white;
- padding: 10px;
- border-radius: 30px;
- left: -60px;
- text-align: center;
- z-index: 10;
- }
- }
- }
- div.household__address--content, div.person__address--content {
- width: 70%;
- left: 30%;
- text-align: left;
- background-color: #ececec;
- border: 1px solid #888;
- div.cell {
- display: table-cell;
- padding: 5px 30px;
- vertical-align: middle;
- & > div {
- display: flex;
- justify-content: space-between;
- }
- i.dot::before, i.dot::after {
- position: absolute;
- width: 20px;
- height: 20px;
- content: '';
- border: 0;
- background-color: white;
- border-radius: 50%;
- border: 5px solid #c3c3c3;
- z-index: 10;
- left: -15px;
- bottom: -15px;
- }
- }
- }
- }
-}
-div.household__address-move {
- div.household__address-move__create {
- display: flex;
- flex-direction: column;
- }
-}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index f83004ce8..4a5711509 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -9,7 +9,7 @@ const personMessages = {
item: {
type_person: "Usager",
type_user: "TMS",
- type_thirdparty: "Tiers",
+ type_thirdparty: "Tiers professionnel",
type_household: "Ménage"
},
person: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
index d5131223c..b3774ce0f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/banner.html.twig
@@ -1,5 +1,5 @@