Cadoles
/
ninebadge
10
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dist/eole/2.8.1/master

This commit is contained in:
Arnaud Fornerot 2022-09-22 14:13:53 +02:00
parent 5dece858da ed91a16b2b
commit 2aea5ec841
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ninebadge-1.0/src/Controller/TallydayController.php
View File

@ -137,6 +137,8 @@ class TallydayController extends AbstractController
$users = $em->getRepository("App:User")->findBy([],["firstname"=>"ASC","lastname"=>"ASC"]);
foreach($users as $user) {
if($user->hasRole("ROLE_USER")) {
$dates[$user->getId()] = [
"id"=>$user->getId(),
"avatar"=>$user->getAvatar(),

13
src/ninebadge-1.0/src/Repository/TallydayRepository.php
View File

@ -65,17 +65,20 @@ class TallydayRepository extends ServiceEntityRepository
}
public function getCapitaltimeinterval($user,$getnovalidate=false) {
$datenow=new \DateTime('00:00');
$datas = $this->_em->getRepository('App:Tallyday')->findBy(["user"=>$user],["datestart"=>"DESC"]);
$tbdays=[];
$ework = new \DateTime('00:00');
// Cumuler les temps de travail sans fuseau
$datenow=new \DateTime('00:00');
$ework = new \DateTime('00:00', new \DateTimeZone('UTC'));
$i=0;
foreach($datas as $data) {
if($data->getDateof()<$datenow) {
$iddayweek=$data->getDateof()->format("w");
if($iddayweek>=1&&$iddayweek<=5) {
if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof());
}
$ework->add($data->getTimeday());
}
@ -84,10 +87,11 @@ class TallydayRepository extends ServiceEntityRepository
if($iddayweek>=1&&$iddayweek<=5) {
if(!in_array($data->getDateof(),$tbdays)) array_push($tbdays,$data->getDateof());
}
$ework->add($data->getTimeday());
}
}
// Enlever du temps travailler les heures sup payé
$timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime());
if($timeextra[1]) {
@ -96,7 +100,8 @@ class TallydayRepository extends ServiceEntityRepository
// Nbday worked
$nbdaywork=count($tbdays);
$etowork = new \DateTime('00:00');
$etowork = new \DateTime('00:00', new \DateTimeZone('UTC'));
$etowork->add(new \DateInterval("PT".($nbdaywork*7)."H"));
$interval = $etowork->diff($ework);

11
src/ninebadge-1.0/templates/Tallyday/month.html.twig
View File

@ -115,13 +115,14 @@ td {
{{validate.dateof|date("W")}}
</td>
{% if loop.first %}
{% for i in 2..(validate.dateof|date("N")) %}
<td></td>
{% endfor %}
{%endif %}
{% endif %}
{% if loop.first and validate.dateof|date("l")!="Monday"%}
{% for i in 2..(validate.dateof|date("N")) %}
<td></td>
{% endfor %}
{%endif %}
<td style="align:top">
<div class="date">{{validate.dateof|date("d/m")}}</div>
<div class="datedetail" style="min-height:28px">