Merge branch '2025-09-29-chemin-decisionnel' into connor-dev (7b2841f6) · Commits · open-source / oscar

docker/dev/postgresql/docker-entrypoint-initdb.d/sql/001-oscar-structure.sql

+2 −1

Original line number	Diff line number	Diff line
		@@ -1016,7 +1016,8 @@ CREATE TABLE public.organization (
		labintel character varying(255) DEFAULT NULL::character varying,
		rnsr character varying(255) DEFAULT NULL::character varying,
		duns character varying(255) DEFAULT NULL::character varying,
		tvaintra character varying(255) DEFAULT NULL::character varying
		tvaintra character varying(255) DEFAULT NULL::character varying,
		codepic TEXT
		);

docker/postgres_initdb.d/sql/01-structure.sql

+3 −1

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ CREATE TABLE public.activity (
		fraisdegestionpartgestionnaire character varying(255) DEFAULT NULL::character varying,
		datecached date,
		datenegociation date,
		datedepotprojet date,
		cache text DEFAULT ''::text,
		cachelocked boolean DEFAULT false NOT NULL,
		cachelockedreason character varying(255) DEFAULT ''::character varying,
		@@ -1124,7 +1125,8 @@ CREATE TABLE public.organization (
		typeobj_id integer,
		createdby_id integer,
		updatedby_id integer,
		deletedby_id integer
		deletedby_id integer,
		codepic TEXT
		);

install/oscar-install.sql

+3 −1

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ CREATE TABLE public.activity (
		fraisdegestionpartgestionnaire character varying(255) DEFAULT NULL::character varying,
		datecached date,
		datenegociation date,
		datedepotprojet date,
		cache text DEFAULT ''::text,
		cachelocked boolean DEFAULT false NOT NULL,
		cachelockedreason character varying(255) DEFAULT ''::character varying,
		@@ -1124,7 +1125,8 @@ CREATE TABLE public.organization (
		typeobj_id integer,
		createdby_id integer,
		updatedby_id integer,
		deletedby_id integer
		deletedby_id integer,
		codepic TEXT
		);

module/Oscar/config/module.config.php

+25 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,27 @@ return array(
		'action' => ['privileges-modifier'],
		'privileges' => [\Oscar\Provider\Privileges::DROIT_PRIVILEGE_EDITION],
		],


		[
		'controller' => 'CheminDecisionnel',
		'action' => [
		'demarrer',
		'terminer',
		'convention',
		],
		'roles' => ['user']
		],

		[
		'controller' => 'CheminDecisionnelAdministration',
		'action' => [
		'cheminsDecisionnels',
		'cheminsDecisionnelsUpdate',
		'formulaire'
		],
		'roles' => ['user']
		],
		]
		],
		],
		@@ -612,6 +633,8 @@ return array(
		\Oscar\Service\administration\AdminRolePrivilegeServiceAPIService::class => \Oscar\Service\administration\AdminRolePrivilegeServiceAPIServiceFactory::class,
		\Oscar\Service\BackupService::class => \Oscar\Service\BackupServiceFactory::class,
		\Oscar\Service\administration\CheckConfigService::class => \Oscar\Service\administration\CheckConfigServiceFactory::class,
		\Oscar\Service\CheminDecisionnelFormulaireService::class => \Oscar\Service\CheminDecisionnelFormulaireServiceFactory::class,
		\Oscar\Service\CheminDecisionnelService::class => \Oscar\Service\CheminDecisionnelServiceFactory::class,
		\Oscar\Service\ConnectorService::class => \Oscar\Service\ConnectorServiceFactory::class,
		\Oscar\Service\ContractDocumentService::class => \Oscar\Service\ContractDocumentServiceFactory::class,
		\Oscar\Service\DocumentFormatterService::class => \Oscar\Service\DocumentFormatterServiceFactory::class,
		@@ -673,6 +696,8 @@ return array(
		'Administration' => \Oscar\Controller\AdministrationControllerFactory::class,
		'AdministrationCheckConfig' => \Oscar\Controller\AdministrationCheckConfigControllerFactory::class,
		'AdministrativeDocument' => \Oscar\Controller\AdministrativeDocumentControllerFactory::class,
		'CheminDecisionnel' => \Oscar\Controller\CheminDecisionnelControllerFactory::class,
		'CheminDecisionnelAdministration' => \Oscar\Controller\CheminDecisionnelAdministrationControllerFactory::class,
		'Connector' => \Oscar\Controller\ConnectorControllerFactory::class,
		'DateType' => \Oscar\Controller\DateTypeControllerFactory::class,
		'Depense' => \Oscar\Controller\DepenseControllerFactory::class,

module/Oscar/config/routes.yml

+55 −0

Original line number	Diff line number	Diff line
		@@ -1962,6 +1962,31 @@ administration:
		defaults:
		action: configDump

		chemins-decisionnels:
		type: segment
		may_terminate: true
		options:
		route: /chemins-decisionnels
		defaults:
		controller: CheminDecisionnelAdministration
		action: cheminsDecisionnels
		child_routes:
		update:
		type: segment
		may_terminate: true
		options:
		route: /:id
		defaults:
		action: cheminsDecisionnelsUpdate
		child_routes:
		formulaire:
		type: segment
		may_terminate: true
		options:
		route: /formulaires/:formulaire-id
		defaults:
		action: formulaire

		# Gestion et chargement du référenciel des pays
		logs:
		type: segment
		@@ -2386,3 +2411,33 @@ siret:
		route: /api
		defaults:
		action: api

		chemins-decisionnels:
		type: literal
		options:
		route: /chemins-decisionnels
		defaults:
		controller: CheminDecisionnel
		child_routes:
		demarrer:
		type: segment
		may_terminate: true
		options:
		route: /:id
		defaults:
		action: demarrer
		child_routes:
		terminer:
		type: segment
		may_terminate: true
		options:
		route: /terminer
		defaults:
		action: terminer
		convention:
		type: segment
		may_terminate: true
		options:
		route: /convention/:formulaire-id
		defaults:
		action: convention