mckmonster/ynh_extension_meeo
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: mckmonster:4b0e9c3d1f9a42fdfb07cbfb43303cdc6eb9e422
Branches Tags
mckmonster:main
..
compare: mckmonster:ca5a094d3526c914e1d42392df381f8b6a69ebb8
Branches Tags
mckmonster:main

2 commits
4b0e9c3d1f ... ca5a094d35

Author SHA1 Message Date
mckmonster
ca5a094d35 Fix de l'affichage des dates sur les absences 2024-07-21 12:12:10 +02:00
mckmonster
619d219b15 Fix commands 2024-07-21 12:11:46 +02:00
2 changed files with 8 additions and 5 deletions
Show stats Expand all files Collapse all files

7
commands/CreateFormsCommand.php
View file

@ -22,7 +22,8 @@ class CreateFormsCommand extends Command
{ {
parent::__construct(); parent::__construct();
$this->wiki = $wiki; $this->wiki = $wiki;
$meeo_config = $this->wiki->params->get('meeo'); $params = $this->wiki->services->get(ParameterBagInterface::class);
$meeo_config = $params->get('meeo');
$this->eleveFormId = $meeo_config['elevesFormId']; $this->eleveFormId = $meeo_config['elevesFormId'];
} }
@ -75,8 +76,8 @@ class CreateFormsCommand extends Command
"bn_sem_type" => "", "bn_sem_type" => "",
"bn_sem_use_template" => "1", "bn_sem_use_template" => "1",
"bn_template" => <<<EOT "bn_template" => <<<EOT
titre***Absence : {{bf_eleve}} - {{bf_date_debut_evenement}}***Titre Automatique*** titre***Absence : {{bf_eleve}} - {{bf_date_debut}}***Titre Automatique***
listefiche***$this->eleveFormId***Elève*** *** *** *** *** ***1*** *** *** * *** * *** *** *** *** listefiche***$this->eleveFormId***Elève*** *** *** ***bf_eleve*** ***1*** *** *** * *** * *** *** *** ***
listedatedeb***bf_date_debut***Debut*** *** ***today*** *** ***1*** *** *** * *** * *** *** *** *** listedatedeb***bf_date_debut***Debut*** *** ***today*** *** ***1*** *** *** * *** * *** *** *** ***
listedatedeb***bf_date_fin***Fin*** *** ***today*** *** ***1*** *** *** * *** * *** *** *** *** listedatedeb***bf_date_fin***Fin*** *** ***today*** *** ***1*** *** *** * *** * *** *** *** ***
textelong***bf_commentaire***Commentaire*** *** *** *** ***wiki***0*** *** *** * *** * *** *** *** *** textelong***bf_commentaire***Commentaire*** *** *** *** ***wiki***0*** *** *** * *** * *** *** *** ***

6
templates/eleve_absences.twig
View file

@ -10,9 +10,11 @@
<i class="fa fa-check" style="color:green" ></i> <i class="fa fa-check" style="color:green" ></i>
{% endif %} {% endif %}
{% if entry['bf_date_debut'] == entry['bf_date_fin'] %} {% if entry['bf_date_debut'] == entry['bf_date_fin'] %}
{{ entry['bf_date_debut']|date("m/d/Y") }} {{ entry['bf_date_debut']|date("m/d/Y") }}
{% elseif entry['bf_date_debut']|date("m/d/Y") == entry['bf_date_fin']|date("m/d/Y") %}
{{ entry['bf_date_debut']|date("m/d/Y H:i") }} - {{ entry['bf_date_fin']|date("H:i") }}
{% else %} {% else %}
{{ entry['bf_date_debut']|date("m/d/Y H:i") }} - {{ entry['bf_date_fin']|date("m/d/Y H:i") }} {{ entry['bf_date_debut']|date("m/d/Y H:i") }} - {{ entry['bf_date_fin']|date("m/d/Y H:i") }}
{% endif %} {% endif %}
<a class="btn btn-default btn-xs" href="{{ url({ tag: entry['id_fiche'], handler: 'edit' }) }}"> <a class="btn btn-default btn-xs" href="{{ url({ tag: entry['id_fiche'], handler: 'edit' }) }}">
<i class="fa fa-pencil-alt"></i> <i class="fa fa-pencil-alt"></i>