Flux de jalons (partie Admin), UI en cours (NON FONCTIONNEL) (1f9464ea) · Commits · open-source / oscar

README.md

+16 −10

Original line number	Diff line number	Diff line
		# OSCAR 2.15 "Kusanagi" (Documentation technique)
		# OSCAR 2.16 "Connor" (Documentation technique)

		## Documentation générale

		@@ -8,20 +8,26 @@

		## Versions

		### Prochaines version 2.16 "Connor" (TODO non-planifié - Norvembre/Octobre 2025)
		- Jalon : Workflow
		- Jalon : Configuration avancée (Mail, message métier)
		- Activité : Demande automatisée
		- Activité : Refonte UI recherche avancée
		- SIFAC+ (Selon la mise à disposition des APIs AMUE) ???
		### Prochaines version 2.17 "???" (TODO non-planifié)

		### Prochaine version 2.15 "Kusanagi" (Branche kusanagi)
		### Version 2.16 "Connor" (Branche connor)

		Testing octobre 2025 - Stable fin novembre 2025

		\| Nom de la version \| Branche GIT \| N°de version \| Status \|
		\|-------------------\|-------------\|--------------\|-----------\|
		\| Connor \| `connor` \| 2.16.x \| Testing \|

		> [Note de mise à jour pour la version CONNOR ](doc/versions/version-2.16-connor.md)


		### Version 2.15 "Kusanagi" (Branche kusanagi)

		Testing juillet 2025 - Stable fin septembre 2025

		\| Nom de la version \| Branche GIT \| N°de version \| Status \|
		\|-------------------\|---------------------\|--------------\|-----------\|
		\| Kusanagi \| `kusanagi` \| 2.15.x \| Testing \|
		\|-------------------\|---------------------\|--------------\|----------\|
		\| Kusanagi \| `kusanagi` \| 2.15.x \| stable \|

		> [Note de mise à jour pour la version KUSANAGI ](doc/versions/version-2.15-kusanagi.md)

doc/versions/version-2.16-connor.md

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		# OSCAR 2.16.x "Connor"

		## Contenu de cette mise à jour

		### Fonctionnel

		### Technique

		## Mise en place technique

		Basculer sur la branche "connor"

		```bash
		# Actualisation du dépôt
		git fetch

		# Changement de branche
		git checkout connor
		git pull

		# Mise à jour
		./oscar-update.sh
		```

		### Installation/Mise à jour

		Mise à jour (et update en cas de patch)

		```bash
		# mise à jour des sources
		git fetch
		git pull
		./oscar-update.sh
		```

module/Oscar/Module.php

+15 −0

Original line number	Diff line number	Diff line
		@@ -13,7 +13,9 @@ use Laminas\EventManager\Event;
		use Laminas\ModuleManager\ModuleManager;
		use Laminas\Mvc\MvcEvent;
		use Oscar\Entity\Authentification;
		use Oscar\Event\OscarEvent;
		use Oscar\Service\ContractDocumentService;
		use Oscar\Service\OscarEventService;
		use UnicaenAuthentification\Event\UserAuthenticatedEvent;
		use UnicaenSignature\Event\ProcessEvent;
		use UnicaenSignature\Event\SignatureEvent;
		@@ -104,6 +106,10 @@ class Module
		$manager->getEventManager()->getSharedManager()->attach('*', 'postPersist', function ($e) {
		$this->onLoginSuccess($e);
		});

		$manager->getEventManager()->getSharedManager()->attach('', '', function ($e) {
		$this->onOscarEvent($e);
		});
		}

		public function onLoginSuccess( $e ) {
		@@ -120,6 +126,15 @@ class Module
		}
		}

		public function onOscarEvent( $e ) {
		//error_log(get_class($e));
		if( get_class($e) == OscarEvent::class ) {
		/** @var OscarEventService $cdm */
		$cdm = $this->sm->get(OscarEventService::class);
		$cdm->trigger($e);
		}
		}

		public function onLdapError(Event $event)
		{
		}

