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

Passage d'un timer en heure supplémentaire si hors des plages horaires de travail

Browse Source
This commit is contained in:
Matthieu Lamalle
2020-07-29 11:46:35 +02:00
parent 80b6e4964f
commit c30bd74e6f
4 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,8 +56,13 @@ SUIVI HORAIRE
<tr>
<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>
<span class="font-weight-bold">
{{ timer.activepenalty ? "<i class='fa fa-exclamation' style='color:red;opacity: 0.33;'></i> Astreinte active" : "" }}
</span>
<span class="font-weight-bold">
{{ timer.additionalhour ? "<i class='fa fa-exclamation-triangle' style='color:red;opacity: 0.33;'></i> Heures supplémentaires" : "" }}
</span>
<p>{{ timer.description }}</p>
</td>
<td>{{ timer.start|date("d/m/Y H:i") }}</td>

8
src/schedule-2.0/templates/Validation/validationtimer.html.twig
View File

@@ -68,8 +68,12 @@
{{ timer.taskname }}
</td>
<td>
<span class="font-weight-bold">{{ timer.activepenalty ? "Astreinte active" : "" }}</span>
<span class="font-weight-bold">{{ timer.additionalhour ? "Heures supplémentaires" : "" }}</span>
<span class="font-weight-bold">
{{ timer.activepenalty ? "<i class='fa fa-exclamation' style='color:red;opacity: 0.33;'></i> Astreinte active" : "" }}
</span>
<span class="font-weight-bold">
{{ timer.additionalhour ? "<i class='fa fa-exclamation-triangle' style='color:red;opacity: 0.33;'></i> Heures supplémentaires" : "" }}
</span>
<p>{{ timer.description }}</p>
</td>
<td>