Compare commits

..

6 Commits

197 changed files with 990 additions and 1394 deletions

View File

@@ -0,0 +1,6 @@
kind: Feature
body: 'Add filtering to admin lists: social actions, social issues, goals, results, and evaluations'
time: 2025-12-10T03:20:45.135973502+01:00
custom:
Issue: "478"
SchemaChange: No schema change

View File

@@ -1,6 +0,0 @@
kind: Feature
body: Add filter and aggregator based on referrer's main center for exports of accompanying period
time: 2025-12-30T16:43:03.898677616+01:00
custom:
Issue: "486"
SchemaChange: No schema change

View File

@@ -0,0 +1,7 @@
kind: Fixed
body: |
Fix migration query after previous fix
time: 2025-12-11T21:49:08.899926492+01:00
custom:
Issue: "466"
SchemaChange: No schema change

View File

@@ -1,6 +0,0 @@
kind: Fixed
body: Fix the condition to display concerned persons in calendar list items.
time: 2025-12-18T10:24:05.885090777+01:00
custom:
Issue: "480"
SchemaChange: No schema change

View File

@@ -1,6 +0,0 @@
kind: Fixed
body: 'Fix ordering of social actions: actions with a closing date in the future should be considered as ''still open''.'
time: 2025-12-18T11:07:22.699897317+01:00
custom:
Issue: "481"
SchemaChange: No schema change

View File

@@ -1,6 +0,0 @@
kind: Fixed
body: Fix export group by center for persons without a center in CenterAggregator.php
time: 2025-12-30T12:57:28.773521385+01:00
custom:
Issue: "477"
SchemaChange: No schema change

View File

@@ -1,9 +0,0 @@
## v4.11.0 - 2025-12-17
### Feature
* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations
### Fixed
* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
* Fix translation key/value
Cannot start with % and should be wrapped in "".

13
.gitignore vendored
View File

@@ -50,15 +50,12 @@ phpstan.neon
###> symfony/phpunit-bridge ###
###< symfony/phpunit-bridge ###
###> symfony/webpack-encore-bundle ###
/node_modules/
/public/build/
npm-debug.log
yarn-error.log
###< symfony/webpack-encore-bundle ###
###> friendsofphp/php-cs-fixer ###
/.php-cs-fixer.php
/.php-cs-fixer.cache
###< friendsofphp/php-cs-fixer ###
###> pentatrion/vite-bundle ###
/node_modules/
/public/build/
###< pentatrion/vite-bundle ###

View File

@@ -6,16 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## v4.11.0 - 2025-12-17
### Feature
* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations
### Fixed
* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
* Fix translation key/value
Cannot start with % and should be wrapped in "".
## v4.10.1 - 2025-12-11
### Fixed
* Fix missing translation variable in NewLocation component

View File

@@ -37,6 +37,7 @@
"ocramius/package-versions": "^1.10 || ^2",
"odolbeau/phone-number-bundle": "^3.6",
"ovh/ovh": "^3.0",
"pentatrion/vite-bundle": "^8.2",
"phpoffice/phpspreadsheet": "^1.16",
"ramsey/uuid-doctrine": "^1.7",
"sensio/framework-extra-bundle": "^5.5",
@@ -84,7 +85,6 @@
"symfony/twig-bundle": "^5.4",
"symfony/ux-translator": "^2.22",
"symfony/validator": "^5.4",
"symfony/webpack-encore-bundle": "^1.11",
"symfony/workflow": "^5.4",
"symfony/yaml": "^5.4",
"thenetworg/oauth2-azure": "^2.0",

View File

@@ -17,7 +17,6 @@ return [
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
Chill\ActivityBundle\ChillActivityBundle::class => ['all' => true],
@@ -37,4 +36,5 @@ return [
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
Pentatrion\ViteBundle\PentatrionViteBundle::class => ['all' => true],
];

View File

@@ -1,6 +1,8 @@
framework:
assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
# Disable Encore-style manifest for default assets package. Vite (Pentatrion) uses public/build/.vite/manifest.json
# internally for vite_entry_* helpers; Symfony's asset() should not depend on a manifest.
json_manifest_path: null
when@test:
framework:

View File

@@ -1,41 +0,0 @@
webpack_encore:
# The path where Encore is building the assets - i.e. Encore.setOutputPath()
output_path: '%kernel.project_dir%/public/build'
# If multiple builds are defined (as shown below), you can disable the default build:
# output_path: false
# Set attributes that will be rendered on all script and link tags
script_attributes:
defer: true
# Uncomment (also under link_attributes) if using Turbo Drive
# https://turbo.hotwired.dev/handbook/drive#reloading-when-assets-change
# 'data-turbo-track': reload
# link_attributes:
# Uncomment if using Turbo Drive
# 'data-turbo-track': reload
# If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
# crossorigin: 'anonymous'
# Preload all rendered script and link tags automatically via the HTTP/2 Link header
# preload: true
# Throw an exception if the entrypoints.json file is missing or an entry is missing from the data
# strict_mode: false
# If you have multiple builds:
# builds:
# frontend: '%kernel.project_dir%/public/frontend/build'
# pass the build name as the 3rd argument to the Twig functions
# {{ encore_entry_script_tags('entry1', null, 'frontend') }}
#when@prod:
# webpack_encore:
# # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
# # Available in version 1.2
# cache: true
when@test:
webpack_encore:
strict_mode: false

View File

@@ -0,0 +1,9 @@
when@dev:
_pentatrion_vite:
prefix: /build
resource: "@PentatrionViteBundle/Resources/config/routing.yaml"
_profiler_vite:
path: /_profiler/vite
defaults:
_controller: Pentatrion\ViteBundle\Controller\ProfilerController::info

View File

@@ -1,6 +1,15 @@
{
"name": "chill",
"name": "chill-bundles",
"private": true,
"version": "2.0.0",
"description": "Chill web application frontend (Vite build at repo root)",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"eslint": "eslint . --ext .js,.ts,.vue"
},
"devDependencies": {
"@alexlafroscia/yaml-merge": "^4.0.0",
"@apidevtools/swagger-cli": "^4.0.4",
@@ -11,11 +20,11 @@
"@hotwired/stimulus": "^3.0.0",
"@luminateone/eslint-baseline": "^1.0.9",
"@symfony/stimulus-bridge": "^3.2.0",
"@symfony/webpack-encore": "^4.1.0",
"@tsconfig/node20": "^20.1.4",
"@types/dompurify": "^3.0.5",
"@types/eslint__js": "^8.42.3",
"@typescript-eslint/parser": "^8.12.2",
"@vitejs/plugin-vue": "^5.1.4",
"bindings": "^1.5.0",
"bootstrap": "^5.3.6",
"chokidar": "^3.5.1",
@@ -40,9 +49,9 @@
"ts-loader": "^9.3.1",
"typescript": "^5.6.3",
"typescript-eslint": "^8.13.0",
"vue-loader": "^17.0.0",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
"vite": "^5.4.8",
"vite-plugin-symfony": "^8",
"vue-loader": "^17.0.0"
},
"dependencies": {
"@fullcalendar/core": "^6.1.4",
@@ -71,21 +80,5 @@
"vue-multiselect": "3.0.0-alpha.2",
"vue-toast-notification": "^3.1.2",
"vuex": "^4.0.0"
},
"browserslist": [
"defaults and fully supports es6-module and not dead"
],
"scripts": {
"dev-server": "encore dev-server",
"dev": "encore dev",
"watch": "encore dev --watch",
"build": "encore production --progress",
"specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
"specs-validate": "swagger-cli validate templates/api/specs.yaml",
"specs-create-dir": "mkdir -p templates/api",
"specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
"version": "node --version",
"eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
},
"private": true
}
}

View File

@@ -1 +1 @@
require("./chillactivity.scss");
import "./chillactivity.scss";

View File

@@ -124,9 +124,9 @@
{# {{ form(delete_form) }} #}
{% block js %}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}

View File

@@ -15,7 +15,7 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -23,12 +23,12 @@
});
window.activity = {{ activity_json|json_encode|raw }};
</script>
{{ encore_entry_script_tags('vue_activity') }}
{{ vite_entry_script_tags('vue_activity') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{{ encore_entry_link_tags('page_edit_activity') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('vue_activity') }}
{{ vite_entry_link_tags('page_edit_activity') }}
{% endblock %}

View File

@@ -30,7 +30,7 @@
{% endblock %}
{% block js %}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -38,10 +38,10 @@
});
window.activity = {{ activity_json|json_encode|raw }};
</script>
{{ encore_entry_script_tags('vue_activity') }}
{{ vite_entry_script_tags('vue_activity') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('vue_activity') }}
{% endblock %}

View File

@@ -7,14 +7,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}

View File

@@ -22,14 +22,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}

View File

@@ -121,9 +121,9 @@
{{ form_end(form) }}
{% block js %}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}

View File

@@ -15,16 +15,16 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.activity = {{ activity_json|json_encode|raw }};
{% if default_location is not null %}window.default_location_id = {{ default_location.id }}{% endif %};
</script>
{{ encore_entry_script_tags('vue_activity') }}
{{ vite_entry_script_tags('vue_activity') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('vue_activity') }}
{% endblock %}

View File

@@ -14,7 +14,7 @@
{% endblock %}
{% block js %}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
@@ -22,10 +22,10 @@
});
window.activity = {{ activity_json|json_encode|raw }};
</script>
{{ encore_entry_script_tags('vue_activity') }}
{{ vite_entry_script_tags('vue_activity') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('vue_activity') }}
{% endblock %}

View File

@@ -6,16 +6,16 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}

View File

@@ -6,14 +6,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_notification_toggle_read_status') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}

View File

@@ -1,18 +0,0 @@
// this file loads all assets from the Chill person bundle
module.exports = function (encore, entries) {
entries.push(__dirname + "/Resources/public/chill/index.js");
encore.addAliases({
ChillActivityAssets: __dirname + "/Resources/public",
});
encore.addEntry(
"page_edit_activity",
__dirname + "/Resources/public/page/edit_activity/index.scss",
);
encore.addEntry(
"vue_activity",
__dirname + "/Resources/public/vuejs/Activity/index.js",
);
};

View File

@@ -0,0 +1,14 @@
export default {
chillBase: [
"./src/Bundle/ChillActivityBundle/Resources/public/chill/index.js",
],
aliases: {
ChillActivityAssets: "./src/Bundle/ChillActivityBundle/Resources/public",
},
inputs: {
page_edit_activity:
"./src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss",
vue_activity:
"./src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js",
},
};

View File

@@ -2,12 +2,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block title %}

View File

@@ -1 +1 @@
require("./chillbudget.scss");
import("./chillbudget.scss");

View File

@@ -7,11 +7,11 @@
{% block title title %}
{% block js %}
{{ encore_entry_script_tags('page_budget') }}
{{ vite_entry_script_tags('page_budget') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('page_budget') }}
{{ vite_entry_link_tags('page_budget') }}
{% endblock %}
{% block content %}

