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

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: eole-ninebadge
+Section: web
+Priority: optional
+Maintainer: Cadoles <contact@cadoles.com>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4
+Homepage: https://forge.cadoles.com/Cadoles/ninebadge
+Vcs-Git: https://forge.cadoles.com/Cadoles/ninebadge
+Vcs-Browser: https://forge.cadoles.com/Cadoles/ninebadge
+
+Package: ninebadge-sso
+Architecture: all
+Depends: ${misc:Depends}, eole-sso
+Description: Filtre SSO pour ninebadge "EOLE".
+
+Package: eole-ninebadge
+Architecture: all
+Depends: ${misc:Depends}, eole-envole-dependances, ninebadge-sso
+Description: Eolisation de l'application ninebadge.
+
+Package: ninebadge-apps
+Architecture: all
+Depends: ${misc:Depends}, envole-dependances-apps
+Description: Sources pour ninebadge "EOLE".

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-ninebadge.install

@@ -0,0 +1 @@
+usr/share/eole

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/envole/%(version)s

debian/ninebadge-apps.install

@@ -0,0 +1 @@
+var/www/html

debian/ninebadge-sso.install

@@ -0,0 +1 @@
+usr/share/sso

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

src/ninebadge-1.0/composer.json

@@ -68,10 +68,7 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true,
+        "sort-packages": true
-        "allow-plugins": {
-            "symfony/flex": true
-        }
     },
     "autoload": {
         "psr-4": {
@@ -92,9 +89,6 @@
         "symfony/polyfill-php56": "*"
     },
     "scripts": {
-        "pre-install-cmd": [
-            "php scripts/checkcomposer.php"
-        ],           
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "cache:clear --env=prod": "symfony-cmd",

src/ninebadge-1.0/scripts/checkcomposer.php

@@ -1,13 +0,0 @@
-<?php
-
-$requiredVersion = 'version 1'; // La version interdite
-
-$composerVersion = trim(shell_exec('COMPOSER_ALLOW_SUPERUSER=1 composer --version --no-ansi'));
-echo $composerVersion."\n";
-
-if (stripos($composerVersion,$requiredVersion)===false ) {
-    echo "La version de Composer $requiredVersion n'est pas autorisée" . PHP_EOL;
-    echo "Veuillez mettre à jour Composer avec 'composer self-update --1'." . PHP_EOL;
-    echo "Ou executez le scripts/reconfigure.sh" . PHP_EOL;
-    exit(1); // Quitte avec un code d'erreur
-}

src/ninebadge-1.0/scripts/reconfigure.sh

@@ -28,8 +28,6 @@ fi
 
 # Installation des dépendances composer
 echo COMPOSER = Install
-export COMPOSER_ALLOW_SUPERUSER=1
-composer self-update --1 --quiet
 composer install --quiet
 
 php bin/console app:AppInit --env=prod

src/ninebadge-1.0/src/Command/BreakdayCommand.php

@@ -83,36 +83,21 @@ class BreakdayCommand extends Command
         foreach($users as $user) {
             if(!$user->hasRole("ROLE_USER")) continue;
 
-            $this->writeln("");
+            $mini=new \Datetime('2022-03-07 00:00');
-            $this->writeln($user->getUsername());
+            $start=new \Datetime('00:00');
-
+            $start->modify("monday this week");
-            $start=new \Datetime('2022-03-07 00:00');
             $end=new \Datetime('00:00');
             $end->modify("last day of this month");  
             $end->modify("next sunday");            
+            $start->modify("previous month");
+            if($start<$mini) $start=clone $mini;
            
-            // On récupère la première journée de pointage de l'utilisateur
-            $qb = $this->em->createQueryBuilder()
-                       ->select('tallyday')
-                       ->from('App:Tallyday','tallyday')
-                       ->Where('tallyday.user=:user')
-                       ->setParameter('user',$user)
-                       ->orderBy('tallyday.dateof', 'ASC')
-                       ->setMaxResults(1);
-
-            $datas = $qb->getQuery()->getResult();
-            if(empty($datas)) continue;
-            $firstday=$datas[0]->getDateof();
-            $this->writeln("FIRST DAY = ".$firstday->format("d/m/Y"));
-
             $response=$this->api("POST",$url."/getBreakdays",json_encode(["key"=>$key,"username"=>$user->getUsername()]));
+            
             if($response&&$response->code=="200") {
                 while($start<=$end) {
                     $havebreakday=false;
-                    $havebreakdayAM=false;
+                    if($start->format("w")!=0&&$start->format("w")!=6) {
-                    $havebreakdayPM=false;
-
-                    if($start->format("w")!=0&&$start->format("w")!=6&&$start>=$firstday) {
                         foreach($response->body->events as $event) {
                             if($event->eventallday) {
                                 $manip=clone $start;
@@ -161,10 +146,7 @@ class BreakdayCommand extends Command
                                             $data->setIsbreakday(true);
                                             $data->setName($event->taskname);
                                             $data->setDatestart(clone $manip);
-                                            $data->setIstelework(false);
+                                            
-                                            $data->setIspenaltypassive(false);
-                                            $data->setIspenaltyactive(false);
-
                                             $manip->add(new \DateInterval("PT7H"));
                                             $data->setDateend(clone $manip);
                                             $this->em->persist($data);
@@ -212,9 +194,6 @@ class BreakdayCommand extends Command
                                             $data->setIsbreakday(true);
                                             $data->setName("AM = ".$event->taskname);
                                             $data->setDatestart(clone $manip);
-                                            $data->setIstelework(false);
-                                            $data->setIspenaltypassive(false);
-                                            $data->setIspenaltyactive(false);
                                             
                                             $manip->add(new \DateInterval("PT3H"));
                                             $manip->add(new \DateInterval("PT30M"));
@@ -224,7 +203,6 @@ class BreakdayCommand extends Command
                                         }
 
                                         $havebreakday=true;
-                                        $havebreakdayAM=true;
                                     }
                                 }
                                 else {
@@ -263,11 +241,8 @@ class BreakdayCommand extends Command
                                                 $data->setValidatemaster(false);
                                                 $data->setIsbreakday(true);
                                                 $data->setName("PM = ".$event->taskname);
-                                                $data->setDatestart(clone $manip);                                                
+                                                $data->setDatestart(clone $manip);
-                                                $data->setIstelework(false);
+                                                
-                                                $data->setIspenaltypassive(false);
-                                                $data->setIspenaltyactive(false);
-
                                                 $manip->add(new \DateInterval("PT3H"));
                                                 $manip->add(new \DateInterval("PT30M"));
                                                 $data->setDateend(clone $manip);
@@ -276,7 +251,6 @@ class BreakdayCommand extends Command
                                             }
         
                                             $havebreakday=true;
-                                            $havebreakdayPM=true;
                                         }
                                     }                                
                                 }
@@ -292,31 +266,6 @@ class BreakdayCommand extends Command
                             $this->em->flush();
                         }
                     }
-                    else {
-                        // Si congés matin mais par l'après midi on supprime un congés potentiel de l'aprés midi 
-                        if($havebreakdayAM && !$havebreakdayPM) {
-                            $manip=clone $start;
-                            $manip->setTime(13,30);
-                            $tallydays=$this->em->getRepository("App:Tallyday")->findBy(["user"=>$user,"dateof"=>$start,"datestart"=>$manip,"validatemaster"=>false,"isbreakday"=>true]);
-                            foreach($tallydays as $tallyday) {
-                                $this->em->remove($tallyday);
-                                $this->em->flush();
-                            }
-                        }
-
-                        // Si congés aprèsmidi mais pas le matin on supprime un congés potentiel du matin
-                        if(!$havebreakdayAM && $havebreakdayPM) {
-                            $manip=clone $start;
-                            $manip->setTime(8,30);
-                            $tallydays=$this->em->getRepository("App:Tallyday")->findBy(["user"=>$user,"dateof"=>$start,"datestart"=>$manip,"validatemaster"=>false,"isbreakday"=>true]);
-                            foreach($tallydays as $tallyday) {
-                                
-                                $this->em->remove($tallyday);
-                                $this->em->flush();
-                            }
-                        }
-
-                    }
 
                     $start->add(new \DateInterval('P1D'));
                 }

src/ninebadge-1.0/src/Controller/TallydayController.php

@@ -137,8 +137,6 @@ 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(),
@@ -278,7 +276,7 @@ class TallydayController extends AbstractController
         if(!$user) return $this->redirectToRoute("app_tallyday_masterlist");
 
         // Pas normal = on ne peut créer une donnée sur une journée déjà validé par master
-        $isvalidemaster= $em->getRepository($this->entity)->findOneBy(["user"=>$user,"dateof"=>$dateof,"validatemaster"=>true]);
+        $isvalidemaster= $em->getRepository($this->entity)->findOneBy(["user"=>$this->getUser(),"dateof"=>$dateof,"validatemaster"=>true]);
         if($isvalidemaster) return $this->redirectToRoute("app_tallyday_masterlist");
 
         return $this->submit($user,$dateof,"master",$request);

src/ninebadge-1.0/src/Form/TimeextraType.php

@@ -37,7 +37,7 @@ class TimeextraType extends AbstractType
         
         $builder->add('hour',
             IntegerType::class, [
-                "label" => "Nombre de Minutes",
+                "label" => "Nombre d'Heure",
                 "required" => true,
             ]
         );

src/ninebadge-1.0/src/Repository/TallydayRepository.php

@@ -65,20 +65,17 @@ 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());
             }
 
