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

This commit is contained in:
Arnaud Fornerot 2022-09-08 14:23:28 +02:00
commit 5dece858da
1 changed files with 35 additions and 19 deletions

View File

@ -19,13 +19,21 @@ td {
{% 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, .card-header {border: none;}
.breakpage {
page-break-after: always;
}
{% endif %}
.nobreakpage{
page-break-after: unset;
}
.card-body {padding:0px;}
.fulltable{width:100%;}
}
.date {
color: #ffffff;
@ -43,11 +51,14 @@ 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>
@ -59,7 +70,7 @@ td {
</div>
{% endif %}
{% endif %}
</div>
<div class="mt-3" style="margin:auto; max-width:1810px;">
{% set nbusers=0 %}
@ -67,16 +78,16 @@ td {
{% if date.validates %}
{% 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">
<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">
{{date.timemonth}} / {{ timetowork }}
</div>
</div>
<div class="card-body">
<table>
<table class="fulltable">
<thead>
<tr>
<th style="width:50px !important">s</th>
@ -201,6 +212,11 @@ td {
maxheight=$(this).height();
});
$( ".card" ).height(maxheight);
$("#btnprint").click(function(){
window.print();
return false;
});
});
{% endblock %}