dcdfba5ccd
eslint fixes
2025-07-09 17:46:36 +02:00
0204bdd38d
Restore features after merging
2025-07-09 17:46:16 +02:00
392fd01b56
Merge branch 'master' into ticket-app-master
...
# Conflicts:
# src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
# src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
# src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
# src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
# src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
# src/Bundle/ChillPersonBundle/Resources/public/types.ts
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
2025-07-09 13:44:23 +02:00
8bc16dadb0
Partage d'export enregistré et génération asynchrone des exports
2025-07-08 13:53:25 +00:00
aed114c75c
Fix Eslint issues
2025-07-08 13:38:51 +00:00
borisw
6eeb717b1a
Refactor third-party type imports and update related components
...
- Changed import path for ThirdParty type in TypeThirdParty.vue and updated its usage.
- Refactored PersonText.vue to import Person and AltName types from ChillPersonAssets.
- Updated types.ts in ChillThirdPartyBundle to include a new 'type' field in the Thirdparty interface.
- Modified TicketBundle types to accommodate Thirdparty type in CallerState.
- Adjusted AddresseeSelectorComponent.vue to use 'thirdparty' instead of 'third_party'.
- Refined BannerComponent.vue to improve readability and maintainability.
- Updated CallerSelectorComponent.vue to reflect changes in entity types.
- Enhanced TicketHistoryListComponent.vue to handle both Person and Thirdparty types.
- Refactored TicketHistoryPersonComponent.vue to accept both Person and Thirdparty entities.
2025-07-07 16:35:31 +02:00
Boris Waaub
3df4043eb9
Afficher les patients suggérés et ajouter un sélecteur urgent/non urgent
2025-07-04 07:45:33 +00:00
06e8264dde
Merge branch 'refs/heads/master' into ticket-app-master
...
# Conflicts:
# src/Bundle/ChillPersonBundle/Resources/public/types.ts
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
2025-07-02 17:28:59 +02:00
70e75adb7d
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-07-02 13:57:20 +02:00
6f7015b152
Fix translations of form fields in admin for social actions
2025-07-02 13:56:41 +02:00
65dde1e6a0
Merge branch '390-fix-search-results' into 'master'
...
Fix participant condition in list_with_period.html.twig
Closes #390
See merge request Chill-Projet/chill-bundles!832
2025-07-02 10:59:17 +00:00
840ef6eed8
Resolve "Fusion actions d'accompagnement"
2025-07-02 10:53:16 +00:00
606435a6b3
Pipeline corrections
2025-07-01 14:47:36 +02:00
088e5692e2
Merge branch 'improve_person_resource_form' into 'master'
...
Improve admin templates for event admin entities + activity reason (category)...
See merge request Chill-Projet/chill-bundles!838
2025-06-30 08:44:24 +00:00
298044bc82
Improve admin templates for event admin entities + activity reason (category)...
2025-06-30 08:44:24 +00:00
95a7efa138
Merge branch 'master' into ticket-app-master
2025-06-20 17:35:06 +02:00
a38116cca4
fix cs
2025-06-20 17:31:13 +02:00
45e193ff6d
Merge remote-tracking branch 'origin/master' into ticket-app-master
2025-06-20 12:53:20 +02:00
dfc146ff3f
Merge remote-tracking branch 'origin/ticket-app-master' into ticket-app-master
2025-06-20 12:45:33 +02:00
Boris Waaub
a8dd1b3548
1277 refacto use symfony translation
2025-06-16 10:59:42 +00:00
fca10ada71
Fix translation keys and participant pluralization in list_with_period.html.twig
...
Updated French translations for "Participants" and improved pluralization handling in accompanying_period keys. Modified list_with_period.html.twig to dynamically translate "Participants" based on the count of current participations.
2025-06-04 16:55:56 +02:00
a35d456308
Fix participant condition in list_with_period.html.twig
...
Updated the condition to properly handle cases where the first participation's person is not the current person.
2025-06-04 16:54:44 +02:00
49cbb6a002
Clean skeleton (and add Junie guidelines)
2025-06-04 08:13:35 +00:00
fc61dfdf3a
Fix CS and add more comments within ticket bundle
2025-06-02 15:51:11 +02:00
ec685dcd47
Merge branch 'prepare-junie' into ticket-app-master
2025-06-02 15:27:38 +02:00
e0abf34784
Remove unnecessary files
2025-06-02 11:24:59 +02:00
69daccb860
Merge remote-tracking branch 'origin/master' into ticket-app-master
2025-05-30 12:47:37 +02:00
6f1fe1c118
Merge branch '379-translation-localization-vue' into 'master'
...
Resolve "Finish handling of internationalization in vuejs: handling translation of "translatable string""
Closes #379
See merge request Chill-Projet/chill-bundles!822
2025-05-28 14:40:27 +00:00
649ad26721
Resolve "Finish handling of internationalization in vuejs: handling translation of "translatable string""
2025-05-28 14:40:26 +00:00
a8c41141e8
Enhance note rendering with Markdown to HTML conversion in AccompanyingCourseWork/show.html.twig
...
Updated the note display logic to use the `chill_markdown_to_html` filter for better formatting and presentation. This change ensures that Markdown syntax in notes is properly rendered as HTML.
2025-05-28 16:36:03 +02:00
4b20b1bc01
Merge remote-tracking branch 'refs/remotes/origin/master' into ticket-app-master
2025-05-27 11:33:22 +02:00
992e6d29d0
Merge branch '321-text-editor-fallback' into 'master'
...
Text editor: Add a toggle button to switch to simple text editor and add emoji and fullscreen to ckeditor toolbar
Closes #321
See merge request Chill-Projet/chill-bundles!827
2025-05-27 09:16:31 +00:00
5f2711023e
Merge branch 'refs/heads/master' into ticket-app-master
...
# Conflicts:
# composer.json
# config/bundles.php
# config/packages/doctrine_migrations_chill.yaml
# package.json
# src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php
# src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
# src/Bundle/ChillMainBundle/Entity/UserGroup.php
# src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
# src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
# src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
# src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
# src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js
# src/Bundle/ChillMainBundle/Resources/public/types.ts
# src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
# src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRender.php
# src/Bundle/ChillMainBundle/chill.api.specs.yaml
# src/Bundle/ChillMainBundle/chill.webpack.config.js
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
# tests/app/config/bootstrap.php
2025-05-27 09:37:04 +02:00
bdf2ed4bbd
Fix typo
2025-05-27 09:35:49 +02:00
bb41af4ed2
replace ck-editor by new CommentEditor on every vuejs components
2025-05-23 13:51:44 +02:00
44a8ddeba4
Resolve "Reorganise page 'Mes parcours'"
2025-05-21 16:13:43 +00:00
8b2af35e97
Fix typo
2025-05-21 17:57:35 +02:00
dc44c46667
Fix SocialActionCSVExporterTest.php
2025-05-21 09:29:25 +02:00
ba571c1a69
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-05-20 10:04:53 +02:00
6a364705f2
Git add desactivation date for social issue csv export
2025-05-20 09:57:07 +02:00
b6d454691a
Git add desactivation date for social action csv export
2025-05-20 09:38:39 +02:00
juminet
2faf194b15
#365 correct works counter in acc course summary
2025-05-16 14:40:19 +00:00
4c5dee5f0a
Fix pipeline
2025-05-14 17:31:48 +02:00
6d13d184d5
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-05-14 13:57:22 +02:00
af36eccfaf
Allow more characters for maritalstatus id
2025-05-14 13:56:36 +02:00
juminet
5ea55ebfe5
381 display previous person participation in acc course work
2025-05-13 08:45:38 +00:00
juminet
a9c3aab528
377 - add the document filename to document title when uploading a new document
2025-05-13 08:30:30 +00:00
620515ad15
Remove "not null" validation on HouseholdComposition properties
...
This change removes the "not null" constraint on specific properties in the HouseholdComposition entity to allow null values. The adjustment addresses Issue #380 and ensures better flexibility without impacting the schema.
2025-04-17 10:56:45 +02:00
3aa4fac80d
Merge branch '364-tel2-third-party' into 'master'
...
Adding a second phone number to thirdparty entity
Closes #364
See merge request Chill-Projet/chill-bundles!810
2025-04-15 12:59:58 +00:00
juminet
a7517eb647
Adding a second phone number to thirdparty entity
2025-04-15 12:59:57 +00:00
