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

Modification plage horaire événement #14

Closed
mlamalle wants to merge 10 commits from updatehourevent into master
pull from: updatehourevent
merge into: Cadoles:master
Conversation 0 Commits 10 Files Changed 17 +4 -2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0197fc119c - Show all commits

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

@@ -1126,6 +1126,8 @@ class ReportController extends AbstractController
$tbproject= []; $tbproject= [];
$tbproject["projectname"] = $project->getDisplayname(); $tbproject["projectname"] = $project->getDisplayname();
$tbproject["name"] = $project->getname();
$tbproject["customer"] = $project->getCustomer()->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/Report/export.csv.twig
View File

@@ -1,11 +1,11 @@
{% block body %} {% block body %}
Projet;Tâche;Utilisateur;Année;Semaine;Cumul; Client;Projet;Tâche;Utilisateur;Année;Semaine;Cumul;
{% for project in projects %} {% for project in projects %}
{% 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.projectname}};{{task.taskname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}}; {{project.customer}};{{project.name}};{{task.taskname}};{{user.displayname}};{{year}};S{{week.weeknumber}};{{user.cumul|replace({".": ","})}};
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}