View File

@@ -7,11 +7,11 @@
{% block title title %}
{% block js %}
{{ encore_entry_script_tags('page_budget') }}
{{ vite_entry_script_tags('page_budget') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('page_budget') }}
{{ vite_entry_link_tags('page_budget') }}
{% endblock %}
{% block content %}

View File

@@ -1,8 +0,0 @@
// this file loads all assets from the Chill budget bundle
module.exports = function (encore, entries) {
encore.addAliases({
ChillBudgetAssets: __dirname + "/Resources/public",
});
encore.addEntry("page_budget", __dirname + "/Resources/public/page/index.js");
};

View File

@@ -0,0 +1,8 @@
export default {
aliases: {
ChillBudgetAssets: "./src/Bundle/ChillBudgetBundle/Resources/public",
},
inputs: {
page_budget: "./src/Bundle/ChillBudgetBundle/Resources/public/page/index.js",
},
};

View File

@@ -1 +1 @@
require("./scss/calendar.scss");
import("./scss/calendar.scss");

View File

@@ -255,5 +255,3 @@ export default {
},
};
</script>
<style src="vue-multiselect/dist/vue-multiselect.css"></style>

View File

@@ -75,7 +75,7 @@
</div>
{% if calendar.comment.comment is not empty
or calendar.persons|length > 0
or calendar.users|length > 0
or calendar.thirdParties|length > 0
or calendar.users|length > 0 %}
<div class="item-row details separator">

View File

@@ -20,13 +20,13 @@
window.endDate = {{ entity.endDate|date('Y-m-d H:i:s')|json_encode|raw }};
window.mainUser = {{ entity.mainUser.id }};
</script>
{{ encore_entry_script_tags('vue_calendar') }}
{{ vite_entry_script_tags('vue_calendar') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_calendar') }}
{{ encore_entry_link_tags('page_calendar') }}
{{ vite_entry_link_tags('vue_calendar') }}
{{ vite_entry_link_tags('page_calendar') }}
{% endblock %}
{% block block_post_menu %}

View File

@@ -20,13 +20,13 @@
window.endDate = {{ entity.endDate|date('Y-m-d H:i:s')|json_encode|raw }};
window.mainUser = {{ entity.mainUser.id }};
</script>
{{ encore_entry_script_tags('vue_calendar') }}
{{ vite_entry_script_tags('vue_calendar') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_calendar') }}
{{ encore_entry_link_tags('page_calendar') }}
{{ vite_entry_link_tags('vue_calendar') }}
{{ vite_entry_link_tags('page_calendar') }}
{% endblock %}
{% block block_post_menu %}

View File

@@ -23,10 +23,10 @@
window.endDate = {{ entity.endDate|date('Y-m-d H:i:s')|json_encode|raw }};
window.mainUser = {{ entity.mainUser.id }};
</script>
{{ encore_entry_script_tags('vue_calendar') }}
{{ vite_entry_script_tags('vue_calendar') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_calendar') }}
{{ vite_entry_link_tags('vue_calendar') }}
{% endblock %}

View File

@@ -9,14 +9,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_answer') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_answer') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_answer') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_answer') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}

View File

@@ -8,14 +8,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_answer') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_answer') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_answer') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_answer') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}

View File

@@ -16,10 +16,10 @@
<script type="text/javascript">
window.userId = {{ user.id }};
</script>
{{ encore_entry_script_tags('vue_mycalendarrange') }}
{{ vite_entry_script_tags('vue_mycalendarrange') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_mycalendarrange') }}
{{ vite_entry_link_tags('vue_mycalendarrange') }}
{% endblock %}

View File

@@ -15,18 +15,18 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript">
window.entity = {{ entity_json|json_encode|raw }};
{% if app.user.currentLocation is not null %}window.default_location_id = {{ app.user.currentLocation.id }};{% endif %};
</script>
{{ encore_entry_script_tags('vue_calendar') }}
{{ vite_entry_script_tags('vue_calendar') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_calendar') }}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('vue_calendar') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block block_post_menu %}

View File

@@ -15,18 +15,18 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript">
window.entity = {{ entity_json|json_encode|raw }};
{% if app.user.currentLocation is not null %}window.default_location_id = {{ app.user.currentLocation.id }};{% endif %};
</script>
{{ encore_entry_script_tags('vue_calendar') }}
{{ vite_entry_script_tags('vue_calendar') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('vue_calendar') }}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('vue_calendar') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block block_post_menu %}

View File

@@ -9,12 +9,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}
{% block content %}

View File

@@ -8,12 +8,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}
{% block content %}

View File

@@ -9,12 +9,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}
{% block content %}

View File

@@ -8,12 +8,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}
{% block content %}

View File

@@ -29,12 +29,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_answer') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_answer') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_answer') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_answer') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}

View File

@@ -1,25 +0,0 @@
// this file loads all assets from the Chill calendar bundle
module.exports = function (encore, entries) {
entries.push(__dirname + "/Resources/public/chill/chill.js");
encore.addAliases({
ChillCalendarAssets: __dirname + "/Resources/public",
});
encore.addEntry(
"vue_calendar",
__dirname + "/Resources/public/vuejs/Calendar/index.js",
);
encore.addEntry(
"vue_mycalendarrange",
__dirname + "/Resources/public/vuejs/MyCalendarRange/index2.ts",
);
encore.addEntry(
"page_calendar",
__dirname + "/Resources/public/chill/index.js",
);
encore.addEntry(
"mod_answer",
__dirname + "/Resources/public/module/Invite/answer.js",
);
};

View File

