Skip to content
Snippets Groups Projects
Commit 4bc30955 authored by root's avatar root
Browse files

Fixing affichage des corps/emploi-type/grade

parent 172c5878
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
module/Carriere/view/carriere/corps/afficher-agents.phtml
+ 15
− 3
View file @ 4bc30955
...@@ -16,8 +16,11 @@ $now = new DateTime(); ...@@ -16,8 +16,11 @@ $now = new DateTime();
/** @var AgentGrade[] $agents */ /** @var AgentGrade[] $agents */
$agents = $corps->getAgentGrades(); $agents = $corps->getAgentGrades();
$agents = array_filter($agents, function (AgentGrade $a) { return !$a->isDeleted();}); $agents = array_filter($agents, function (AgentGrade $a) { return $a->estCommence() && !$a->isDeleted();});
usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();}); usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();});
$actifs = 0; $inactifs = 0;
foreach ($agents as $agent) { if ($agent->estFini()) $inactifs++; else $actifs++;}
?> ?>
<div class="row"> <div class="row">
...@@ -28,7 +31,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -28,7 +31,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
<!-- <dt class="col-md-5"> #Agent </dt>--> <!-- <dt class="col-md-5"> #Agent </dt>-->
<!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>--> <!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>-->
<dt class="col-md-5"> #AgentGrade </dt> <dt class="col-md-5"> #AgentGrade </dt>
<dd class="col-md-7"> <?php echo count($agentGrades); ?></dd> <dd class="col-md-7"> <?php echo $actifs; ?> actifs (<?php echo $inactifs ?> inactifs)</dd>
</dl> </dl>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -41,6 +44,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -41,6 +44,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</div> </div>
</div> </div>
<label for="actif_only">Conserver les actifs seulement</label>
<input type="checkbox" name="actif_only" id="actif_only" checked>
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -51,7 +57,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -51,7 +57,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($agentGrades as $agent) : ?> <?php foreach ($agents as $agent) : ?>
<tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> > <tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> >
<td> <?php echo $agent->getId(); ?> </td> <td> <?php echo $agent->getId(); ?> </td>
<td> <td>
...@@ -71,6 +77,12 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -71,6 +77,12 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</table> </table>
<script> <script>
$('tr.historise').hide();
$('#actif_only').on('change', function() {
let val = $('#actif_only').is(':checked');
if (val === true) $('tr.historise').hide(); else $('tr.historise').show();
});
$('a.linkexterne').on('click',function(e) { $('a.linkexterne').on('click',function(e) {
e.preventDefault(); e.preventDefault();
$('.modal').modal("hide"); $('.modal').modal("hide");
......
module/Carriere/view/carriere/emploi-type/afficher-agents.phtml
+ 15
− 7
View file @ 4bc30955
...@@ -10,17 +10,18 @@ ...@@ -10,17 +10,18 @@
use Application\Entity\Db\Agent; use Application\Entity\Db\Agent;
use Application\Entity\Db\AgentGrade; use Application\Entity\Db\AgentGrade;
use Application\Provider\Privilege\AgentPrivileges; use Application\Provider\Privilege\AgentPrivileges;
use Carriere\Entity\Db\Corps;
use Carriere\Entity\Db\EmploiType; use Carriere\Entity\Db\EmploiType;
$now = new DateTime(); $now = new DateTime();
/** @var AgentGrade[] $agents */ /** @var AgentGrade[] $agents */
$agents = $emploiType->getAgentGrades(); $agents = $emploiType->getAgentGrades();
$agents = array_filter($agents, function (AgentGrade $a) { return !$a->isDeleted();}); $agents = array_filter($agents, function (AgentGrade $a) { return $a->estCommence($now) && !$a->isDeleted();});
usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();}); usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();});
?>
$actifs = 0; $inactifs = 0;
foreach ($agents as $agent) { if ($agent->estFini()) $inactifs++; else $actifs++;}
?>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<dl class="row"> <dl class="row">
...@@ -29,7 +30,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -29,7 +30,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
<!-- <dt class="col-md-5"> #Agent </dt>--> <!-- <dt class="col-md-5"> #Agent </dt>-->
<!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>--> <!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>-->
<dt class="col-md-5"> #AgentGrade </dt> <dt class="col-md-5"> #AgentGrade </dt>
<dd class="col-md-7"> <?php echo count($agentGrades); ?></dd> <dd class="col-md-7"> <?php echo $actifs; ?> actifs (<?php echo $inactifs ?> inactifs)</dd>
</dl> </dl>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -42,6 +43,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -42,6 +43,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</div> </div>
</div> </div>
<label for="actif_only">Conserver les actifs seulement</label>
<input type="checkbox" name="actif_only" id="actif_only" checked>
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -52,7 +56,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -52,7 +56,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($agentGrades as $agent) : ?> <?php foreach ($agents as $agent) : ?>
<tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> > <tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> >
<td> <?php echo $agent->getId(); ?> </td> <td> <?php echo $agent->getId(); ?> </td>
<td> <td>
...@@ -71,9 +75,13 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -71,9 +75,13 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</tbody> </tbody>
</table> </table>
<script> <script>
$('tr.historise').hide();
$('#actif_only').on('change', function() {
let val = $('#actif_only').is(':checked');
if (val === true) $('tr.historise').hide(); else $('tr.historise').show();
});
$('a.linkexterne').on('click',function(e) { $('a.linkexterne').on('click',function(e) {
e.preventDefault(); e.preventDefault();
$('.modal').modal("hide"); $('.modal').modal("hide");
......
module/Carriere/view/carriere/grade/afficher-agents.phtml
+ 16
− 3
View file @ 4bc30955
...@@ -16,8 +16,12 @@ $now = new DateTime(); ...@@ -16,8 +16,12 @@ $now = new DateTime();
/** @var AgentGrade[] $agents */ /** @var AgentGrade[] $agents */
$agents = $grade->getAgentGrades(); $agents = $grade->getAgentGrades();
$agents = array_filter($agents, function (AgentGrade $a) { return !$a->isDeleted();}); $agents = array_filter($agents, function (AgentGrade $a) { return $a->estCommence() && !$a->isDeleted();});
usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();}); usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->getDenomination() > $b->getAgent()->getDenomination();});
$actifs = 0; $inactifs = 0;
foreach ($agents as $agent) { if ($agent->estFini()) $inactifs++; else $actifs++;}
?> ?>
<div class="row"> <div class="row">
...@@ -28,7 +32,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -28,7 +32,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
<!-- <dt class="col-md-5"> #Agent </dt>--> <!-- <dt class="col-md-5"> #Agent </dt>-->
<!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>--> <!-- <dd class="col-md-7"> --><?php //echo count($agents); ?><!--</dd>-->
<dt class="col-md-5"> #AgentGrade </dt> <dt class="col-md-5"> #AgentGrade </dt>
<dd class="col-md-7"> <?php echo count($agentGrades); ?></dd> <dd class="col-md-7"> <?php echo $actifs; ?> actifs (<?php echo $inactifs ?> inactifs)</dd>
</dl> </dl>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -41,6 +45,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -41,6 +45,9 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</div> </div>
</div> </div>
<label for="actif_only">Conserver les actifs seulement</label>
<input type="checkbox" name="actif_only" id="actif_only" checked>
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
...@@ -51,7 +58,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -51,7 +58,7 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($agentGrades as $agent) : ?> <?php foreach ($agents as $agent) : ?>
<tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> > <tr <?php if ($agent->estFini($now)) echo 'class="historise"'; ?> >
<td> <?php echo $agent->getId(); ?> </td> <td> <?php echo $agent->getId(); ?> </td>
<td> <td>
...@@ -71,6 +78,12 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge ...@@ -71,6 +78,12 @@ usort($agents, function(AgentGrade $a, AgentGrade $b) {return $a->getAgent()->ge
</table> </table>
<script> <script>
$('tr.historise').hide();
$('#actif_only').on('change', function() {
let val = $('#actif_only').is(':checked');
if (val === true) $('tr.historise').hide(); else $('tr.historise').show();
});
$('a.linkexterne').on('click',function(e) { $('a.linkexterne').on('click',function(e) {
e.preventDefault(); e.preventDefault();
$('.modal').modal("hide"); $('.modal').modal("hide");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment