51607572de
Create admin for motive
2025-11-07 10:11:46 +00:00
d691098a21
Merge branch 'master' into ticket-app-master
...
# Conflicts:
# .junie/guidelines.md
# src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
# src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
# src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
# src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
# src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
# src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
# src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
# src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
# src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
# src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
# src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
# src/Bundle/ChillPersonBundle/Resources/public/types.ts
# 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/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
# src/Bundle/ChillPersonBundle/translations/messages.fr.yml
2025-11-06 10:16:15 +01:00
671ed21d59
Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
2025-11-05 09:29:50 +00:00
4b9db6ceb6
Merge branch '451-activity-social-actions-list' into 'master'
...
Fix: display also social actions linked to parents of the selected social issue
Closes #451
See merge request Chill-Projet/chill-bundles!907
2025-11-05 08:51:47 +00:00
c79c39b562
Fix: display also social actions linked to parents of the selected social issue
2025-11-05 08:51:47 +00:00
2df01833ad
Merge branch '453-bug-csv-social-actions' into 'master'
...
Fix: export actions and their results in csv even when action does not have...
Closes #453
See merge request Chill-Projet/chill-bundles!908
2025-11-05 08:47:50 +00:00
ffb8183d4d
Fix: export actions and their results in csv even when action does not have...
2025-11-05 08:47:49 +00:00
fa8e92ebf5
Merge branch '425-rename-cercle-and-centre' into 'master'
...
Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire""
Closes #425
See merge request Chill-Projet/chill-bundles!894
2025-11-04 15:25:11 +00:00
b7a92bf656
Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire""
2025-11-04 15:25:10 +00:00
bf38ec22c9
Add missing import in FormEvaluation.vue and temporarily set wopi-bundle requirement to specific commit (until bundles is fully upgraded to sf7)
2025-10-30 11:40:20 +01:00
f42bb498e4
Fix deprecation notice League/csv for createFromStream and createFromPath replaced by new from() method
2025-10-27 13:21:04 +01:00
Boris Waaub
b43aeebc3c
FIX des bugs du merge request 884
2025-09-30 13:49:04 +00:00
Boris Waaub
0ba2cbc1e8
Misc: homepage widget with tickets, and improvements in ticket list
2025-09-16 11:16:57 +00:00
8e2e676e3d
Add ticket filtering "byTicketId"
2025-09-15 11:11:40 +02:00
7b60b7a8af
Fix document generation and workflow generation do not work on accompanying period work documents
2025-09-12 10:42:34 +00:00
db98519e65
Fix translations and close button modal for duplicate evaluation document
2025-09-11 14:21:05 +00:00
5b90d23367
Resolve "Dupliquer une document d'une évaluation vers une autre" + "Déplacer un document vers une autre évaluation"
2025-09-11 11:01:16 +00:00
0d0649dd31
Change route URL to avoid clash with person duplicate controller method
2025-09-08 14:51:54 +02:00
2665e43a61
Merge branch 'master' into ticket-app-master
...
# Conflicts:
# .eslint-baseline.json
# src/Bundle/ChillMainBundle/Entity/User.php
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
# src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
# src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
2025-09-05 18:32:01 +02:00
Boris Waaub
e7c04e34a9
Améliorations du dernier MR multiple-tasks-from-board-78
2025-09-01 13:35:15 +00:00
ea06a96f91
Add external identifiers for person, editable in edit form, with minimal features associated
2025-09-01 08:05:11 +00:00
adc9c47d0a
Add event theme color for badge
2025-08-26 15:18:08 +02:00
904f4e5ed9
Add a filter to list for acpw where current user intervenes
2025-08-18 16:26:20 +00:00
2754251fdc
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-08-06 14:20:29 +02:00
2f6cef4238
- **fix:** move closing motive up to be coherent with display elsewhere
2025-08-06 14:20:09 +02:00
2309636eae
- **fix:** adjust display logic for accompanying period dates, include closing date if period is closed.
2025-08-06 13:47:29 +02:00
ab8da4ab7a
Resolve "Notification: envoi à des groupes utilisateurs"
2025-07-20 20:18:49 +00:00
e3a6b60fa2
Revert "Merge branch 'ticket/supplementary-comments-on-motive' into 'master'"
...
This reverts merge request !855
2025-07-20 18:50:33 +00:00
63d0a52ea1
Ajout de commentaires supplémentaires aux motifs
2025-07-11 14:06:40 +00:00
837089ff5d
Fix testMerge method in AccompanyingPeriodWorkMergeServiceTest.php
2025-07-10 11:33:23 +02:00
dcdfba5ccd
eslint fixes
2025-07-09 17:46:36 +02:00
0204bdd38d
Restore features after merging
2025-07-09 17:46:16 +02:00
f383fab578
Fix styling
2025-07-09 15:30:39 +02:00
703f5dc32d
Transfer evaluations (and related documents) during merge
2025-07-09 15:21:42 +02:00
b870e71f77
Add translation for validation message in social action merger
2025-07-09 15:21:24 +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
