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

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

Browse Source
This commit is contained in:
Arnaud Fornerot
2021-11-23 15:22:40 +01:00
parent 0cae27c5b7 0ba36598fa
commit 49dbeedaec
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/schedule-2.0/src/Controller/ExportController.php
View File

@@ -262,6 +262,8 @@ class ExportController extends AbstractController
$tbproject["projectname"] = $project->getDisplayname(); $tbproject["projectname"] = $project->getDisplayname();
$tbproject["name"] = $project->getname(); $tbproject["name"] = $project->getname();
$tbproject["customer"] = $project->getCustomer()->getName(); $tbproject["customer"] = $project->getCustomer()->getName();
$tbproject["service"] = $project->getService()->getName();
$tbproject["domaine"] = $project->getDomaine()->getName();
// Somme event validé par semaine // Somme event validé par semaine
$start=new \Datetime('first day of this month'); $start=new \Datetime('first day of this month');
$start->sub(new \DateInterval('P'.$nbmonth.'M')); $start->sub(new \DateInterval('P'.$nbmonth.'M'));

4
src/schedule-2.0/templates/Export/export_project_weekly.csv.twig
View File

@@ -1,12 +1,12 @@
{% block body %} {% block body %}
Client;Projet;Tâche;Nature;Utilisateur;Année;Semaine;Cumul; Client;Projet;Tâche;Activité;Domaine;Nature;Utilisateur;Année;Semaine;Cumul;
{% for project in projects %} {% for project in projects %}
{% if project.weeks_by_task_by_user is defined %} {% if project.weeks_by_task_by_user is defined %}
{% for year,weeks in project.weeks_by_task_by_user %} {% for year,weeks in project.weeks_by_task_by_user %}
{% for week in weeks %} {% for week in weeks %}
{% for task in week.tasks%} {% for task in week.tasks%}
{% for user in task.users%} {% for user in task.users%}
{{project.customer}};{{project.name}};{{task.taskname|replace({"&": "et"})}};{{task.nature}};{{user.displayname}};{{week.isoyear}};{{week.isoweek}};{{user.cumul|replace({".": ","})}}; {{project.customer}};{{project.name}};{{task.taskname|replace({"&": "et"})}};{{project.service}};{{project.domaine}};{{task.nature}};{{user.displayname}};{{week.isoyear}};{{week.isoweek}};{{user.cumul|replace({".": ","})}};
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}