diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php index 981caa5..472162c 100755 --- a/src/Controller/ScrumController.php +++ b/src/Controller/ScrumController.php @@ -679,6 +679,8 @@ class ScrumController extends AbstractController } private function getEstim($scrum) { + + // Initialisation de l'enregistrement $em = $this->getDoctrine()->getManager(); $firstcolumn=$em->getRepository('App:Scrumcolumn')->findOneBy(["scrum"=>$scrum], ['rowid' => 'ASC']); @@ -694,10 +696,25 @@ class ScrumController extends AbstractController $tbestim=[]; $viewclosed = $this->get('session')->get("viewclosed"); + if($viewclosed=="false") { + $giteamilestones=$this->giteaservice->getMilestones($scrum->getGiteajson()["owner"]["login"],$scrum->getGiteajson()["name"],"?state=open"); + $giteamilestones=array_column($giteamilestones,"id"); + } + foreach($issues as $issue) { + // bypass jalon closed + if($viewclosed=="false") { + + /* + if(array_key_exists("milestone",$issue->getGiteajson()) && !empty($issue->getGiteajson()["milestone"]) && $issue->getGiteajson()["milestone"]) + dump($issue->getGiteajson()["milestone"]["title"]); + */ + if(array_key_exists("milestone",$issue->getGiteajson()) && !empty($issue->getGiteajson()["milestone"]) && !in_array($issue->getGiteajson()["milestone"]["id"],$giteamilestones)) + continue; + } - // bypass closed - if($viewclosed=="false"&&($issue->getGiteastate()=="closed"||($issue->getScrumsprint()&&$issue->getScrumsprint()->getClosed()))) continue; + + //if($viewclosed=="false"&&($issue->getGiteastate()=="closed"||($issue->getScrumsprint()&&$issue->getScrumsprint()->getClosed()))) continue; // Ids $idcol=($issue->getScrumcolumn()?$issue->getScrumcolumn()->getId():$firstcolumn->getId()); @@ -777,14 +794,22 @@ class ScrumController extends AbstractController $tbestim[$idjal]["sprints"][$idspr]["nbiss"]++; $tbestim[$idjal]["sprints"][$idspr]["columns"][$idcol]["nbiss"]++; + + $this->formatDec($tbestim[$idjal]["nbjrs"]); $this->formatDec($tbestim[$idjal]["columns"][$idcol]["nbjrs"]); $this->formatDec($tbestim[$idjal]["sprints"][$idspr]["nbjrs"]); $this->formatDec($tbestim[$idjal]["sprints"][$idspr]["columns"][$idcol]["nbjrs"]); - - + } - + // dd("stop"); + + $keysort = array_column($tbestim, 'nmjal'); + array_multisort($keysort, SORT_DESC, $tbestim); + foreach($tbestim as $keyj => $jalon) { + $keysort = array_column($jalon["sprints"],"nmspr"); + array_multisort($keysort, SORT_DESC, $tbestim[$keyj]["sprints"]); + } return $tbestim; } diff --git a/templates/Scrum/stat.html.twig b/templates/Scrum/stat.html.twig index ea7affc..03b84ad 100644 --- a/templates/Scrum/stat.html.twig +++ b/templates/Scrum/stat.html.twig @@ -80,9 +80,9 @@