Merge branch 'connor' into connor-css-vite (309b112d) · Commits · open-source / oscar

composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		"guzzlehttp/guzzle": "^7.0",
		"phpoffice/phpspreadsheet": "^1.29",
		"phpoffice/phpword": "^1.1",
		"unicaen/signature": "2.0.*",
		"unicaen/signature": "2.1.*",
		"ext-gettext": "*",
		"ext-fileinfo": "*",
		"symfony/filesystem": "^7.1",

composer.lock

+4 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
		"This file is @generated automatically"
		],
		"content-hash": "3ab203343807ef8a44c89d7b29f7607a",
		"content-hash": "a357f1cdb50d569594c4b8e44b451e19",
		"packages": [
		{
		"name": "apereo/phpcas",
		@@ -9171,11 +9171,11 @@
		},
		{
		"name": "unicaen/signature",
		"version": "2.0.3",
		"version": "2.1.1",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/signature.git",
		"reference": "5da3977ae8cb95b9ccb1aefb004b673e10df361c"
		"reference": "479640214aa97d5740274aea8472fd17def491e4"
		},
		"require": {
		"ext-fileinfo": "*",
		@@ -9205,7 +9205,7 @@
		}
		},
		"description": "Module de signature électronique",
		"time": "2025-09-09T10:17:07+00:00"
		"time": "2025-10-24T13:01:36+00:00"
		},
		{
		"name": "unicaen/utilisateur",

config/autoload/unicaen-signature.global.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@ return [

		// Types mimes des documents supportés pour la procédure de signature
		'documents_mimes' => [
		'application/pdf',
		'application/pdf; charset=iso-8859-1',
		'application/pdf; charset=binary'
		'application/pdf' => 'pdf',
		'application/pdf; charset=iso-8859-1' => 'pdf',
		'application/pdf; charset=binary' => 'pdf'
		],

		/////////////////////////////////////////////////////////////////////////////////

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+0 −1

Original line number	Diff line number	Diff line
		@@ -875,7 +875,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
		);
		} else {
		var_dump($form->getMessages());
		var_dump($form);
		die();

		}

module/Oscar/src/Oscar/Entity/ActivityLogRepository.php

deleted100644 → 0

+0 −86

Original line number	Diff line number	Diff line
		<?php

		/**
		* @author Stéphane Bouvry<stephane.bouvry@unicaen.fr>
		* @date: 29/05/15 12:01
		* @copyright Certic (c) 2015
		*/

		namespace Oscar\Entity;

		use Doctrine\ORM\EntityRepository;
		use Oscar\Utils\UnicaenDoctrinePaginator;

		class ActivityLogRepository extends EntityRepository
		{
		/**
		* @param $message Informations sur l'événement à inscrire.
		* @param int $level Niveau de confidentialité
		* @param string $context Context
		* @param int $contextId ID du context
		* @param int $userId UID
		* @param array $data Données complémentaires (libre)
		*
		* @return LogActivity
		*/
		public function addActivity(
		$message,
		$level = LogActivity::DEFAULT_LEVEL,
		$type = LogActivity::DEFAULT_TYPE,
		$context = LogActivity::DEFAULT_CONTEXT,
		$contextId = LogActivity::DEFAULT_CONTEXTID,
		$userId = LogActivity::DEFAULT_USER,
		array $data = null
		) {

		$activity = new LogActivity();
		$activity->setMessage($message)
		->setType($type)
		->setLevel($level)
		->setUserId($userId)
		->setContext($context)
		->setContextId($contextId)
		->setDatas($data)
		;
		$this->getEntityManager()->persist($activity);
		$this->getEntityManager()->flush($activity);
		error_log($activity);
		return $activity;
		}

		/**
		* Retourne les dernières actions de l'utilisateur.
		*
		* @param $userId
		* @param int $limit
		* @return LogActivity[]
		*/
		public function getUserActivity($userId, $limit = 20)
		{
		$qb = $this->createQueryBuilder('a')
		->select('a')
		->where('a.userId = :userId')
		->andWhere('a.type != \'debug\'')
		->setMaxResults($limit)
		->addOrderBy('a.dateCreated', 'DESC')
		->setParameter('userId', $userId);
		return $qb->getQuery()->getResult();
		}

		/**
		*
		* @param int $page
		* @param array $filter
		* @param int $resultByPage
		* @return UnicaenDoctrinePaginator
		*/
		public function getActivitiesPaged($page = 1, $filter = array(), $resultByPage = 50)
		{
		$qb = $this->createQueryBuilder('a')
		->select('a')
		->setMaxResults($resultByPage)
		->addOrderBy('a.dateCreated', 'DESC')
		;
		return new UnicaenDoctrinePaginator($qb->getQuery(), $page, $resultByPage);
		}
		}