diff --git a/.gitignore b/.gitignore index c18ac5a..6e8ede1 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ yarn-error.log /public/uploads/logo/* !/public/uploads/logo/logo.png /public/uploads/ckeditor +/public/uploads/issues diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php index 08216be..3971430 100755 --- a/src/Controller/ScrumController.php +++ b/src/Controller/ScrumController.php @@ -4,9 +4,10 @@ namespace App\Controller; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Form\FormError; +use Symfony\Component\Filesystem\Filesystem; +use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Symfony\Component\HttpFoundation\ResponseHeaderBag; use App\Entity\Scrum as Entity; use App\Entity\Scrumissue as Scrumissue; @@ -513,7 +514,7 @@ class ScrumController extends AbstractController $showfilters = $em->getRepository("App:User")->getUserpreference($this->getUser(),"showfilters",$id); if($fgcsv) { - $dir = $this->appKernel->getProjectDir() . '/uploads/issues/'; + $dir = $this->getParameter('kernel.project_dir') . '/public/uploads/issues/'; $file = "issues-".$id.".csv"; $fs = new Filesystem(); $fs->mkdir($dir); @@ -527,6 +528,8 @@ class ScrumController extends AbstractController foreach($gitearepos as $gitearepo) { foreach($gitearepo["issues"] as $giteaissue) { $statut=""; + $issue=$em->getRepository("App:Scrumissue")->findOneBy(["giteaid"=>$giteaissue->id]); + $type=""; $labels=""; foreach($giteaissue->labels as $label) { @@ -540,6 +543,7 @@ class ScrumController extends AbstractController $tmp=[ $gitearepo["name"], (isset($giteaissue->milestone->title)?$giteaissue->milestone->title:""), + ($issue->getScrumsprint()?$issue->getScrumsprint()->getName():"Aucun"), $type, $giteaissue->number, $giteaissue->title,