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

Compare commits

base: Cadoles:7b7b79e7a671bdf25e1820cf52affa6995d13702
Branches Tags
Cadoles:master Cadoles:dist/eole/2.8.1/master
Cadoles:pkg/stable/eole-2.8.1/1.1.0-12 Cadoles:pkg/stable/eole-2.8.1/1.1.0-11 Cadoles:pkg/stable/eole-2.8.1/1.1.0-10 Cadoles:pkg/stable/eole-2.8.1/1.1.0-9 Cadoles:pkg/stable/eole-2.8.1/1.1.0-8 Cadoles:pkg/stable/eole-2.8.1/1.1.0-7 Cadoles:pkg/stable/eole-2.8.1/1.1.0-6 Cadoles:pkg/stable/eole-2.8.1/1.1.0-5 Cadoles:pkg/stable/eole-2.8.1/1.1.0-4 Cadoles:pkg/stable/eole-2.8.1/1.1.0-3 Cadoles:pkg/stable/eole-2.8.1/1.1.0-2 Cadoles:pkg/stable/eole-2.8.1/1.1.0-1 Cadoles:pkg/stable/eole-2.8.1/1.1.0-0
..
compare: Cadoles:pkg/stable/eole-2.8.1/1.1.0-11
Branches Tags
Cadoles:master Cadoles:dist/eole/2.8.1/master
Cadoles:pkg/stable/eole-2.8.1/1.1.0-12 Cadoles:pkg/stable/eole-2.8.1/1.1.0-11 Cadoles:pkg/stable/eole-2.8.1/1.1.0-10 Cadoles:pkg/stable/eole-2.8.1/1.1.0-9 Cadoles:pkg/stable/eole-2.8.1/1.1.0-8 Cadoles:pkg/stable/eole-2.8.1/1.1.0-7 Cadoles:pkg/stable/eole-2.8.1/1.1.0-6 Cadoles:pkg/stable/eole-2.8.1/1.1.0-5 Cadoles:pkg/stable/eole-2.8.1/1.1.0-4 Cadoles:pkg/stable/eole-2.8.1/1.1.0-3 Cadoles:pkg/stable/eole-2.8.1/1.1.0-2 Cadoles:pkg/stable/eole-2.8.1/1.1.0-1 Cadoles:pkg/stable/eole-2.8.1/1.1.0-0

6 Commits
7b7b79e7a6 ... pkg/stable

Author SHA1 Message Date
Arnaud Fornerot
5dece858da Merge branch 'master' into dist/eole/2.8.1/master 2022-09-08 14:23:28 +02:00
afornerot
3d53772947 utilisation de l'impression du navigateur plutot que wkhtmltopdf (ref #12) 2022-09-08 13:39:38 +02:00
Arnaud Fornerot
7a6aea2238 Merge branch 'master' into dist/eole/2.8.1/master 2022-08-24 09:41:40 +02:00
afornerot
dfc348e650 correction synchronisation schedule 2022-08-24 09:41:07 +02:00
Arnaud Fornerot
ddb6a4d53a Merge branch 'master' into dist/eole/2.8.1/master 2022-06-29 14:02:18 +02:00
afornerot
5fad26f3b6 largeur btn 2022-06-29 14:01:59 +02:00
3 changed files with 52 additions and 27 deletions
Expand all files Collapse all files

15
src/ninebadge-1.0/src/Command/BreakdayCommand.php
View File

@ -146,7 +146,10 @@ class BreakdayCommand extends Command
$data->setIsbreakday(true); $data->setIsbreakday(true);
$data->setName($event->taskname); $data->setName($event->taskname);
$data->setDatestart(clone $manip); $data->setDatestart(clone $manip);
$data->setIstelework(false);
$data->setIspenaltypassive(false);
$data->setIspenaltyactive(false);
$manip->add(new \DateInterval("PT7H")); $manip->add(new \DateInterval("PT7H"));
$data->setDateend(clone $manip); $data->setDateend(clone $manip);
$this->em->persist($data); $this->em->persist($data);
@ -194,6 +197,9 @@ class BreakdayCommand extends Command
$data->setIsbreakday(true); $data->setIsbreakday(true);
$data->setName("AM = ".$event->taskname); $data->setName("AM = ".$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("PT3H"));
$manip->add(new \DateInterval("PT30M")); $manip->add(new \DateInterval("PT30M"));
@ -241,8 +247,11 @@ class BreakdayCommand extends Command
$data->setValidatemaster(false); $data->setValidatemaster(false);
$data->setIsbreakday(true); $data->setIsbreakday(true);
$data->setName("PM = ".$event->taskname); $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("PT3H"));
$manip->add(new \DateInterval("PT30M")); $manip->add(new \DateInterval("PT30M"));
$data->setDateend(clone $manip); $data->setDateend(clone $manip);

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

@ -19,13 +19,21 @@ td {
{% if fgprint %}color:#000000 !important;{%endif%} {% if fgprint %}color:#000000 !important;{%endif%}
} }
{% if fgprint %} @media print {
.noprint { display:none; }
body,h1,.card-header {font-family: 'arial' !important}
.card {float: none !important; } .card {float: none !important; }
.card, .card-header {border: none;} .card, .card-header {border: none;}
.breakpage { .breakpage {
page-break-after: always; page-break-after: always;
} }
{% endif %} .nobreakpage{
page-break-after: unset;
}
.card-body {padding:0px;}
.fulltable{width:100%;}
}
.date { .date {
color: #ffffff; color: #ffffff;
@ -43,23 +51,26 @@ td {
RAPPORT MENSUEL = {{ monthof|date("m/Y") }} RAPPORT MENSUEL = {{ monthof|date("m/Y") }}
</h1> </h1>
<div class="noprint">
{% if not fgprint %} {% 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 %} {% endif %}
{% endif %} </div>
<div class="mt-3" style="margin:auto; max-width:1810px;"> <div class="mt-3" style="margin:auto; max-width:1810px;">
{% set nbusers=0 %} {% set nbusers=0 %}
@ -67,16 +78,16 @@ td {
{% if date.validates %} {% if date.validates %}
{% set nbusers=nbusers+1 %} {% set nbusers=nbusers+1 %}
<div class="card mr-1 mb-1 float-left {% if nbusers==2 %}breakpage{% endif %} "> <div class="card mr-1 mb-1 float-left {% if nbusers==2 %}breakpage{%else%}nobreakpage{% endif %} ">
<div class="card-header"> <div class="card-header">
<img src="{{date.avatar|urlavatar}}" class="avatar"> {{ date.displayname }} {% if not fgprint %} <img src="{{date.avatar|urlavatar}}" class="avatar noprint">{%endif%} {{ date.displayname }}
<div class="float-right text-right"> <div class="float-right text-right">
{{date.timemonth}} / {{ timetowork }} {{date.timemonth}} / {{ timetowork }}
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<table> <table class="fulltable">
<thead> <thead>
<tr> <tr>
<th style="width:50px !important">s</th> <th style="width:50px !important">s</th>
@ -201,6 +212,11 @@ td {
maxheight=$(this).height(); maxheight=$(this).height();
}); });
$( ".card" ).height(maxheight); $( ".card" ).height(maxheight);
$("#btnprint").click(function(){
window.print();
return false;
});
}); });
{% endblock %} {% endblock %}

10
src/ninebadge-1.0/templates/Tallyday/tallyday.html.twig
View File

@ -139,7 +139,7 @@
</div> </div>
{% if not isvalideuser and not isvalidemaster %} {% 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%"> <div class="custom-control custom-switch" style="zoom:130%">
<input type="checkbox" class="custom-control-input" id="istelework" {%if istelework%}checked{%endif%}> <input type="checkbox" class="custom-control-input" id="istelework" {%if istelework%}checked{%endif%}>
<label class="custom-control-label" for="istelework">Télétravail</label> <label class="custom-control-label" for="istelework">Télétravail</label>
@ -156,20 +156,20 @@
</div> </div>
</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> <br>
{% endif %} {% 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 %} {% 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 %} {% endif %}
{% if is_granted('ROLE_MASTER') %} {% if is_granted('ROLE_MASTER') %}
<hr class="mt-5" style="width: 300px; background-color:var(--colorbgbodylight);"> <hr class="mt-5" style="width: 300px; background-color:var(--colorbgbodylight);">
<h3>GESTION</h3> <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 %} {% endif %}