Skip to content
Snippets Groups Projects
Commit b2ad8516 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Utilisation de l'aide de vue avec renderTitle pour les titres des pages de l'intervenant

parent e2b4036a
No related branches found
No related tags found
1 merge request!55Ll bug report services
Show whitespace changes
Inline Side-by-side
Showing
with 133 additions and 160 deletions
module/Application/src/Application/View/Helper/Intervenant/IntervenantViewHelper.php
+ 15
− 0
View file @ b2ad8516
......@@ -122,4 +122,19 @@ class IntervenantViewHelper extends AbstractHtmlElement
return $out;
}
public function renderTitle(?string $title)
{
$title = 'tt' . $title;
$intervenant = $this->getIntervenant();
//echo $intervenant . ' <small>' . $intervenant->getStatut() . '</small>';
$this->getView()->headTitle()->append($intervenant->getNomUsuel())->append($title);
$title .= ' <small>' . $intervenant . '</small>';
echo $this->getView()->tag('h1', ['class' => 'page-header'])->html($title);
}
}
\ No newline at end of file
module/Application/view/application/agrement/lister.phtml
+ 12
− 13
View file @ b2ad8516
......@@ -10,19 +10,18 @@
* @var $hasActions boolean
*/
$this->headTitle()->append($intervenant->getNomUsuel())->append("Agrément $typeAgrement");
$title = "Agrément par " . $typeAgrement->toString(true);
$this->intervenant($intervenant)->renderTitle($title);
?>
<h1 class="page-header"><?= sprintf("Agrément par %s <small>%s</small>", $typeAgrement->toString(true), $intervenant) ?></h1>
<?php if (!empty($data)): ?>
if (!empty($data)): ?>
<table class="table table-bordered table-hover">
<thead>
<tr>
<?php if ($needStructure): ?><th style="width: 100px">Composante</th><?php endif; ?>
<?php if ($needStructure): ?>
<th style="width: 100px">Composante</th><?php endif; ?>
<th>Agrément</th>
<?php if ($hasActions): ?><th style="width:1px">Action</th><?php endif; ?>
<?php if ($hasActions): ?>
<th style="width:1px">Action</th><?php endif; ?>
</tr>
</thead>
<tbody>
......@@ -46,7 +45,8 @@ $this->headTitle()->append($intervenant->getNomUsuel())->append("Agrément $type
L'agrément ne peut être retiré que l'année de sa décision.
<?php else: ?>
<?php if ($actionUrl): ?>
<a class="btn btn-primary pop-ajax " data-submit-reload="true" data-min-width="13em" data-placement="left"
<a class="btn btn-primary pop-ajax " data-submit-reload="true" data-min-width="13em"
data-placement="left"
href="<?= $actionUrl ?>"><?= $actionLabel ?></a>
<?php endif; ?>
<?php endif; ?>
......@@ -63,6 +63,5 @@ $this->headTitle()->append($intervenant->getNomUsuel())->append("Agrément $type
<?php endif; ?>
<hr/>
<?= $this->feuilleDeRoute($intervenant)->renderNav($typeAgrement->getCode()); ?>
module/Application/view/application/contrat/index.phtml
+ 2
− 6
View file @ b2ad8516
......@@ -16,7 +16,7 @@ foreach ($contrats as $contrat) {
}
}
$this->headTitle()->append($intervenant->getNomUsuel())->append("Contrat/avenant");
$this->intervenant($intervenant)->renderTitle("Contrat/avenant");
$this->messenger()->addMessagesFromFlashMessenger();
if ($services['non-contractualises']) {
......@@ -25,11 +25,7 @@ if ($services['non-contractualises']) {
$this->messenger()->addMessage('Tous les enseignements prévisionnels validés ont fait l\'objet d\'un contrat ou d\'un avenant.', 'success');
}
?>
<h1 class="page-header"><?= $title ?></h1>
<?= $this->messenger() ?>
$this->messenger() ?>
<style>
th.structure, td.structure {
......
module/Application/view/application/intervenant/services.phtml
+ 1
− 7
View file @ b2ad8516
......@@ -33,13 +33,7 @@ $menuUrl = $this->url('intervenant/services', ['intervenant' => $intervenant->ge
$btnNextUrl = $this->url('workflow/feuille-de-route-btn-next', ['intervenant' => $intervenant->getId(), 'wfEtapeCode' => $nextEtape]);
$this->headTitle()->append($intervenant->getNomUsuel())->append($title);
$title .= ' <small>' . $intervenant . '</small>';
?>
<h1 class="page-header"><?= $title; ?></h1>
<?php
$this->intervenant($intervenant)->renderTitle($title);
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
......
module/Application/view/application/intervenant/voir-heures-comp.phtml
+ 2
− 4
View file @ b2ad8516
......@@ -10,7 +10,6 @@ $totalService =
+ (float)vn($data, 'SERVICE_FC')
+ (float)vn($data, 'SERVICE_REFERENTIEL');
$this->headTitle()->append($intervenant->getNomUsuel())->append("Heures compl.");
function vn(array $array, $key, $type = 's')
{
......@@ -34,6 +33,8 @@ function vn(array $array, $key, $type = 's')
return null;
}
$this->intervenant($intervenant)->renderTitle('Calcul HETD');
?>
<style>
......@@ -41,9 +42,6 @@ function vn(array $array, $key, $type = 's')
background-color: #eee
}
</style>
<h1 class="page-header"><?= $intervenant ?>
<small><?= $intervenant->getStatut()->getTypeIntervenant() ?></small>
</h1>
<?= $this->form()->openTag($form->prepare()); ?>
<div class="row">
<div class="col-sm-4"><?= $this->formControlGroup($form->get('type-volume-horaire')); ?></div>
......
module/Application/view/application/intervenant/voir.phtml
+ 1
− 9
View file @ b2ad8516
......@@ -5,15 +5,7 @@ use Application\Provider\Privilege\Privileges;
/* @var $intervenant \Application\Entity\Db\Intervenant */
/* @var $role \Application\Acl\Role */
$this->headTitle()->append($intervenant->getNomUsuel())->append("Fiche");
?>
<h1 class="page-header"><?= $intervenant ?>
<small><?= $intervenant->getStatut()->getTypeIntervenant() ?></small>
</h1>
<?php
$this->intervenant($intervenant)->renderTitle('Fiche');
$tabs = [
[
......
module/Application/view/application/paiement/demande-mise-en-paiement.phtml
+ 27
− 35
View file @ b2ad8516
......@@ -14,19 +14,12 @@
$title = 'Demande de mise en paiement';
if ($intervenant) {
$title .= ' <small>'.$intervenant.'</small>';
$this->headTitle()->append($intervenant->getNomUsuel())->append($title);
$this->intervenant($intervenant)->renderTitle($title);
} else {
$this->headTitle()->append($title);
echo $this->tag('h1', ['class' => 'page-header'])->html($title);
}
$this->headTitle()->append($intervenant->getNomUsuel())->append($title) ?>
<h1 class="page-header"><?= $title; ?></h1>
<?php
if ($whyNotEditable) {
echo '<div class="alert alert-warning">'
. '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'
......@@ -44,7 +37,6 @@ if ($whyNotEditable){
}
echo $this->demandeMiseEnPaiement($servicesAPayer, $changeIndex)->setBudget($budget)->render();
echo $this->historique()->setHistoModification($dateDerniereModif)->setHistoModificateur($dernierModificateur);
......
module/Application/view/application/paiement/edition-mise-en-paiement.phtml
+ 1
− 4
View file @ b2ad8516
......@@ -6,12 +6,9 @@
* @var $paiements \Application\Entity\Db\MiseEnPaiement[]
*/
$this->headTitle()->append($intervenant->getNomUsuel())->append("Mises en paiement");
$this->intervenant($intervenant)->renderTitle('Annulation de mises en paiement');
?>
<h1 class="page-header">Annulation de mises en paiement
<small><?= $intervenant ?></small>
</h1>
<form method="post" id="mepform">
<table class="table table-bordered table-condensed table-extra-condensed table-hover table-sort">
<thead>
......
module/Application/view/application/paiement/visualisation-mise-en-paiement.phtml
+ 71
− 75
View file @ b2ad8516
......@@ -6,13 +6,7 @@
* @var $paiements \Application\Entity\Db\TblPaiement[]
*/
$this->headTitle()->append($intervenant->getNomUsuel())->append("Mises en paiement");
?>
<h1 class="page-header">Mises en paiement
<small><?= $intervenant ?></small>
</h1>
<?php
$this->intervenant($intervenant)->renderTitle("Mises en paiement");
$data = [];
$periodes = [];
......@@ -105,7 +99,8 @@ foreach( $periodes as $id => $periode ){
<th style="width:25%">Formation</th>
<th style="width:25%">Enseignement</th>
<th style="width:10%">À payer <abbr title="Heures équivalent TD">(HETD)</abbr></th>
<th style="width:10%"><abbr title="Demandes émanant de la composante">Demandes de paiement</abbr> <abbr title="Heures équivalent TD">(HETD)</abbr></th>
<th style="width:10%"><abbr title="Demandes émanant de la composante">Demandes de paiement</abbr> <abbr
title="Heures équivalent TD">(HETD)</abbr></th>
<th style="width:20%">Mises en paiement <abbr title="Heures équivalent TD">(HETD)</abbr></th>
</tr>
<?php
......@@ -119,18 +114,15 @@ foreach( $data as $d ){
echo '<td>' . $d['structure'] . '</td>';
echo '<td>' . $d['etape'] . '</td>';
echo '<td>' . $d['element'] . '</td>';
} elseif (isset($d['etablissement'])) {
// enseignement extérieur
echo '<td colspan="2">' . $d['etablissement'] . '</td>';
echo '<td>' . $d['description'] . '</td>';
} elseif (isset($d['fonction'])) {
// référentiel
echo '<td>' . $d['structure'] . '</td>';
echo '<td>' . $d['fonction'] . ' <small>(Référentiel)</small></td>';
echo '<td>' . $d['description'] . '</td>';
}
echo '<td>' . \UnicaenApp\Util::formattedNumber($d['heures-a-payer']) . '</td>';
......@@ -161,11 +153,13 @@ foreach( $data as $d ){
<td colspan="2" style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-a-payer']) ?></td>
</tr>
<tr>
<th><abbr title="Demandes émanant de la composante">Demandes de paiement</abbr> <abbr title="Heures équivalent TD">(HETD)</abbr></th>
<th><abbr title="Demandes émanant de la composante">Demandes de paiement</abbr> <abbr title="Heures équivalent TD">(HETD)</abbr>
</th>
<td colspan="2" style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-demandees']) ?></td>
</tr>
<tr>
<th rowspan="<?= count($total['heures-payees']) ?>">Mises en paiement <abbr title="Heures équivalent TD">(HETD)</abbr></th>
<th rowspan="<?= count($total['heures-payees']) ?>">Mises en paiement <abbr title="Heures équivalent TD">(HETD)</abbr>
</th>
</tr>
<?php foreach ($periodes as $pid => $periode): if (isset($total['heures-payees'][$pid])): ?>
<tr>
......@@ -175,10 +169,12 @@ foreach( $data as $d ){
<?php endif; endforeach; ?>
<tr>
<th>Mises en paiement (total <abbr title="Heures équivalent TD">HETD</abbr>)</th>
<td colspan="2" style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-payees']['total']) ?></td>
<td colspan="2"
style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-payees']['total']) ?></td>
</tr>
<tr>
<th>Restant à payer <abbr title="Heures équivalent TD">(HETD)</abbr></th>
<td colspan="2" style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-a-payer']-$total['heures-payees']['total']) ?></td>
<td colspan="2"
style="text-align:right"><?= \UnicaenApp\Util::formattedNumber($total['heures-a-payer'] - $total['heures-payees']['total']) ?></td>
</tr>
</table>
\ No newline at end of file
module/Application/view/application/service/validation.phtml
+ 1
− 7
View file @ b2ad8516
......@@ -6,14 +6,8 @@
* @var $typeVolumehoraire \Application\Entity\Db\TypeVolumeHoraire
*/
$this->headTitle()->append($intervenant->getNomUsuel())->append($title);
?>
<h1 class="page-header">
<?= $title ?>
<small><?= $intervenant ?></small>
</h1>
<?php
$this->intervenant($intervenant)->renderTitle($title);
$wells = [
'non-valides' => 'Enseignements non validés',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment