Compare commits

..

No commits in common. "main" and "v2.0.0-alpha2" have entirely different histories.

38 changed files with 5834 additions and 4522 deletions

View File

@ -1,3 +0,0 @@
## 2.0.0-RC1 - 2024-07-18
### Release
* upgrade to chill-bundles/3.0.0-RC5

View File

@ -1,3 +0,0 @@
## 2.0.0-RC2 - 2024-07-18
### Fixed
* Fix definition of workflow

View File

@ -1,9 +0,0 @@
## 2.1.0 - 2024-07-23
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
* upgrade to chill-bundles/3.0.0-RC5
* Upgrade chill-bundles to v3.0.0-RC6
### Fixed
* Fix definition of workflow

View File

@ -1,3 +0,0 @@
## 2.2.0 - 2024-07-25
### Release
* Update chill-bundles to v3.0.0-RC7

View File

@ -1,3 +0,0 @@
## 2.1.0 - 2024-07-30
### Release
* Update chill-bundles to v3.0.0-RC8

View File

@ -1,3 +0,0 @@
## 2.1.0 - 2024-08-08
### Release
* Update chill-bundles to v3.0.0-RC9

View File

@ -1,3 +1,3 @@
## 2.0.0-alpha1 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* Upgrade chill to v2.0.0-RC3

View File

@ -1,3 +1,4 @@
## 2.0.0-alpha2 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4

View File

@ -1,3 +0,0 @@
## 2.0.0-alpha3 - 2024-07-03
### Release
* Add graylog to image

View File

@ -1,3 +0,0 @@
## 2.0.0-alpha4 - 2024-07-03
### Release
* fixes

View File

@ -1,3 +0,0 @@
## 2.1.0 - 2024-09-24
### Release
* Update bundles version to 3.1.0

View File

@ -1,3 +0,0 @@
## 2.2.0 - 2024-10-01
### Release
* Bundles version updated to 3.1.1

View File

@ -1,3 +0,0 @@
## 2.3.0 - 2024-10-30
### Feature
* Update bundles to v3.2.0 adding gender entity feature

View File

@ -1,3 +0,0 @@
## 2.4.0 - 2024-11-01
### Feature
* Update chill bundles to v3.2.2: new feature gender entity"

View File

@ -1,3 +0,0 @@
## 2.5.0 - 2024-12-09
### Release
* Update bundles to v3.5.0

View File

@ -1,3 +0,0 @@
## 2.6.0 - 2025-01-08
### Release
* Update to chill bundles v3.5.3

View File

@ -1,3 +0,0 @@
## 2.7.0 - 2025-01-20
### Release
* Update chill bundles to version 3.6.0

View File

@ -1,3 +0,0 @@
## 2.8.0 - 2025-03-04
### Release
* Update chill bundles to v3.9.2

View File

@ -1,3 +0,0 @@
## 2.9.0 - 2025-03-18
### Release
* Update chill bundles to v3.10.3

View File

@ -0,0 +1,5 @@
kind: Release
body: Upgrade chill to v3.0.0-RC3
time: 2024-07-03T12:46:35.963251524+02:00
custom:
Issue: ""

View File

@ -0,0 +1,5 @@
kind: Release
body: upgrade chill-bundle to v3.0.0-RC4
time: 2024-07-03T13:38:16.338710196+02:00
custom:
Issue: ""

View File

@ -32,7 +32,6 @@ steps:
pull: always
commands:
- composer install --no-scripts --no-interaction
- bin/console cache:clear
depends_on:
- build-base-image

5
.env
View File

@ -76,9 +76,4 @@ ADD_ADDRESS_MAP_CENTER_Z=14
# Variables for relatorio host, which generates documents
RELATORIO_HOST=
RELATORIO_PORT=
WOPI_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}
###< chill-project/chill-bundles ###
###> symfony/ovh-cloud-notifier ###
# OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
###< symfony/ovh-cloud-notifier ###

View File

@ -6,84 +6,11 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie).
## 2.9.0 - 2025-03-18
### Release
* Update chill bundles to v3.10.3
## 2.8.0 - 2025-03-04
### Release
* Update chill bundles to v3.9.2
## 2.7.0 - 2025-01-20
### Release
* Update chill bundles to version 3.6.0
## 2.6.0 - 2025-01-08
### Release
* Update to chill bundles v3.5.3
## 2.5.0 - 2024-12-09
### Release
* Update bundles to v3.5.0
## 2.4.0 - 2024-11-01
### Feature
* Update chill bundles to v3.2.2: new feature gender entity"
## 2.3.0 - 2024-10-30
### Feature
* Update bundles to v3.2.0 adding gender entity feature
## 2.2.0 - 2024-10-01
### Release
* Bundles version updated to 3.1.1
## 2.1.0 - 2024-09-24
### Release
* Update bundles version to 3.1.0
## 2.0.0-alpha4 - 2024-07-03
### Release
* fixes
## 2.0.0-alpha3 - 2024-07-03
### Release
* Add graylog to image
## 2.0.0-alpha2 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
## 2.0.0-alpha1 - 2024-07-03
### Release
* Upgrade chill to v3.0.0-RC3
## 2.1.0 - 2024-08-08
### Release
* Update chill-bundles to v3.0.0-RC9
## 2.1.0 - 2024-07-30
### Release
* Update chill-bundles to v3.0.0-RC8
## 2.2.0 - 2024-07-25
### Release
* Update chill-bundles to v3.0.0-RC7
## 2.1.0 - 2024-07-23
### Release
* Upgrade chill to v3.0.0-RC3
* upgrade chill-bundle to v3.0.0-RC4
* Add graylog to image
* upgrade to chill-bundles/3.0.0-RC5
* Upgrade chill-bundles to v3.0.0-RC6
### Fixed
* Fix definition of workflow
## 2.0.0-RC2 - 2024-07-18
### Fixed
* Fix definition of workflow
## 2.0.0-RC1 - 2024-07-18
### Release
* upgrade to chill-bundles/3.0.0-RC5
* Upgrade chill to v2.0.0-RC3

View File

@ -1,13 +1,12 @@
FROM php:8.3-fpm-alpine AS chill_base_php82
FROM php:8.2-fpm-alpine AS chill_base_php82
ENV POSTGRES_VERSION=15
ENV POSTGRES_VERSION 14
# default UID for the PHP user
ARG UID=1000
ARG GID=1000
# install php extensions and deps
# apk add --no-cache --update --virtual rabbitmq-c-dev rabbitmq-c-utils gcc g++ make autoconf && pecl install amqp
RUN apk update && apk add --no-cache \
wget gnupg \
libpq-dev \
@ -17,7 +16,6 @@ RUN apk update && apk add --no-cache \
linux-headers \
gcc g++ make autoconf \
bash git \
rabbitmq-c rabbitmq-c-dev \
&& docker-php-ext-install pdo_pgsql intl mbstring zip bcmath exif sockets \
&& git clone https://github.com/nikic/php-ast.git \
&& cd php-ast \
@ -28,8 +26,6 @@ RUN apk update && apk add --no-cache \
&& cd .. && rm -rf php-ast \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install amqp \
&& docker-php-ext-enable amqp \
&& apk add libpng-dev libjpeg-turbo-dev freetype-dev \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) gd \

View File

@ -1,7 +0,0 @@
import SwaggerUI from 'swagger-ui';
import 'swagger-ui/dist/swagger-ui.css';
SwaggerUI({
url: '/_dev/specs.yaml',
dom_id: '#swag'
})

View File

@ -9,9 +9,8 @@
"ext-iconv": "*",
"champs-libres/wopi-bundle": "dev-master@dev",
"champs-libres/wopi-lib": "dev-master@dev",
"chill-project/chill-bundles": "3.10.2",
"chill-project/chill-bundles": "v3.0.0-RC4",
"chill-project/chill-deploy": "^1.0",
"graylog2/gelf-php": "^2.0",
"symfony/console": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/flex": "^1.17|^2",

2466
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -34,5 +34,4 @@ return [
Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
];

View File

@ -1,13 +0,0 @@
framework:
notifier:
chatter_transports:
texter_transports:
ovhcloud: '%env(OVHCLOUD_DSN)%'
channel_policy:
# use chat/slack, chat/telegram, sms/twilio or sms/nexmo
urgent: ['email']
high: ['email']
medium: ['email']
low: ['email']
admin_recipients:
- { email: admin@example.com }

View File

@ -1,3 +0,0 @@
ux_translator:
# The directory where the JavaScript translations are dumped
dump_directory: '%kernel.project_dir%/vendor/chill-project/chill-bundles/var/translations'

View File

@ -1,3 +0,0 @@
wopi:
server: "%env(resolve:WOPI_SERVER)%"
enable_lock: false

View File

@ -8,10 +8,8 @@ framework:
- Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
- Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
label:
fr: 'Suivi CD85'
fr: 'Suivi'
support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
marking_store:
service: Chill\MainBundle\Workflow\EntityWorkflowMarkingStore
initial_marking: 'initial'
places:
initial:
@ -42,6 +40,14 @@ framework:
forward: {fr: Visa accordé}
backward: {fr: Visa refusé}
neutral: {fr: Autre}
attenteSignature:
metadata:
label:
fr: En attente de signature
validationFilterInputLabels:
forward: {fr: Signature accordée}
backward: {fr: Signature refusée}
neutral: {fr: Autre}
attenteTraitement:
metadata:
label:
@ -66,16 +72,6 @@ framework:
forward: {fr: Validation de la mise en forme}
backward: {fr: Refus de validation de la mise en forme}
neutral: {fr: Autre}
attenteReceptionExternal:
metadata:
isSentExternal: true
onExternalView: clotureApresLectureEnvoiExterne
label:
fr: En attente d'ouverture par un destinataire externe
validationFilterInputLabels:
forward: {fr: Document reçu par un destinataire externe}
backward: {fr: Document non reçu par un destinataire externe}
neutral: {fr: Autre}
annule:
metadata:
isFinal: true
@ -121,12 +117,22 @@ framework:
- attenteModification
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteTraitement
to: attenteVisa
metadata:
label:
fr: Demande de visa
isForward: true
demandeSignature:
from:
- initial
- attenteModification
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteVisa
to: attenteSignature
metadata:
label: {fr: Demande de signature}
isForward: true
demandeTraitement:
from:
- initial
@ -134,6 +140,7 @@ framework:
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteVisa
- attenteSignature
to: attenteTraitement
metadata:
label: {fr: Demande de traitement}
@ -145,32 +152,12 @@ framework:
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteVisa
- attenteSignature
- attenteTraitement
to: attenteEnvoi
metadata:
label: {fr: Demande d'envoi}
isForward: true
demandeEnvoiExterne:
from:
- initial
- attenteModification
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteVisa
- attenteTraitement
to: attenteReceptionExternal
metadata:
label: {fr: Envoi sécurisé par courrier électronique}
isForward: true
clotureApresLectureEnvoiExterne:
from:
- attenteReceptionExternal
to:
- final
metadata:
transitionGuard: system
isForward: true
label: {fr: Consultation de l'envoi sécurisé}
annulation:
from:
- initial
@ -178,13 +165,13 @@ framework:
- attenteMiseEnForme
- attenteValidationMiseEnForme
- attenteVisa
- attenteSignature
- attenteTraitement
- attenteEnvoi
to: annule
metadata:
label: {fr: Annulation}
isForward: false
transitionGuard: 'system+only-dest' # can be 'system+only-dest' or 'only-dest' (only-dest is default)
# transitions qui répètent l'étape
demandeMiseEnFormeSupplementaire:
from:
@ -200,6 +187,12 @@ framework:
metadata:
label: {fr: Demande de visa supplémentaire}
isForward: true
demandeSignatureSupplementaire:
from:
- attenteSignature
to: attenteSignature
metadata:
label: {fr: Demande de signature supplémentaire}
demandeTraitementSupplementaire:
from:
- attenteTraitement
@ -210,6 +203,7 @@ framework:
refusEtModificationDocument:
from:
- attenteVisa
- attenteSignature
- attenteTraitement
- attenteEnvoi
to: attenteModification
@ -220,6 +214,7 @@ framework:
refusEtDemandeMiseEnForme:
from:
- attenteVisa
- attenteSignature
- attenteTraitement
- attenteEnvoi
to: attenteMiseEnForme
@ -228,11 +223,21 @@ framework:
isForward: false
refusEtDemandeVisa:
from:
- attenteSignature
- attenteTraitement
- attenteEnvoi
to: attenteVisa
metadata:
label: {fr: Refus et demande de visa}
isForward: false
refusEtDemandeSignature:
from:
- attenteTraitement
- attenteEnvoi
to: attenteSignature
metadata:
label: {fr: Refus et demande de signature}
isForward: false
refusEtDemandeTraitement:
from:
- attenteEnvoi
@ -263,17 +268,24 @@ framework:
metadata:
label: {fr: Accorde le visa et cloture positive}
isForward: true
attenteSignatureToFinal:
from:
- attenteSignature
to: final
metadata:
label: {fr: Accorde la signature et cloture positive}
isForward: true
attenteTraitementToFinal:
from:
- attenteTraitement
to: final
metadata:
label: {fr: Traitement terminé et cloture positive}
label: {fr: Traitement terminé et cloture postive}
isForward: true
attenteEnvoiToFinal:
from:
- attenteEnvoi
to: final
metadata:
label: {fr: Envoyé et cloture positive}
label: {fr: Envoyé et cloture postive}
isForward: true

View File

@ -4,17 +4,11 @@
],
"private": true,
"devDependencies": {
"@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
"bootstrap": "5.2.3",
"intl-messageformat": "^10.5.11"
"bootstrap": "5.2.3"
},
"scripts": {
"specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/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",
"dev": "yarn run encore dev",
"prod": "yarn run encore production"
},
"version": "0.0.0"
"specs": "yarn run specs-build && yarn run specs-validate"
}
}

