correctif mastersubmit tailly

debian/compat

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

debian/control

@@ -1,24 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

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

debian/gbp.conf

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

debian/ninebadge-apps.install

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

debian/ninebadge-sso.install

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

debian/rules

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

debian/source/format

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

src/ninebadge-1.0/composer.json

@@ -68,7 +68,10 @@
         "preferred-install": {
             "*": "dist"
         },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "symfony/flex": true
+        }
     },
     "autoload": {
         "psr-4": {
@@ -89,6 +92,9 @@
         "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

@@ -0,0 +1,13 @@
+<?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,6 +28,8 @@ 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,21 +83,36 @@ class BreakdayCommand extends Command
         foreach($users as $user) {
             if(!$user->hasRole("ROLE_USER")) continue;
 
-            $mini=new \Datetime('2022-03-07 00:00');
+            $this->writeln("");
-            $start=new \Datetime('00:00');
+            $this->writeln($user->getUsername());
-            $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;
-                    if($start->format("w")!=0&&$start->format("w")!=6) {
+                    $havebreakdayAM=false;
+                    $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;
@@ -209,6 +224,7 @@ class BreakdayCommand extends Command
                                         }
 
                                         $havebreakday=true;
+                                        $havebreakdayAM=true;
                                     }
                                 }
                                 else {
@@ -260,6 +276,7 @@ class BreakdayCommand extends Command
                                             }
         
                                             $havebreakday=true;
+                                            $havebreakdayPM=true;
                                         }
                                     }                                
                                 }
@@ -275,6 +292,31 @@ 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

@@ -278,7 +278,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"=>$this->getUser(),"dateof"=>$dateof,"validatemaster"=>true]);
+        $isvalidemaster= $em->getRepository($this->entity)->findOneBy(["user"=>$user,"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 d'Heure",
+                "label" => "Nombre de Minutes",
                 "required" => true,
             ]
         );

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

@@ -92,10 +92,14 @@ 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());
-        if($timeextra[1]) {
+        if($timeextra[1]>0) {
-            $ework->sub(new \DateInterval("PT".$timeextra[1]."H"));
+            $ework->sub(new \DateInterval("PT".$timeextra[1]."M"));
+        }
+        // Ajouter du temps sur des heures supplémentaires majorées
+        else {
+            $ework->add(new \DateInterval("PT".($timeextra[1]*-1)."M"));
         }
 
         // Nbday worked

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 Heure</th>
+                            <th>Nb Minutes</th>
                         </tr>
                     </thead>
                     <tbody>