Merge remote-tracking branch 'origin/master' (6b6ab8f6) · Commits · open-source / OSE

code/test7.php

+8 −0

Changes for code/test7.php: 8 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,3 +4,11 @@
		* @var $this \Application\View\Renderer\PhpRenderer
		* @var $container \Psr\Container\ContainerInterface
		*/

		//select * from v_tbl_paiement where intervenant_id = 826844 AND service_referentiel_id = 21673

		$stbl = $container->get(\UnicaenTbl\Service\TableauBordService::class);

		$data = ['INTERVENANT_ID' => 826844];

		$stbl->calculer('paiement', $data);
		No newline at end of file

composer.lock

+25 −26

Changes for composer.lock: 25 added lines, 26 removed lines.
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": "00ff9bc298c69f77e92b5892881a7db4",
		"content-hash": "b1dec40219b9284fb87959cb1656f00e",
		"packages": [
		{
		"name": "apereo/phpcas",
		@@ -2660,16 +2660,16 @@
		},
		{
		"name": "laminas/laminas-escaper",
		"version": "2.15.0",
		"version": "2.16.0",
		"source": {
		"type": "git",
		"url": "https://github.com/laminas/laminas-escaper.git",
		"reference": "c612b0488ae486284c39885efca494c180f16351"
		"reference": "9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/c612b0488ae486284c39885efca494c180f16351",
		"reference": "c612b0488ae486284c39885efca494c180f16351",
		"url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8",
		"reference": "9cf1f5317ca65b4fd5c6a3c2855e24a187b288c8",
		"shasum": ""
		},
		"require": {
		@@ -2681,12 +2681,11 @@
		"zendframework/zend-escaper": "*"
		},
		"require-dev": {
		"infection/infection": "^0.27.11",
		"infection/infection": "^0.29.8",
		"laminas/laminas-coding-standard": "~3.0.1",
		"maglnet/composer-require-checker": "^3.8.0",
		"phpunit/phpunit": "^9.6.22",
		"psalm/plugin-phpunit": "^0.19.0",
		"vimeo/psalm": "^5.26.1"
		"phpunit/phpunit": "^10.5.45",
		"psalm/plugin-phpunit": "^0.19.2",
		"vimeo/psalm": "^6.6.2"
		},
		"type": "library",
		"autoload": {
		@@ -2718,7 +2717,7 @@
		"type": "community_bridge"
		}
		],
		"time": "2024-12-17T19:39:54+00:00"
		"time": "2025-02-17T12:40:19+00:00"
		},
		{
		"name": "laminas/laminas-eventmanager",
		@@ -5183,16 +5182,16 @@
		},
		{
		"name": "myclabs/deep-copy",
		"version": "1.12.1",
		"version": "1.13.0",
		"source": {
		"type": "git",
		"url": "https://github.com/myclabs/DeepCopy.git",
		"reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
		"reference": "024473a478be9df5fdaca2c793f2232fe788e414"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
		"reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
		"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
		"reference": "024473a478be9df5fdaca2c793f2232fe788e414",
		"shasum": ""
		},
		"require": {
		@@ -5231,7 +5230,7 @@
		],
		"support": {
		"issues": "https://github.com/myclabs/DeepCopy/issues",
		"source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
		"source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
		},
		"funding": [
		{
		@@ -5239,7 +5238,7 @@
		"type": "tidelift"
		}
		],
		"time": "2024-11-08T17:47:46+00:00"
		"time": "2025-02-12T12:17:51+00:00"
		},
		{
		"name": "nikic/php-parser",
		@@ -7865,11 +7864,11 @@
		},
		{
		"name": "unicaen/vue",
		"version": "6.3.1",
		"version": "6.3.2",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/vue.git",
		"reference": "711faf702e40cf43c7dfbe44671ae25ab31a7d64"
		"reference": "2b7dc7c451203cb6e7b476fb18df39414f464ca1"
		},
		"type": "library",
		"autoload": {
		@@ -7881,7 +7880,7 @@
		]
		},
		"description": "Module pour utiliser Vue.js",
		"time": "2025-01-22T09:35:03+00:00"
		"time": "2025-02-17T14:08:11+00:00"
		},
		{
		"name": "unicaen/zfc-user",
		@@ -9068,16 +9067,16 @@
		},
		{
		"name": "phpstan/phpdoc-parser",
		"version": "2.0.0",
		"version": "2.0.2",
		"source": {
		"type": "git",
		"url": "https://github.com/phpstan/phpdoc-parser.git",
		"reference": "c00d78fb6b29658347f9d37ebe104bffadf36299"
		"reference": "51087f87dcce2663e1fed4dfd4e56eccd580297e"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299",
		"reference": "c00d78fb6b29658347f9d37ebe104bffadf36299",
		"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51087f87dcce2663e1fed4dfd4e56eccd580297e",
		"reference": "51087f87dcce2663e1fed4dfd4e56eccd580297e",
		"shasum": ""
		},
		"require": {
		@@ -9109,9 +9108,9 @@
		"description": "PHPDoc parser with support for nullable, intersection and generic types",
		"support": {
		"issues": "https://github.com/phpstan/phpdoc-parser/issues",
		"source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0"
		"source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.2"
		},
		"time": "2024-10-13T11:29:49+00:00"
		"time": "2025-02-17T20:25:51+00:00"
		},
		{
		"name": "phpunit/php-code-coverage",

data/ddl/view/V_TBL_PAIEMENT.sql

+2 −2

Changes for data/ddl/view/V_TBL_PAIEMENT.sql: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -192,8 +192,8 @@ SELECT
		CASE WHEN si.mode_enseignement_realise = 'semestriel' THEN 1 ELSE 0 END calcul_semestriel,
		mep.id a_payer_id,
		i.annee_id annee_id,
		sr.id service_id,
		NULL service_referentiel_id,
		NULL service_id,
		sr.id service_referentiel_id,
		NULL mission_id,
		NULL volume_horaire_id,
		si.type_intervenant_id type_intervenant_id,

module/Paiement/src/Tbl/Process/PaiementDebugger.php

+6 −1

Changes for module/Paiement/src/Tbl/Process/PaiementDebugger.php: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ use Paiement\Entity\Db\TauxRemu;
		use Paiement\Tbl\Process\Sub\ServiceAPayer;
		use Referentiel\Entity\Db\ServiceReferentiel;
		use Referentiel\Entity\Db\VolumeHoraireReferentiel;
		use Service\Entity\Db\EtatVolumeHoraire;
		use Service\Entity\Db\TypeVolumeHoraire;
		use UnicaenApp\Entity\HistoriqueAwareInterface;

		/**
		@@ -365,10 +367,13 @@ class PaiementDebugger
		'Dernière modification par ' \|\| u.display_name \|\| ' le ' \|\| to_char(vhr.histo_modification,'dd/mm/YYYY') histo
		FROM
		formule_resultat_volume_horaire frvh
		JOIN formule_resultat_intervenant fri ON fri.id = frvh.formule_resultat_intervenant_id
		JOIN type_volume_horaire tvh ON tvh.id = fri.type_volume_horaire_id AND tvh.code = '".TypeVolumeHoraire::CODE_REALISE."'
		JOIN etat_volume_horaire evh ON evh.id = fri.etat_volume_horaire_id AND evh.code = '".EtatVolumeHoraire::CODE_VALIDE."'
		JOIN volume_horaire_ref vhr ON vhr.id = frvh.volume_horaire_ref_id
		JOIN utilisateur u ON u.id = vhr.histo_modificateur_id
		WHERE
		frvh.id = :frsr
		frvh.service_referentiel_id = :frsr
		ORDER BY
		frvh.id
		";

module/Paiement/src/Tbl/Process/PaiementProcess.php

+6 −1

Changes for module/Paiement/src/Tbl/Process/PaiementProcess.php: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -195,14 +195,19 @@ class PaiementProcess implements ProcessInterface
		$this->services[$key] = $sap;
		}

		if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {
		$lap = new LigneAPayer();
		$tauxRemu = (int)$data['TAUX_REMU_ID'];
		$horaireDebut = (string)$data['HORAIRE_DEBUT'];
		$lap->tauxValeur = $this->getServiceTauxRemu()->tauxValeur($tauxRemu, $horaireDebut);
		$lap->pourcAA = $this->repartiteur->fromBdd($data);
		$lap->fromBdd($data);
		if (!array_key_exists($lapKey, $this->services[$key]->lignesAPayer)) {

		$this->services[$key]->lignesAPayer[$lapKey] = $lap;
		}else{
		$olap = &$this->services[$key]->lignesAPayer[$lapKey];
		$olap->heuresAA += $lap->heuresAA;
		$olap->heuresAC += $lap->heuresAC;
		}

		if ($mepKey > 0 && !array_key_exists($mepKey, $this->services[$key]->misesEnPaiement)) {