@@ -87,25 +84,19 @@ 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 minutes sup payé
+        // Enlever du temps travailler les heures sup payé
         $timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime());
-        if($timeextra[1]>0) {
+        if($timeextra[1]) {
-            $ework->sub(new \DateInterval("PT".$timeextra[1]."M"));
+            $ework->sub(new \DateInterval("PT".$timeextra[1]."H"));
-        }
-        // Ajouter du temps sur des heures supplémentaires majorées
-        else {
-            $ework->add(new \DateInterval("PT".($timeextra[1]*-1)."M"));
         }
 
         // 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);

src/ninebadge-1.0/templates/Tallyday/month.html.twig

@@ -19,21 +19,13 @@ td {
     {% if fgprint %}color:#000000 !important;{%endif%}
 }
 
-@media print {
+{% if fgprint %}
-    .noprint { display:none; }
-    body,h1,.card-header {font-family: 'arial' !important}
-    
     .card {float: none !important; }
     .card, .card-header {border: none;}
     .breakpage {
         page-break-after: always;
     }    
-    .nobreakpage{
+{% endif %}
-        page-break-after: unset;
-    }    
-    .card-body {padding:0px;}
-    .fulltable{width:100%;}
-}
 
 .date {
     color: #ffffff;
@@ -51,26 +43,23 @@ td {
     RAPPORT MENSUEL = {{ monthof|date("m/Y") }}
     </h1>
 
-    <div class="noprint">
     {% if not fgprint %}
-        <a class="btn btn-secondary mr-2" href={{ path('app_tallyday') }}>Retour</a>
+    <a class="btn btn-secondary mr-2" href={{ path('app_tallyday') }}>Retour</a>
-        <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:prevmonth}) }}>Mois Précédent</a>
+    <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:prevmonth}) }}>Mois Précédent</a>
-        <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:nextmonth}) }}>Mois Suivant</a>
+    <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:nextmonth}) }}>Mois Suivant</a>
-        <!-- <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:monthof|date("Ym"),type:"pdf"}) }}>Export PDF</a> -->
+    <a class="btn btn-secondary mr-2" href={{ path('app_tallyday_mastermonth',{monthof:monthof|date("Ym"),type:"pdf"}) }}>Export PDF</a>
-        <a id="btnprint" class="btn btn-secondary mr-2" href="#">Imprimer</a>
-        
 
-        <a class="btn btn-secondary float-right" href={{ path('app_tallyday_masterexport') }}>Export CSV</a>
+    <a class="btn btn-secondary float-right" href={{ path('app_tallyday_masterexport') }}>Export CSV</a>
-        <a class="btn btn-secondary float-right mr-2" href={{ path('app_tallyday_masterlist') }}>Gestion des Pointages</a>
+    <a class="btn btn-secondary float-right mr-2" href={{ path('app_tallyday_masterlist') }}>Gestion des Pointages</a>
-        <a class="btn btn-secondary float-right mr-2" href={{ path('app_timeextra') }}>Gestion Heures Sup</a>
+    <a class="btn btn-secondary float-right mr-2" href={{ path('app_timeextra') }}>Gestion Heures Sup</a>
-        {% if message is defined and not message is empty %}
+    {% if message is defined and not message is empty %}
-            <div class='alert alert-danger' style='margin: 5px 0px'>
+        <div class='alert alert-danger' style='margin: 5px 0px'>
-                <strong>Erreur</strong><br>
+            <strong>Erreur</strong><br>
-                {{ message|raw }}<br>
+            {{ message|raw }}<br>
-            </div>
+        </div>
-        {% endif %}
     {% endif %}
