timeextra en minute et non en heure (ref #14)
This commit is contained in:
parent
ed91a16b2b
commit
3ee638a857
|
@ -37,7 +37,7 @@ class TimeextraType extends AbstractType
|
||||||
|
|
||||||
$builder->add('hour',
|
$builder->add('hour',
|
||||||
IntegerType::class, [
|
IntegerType::class, [
|
||||||
"label" => "Nombre d'Heure",
|
"label" => "Nombre de Minutes",
|
||||||
"required" => true,
|
"required" => true,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
@ -92,10 +92,10 @@ class TallydayRepository extends ServiceEntityRepository
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enlever du temps travailler les heures sup payé
|
// Enlever du temps travailler les minutes sup payé
|
||||||
$timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime());
|
$timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime());
|
||||||
if($timeextra[1]) {
|
if($timeextra[1]) {
|
||||||
$ework->sub(new \DateInterval("PT".$timeextra[1]."H"));
|
$ework->sub(new \DateInterval("PT".$timeextra[1]."M"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Nbday worked
|
// Nbday worked
|
||||||
|
|
|
@ -28,7 +28,7 @@ GESTION DES HEURES SUPPLEMENTAIRES
|
||||||
<th width="70px" class="no-sort">Action</th>
|
<th width="70px" class="no-sort">Action</th>
|
||||||
<th>Utilisateur</th>
|
<th>Utilisateur</th>
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>Nb Heure</th>
|
<th>Nb Minutes</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
Loading…
Reference in New Issue