module/Oscar/config/module.config.php

+8 −2

Original line number	Diff line number	Diff line
		@@ -530,10 +530,12 @@ return array(
		'roles' => ['user'],
		],
		[
		'controller' => 'Console',
		'roles' => [],
		'controller' => 'ActivityDateFlow',
		'action' => ['admin'],
		'roles' => ['user'],
		],


		////////////////////////////////////////////////////////////////
		// DROITS
		////////////////////////////////////////////////////////////////
		@@ -594,6 +596,7 @@ return array(

		'factories' => array(
		\Oscar\Service\ActivityAvenantsService::class => \Oscar\Service\ActivityAvenantsServiceFactory::class,
		\Oscar\Service\ActivityDateFlowService::class => \Oscar\Factory\GenericOscarFactory::class,
		\Oscar\Service\ActivityLogService::class => \Oscar\Service\ActivityLogServiceFactory::class,
		\Oscar\Service\ActivityPaymentService::class => \Oscar\Service\ActivityPaymentServiceFactory::class,
		\Oscar\Service\ActivityRequestService::class => \Oscar\Service\ActivityRequestServiceFactory::class,
		@@ -610,12 +613,14 @@ return array(
		\Oscar\Service\GearmanJobLauncherService::class => \Oscar\Service\GearmanJobLauncherServiceFactory::class,
		\Oscar\Service\JsonFormatterService::class => \Oscar\Service\JsonFormatterServiceFactory::class,
		'Logger' => \Oscar\Service\LoggerServiceFactory::class,
		\Oscar\Service\LoggerService::class => \Oscar\Service\LoggerServiceFactory::class,
		\Oscar\Service\MailingService::class => \Oscar\Service\MailingServiceFactory::class,
		\Oscar\Service\MaintenanceService::class => \Oscar\Service\MaintenanceServiceFactory::class,
		\Oscar\Service\MilestoneService::class => \Oscar\Service\MilestoneServiceFactory::class,
		\Oscar\Service\NotificationService::class => \Oscar\Service\NotificationServiceFactory::class,
		\Oscar\Service\OrganizationService::class => \Oscar\Service\OrganizationServiceFactory::class,
		\Oscar\Service\OscarConfigurationService::class => \Oscar\Service\OscarConfigurationServiceFactory::class,
		\Oscar\Service\OscarEventService::class => \Oscar\Factory\GenericOscarFactory::class,
		\Oscar\Service\OscarUserContext::class => \Oscar\Service\OscarUserContextFactory::class,
		\Oscar\Service\PcruFtpService::class => \Oscar\Service\PcruFtpServiceFactory::class,
		\Oscar\Service\PcruInformationsService::class => \Oscar\Service\PcruInformationsServiceFactory::class,
		@@ -653,6 +658,7 @@ return array(
		'Activity' => \Oscar\Controller\ProjectGrantControllerFactory::class,
		'ActivityAvenants' => \Oscar\Controller\Factory\ActivityAvenantsControllerFactory::class,
		'ActivityDate' => \Oscar\Controller\ActivityDateControllerFactory::class,
		'ActivityDateFlow' => \Oscar\Controller\ActivityDateFlowControllerFactory::class,
		'ActivityMotsCles' => \Oscar\Controller\ActivityMotsClesControllerFactory::class,
		'ActivityNotes' => \Oscar\Controller\ActivityNotesControllerFactory::class,
		'ActivityPayment' => \Oscar\Controller\ActivityPaymentControllerFactory::class,

module/Oscar/config/routes.yml

+15 −0

Original line number	Diff line number	Diff line
		@@ -2292,6 +2292,21 @@ activity-mots-cles:
		defaults:
		action: api

		activitydateflow:
		type: literal
		options:
		route: /activity-date-flow
		defaults:
		controller: ActivityDateFlow
		may_terminate: false
		child_routes:
		admin:
		type: segment
		options:
		route: /admin
		defaults:
		action: admin

		pcru:
		type: literal
		options: