diff --git a/.changes/unreleased/Feature-20230926-164441.yaml b/.changes/unreleased/Feature-20230926-164441.yaml deleted file mode 100644 index 10ad686ec..000000000 --- a/.changes/unreleased/Feature-20230926-164441.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Feature -body: "The regulation list load accompanying periods by exact postal code (address - associated with postal code), and not by the content of the postal code (postal - code with same code's string)" -time: 2023-09-26T16:44:41.414746336+02:00 -custom: - Issue: "155" diff --git a/.changes/unreleased/Fixed-20230913-115954.yaml b/.changes/unreleased/Fixed-20230913-115954.yaml deleted file mode 100644 index df1eef370..000000000 --- a/.changes/unreleased/Fixed-20230913-115954.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Fixed -body: Fix the label of filter ActivityTypeFilter to a more obvious one -time: 2023-09-13T11:59:54.948009297+02:00 -custom: - Issue: "142" diff --git a/.changes/unreleased/Fixed-20230926-175815.yaml b/.changes/unreleased/Fixed-20230926-175815.yaml deleted file mode 100644 index 8eb833de7..000000000 --- a/.changes/unreleased/Fixed-20230926-175815.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Fixed -body: '[export] Fix association of filter "filter location by type" which did not - appears on "list of activities"' -time: 2023-09-26T17:58:15.871908118+02:00 -custom: - Issue: "140" diff --git a/.changes/unreleased/Fixed-20230928-120910.yaml b/.changes/unreleased/Fixed-20230928-120910.yaml new file mode 100644 index 000000000..72c9dd9b4 --- /dev/null +++ b/.changes/unreleased/Fixed-20230928-120910.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: 'View a third party: avoid errors when a contact has a civility' +time: 2023-09-28T12:09:10.199359071+02:00 +custom: + Issue: "164" diff --git a/.changes/v2.7.0.md b/.changes/v2.7.0.md new file mode 100644 index 000000000..df389b9d3 --- /dev/null +++ b/.changes/v2.7.0.md @@ -0,0 +1,6 @@ +## v2.7.0 - 2023-09-27 +### Feature +* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) +### Fixed +* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one +* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" diff --git a/CHANGELOG.md b/CHANGELOG.md index 50b9fe257..d2a1e74b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v2.7.0 - 2023-09-27 +### Feature +* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) +### Fixed +* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one +* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" + ## v2.6.3 - 2023-09-19 ### Fixed * Remove id property from document diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php index d3db49e48..04ce8928e 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php @@ -119,7 +119,7 @@ final readonly class AccompanyingPeriodWorkRepository implements ObjectRepositor . ")"; } - $sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate)"; + $sql .= " AND daterange(:after::date, :before::date) && daterange(w.startDate, w.endDate, '[]')"; // if the start and end date were inversed, we inverse the order to avoid an error if (null !== ($filters['after'] ?? null) && null !== ($filters['before']) && $filters['after'] > $filters['before']) { diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig index f330246fc..4e7fd159d 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig @@ -25,7 +25,7 @@