Compare commits

..

12 Commits

16 changed files with 47 additions and 34 deletions

4
.changes/v3.2.1.md Normal file
View File

@@ -0,0 +1,4 @@
## v3.2.1 - 2024-10-31
### Fixed
* Add the possibility of unknown to the gender entity
* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.

3
.changes/v3.2.2.md Normal file
View File

@@ -0,0 +1,3 @@
## v3.2.2 - 2024-10-31
### Fixed
* Fix gender translation for unknown

4
.changes/v3.2.3.md Normal file
View File

@@ -0,0 +1,4 @@
## v3.2.3 - 2024-11-05
### Fixed
* ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
Fix color of Chill footer

3
.changes/v3.2.4.md Normal file
View File

@@ -0,0 +1,3 @@
## v3.2.4 - 2024-11-06
### Fixed
* Fix compilation of chill assets

View File

@@ -6,6 +6,24 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## v3.2.4 - 2024-11-06
### Fixed
* Fix compilation of chill assets
## v3.2.3 - 2024-11-05
### Fixed
* ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
Fix color of Chill footer
## v3.2.2 - 2024-10-31
### Fixed
* Fix gender translation for unknown
## v3.2.1 - 2024-10-31
### Fixed
* Add the possibility of unknown to the gender entity
* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
## v3.2.0 - 2024-10-30
### Feature
* Introduce a gender entity

View File

@@ -1,19 +0,0 @@
footer.footer {
padding: 0;
background-color: white;
border-top: 1px solid grey;
div.sponsors {
p {
padding-bottom: 10px;
color: #000;
font-size: 16px;
}
background-color: white;
padding: 2em 0;
img {
display: block;
margin: auto;
}
}
}

View File

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

View File

@@ -5,8 +5,7 @@ module.exports = function(encore, chillEntries)
personal_situation_edit_file = __dirname + '/Resources/public/module/personal_situation/index.js',
cv_edit_file = __dirname + '/Resources/public/module/cv_edit/index.js',
immersion_edit_file = __dirname + '/Resources/public/module/immersion_edit/index.js',
images = __dirname + '/Resources/public/images/index.js',
sass_styles = __dirname + '/Resources/public/sass/index.js'
images = __dirname + '/Resources/public/images/index.js'
;
encore.addEntry('dispositifs_edit', dispositif_edit_file);
@@ -15,6 +14,4 @@ module.exports = function(encore, chillEntries)
encore.addEntry('images', images);
encore.addEntry('cs_cv', cv_edit_file);
chillEntries.push(sass_styles);
};

View File

@@ -16,4 +16,5 @@ enum GenderEnum: string
case MALE = 'man';
case FEMALE = 'woman';
case NEUTRAL = 'neutral';
case UNKNOWN = 'unknown';
}

View File

@@ -18,4 +18,5 @@ enum GenderIconEnum: string
case NEUTRAL = 'bi bi-gender-neuter';
case AMBIGUOUS = 'bi bi-gender-ambiguous';
case TRANS = 'bi bi-gender-trans';
case UNKNOWN = 'bi bi-question';
}

View File

@@ -39,7 +39,8 @@ const messages = {
birthday: {
man: "Né le",
woman: "Née le",
neutral: "Né·e le"
neutral: "Né·e le",
unknown: "Né·e le",
},
deathdate: "Date de décès",
household_without_address: "Le ménage de l'usager est sans adresse",

View File

@@ -35,7 +35,7 @@ interface ChillEntityRenderInterface
*
* @phpstan-pure
*/
public function renderBox($entity, array $options): string;
public function renderBox(mixed $entity, array $options): string;
/**
* Return the entity as a string.
@@ -46,7 +46,7 @@ interface ChillEntityRenderInterface
*
* @phpstan-pure
*/
public function renderString($entity, array $options): string;
public function renderString(mixed $entity, array $options): string;
/**
* Return true if the class support this object for the given options.

View File

@@ -34,28 +34,28 @@ final class Version20240926093955 extends AbstractMigration
'{\"fr\": \"homme\", \"nl\": \"man\"}',
true,
'man',
'',
'bi bi-gender-male',
1.0
),
(nextval('chill_main_gender_id_seq'),
'{\"fr\": \"femme\", \"nl\": \"vrouw\"}',
true,
'woman',
'',
'bi bi-gender-female',
1.1
),
(nextval('chill_main_gender_id_seq'),
'{\"fr\": \"neutre\", \"nl\": \"neutraal\"}',
true,
'neutral',
'',
'bi bi-gender-neuter',
1.1
),
(nextval('chill_main_gender_id_seq'),
'{\"fr\": \"inconnu\", \"nl\": \"ongekend\"}',
true,
'unknown',
'',
'bi bi-question',
1.2
)
");

View File

@@ -714,5 +714,6 @@ news:
gender:
genderTranslation: traduction grammaticale
not defined: Non défini
pick gender: Choisir une genre

View File

@@ -201,7 +201,7 @@ class PersonMove
private function getDeleteEntities(): array
{
return [
AccompanyingPeriod\AccompanyingPeriodWork::class,
// AccompanyingPeriod\AccompanyingPeriodWork::class,
Relationship::class,
];
}
@@ -216,7 +216,7 @@ class PersonMove
}
/**
* get the full table name with schema if it does exists.
* get the full table name with schema if it exists.
*/
private function getTableName(ClassMetadata $metadata): string
{

View File

@@ -33,7 +33,7 @@
{% if w.referrers %}
<li>
<span class="item-key">{{ 'Referrers'|trans ~ ' : ' }}</span>
{% for rh in w.referrersHistory %}
{% for rh in w.referrersHistoryCurrent %}
<span class="badge-user">{{ rh.user|chill_entity_render_box({'at_date': rh.startDate}) }}</span>
{% endfor %}
{% if w.referrers|length == 0 %}