@@ -0,0 +1,18 @@
export default {
chillBase: [
"./src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js",
],
aliases: {
ChillCalendarAssets: "./src/Bundle/ChillCalendarBundle/Resources/public",
},
inputs: {
vue_calendar:
"./src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js",
vue_mycalendarrange:
"./src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts",
page_calendar:
"./src/Bundle/ChillCalendarBundle/Resources/public/chill/index.js",
mod_answer:
"./src/Bundle/ChillCalendarBundle/Resources/public/module/Invite/answer.js",
},
};

View File

@@ -17,9 +17,9 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -2,12 +2,12 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}

View File

@@ -17,9 +17,9 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -3,11 +3,11 @@
{% block title 'docgen.Generate a document'|trans %}
{% block js %}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block content %}

View File

@@ -1,11 +0,0 @@
// this file loads all assets from the Chill DocGenerator bundle
module.exports = function (encore, entries) {
encore.addAliases({
ChillDocGeneratorAssets: __dirname + "/Resources/public",
});
encore.addEntry(
"mod_docgen_picktemplate",
__dirname + "/Resources/public/module/PickTemplate/index.js",
);
};

View File

@@ -0,0 +1,10 @@
export default {
aliases: {
ChillDocGeneratorAssets:
"./src/Bundle/ChillDocGeneratorBundle/Resources/public",
},
inputs: {
mod_docgen_picktemplate:
"./src/Bundle/ChillDocGeneratorBundle/Resources/public/module/PickTemplate/index.js",
},
};

View File

@@ -1,2 +1,2 @@
require("./uploader.js");
require("./downloader.js");
import("./uploader.js");
import("./downloader.js");

View File

@@ -22,8 +22,8 @@ import { initializeButtons } from "./downloader.js";
// load css
//require('dropzone/dist/basic.css');
require("dropzone/dist/dropzone.css");
require("./index.scss");
import("dropzone/dist/dropzone.css");
import("./index.scss");
//
// disable dropzone autodiscover

View File

@@ -366,7 +366,7 @@ import {
} from "../../types";
import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
import * as pdfjsLib from "pdfjs-dist";
import {
import type {
PDFDocumentProxy,
PDFPageProxy,
} from "pdfjs-dist/types/src/display/api";

View File

@@ -42,10 +42,10 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -38,10 +38,10 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -12,9 +12,9 @@
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('mod_entity_workflow_pick') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_entity_workflow_pick') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}
@@ -80,7 +80,7 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ encore_entry_script_tags('mod_entity_workflow_pick') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_entity_workflow_pick') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}

View File

@@ -3,14 +3,14 @@ activeRouteKey = '' %} {% block title %}
{{ "Documents" }}
{% endblock %} {% block js %}
{{ parent() }}
{{ encore_entry_script_tags("mod_docgen_picktemplate") }}
{{ encore_entry_script_tags("mod_entity_workflow_pick") }}
{{ encore_entry_script_tags("mod_document_action_buttons_group") }}
{{ vite_entry_script_tags("mod_docgen_picktemplate") }}
{{ vite_entry_script_tags("mod_entity_workflow_pick") }}
{{ vite_entry_script_tags("mod_document_action_buttons_group") }}
{% endblock %} {% block css %}
{{ parent() }}
{{ encore_entry_script_tags("mod_docgen_picktemplate") }}
{{ encore_entry_link_tags("mod_entity_workflow_pick") }}
{{ encore_entry_link_tags("mod_document_action_buttons_group") }}
{{ vite_entry_script_tags("mod_docgen_picktemplate") }}
{{ vite_entry_link_tags("mod_entity_workflow_pick") }}
{{ vite_entry_link_tags("mod_document_action_buttons_group") }}
{% endblock %} {% block content %}
<div class="document-list">
<h1>{{ "Documents" }}</h1>

View File

@@ -13,14 +13,14 @@ License * along with this program. If not, see <http://www.gnu.org/licenses/>.
{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}
{% endblock %} {% block js %}
{{ parent() }}
{{ encore_entry_script_tags("mod_docgen_picktemplate") }}
{{ encore_entry_script_tags("mod_entity_workflow_pick") }}
{{ encore_entry_script_tags("mod_document_action_buttons_group") }}
{{ vite_entry_script_tags("mod_docgen_picktemplate") }}
{{ vite_entry_script_tags("mod_entity_workflow_pick") }}
{{ vite_entry_script_tags("mod_document_action_buttons_group") }}
{% endblock %} {% block css %}
{{ parent() }}
{{ encore_entry_link_tags("mod_docgen_picktemplate") }}
{{ encore_entry_link_tags("mod_entity_workflow_pick") }}
{{ encore_entry_link_tags("mod_document_action_buttons_group") }}
{{ vite_entry_link_tags("mod_docgen_picktemplate") }}
{{ vite_entry_link_tags("mod_entity_workflow_pick") }}
{{ vite_entry_link_tags("mod_document_action_buttons_group") }}
{% endblock %} {% block content %}
<div class="document-list">

View File

@@ -58,9 +58,9 @@
{% endblock %}
{% block js %}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -54,9 +54,9 @@
{% endblock %}
{% block js %}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{% endblock %}

View File

@@ -24,11 +24,11 @@
{% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
{% block js %}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block content %}

View File

