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/src/Command/BreakdayCommand.php

@@ -146,9 +146,6 @@ 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);
@@ -197,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"));
@@ -248,9 +242,6 @@ class BreakdayCommand extends Command
                                                 $data->setIsbreakday(true);
                                                 $data->setName("PM = ".$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"));

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,14 +43,11 @@ 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_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: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 mr-2" href={{ path('app_tallyday_masterlist') }}>Gestion des Pointages</a>
@@ -70,7 +59,7 @@ td {
         </div>
     {% endif %}
     {% endif %}
-    </div>
+
 
     <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>
@@ -212,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 %}