Remise en forme des phtml des parcours + css (8fee2462) · Commits · open-source / emc2

CHANGELOG.md

+2 −0

Changes for CHANGELOG.md: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Version 1.1.1
		-------------
		+ Affichage des structures de l'agent dans l'entête des entretiens professionnels (lien vers la structure si l'utilisateur a les droits de visualiser la structure).
		+ Division de l'onglet Compte-rendu d'évaluation de formation en trois onglets : Compte-rendu d'évaluation de formation, Parcours de formation et applicatif, Acquis de l'agent
		+ Possibilité de renseigner les applications dans le parcours applicatif
		No newline at end of file

module/Application/config/merged/validation.config.php

+1 −1

Changes for module/Application/config/merged/validation.config.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -190,7 +190,7 @@ return [

		'view_helpers' => [
		'invokables' => [
		'validationBadge' => ValidationBadgeViewHelper::class,
		'validationBadgeBis' => ValidationBadgeViewHelper::class,
		],
		],

module/Application/config/module.config.php

+5 −4

Changes for module/Application/config/module.config.php: 5 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -293,10 +293,11 @@ return [
		'110_' => 'vendor/DataTables-1.10.18/datatables.min.css',
		'112_' => 'vendor/font-awesome-5.15.2/css/all.min.css',
		'114_' => 'vendor/bootstrap-select-1.13.2/dist/css/bootstrap-select.min.css',
		'996_' => 'css/ubuntu.css',
		'997_' => 'css/unicaen.css',
		'998_' => 'css/icon.css',
		'999_' => 'css/highlight.css',
		'990_' => 'css/ubuntu.css',
		'995_' => 'css/unicaen.css',
		'996_' => 'css/icon.css',
		'997_' => 'css/highlight.css',
		'998_' => 'css/tooltip.css',
		],
		'images' => [
		'100_' => 'img/PrEECoG.svg',

module/Application/src/Application/View/Helper/ValidationBadgeViewHelper.php

+1 −1

Changes for module/Application/src/Application/View/Helper/ValidationBadgeViewHelper.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -23,6 +23,6 @@ class ValidationBadgeViewHelper extends AbstractHelper
		$view = $this->getView();
		$view->resolver()->attach(new TemplatePathStack(['script_paths' => [__DIR__ . "/partial"]]));

		return $view->partial('validation-badge', ['validation' => $validation, 'options' => $options]);
		return $view->partial('validation-badge-bis', ['validation' => $validation, 'options' => $options]);
		}
		}
		No newline at end of file

module/Application/src/Application/View/Helper/partial/parcours-application.phtml

+8 −59

Changes for module/Application/src/Application/View/Helper/partial/parcours-application.phtml: 8 added lines, 59 removed lines.
Original line number	Diff line number	Diff line
		@@ -50,40 +50,27 @@ ksort($applicationsArray);
		$canModifier = isset($options['modification'])?$options['modification']:false;
		?>

		<?php / Titre du parcours de formation ***************************************************************************/ ?>
		<div class="parcours">

		<div class="parcours-de-formation">

		<div class="row">
		<div class="col-md-11 titre-bloc">
		<h3>Parcours de formation lié aux applications</h3>
		</div>
		<div class="titre">
		<h3>Parcours d'entrée applicatif</h3>
		</div>

		<br/>

		<?php / Affichage du tableau **************************************************************************************/ ?>

		<div>
		<table class="parcours-de-formation">
		<div class="listing">
		<table>
		<?php foreach($applicationsArray as $groupe => $applicationArray) : ?>
		<?php usort($applicationArray, function ($a, $b) {return $a->getLibelle() > $b->getLibelle();}); ?>

		<?php / Barre de groupe de formation *****************************************************************/ ?>
		<tr>
		<th class="titre" colspan="3">
		<th colspan="2">
		<?php echo $groupe; ?>
		</th>
		</tr>

		<?php / Barre de formation ****************************************************************************/ ?>

		<?php foreach($applicationArray as $application) : ?>
		<tr>
		<td class="libelle">
		<?php echo $application->getLibelle(); ?>
		</td>
		<td class="formation">
		<td class="validation">
		<?php $hasApplication = $agent->hasApplication($application); ?>
		<?php if ($hasApplication === null) : ?>
		<?php if ($canModifier) : ?>
		@@ -102,17 +89,7 @@ ksort($applicationsArray);
		<?php else : ?>
		<?php $validation = ($hasApplication AND $hasApplication->getValidation())?$hasApplication->getValidation():null; ?>
		<?php if ($validation) : ?>
		<?php if ($validation->getValeur() === null) : ?>
		<span class="icon ok" style="color: darkgreen;"
		data-toggle="tooltip" data-html="true"
		title="Validée le <?php echo $validation->getHistoModification()->format('d/m/Y'); ?> par <?php echo $validation->getHistoModificateur()->getDisplayName(); ?>"
		></span>
		<?php else: ?>
		<span class="icon ko" style="color: darkred;"
		data-toggle="tooltip" data-html="true"
		title="Refusée le <?php echo $validation->getHistoModification()->format('d/m/Y'); ?> par <?php echo $validation->getHistoModificateur()->getDisplayName(); ?>"
		></span>
		<?php endif; ?>
		<?php echo $this->validationBadge($validation); ?>
		<?php else : ?>
		<?php if ($canModifier) : ?>
		<a
		@@ -132,37 +109,9 @@ ksort($applicationsArray);
		<?php endif; ?>
		<?php endif; ?>
		</td>
		<td class="action"></td>
		</tr>
		<?php endforeach; ?>
		<?php endforeach; ?>
		</table>
		</div>
		</div>
		No newline at end of file


		<style>
		div.parcours-de-formation {
		padding-top: 2rem;
		}

		div.parcours-de-formation h4 {
		text-decoration: underline;
		}

		table.parcours-de-formation {
		width:95%;
		}

		table.parcours-de-formation th {
		padding: 0.5rem;
		color: white;
		}
		table.parcours-de-formation td.libelle {
		padding-left: 1rem;
		width:80%;
		}
		table.parcours-de-formation td.formation {
		text-align: center;
		}
		</style>
		No newline at end of file