@@ -7,21 +7,21 @@
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<title>Signature</title>
{{ encore_entry_link_tags('mod_bootstrap') }}
{{ encore_entry_link_tags('mod_forkawesome') }}
{{ encore_entry_link_tags('chill') }}
{{ encore_entry_link_tags('vue_document_signature') }}
{{ vite_entry_link_tags('mod_bootstrap') }}
{{ vite_entry_link_tags('mod_forkawesome') }}
{{ vite_entry_link_tags('chill') }}
{{ vite_entry_link_tags('vue_document_signature') }}
</head>
<body>
{% block js %}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
<script type="text/javascript">
window.signature = {{ signature|json_encode|raw }};
</script>
{{ encore_entry_script_tags('vue_document_signature') }}
{{ vite_entry_script_tags('vue_document_signature') }}
{% endblock %}
<div class="content" id="content">

View File

@@ -2,12 +2,12 @@
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_document_download_button') }}
{{ vite_entry_link_tags('mod_document_download_button') }}
{% endblock %}
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_document_download_button') }}
{{ vite_entry_script_tags('mod_document_download_button') }}
{% endblock %}
{% block title %}{{ 'workflow.public_link.title'|trans }} - {{ title }}{% endblock %}

View File

@@ -1,21 +0,0 @@
module.exports = function (encore) {
encore.addAliases({
ChillDocStoreAssets: __dirname + "/Resources/public",
});
encore.addEntry(
"mod_async_upload",
__dirname + "/Resources/public/module/async_upload/index.ts",
);
encore.addEntry(
"mod_document_action_buttons_group",
__dirname + "/Resources/public/module/document_action_buttons_group/index",
);
encore.addEntry(
"mod_document_download_button",
__dirname + "/Resources/public/module/button_download/index",
);
encore.addEntry(
"vue_document_signature",
__dirname + "/Resources/public/vuejs/DocumentSignature/index",
);
};

View File

@@ -0,0 +1,15 @@
export default {
aliases: {
ChillDocStoreAssets: "./src/Bundle/ChillDocStoreBundle/Resources/public",
},
inputs: {
mod_async_upload:
"./src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts",
mod_document_action_buttons_group:
"./src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts",
mod_document_download_button:
"./src/Bundle/ChillDocStoreBundle/Resources/public/module/button_download/index.ts",
vue_document_signature:
"./src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts",
},
};

View File

@@ -1 +1 @@
require("./chillevent.scss");
import("./chillevent.scss");

View File

@@ -1,10 +1,10 @@
{% extends '@ChillEvent/layout.html.twig' %} {% block js %}
{{ encore_entry_script_tags("mod_async_upload") }}
{{ encore_entry_script_tags("mod_pickentity_type") }}
{{ vite_entry_script_tags("mod_async_upload") }}
{{ vite_entry_script_tags("mod_pickentity_type") }}
{% endblock %} {% block css %}
{{ encore_entry_link_tags("mod_async_upload") }}
{{ encore_entry_link_tags("mod_pickentity_type") }}
{{ vite_entry_link_tags("mod_async_upload") }}
{{ vite_entry_link_tags("mod_pickentity_type") }}
{% endblock %} {% block title 'Event edit'|trans %} {% block event_content -%}
<div class="col-10">

View File

@@ -1,9 +1,9 @@
{% extends '@ChillEvent/layout.html.twig' %}
{% block css %}
{{ encore_entry_link_tags("mod_async_upload") }}
{{ encore_entry_link_tags("mod_pickentity_type") }}
{{ encore_entry_link_tags('vue_event') }}
{{ vite_entry_link_tags("mod_async_upload") }}
{{ vite_entry_link_tags("mod_pickentity_type") }}
{{ vite_entry_link_tags('vue_event') }}
{% endblock %}
{% block title 'Event creation'|trans %}
@@ -52,9 +52,9 @@
{% endblock %}
{% block js %}
{{ encore_entry_script_tags("mod_async_upload") }}
{{ encore_entry_script_tags("mod_pickentity_type") }}
{{ encore_entry_script_tags('vue_event') }}
{{ vite_entry_script_tags("mod_async_upload") }}
{{ vite_entry_script_tags("mod_pickentity_type") }}
{{ vite_entry_script_tags('vue_event') }}
<script type="text/javascript">
window.entity = {{ entity_json|json_encode|raw }};
{% if app.user.currentLocation is not null %}window.default_location_id = {{ app.user.currentLocation.id }};{% endif %}

View File

@@ -1,10 +1,10 @@
{% extends '@ChillEvent/layout.html.twig' %} {% block title 'Events'|trans %} {%
block js %}
{{ parent() }}
{{ encore_entry_script_tags("mod_pickentity_type") }}
{{ vite_entry_script_tags("mod_pickentity_type") }}
{% endblock %} {% block css %}
{{ parent() }}
{{ encore_entry_link_tags("mod_pickentity_type") }}
{{ vite_entry_link_tags("mod_pickentity_type") }}
{% endblock %} {% block content %}
<div class="col-10">
<h1>{{ block("title") }}</h1>

View File

@@ -6,14 +6,14 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% macro insert_onthefly(type, entity, parent = null) %}

View File

@@ -1,10 +0,0 @@
module.exports = function (encore, entries) {
entries.push(__dirname + "/Resources/public/chill/index.js");
encore.addEntry(
"vue_event",
__dirname + "/Resources/public/vuejs/index.js",
);
};

View File

@@ -0,0 +1,8 @@
export default {
chillBase: [
"./src/Bundle/ChillEventBundle/Resources/public/chill/index.js",
],
inputs: {
vue_event: "./src/Bundle/ChillEventBundle/Resources/public/vuejs/index.js",
},
};

View File

@@ -1 +1 @@
require("./footer_bandeau.jpg");
import("./footer_bandeau.jpg");

View File

