diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php index 7502309..2e7619b 100755 --- a/src/Controller/ScrumController.php +++ b/src/Controller/ScrumController.php @@ -207,17 +207,17 @@ class ScrumController extends AbstractController $idspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getId():-100); // Roworders - $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getId()); + $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getRowid()); $rowjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():-100); $rowspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getRowid():-100); // Names - $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getId()); + $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getName()); $nmjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():"Aucun"); $nmspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getName():"Aucun"); // Idgiteas - $gicol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getGiteaid():$firstcolumn->getId()); + $gicol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getGiteaid():$firstcolumn->getGiteaid()); $gijal=($issue->getGiteaMilestone()?$issue->getGiteaMilestone():-100); // Liste des colonnes/jalons/sprint avec des issues @@ -611,6 +611,7 @@ class ScrumController extends AbstractController // Préférences utilisateur $filtermilestones = $em->getRepository("App:User")->getUserpreference($this->getUser(),"filtermilestones",$id); $filtersprints = $em->getRepository("App:User")->getUserpreference($this->getUser(),"filtersprints",$id); + $filterbynumber = $em->getRepository("App:User")->getUserpreference($this->getUser(),"filterbynumber",$id); $showfilters = $em->getRepository("App:User")->getUserpreference($this->getUser(),"showfilters",$id); // Création du tableau des issues @@ -632,12 +633,12 @@ class ScrumController extends AbstractController $idspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getId():-100); // Roworders - $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getId()); + $rowcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getRowid():$firstcolumn->getRowid()); $rowjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():-100); $rowspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getRowid():-100); // Names - $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getId()); + $nmcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getName():$firstcolumn->getName()); $nmjal=($issue->getGiteaMilestonename()?$issue->getGiteaMilestonename():"Aucun"); $nmspr=($issue->getScrumsprint()?$issue->getScrumsprint()->getName():"Aucun"); @@ -647,6 +648,7 @@ class ScrumController extends AbstractController "idjal" => $idjal, "nmjal" => $nmjal, "nbjrs" => 0, + "nbiss" => 0, "columns" => [], "sprints" => [], ]; @@ -658,6 +660,7 @@ class ScrumController extends AbstractController "idspr" => $idspr, "nmspr" => $nmspr, "nbjrs" => 0, + "nbiss" => 0, "columns" => [], ]; } @@ -669,6 +672,7 @@ class ScrumController extends AbstractController "nmcol" => $nmcol, "color" => ($issue->getScrumcolumn()?$issue->getScrumcolumn()->getGiteajson()["color"]:$firstcolumn->getGiteajson()["color"]), "nbjrs" => 0, + "nbiss" => 0, ]; } @@ -679,6 +683,7 @@ class ScrumController extends AbstractController "nmcol" => $nmcol, "color" => ($issue->getScrumcolumn()?$issue->getScrumcolumn()->getGiteajson()["color"]:$firstcolumn->getGiteajson()["color"]), "nbjrs" => 0, + "nbiss" => 0, ]; } @@ -687,6 +692,12 @@ class ScrumController extends AbstractController $tbestim[$idjal]["columns"][$idcol]["nbjrs"]+=$issue->getWeight(); $tbestim[$idjal]["sprints"][$idspr]["nbjrs"]+=$issue->getWeight(); $tbestim[$idjal]["sprints"][$idspr]["columns"][$idcol]["nbjrs"]+=$issue->getWeight(); + + $tbestim[$idjal]["nbiss"]++; + $tbestim[$idjal]["columns"][$idcol]["nbiss"]++; + $tbestim[$idjal]["sprints"][$idspr]["nbiss"]++; + $tbestim[$idjal]["sprints"][$idspr]["columns"][$idcol]["nbiss"]++; + } return $this->render($this->render.'stat.html.twig', [ @@ -694,7 +705,10 @@ class ScrumController extends AbstractController 'usesidebar' => false, 'usetitle' => $data->getName(), 'giteamilestones' => $giteamilestones, + 'sprints' => $data->getScrumsprints(), 'filtermilestones' => $filtermilestones, + 'filtersprints' => $filtersprints, + 'filterbynumber' => $filterbynumber, 'showfilters' => $showfilters, $this->data => $data, 'tbestim' => $tbestim, diff --git a/templates/Scrum/stat.html.twig b/templates/Scrum/stat.html.twig index 3903523..b16ab1b 100644 --- a/templates/Scrum/stat.html.twig +++ b/templates/Scrum/stat.html.twig @@ -35,7 +35,27 @@ {% endfor %} - + + + +