d16de04d27
Merge branch 'master' into ticket-app-master
...
# Conflicts:
# docs/source/development/create-a-new-bundle.md
# src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
# src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
# src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
# src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
# src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
# src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
# src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
# src/Bundle/ChillMainBundle/translations/messages.fr.yml
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
2025-12-05 17:04:49 +01:00
ec93034802
Improve accessibility of event form
2025-12-05 11:58:24 +00:00
799d04142e
Ajouter une variable de localisation aux utilisateurs
2025-11-14 13:52:33 +00:00
82f347b93a
Improve accessibility on the login page
2025-11-14 10:16:08 +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
b7a92bf656
Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire""
2025-11-04 15:25:10 +00:00
d82c9cc9a7
Resolve "Ajouter un bandeau qui permet de distinguer les différents environnements"
2025-10-08 11:05:22 +00:00
bc2fbee5c6
Fix: notification edit template
...
form field addressesEmail removed
2025-10-06 12:14:00 +02:00
be39fa16e7
Signature fixes
2025-10-03 09:49:33 +00:00
3928b2cc7a
Refactor MenuComposer to improve type safety and simplify local menu builder integration
2025-09-29 15:03:05 +00:00
Boris Waaub
e1ef65d4ca
Correction de bugs, ajout champs urgents dans la modal d'initialisation du ticket et ajout d'un configuration pour l'affichage des tabs dans la homepage
2025-09-22 09:23:30 +00:00
7b60b7a8af
Fix document generation and workflow generation do not work on accompanying period work documents
2025-09-12 10:42:34 +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
1195b54a68
Resolve "user notification preferences are not displayed correctly"
2025-09-10 16:28:45 +00:00
2a280b814f
Refactor view templates: relocate 'merge' action block and standardize 'duplicate link' block handling
2025-09-09 17:36:46 +02:00
7db8a371fc
Resolve "Absence user: add end date"
2025-09-08 13:47:14 +00: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
d204df0316
Merge branch '422-password-recover-layout' into 'master'
...
Resolve "Fix layout of password recover pages"
Closes #422
See merge request Chill-Projet/chill-bundles!869
2025-09-02 08:29:27 +00:00
juminet
82c02f442b
Resolve "Fix layout of password recover pages"
2025-09-02 08:29:26 +00:00
1fa464b87a
Fix typo in 'uncheckAll' script for centers selection
2025-08-28 13:32:43 +02:00
eed9913a49
Allow select2 option for entityChoice filterOrderHelper
2025-08-26 15:18:08 +02:00
f5668592ca
Resolve "Fusion des tiers"
2025-08-18 15:34:48 +00:00
fe6e6e54c1
Show filters on list pages unfolded by default
2025-07-22 15:50:49 +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
Boris Waaub
61d1232e31
Implémenter une app vue avec la liste des tickets attribués
2025-07-18 16:06:16 +00:00
63d0a52ea1
Ajout de commentaires supplémentaires aux motifs
2025-07-11 14:06:40 +00: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
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
840ef6eed8
Resolve "Fusion actions d'accompagnement"
2025-07-02 10:53:16 +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
b0959f8cc5
Resolve "Code mort: module wopi-link semble inutilisé"
2025-05-16 08:33:56 +00:00
203a098054
Refactor document row layouts to use CSS grid
...
Replaced the old 'item-col' structure with a 'item-two-col-grid' layout across multiple templates, improving consistency and responsiveness. Introduced CSS grid styles ensuring proper alignment and wrapping of titles and aside elements in different viewport sizes. This enhances the overall readability and maintainability of the views.
2025-04-10 15:41:06 +02:00
d58acff541
Add css layout for badges for accompanying period work, activity and calendar
2025-04-10 15:41:06 +02:00
7285e5c2b0
Merge branch '331-manage-attachments-to-workflow' into 'master'
...
Add attachments to workflow
Closes #331
See merge request Chill-Projet/chill-bundles!764
2025-02-03 21:15:00 +00:00
37227a3aeb
Add attachments to workflow
2025-02-03 21:15:00 +00:00
9a5fd67842
Resolve "Afficher les noms des usagers et l'entité concerné par l'entité notifiée dans la liste des notifications"
2025-01-23 11:34:16 +00:00
9ef884349a
Add workflow title to notification content
...
Updated the French template for workflow transition notifications to include the workflow title. This ensures users have more context in the notification email.
2024-11-21 21:26:08 +01:00
5acf9432d6
Add workflow title to notification content
...
Updated the French template for workflow transition notifications to include the workflow title. This ensures users have more context in the notification email.
2024-11-21 21:21:09 +01:00
6ca4b91e1e
Refactor breadcrumb macro parameters in Workflow templates
...
Updated the breadcrumb macro's parameters to accept `entity_workflow` directly instead of a context object. This change affects the index, list, and macro_breadcrumb templates, ensuring consistent parameter usage and improving readability.
This avoid exploiting a bug which was solved in twig 3.15.0
2024-11-19 12:58:20 +01:00
9a44cf060f
Add workflow title to notification emails for workflow transition, to user groups
...
Incorporated the workflow title into notification emails to provide more context to users. Updated the NotificationToUserGroupsOnTransition class and its tests to include the title from EntityWorkflowManager. Adjusted the French email templates to display the workflow title correctly.
2024-11-18 15:05:03 +01:00
21ec3121ec
Merge branch 'signature-app-master' into 'master'
...
Signature app master
Closes #307
See merge request Chill-Projet/chill-bundles!743
2024-11-12 20:30:00 +00:00
bfa58177e0
fix url for granting access to workflow by key
2024-11-12 17:48:44 +01:00
ddf73e1a48
Updated URL in French workflow notification template
...
The absolute url in the French version of the workflow notification content to user group has been updated. It now points to 'chill_main_workflow_grant_access_by_key' instead of 'chill_main_workflow_show'. This update improves the user experience by taking the user directly to the desired page.
2024-11-12 14:52:39 +01:00
c3cc6c8353
Do not fail displaying notification when workflow has been deleted
2024-11-12 13:57:48 +01:00
43b70fd773
Rename translation key for workflow signature titles
...
Updated the translation key from 'workflow.signature_required_title' to 'workflow.signatures_title' in the workflow history view. This change ensures consistency and proper usage of the translation key across different parts of the application.
2024-11-04 15:26:07 +01:00
f750cfecac
Show userGroup in workflow breadcrumb
...
related:
- https://champs-libres.openproject.com/wp/774
- OP#774
- Vendee/accent-suivi-developpement#1274
2024-10-24 16:15:49 +02:00
d45de5405b
Use the twig function chill_entity_render_string to render the person's name
2024-10-21 17:41:59 +02:00
7b322d7bab
Rename signature templates by removing underscores
...
Standardized template names in WorkflowController and WorkflowAddSignatureController for better consistency. Updated references and renamed template files accordingly.
2024-10-21 17:41:59 +02:00
