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

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

@@ -146,7 +146,10 @@ 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);
@@ -194,6 +197,9 @@ 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"));
@@ -241,8 +247,11 @@ 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);

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

@@ -139,7 +139,7 @@
         </div>        
         
         {% if not isvalideuser and not isvalidemaster %}
-            <div style="width:380px; text-align:left">
+            <div style="width:300px; 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:380px" 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:300px" 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:380px">Gérer mes Pointages</a>
+        <a href="{{path("app_tallyday_userlist")}}" class="btn btn-secondary mt-3"  style="width:300px">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:380px">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:300px">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:380px">Gestion des Pointages</a>
+            <a href="{{path("app_tallyday_masterlist")}}" class="btn btn-success mt-3 mb-3"  style="width:300px">Gestion des Pointages</a>
         {% endif %}