diff --git a/src/Controller/ScrumissueController.php b/src/Controller/ScrumissueController.php index c212f8b..e5cfe92 100755 --- a/src/Controller/ScrumissueController.php +++ b/src/Controller/ScrumissueController.php @@ -180,6 +180,7 @@ class ScrumissueController extends AbstractController $scrum=$em->getRepository("App:Scrum")->find($id); if(!$scrum) return new JsonResponse(['message' => 'No Scrum'], 403); $lastupdate=$scrum->getUpdatedate(); + $lastupdate->setTimezone(new \DateTimeZone("UTC")); $giteaissues=$this->giteaservice->getIssues($scrum->getGiteajson()["owner"]["login"],$scrum->getGiteajson()["name"]); if(!is_array($giteaissues)) die("Probleme de connexion avec gitea veuillez vous reconnecter"); @@ -200,6 +201,9 @@ class ScrumissueController extends AbstractController $updateissue->setTimezone(new \DateTimeZone("UTC")); if($updateissue>$lastupdate) { + //var_dump($updateissue); + //var_dump($lastupdate); + $fgissueupdated=true; } diff --git a/src/Repository/ScrumRepository.php b/src/Repository/ScrumRepository.php index 2cc53ef..4ed4498 100644 --- a/src/Repository/ScrumRepository.php +++ b/src/Repository/ScrumRepository.php @@ -177,7 +177,8 @@ class ScrumRepository extends ServiceEntityRepository // Génération des issues $tbgiteaissues=[]; $fgscrumupdate=false; - $this->datescrumupdate=new \DateTime(); + $this->datescrumupdate=new \DateTime("01/01/1900"); + $this->datescrumupdate->setTimezone(new \DateTimeZone("UTC")); foreach($giteaissues as $giteaissue) { @@ -207,6 +208,14 @@ class ScrumRepository extends ServiceEntityRepository } if($fgissueupdated) { + $updateissue=new \DateTime(json_decode(json_encode($giteaissue), true)["updated_at"]); + $updateissue->setTimezone(new \DateTimeZone("UTC")); + + $closeissue=new \DateTime(json_decode(json_encode($giteaissue), true)["closed_at"]); + $closeissue->setTimezone(new \DateTimeZone("UTC")); + + $this->datescrumupdate=max($this->datescrumupdate,$updateissue,$closeissue); + $fgscrumupdate=true; $this->majissue($scrumissue,$giteaissue,false); } diff --git a/templates/Scrum/view.html.twig b/templates/Scrum/view.html.twig index 5a73e5f..e45ce7b 100644 --- a/templates/Scrum/view.html.twig +++ b/templates/Scrum/view.html.twig @@ -934,7 +934,7 @@ } } }); - }, 60000); + }, 6000); });