Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

ajout page validation des timer et option heure supplémentaires

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-29 10:59:11 +02:00
parent a316a4c753
commit 1fb5c4c715
10 changed files with 373 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/schedule-2.0/templates/Timer/edit.html.twig
View File

@@ -59,6 +59,7 @@
{{ form_row(form.task) }}
{{ form_row(form.description) }}
{{ form_row(form.activepenalty) }}
{{ form_row(form.additionalhour) }}
{{ form_row(form.start) }}
{{ form_row(form.end) }}
{{ form_row(form.duration) }}

4
src/schedule-2.0/templates/Timer/export.csv.twig
View File

@@ -1,7 +1,7 @@
{% block body %}
Astreintes Actives
Tâche;Active;Utilisateur;Début;Fin;Durée;Description;
Tâche;Astr.Act;H.Supp;Utilisateur;Début;Fin;Durée;Description;
{% for timer in timers %}
{{timer.taskname}};{{timer.activepenalty}};{{timer.user}};{{timer.start|date("d/m/Y H:i")}};{{timer.end|date("d/m/Y H:i")}};{{timer.duration|date("H:i")}};{{timer.description}};
{{timer.taskname}};{{timer.activepenalty}};{{timer.additionalhour}};{{timer.user}};{{timer.start|date("d/m/Y H:i")}};{{timer.end|date("d/m/Y H:i")}};{{timer.duration|date("H:i")}};{{timer.description}};
{% endfor %}
{% endblock %}

3
src/schedule-2.0/templates/Timer/list.html.twig
View File

@@ -37,7 +37,7 @@ SUIVI HORAIRE
</div>
<a class="btn btn-success" href={{ path('app_timer_view') }}>Voir le calendrier</a>
<a class="btn btn-success" href={{ path('app_timer_view') }}>Exporter Astreintes actives</a>
<a class="btn btn-success" href={{ path('app_timer_export_activepenalty') }}>Exporter Astreintes actives et heures supplémentaires</a>
<p></p>
<div class="dataTable_wrapper">
<table class="table table-striped table-bordered table-hover small" id="dataTables" style="width:100%">
@@ -57,6 +57,7 @@ SUIVI HORAIRE
<td>{{ timer.task.displayname }}</td>
<td>
<span class="font-weight-bold">{{ timer.activepenalty ? "Astreinte active" : "" }}</span>
<span class="font-weight-bold">{{ timer.additionalhour ? "Heures supplémentaires" : "" }}</span>
<p>{{ timer.description }}</p>
</td>
<td>{{ timer.start|date("d/m/Y H:i") }}</td>