@@ -189,14 +189,14 @@ crud:
title_edit: Rapport "belemmering" bewerken
title_delete: Belemmering verwijderen
button_delete: Verwijderen
confirm_message_delete: "%as_string% verwijderen?"
confirm_message_delete: %as_string% verwijderen?
cscv:
title_new: Nieuw CV voor %person%
title_view: CV voor %person%
title_edit: CV bewerken
title_delete: CV verwijderen
button_delete: Verwijderen
confirm_message_delete: "%as_string% verwijderen?"
confirm_message_delete: %as_string% verwijderen?
no_date: Geen datum aangegeven
no_end_date: einddatum onbekend
no_start_date: startdatum onbekend
@@ -206,7 +206,7 @@ crud:
title_edit: Immersie bewerken
title_delete: Immersie verwijderen
button_delete: Verwijderen
confirm_message_delete: "%as_string% verwijderen?"
confirm_message_delete: %as_string% verwijderen?
projet_prof:
title_new: Nieuw professioneel project voor %person%
title_view: Professioneel project voor %person%

View File

@@ -1,7 +1,7 @@
{% extends '@ChillPerson/CRUD/edit.html.twig' %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block title 'Dispositifs de ' ~ entity.person.firstName ~ ' ' ~ entity.person.lastName %}
@@ -88,7 +88,7 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript" src="{{ asset('build/dispositifs_edit.js') }}"></script>
<script type="text/javascript">

View File

@@ -114,13 +114,13 @@
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock css %}
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript" src="{{ asset('build/personal_situation_edit.js') }}"></script>
{% endblock js %}

View File

@@ -274,12 +274,12 @@
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_script_tags('mod_document_action_buttons_group') }}
{{ vite_entry_link_tags('mod_async_upload') }}
{{ vite_entry_script_tags('mod_document_action_buttons_group') }}
{% endblock css %}
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_async_upload') }}
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{{ vite_entry_script_tags('mod_async_upload') }}
{{ vite_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock js %}

View File

@@ -4,7 +4,7 @@
{% set activeRouteKey = '' %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block title %}
@@ -66,6 +66,6 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript" src="{{ asset('build/immersion_edit.js') }}"></script>
{% endblock %}

View File

@@ -4,7 +4,7 @@
{% set activeRouteKey = '' %}
{% block css %}
{{ encore_entry_link_tags('mod_pickentity_type') }}
{{ vite_entry_link_tags('mod_pickentity_type') }}
{% endblock %}
{% block title %}
@@ -69,7 +69,7 @@
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('mod_pickentity_type') }}
{{ vite_entry_script_tags('mod_pickentity_type') }}
<script type="text/javascript" src="{{ asset('build/immersion_edit.js') }}"></script>
{% endblock %}

View File

@@ -1,15 +0,0 @@
module.exports = function (encore, chillEntries) {
let dispositif_edit_file =
__dirname + "/Resources/public/module/dispositif_edit/index.js",
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";
encore.addEntry("dispositifs_edit", dispositif_edit_file);
encore.addEntry("personal_situation_edit", personal_situation_edit_file);
encore.addEntry("immersion_edit", immersion_edit_file);
encore.addEntry("images", images);
encore.addEntry("cs_cv", cv_edit_file);
};

View File

@@ -0,0 +1,13 @@
export default {
inputs: {
dispositifs_edit:
"./src/Bundle/ChillJobBundle/src/Resources/public/module/dispositif_edit/index.js",
personal_situation_edit:
"./src/Bundle/ChillJobBundle/src/Resources/public/module/personal_situation/index.js",
immersion_edit:
"./src/Bundle/ChillJobBundle/src/Resources/public/module/immersion_edit/index.js",
images: "./src/Bundle/ChillJobBundle/src/Resources/public/images/index.js",
cs_cv:
"./src/Bundle/ChillJobBundle/src/Resources/public/module/cv_edit/index.js",
},
};

View File