-    </div>
+    {% endif %}
+
 
     <div class="mt-3" style="margin:auto; max-width:1810px;">
     {% set nbusers=0 %}
@@ -78,16 +67,16 @@ td {
         {% if date.validates %}
             {% set nbusers=nbusers+1 %}
 
-            <div class="card mr-1 mb-1 float-left {% if nbusers==2 %}breakpage{%else%}nobreakpage{% endif %} ">
+            <div class="card mr-1 mb-1 float-left {% if nbusers==2 %}breakpage{% endif %} ">
                 <div class="card-header">
-                    {% if not fgprint %} <img src="{{date.avatar|urlavatar}}" class="avatar noprint">{%endif%} {{ date.displayname }}
+                    <img src="{{date.avatar|urlavatar}}" class="avatar"> {{ date.displayname }}
                     <div class="float-right text-right">
                         {{date.timemonth}} / {{ timetowork }}
                     </div>
                 </div>
 
                 <div class="card-body">
-                    <table class="fulltable">
+                    <table>
                         <thead>
                             <tr>
                                 <th style="width:50px !important">s</th>
@@ -115,14 +104,13 @@ 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">
@@ -213,11 +201,6 @@ td {
                 maxheight=$(this).height();
         });        
         $( ".card" ).height(maxheight);
-
-        $("#btnprint").click(function(){
-            window.print();
-            return false;
-        });
     });
 
 {% endblock %}

src/ninebadge-1.0/templates/Tallyday/tallyday.html.twig

@@ -139,7 +139,7 @@
         </div>        
         
         {% if not isvalideuser and not isvalidemaster %}
-            <div style="width:300px; text-align:left">
+            <div style="width:380px; text-align:left">
                 <div class="custom-control custom-switch" style="zoom:130%">
                     <input type="checkbox" class="custom-control-input" id="istelework" {%if istelework%}checked{%endif%}>
                     <label class="custom-control-label" for="istelework">Télétravail</label>
@@ -156,20 +156,20 @@
                 </div>
             </div>
 
-            <a href="{{path("app_tallyday_uservalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-danger mt-3"  style="width:300px" data-method="confirm" data-confirm="Êtes-vous sûr de vouloir valider votre journée ?">Valider ma journée</a>
+            <a href="{{path("app_tallyday_uservalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-danger mt-3"  style="width:380px" data-method="confirm" data-confirm="Êtes-vous sûr de vouloir valider votre journée ?">Valider ma journée</a>
             <br>
         {% endif %}
 
-        <a href="{{path("app_tallyday_userlist")}}" class="btn btn-secondary mt-3"  style="width:300px">Gérer mes Pointages</a>
+        <a href="{{path("app_tallyday_userlist")}}" class="btn btn-secondary mt-3"  style="width:380px">Gérer mes Pointages</a>
 
         {% if isvalideuser and not isvalidemaster %}
-        <br><a href="{{path("app_tallyday_userdevalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-warning mt-3"  style="width:300px">Dévalider ma journée</a>
+        <br><a href="{{path("app_tallyday_userdevalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-warning mt-3"  style="width:380px">Dévalider ma journée</a>
         {% endif %}
         
         {% if is_granted('ROLE_MASTER') %}
             <hr class="mt-5" style="width: 300px; background-color:var(--colorbgbodylight);">
             <h3>GESTION</h3>
-            <a href="{{path("app_tallyday_masterlist")}}" class="btn btn-success mt-3 mb-3"  style="width:300px">Gestion des Pointages</a>
+            <a href="{{path("app_tallyday_masterlist")}}" class="btn btn-success mt-3 mb-3"  style="width:380px">Gestion des Pointages</a>
         {% endif %}
 
 

src/ninebadge-1.0/templates/Timeextra/list.html.twig

@@ -28,7 +28,7 @@ GESTION DES HEURES SUPPLEMENTAIRES
                             <th width="70px" class="no-sort">Action</th>
                             <th>Utilisateur</th>
                             <th>Date</th>
-                            <th>Nb Minutes</th>
+                            <th>Nb Heure</th>
                         </tr>
                     </thead>
                     <tbody>