View File

@ -304,27 +304,6 @@
"config/packages/monolog.yaml"
]
},
"symfony/notifier": {
"version": "5.4",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "5.0",
"ref": "178877daf79d2dbd62129dd03612cb1a2cb407cc"
},
"files": [
"config/packages/notifier.yaml"
]
},
"symfony/ovh-cloud-notifier": {
"version": "5.4",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "5.1",
"ref": "fe2e382c22d60eae9ad54cb22862b1c15291fdf8"
}
},
"symfony/routing": {
"version": "5.4",
"recipe": {
@ -376,21 +355,6 @@
"templates/base.html.twig"
]
},
"symfony/ux-translator": {
"version": "2.23",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "2.9",
"ref": "bc396565cc4cab95692dd6df810553dc22e352e1"
},
"files": [
"assets/translator.js",
"config/packages/ux_translator.yaml",
"var/translations/configuration.js",
"var/translations/index.js"
]
},
"symfony/validator": {
"version": "5.4",
"recipe": {

View File

@ -1,6 +1,20 @@
{
"extends": "./vendor/chill-project/chill-bundles/ts-config-base.json",
"extends": "@tsconfig/node14/tsconfig.json",
"compilerOptions": {
"lib": [
"es2020",
"dom"
],
"module": "es6",
"moduleResolution": "node",
"isolatedModules": true,
"allowJs": false,
"checkJs": false,
"importHelpers": true,
"allowSyntheticDefaultImports": true,
"types": [
"node"
],
"sourceMap": true
},
"includes": [
@ -11,9 +25,6 @@
],
"exclude": [
"./vendor/chill-project/chill-bundles/tests/*",
"./vendor/chill-project/chill-bundles/docs/*",
"./vendor/chill-project/chill-bundles/assets/translator.ts",
"./vendor/chill-project/chill-bundles/var/*.*"
"./vendor/chill-project/chill-bundles/docs/*"
]
}

View File

@ -15,7 +15,7 @@ async function* getFiles(dir, depth, ignored) {
const res = resolve(dir, dirent.name);
if (dirent.isDirectory()) {
if (depth > 0) {
yield* getFiles(res, depth - 1, ignored);
yield* getFiles(res, depth - 1, ignored);
}
} else if (ignored.includes(res)) {
continue;
@ -85,28 +85,26 @@ async function populateConfig(Encore, chillEntries) {
// export the final configuration
module.exports = (async () => {
// Manually configure the runtime environment if not already configured yet by the "encore" command.
// It's useful when you use tools that rely on webpack.config.js file.
if (!Encore.isRuntimeEnvironmentConfigured()) {
Encore.configureRuntimeEnvironment(process.env.NODE_ENV || 'dev');
}
// Manually configure the runtime environment if not already configured yet by the "encore" command.
// It's useful when you use tools that rely on webpack.config.js file.
if (!Encore.isRuntimeEnvironmentConfigured()) {
Encore.configureRuntimeEnvironment(process.env.NODE_ENV || 'dev');
}
// basic encore configuration
Encore
.setOutputPath('public/build/')
.setPublicPath('/build')
.enableSassLoader()
.enableVueLoader(() => {}, {
version: 3,
runtimeCompilerBuild: true,
version: 3
})
.enableTypeScriptLoader(function (tsConfig){
tsConfig.appendTsSuffixTo = [/\.vue$/];
tsConfig.appendTsxSuffixTo = [/\.vue$/];
// temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855
tsConfig.compilerOptions = {strict: !Encore.isProduction()};
tsConfig.silent = false;
})
.enableTypeScriptLoader(/*function (tsConfig){
tsConfig.appendTsSuffixTo = [/\.vue$/];
tsConfig.appendTsxSuffixTo = [/\.vue$/];
// temporary fix for https://github.com/vuejs/vue-loader/issues/1915 and https://github.com/vuejs/core/issues/2855
tsConfig.compilerOptions = {strict: !Encore.isProduction()};
tsConfig.compilerOptions.paths = {"translator": [resolve(__dirname, "./assets/translator.ts")]};
tsConfig.silent = false;
}*/)
//.enableForkedTypeScriptTypesChecking()
.autoProvidejQuery()
.enableSourceMaps(!Encore.isProduction())
@ -115,26 +113,40 @@ module.exports = (async () => {
.enableVersioning()
.enableSingleRuntimeChunk()
.splitEntryChunks()
//.addLoader({ test: /\.pdf$/, loader: 'file-loader', options: { name: '[name]_[hash].[ext]', outputPath: 'pdf/' } })
// added when upgrading to symfony 5.4
// enables and configure @babel/preset-env polyfills
//.configureBabelPresetEnv((config) => {
// config.useBuiltIns = 'usage';
// config.corejs = '3.23';
//})
//.addLoader({ test: /\.pdf$/, loader: 'file-loader', options: { name: '[name]_[hash].[ext]', outputPath: 'pdf/' } })
;
// populate config with chill entries
let chillEntries = [];
await populateConfig(Encore, chillEntries);
// configure Babel
// .configureBabel((config) => {
// config.plugins.push('@babel/a-babel-plugin');
// })
// enables and configure @babel/preset-env polyfills
// .configureBabelPresetEnv((config) => {
// config.useBuiltIns = 'usage';
// config.corejs = '3.23';
// })
;
Encore.addAliases({
translator: resolve(__dirname, './vendor/chill-project/chill-bundles/assets/translator')
});
// enables Sass/SCSS support
//.enableSassLoader()
// populate config with chill entries
let chillEntries = [];
await populateConfig(Encore, chillEntries);
// add swagger UI
if (!Encore.isProduction()) {
Encore
.addEntry('swagger', __dirname + '/assets/swagger-ui/index.js')
.addLoader({
test: /\.yaml$/,
type: 'json',
use: [
{ loader: 'json-loader' },
{ loader: 'yaml-loader' }
],
});
}
//getting the encore config and appending chill entries
config = Encore.getWebpackConfig();

7472
yarn.lock

File diff suppressed because it is too large Load Diff