@@ -1,12 +1,12 @@
@font-face {
/*font-family: 'open_sanssemibold';*/
font-family: 'Open Sans';
src: url('opensans-semibold-webfont.eot');
src: url('opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-semibold-webfont.woff2') format('woff2'),
url('opensans-semibold-webfont.woff') format('woff'),
url('opensans-semibold-webfont.ttf') format('truetype'),
url('opensans-semibold-webfont.svg#open_sanssemibold') format('svg');
src: url('./opensans-semibold-webfont.eot');
src: url('./opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-semibold-webfont.woff2') format('woff2'),
url('./opensans-semibold-webfont.woff') format('woff'),
url('./opensans-semibold-webfont.ttf') format('truetype'),
url('./opensans-semibold-webfont.svg#open_sanssemibold') format('svg');
font-weight: 600;
font-style: normal;
}
@@ -14,12 +14,12 @@
@font-face {
/*font-family: 'open_sanssemibold_italic';*/
font-family: 'Open Sans';
src: url('opensans-semibolditalic-webfont.eot');
src: url('opensans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-semibolditalic-webfont.woff2') format('woff2'),
url('opensans-semibolditalic-webfont.woff') format('woff'),
url('opensans-semibolditalic-webfont.ttf') format('truetype'),
url('opensans-semibolditalic-webfont.svg#open_sanssemibold_italic') format('svg');
src: url('./opensans-semibolditalic-webfont.eot');
src: url('./opensans-semibolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-semibolditalic-webfont.woff2') format('woff2'),
url('./opensans-semibolditalic-webfont.woff') format('woff'),
url('./opensans-semibolditalic-webfont.ttf') format('truetype'),
url('./opensans-semibolditalic-webfont.svg#open_sanssemibold_italic') format('svg');
font-weight: 600;
font-style: italic;
}
@@ -27,12 +27,12 @@
@font-face {
/*font-family: 'open_sansitalic';*/
font-family: 'Open Sans';
src: url('opensans-italic-webfont.eot');
src: url('opensans-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-italic-webfont.woff2') format('woff2'),
url('opensans-italic-webfont.woff') format('woff'),
url('opensans-italic-webfont.ttf') format('truetype'),
url('opensans-italic-webfont.svg#open_sansitalic') format('svg');
src: url('./opensans-italic-webfont.eot');
src: url('./opensans-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-italic-webfont.woff2') format('woff2'),
url('./opensans-italic-webfont.woff') format('woff'),
url('./opensans-italic-webfont.ttf') format('truetype'),
url('./opensans-italic-webfont.svg#open_sansitalic') format('svg');
font-weight: normal;
font-style: italic;
}
@@ -40,12 +40,12 @@
@font-face {
/*font-family: 'open_sanslight';*/
font-family: 'Open Sans';
src: url('opensans-light-webfont.eot');
src: url('opensans-light-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-light-webfont.woff2') format('woff2'),
url('opensans-light-webfont.woff') format('woff'),
url('opensans-light-webfont.ttf') format('truetype'),
url('opensans-light-webfont.svg#open_sanslight') format('svg');
src: url('./opensans-light-webfont.eot');
src: url('./opensans-light-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-light-webfont.woff2') format('woff2'),
url('./opensans-light-webfont.woff') format('woff'),
url('./opensans-light-webfont.ttf') format('truetype'),
url('./opensans-light-webfont.svg#open_sanslight') format('svg');
font-weight: 300;
font-style: normal;
}
@@ -53,12 +53,12 @@
@font-face {
/*font-family: 'open_sanslight_italic';*/
font-family: 'Open Sans';
src: url('opensans-lightitalic-webfont.eot');
src: url('opensans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-lightitalic-webfont.woff2') format('woff2'),
url('opensans-lightitalic-webfont.woff') format('woff'),
url('opensans-lightitalic-webfont.ttf') format('truetype'),
url('opensans-lightitalic-webfont.svg#open_sanslight_italic') format('svg');
src: url('./opensans-lightitalic-webfont.eot');
src: url('./opensans-lightitalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-lightitalic-webfont.woff2') format('woff2'),
url('./opensans-lightitalic-webfont.woff') format('woff'),
url('./opensans-lightitalic-webfont.ttf') format('truetype'),
url('./opensans-lightitalic-webfont.svg#open_sanslight_italic') format('svg');
font-weight: 300;
font-style: italic;
}
@@ -66,12 +66,12 @@
@font-face {
/*font-family: 'open_sansregular';*/
font-family: 'Open Sans';
src: url('opensans-regular-webfont.eot');
src: url('opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-regular-webfont.woff2') format('woff2'),
url('opensans-regular-webfont.woff') format('woff'),
url('opensans-regular-webfont.ttf') format('truetype'),
url('opensans-regular-webfont.svg#open_sansregular') format('svg');
src: url('./opensans-regular-webfont.eot');
src: url('./opensans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-regular-webfont.woff2') format('woff2'),
url('./opensans-regular-webfont.woff') format('woff'),
url('./opensans-regular-webfont.ttf') format('truetype'),
url('./opensans-regular-webfont.svg#open_sansregular') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -79,12 +79,12 @@
@font-face {
/*font-family: 'open_sansbold';*/
font-family: 'Open Sans';
src: url('opensans-bold-webfont.eot');
src: url('opensans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-bold-webfont.woff2') format('woff2'),
url('opensans-bold-webfont.woff') format('woff'),
url('opensans-bold-webfont.ttf') format('truetype'),
url('opensans-bold-webfont.svg#open_sansbold') format('svg');
src: url('./opensans-bold-webfont.eot');
src: url('./opensans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-bold-webfont.woff2') format('woff2'),
url('./opensans-bold-webfont.woff') format('woff'),
url('./opensans-bold-webfont.ttf') format('truetype'),
url('./opensans-bold-webfont.svg#open_sansbold') format('svg');
font-weight: bold;
font-style: normal;
}
@@ -92,12 +92,12 @@
@font-face {
/*font-family: 'open_sansbold_italic';*/
font-family: 'Open Sans';
src: url('opensans-bolditalic-webfont.eot');
src: url('opensans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-bolditalic-webfont.woff2') format('woff2'),
url('opensans-bolditalic-webfont.woff') format('woff'),
url('opensans-bolditalic-webfont.ttf') format('truetype'),
url('opensans-bolditalic-webfont.svg#open_sansbold_italic') format('svg');
src: url('./opensans-bolditalic-webfont.eot');
src: url('./opensans-bolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-bolditalic-webfont.woff2') format('woff2'),
url('./opensans-bolditalic-webfont.woff') format('woff'),
url('./opensans-bolditalic-webfont.ttf') format('truetype'),
url('./opensans-bolditalic-webfont.svg#open_sansbold_italic') format('svg');
font-weight: bold;
font-style: italic;
@@ -106,12 +106,12 @@
@font-face {
/*font-family: 'open_sansextrabold';*/
font-family: 'Open Sans';
src: url('opensans-extrabold-webfont.eot');
src: url('opensans-extrabold-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-extrabold-webfont.woff2') format('woff2'),
url('opensans-extrabold-webfont.woff') format('woff'),
url('opensans-extrabold-webfont.ttf') format('truetype'),
url('opensans-extrabold-webfont.svg#open_sansextrabold') format('svg');
src: url('./opensans-extrabold-webfont.eot');
src: url('./opensans-extrabold-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-extrabold-webfont.woff2') format('woff2'),
url('./opensans-extrabold-webfont.woff') format('woff'),
url('./opensans-extrabold-webfont.ttf') format('truetype'),
url('./opensans-extrabold-webfont.svg#open_sansextrabold') format('svg');
font-weight: 800;
font-style: normal;
}
@@ -119,12 +119,12 @@
@font-face {
/*font-family: 'open_sansextrabold_italic';*/
font-family: 'Open Sans';
src: url('opensans-extrabolditalic-webfont.eot');
src: url('opensans-extrabolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('opensans-extrabolditalic-webfont.woff2') format('woff2'),
url('opensans-extrabolditalic-webfont.woff') format('woff'),
url('opensans-extrabolditalic-webfont.ttf') format('truetype'),
url('opensans-extrabolditalic-webfont.svg#open_sansextrabold_italic') format('svg');
src: url('./opensans-extrabolditalic-webfont.eot');
src: url('./opensans-extrabolditalic-webfont.eot?#iefix') format('embedded-opentype'),
url('./opensans-extrabolditalic-webfont.woff2') format('woff2'),
url('./opensans-extrabolditalic-webfont.woff') format('woff'),
url('./opensans-extrabolditalic-webfont.ttf') format('truetype'),
url('./opensans-extrabolditalic-webfont.svg#open_sansextrabold_italic') format('svg');
font-weight: 800;
font-style: italic;
}
}

View File

@@ -4,44 +4,49 @@
*/
/// import jQuery
const $ = require("jquery");
global.$ = global.jQuery = $;
import $ from "jquery";
// expose jQuery globally for plugins expecting it
window.$ = window.jQuery = $;
/// import select2
const select2 = require("select2");
global.select2 = select2;
/// import select2 (relies on global jQuery)
import "select2/dist/js/select2.full";
window.select2 = window.select2 || window.$?.fn?.select2;
require("select2/dist/css/select2.css");
require("select2-bootstrap-theme/dist/select2-bootstrap.css");
import "select2/dist/css/select2.css";
import "select2-bootstrap-theme/dist/select2-bootstrap.css";
// Global vendor styles
import "vue-multiselect/dist/vue-multiselect.css";
import "vis-network/dist/dist/vis-network.min.css";
/*
* Load Chill themes assets
*/
require("./chillmain.scss");
import "./chillmain.scss";
import { chill } from "./js/chill.js";
global.chill = chill;
// expose chill helper globally for legacy inline scripts
window.chill = chill;
require("./js/date");
require("./js/counter.js");
import "./js/date";
import "./js/counter.js";
/// Load fonts
require("./fonts/OpenSans/OpenSans.scss");
import "./fonts/OpenSans/OpenSans.scss";
/// Load images
require("./img/favicon.ico");
require("./img/logo-chill-sans-slogan_white.png");
require("./img/logo-chill-outil-accompagnement_white.png");
import "./img/favicon.ico";
import "./img/logo-chill-sans-slogan_white.png";
import "./img/logo-chill-outil-accompagnement_white.png";
/*
* Load local libs
* Some libs are only used in a few pages, they are loaded on a case by case basis
*/
require("../lib/breadcrumb/index.js");
require("../lib/download-report/index.js");
require("../lib/select_interactive_loading/index.js");
import "../lib/breadcrumb/index.js";
import "../lib/download-report/index.js";
import "../lib/select_interactive_loading/index.js";
//require('../lib/show_hide/index.js');
//require('../lib/tabs/index.js');

View File

@@ -1 +1 @@
require("./layout.scss");
import "./layout.scss";

View File

@@ -14,5 +14,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { download_report } from "./download-report.js";
chill.download_report = require("./download-report.js");
// Ensure global namespace exists, then expose for legacy usage
window.chill = window.chill || {};
window.chill.download_report = download_report;

View File

@@ -1,2 +1,2 @@
require("./tabs.js");
require("./tabs.scss");
import "./tabs.js";
import "./tabs.scss";

View File

@@ -1,4 +1,4 @@
require("./blur.scss");
import "./blur.scss";
document.querySelectorAll(".confidential").forEach(function (el) {
let i = document.createElement("i");

View File

@@ -1,8 +1,8 @@
// Compile all bootstrap assets from nodes-modules
//require('bootstrap/scss/bootstrap.scss')
// Or compile bootstrap only enabled assets
require("./bootstrap.scss");
// Or compile bootstrap only enabled assets (use ESM import so Vite processes CSS in dev)
import "./bootstrap.scss";
// You can specify which plugins you need
import Dropdown from "bootstrap/js/src/dropdown";

View File

@@ -1,2 +1,2 @@
// Compile all Fork-Awesome fonts assets from node-modules
require("fork-awesome/scss/fork-awesome.scss");
import "fork-awesome/scss/fork-awesome.scss";

View File

@@ -1 +1 @@
require("./login.scss");
import "./login.scss";

View File

@@ -1,4 +1,4 @@
@import 'ChillMainAssets/chill/fonts/OpenSans/OpenSans';
@import '../../chill/fonts/OpenSans/OpenSans';
html, body {
height: 100%;
@@ -47,7 +47,7 @@ label {
padding-right: 5px;
}
input {
color: 'black';
color: black;
}
form {

View File

@@ -248,5 +248,3 @@ export default {
},
};
</script>
<style src="vue-multiselect/dist/vue-multiselect.css"></style>

Some files were not shown because too many files have changed in this diff Show More