From d9448ccfee5caab7a837deab43c605cf75f7ec4a Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 15 Apr 2024 13:25:09 +0200 Subject: [PATCH] link unlink --- config/routes.yaml | 3 ++ src/Controller/ScrumController.php | 15 +++++++ src/Entity/Scrumissue.php | 1 + src/Service/giteaService.php | 1 + templates/Scrum/link.html.twig | 72 ++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+) create mode 100644 templates/Scrum/link.html.twig diff --git a/config/routes.yaml b/config/routes.yaml index 57c57bd..6e0ffe1 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -206,6 +206,9 @@ app_scrum_stat: path: /user/scrum/stat/{id} defaults: { _controller: App\Controller\ScrumController:stat } +app_scrum_link: + path: /user/scrum/link/{id} + defaults: { _controller: App\Controller\ScrumController:link } app_scrum_info: path: /user/scrum/info/{id} diff --git a/src/Controller/ScrumController.php b/src/Controller/ScrumController.php index 98f0739..80640ac 100755 --- a/src/Controller/ScrumController.php +++ b/src/Controller/ScrumController.php @@ -644,6 +644,21 @@ class ScrumController extends AbstractController ]); } + public function link($id,Request $request) + { + // Initialisation de l'enregistrement + $em = $this->getDoctrine()->getManager(); + $data=$em->getRepository($this->entity)->find($id); + if(!$data) return $this->redirectToRoute($this->route); + + return $this->render($this->render.'link.html.twig',[ + "useheader" => true, + "usesidebar" => false, + "maxwidth" => 1000, + "scrum" => $data, + ]); + } + public function info($id,Request $request) { $em = $this->getDoctrine()->getManager(); diff --git a/src/Entity/Scrumissue.php b/src/Entity/Scrumissue.php index fb46756..72c141a 100644 --- a/src/Entity/Scrumissue.php +++ b/src/Entity/Scrumissue.php @@ -100,6 +100,7 @@ class Scrumissue /** * @ORM\OneToMany(targetEntity="Scrumissue", mappedBy="scrumissueblock", cascade={"persist"}, orphanRemoval=false) + * @ORM\OrderBy({"giteanumber" = "ASC"}) */ private $scrumissuedependencies; diff --git a/src/Service/giteaService.php b/src/Service/giteaService.php index 975be1f..9cf81ed 100644 --- a/src/Service/giteaService.php +++ b/src/Service/giteaService.php @@ -337,6 +337,7 @@ class giteaService $body = \Unirest\Request\Body::json($query); $body=str_replace('"'.$toblock.'"',$toblock,$body); $response=$this->api("POST",$apiurl,$body,$this->session->get("giteatoken")); + dump($response); if(!$response||($response->code!="200"&&$response->code!="201")) return false; else return $response->body; } diff --git a/templates/Scrum/link.html.twig b/templates/Scrum/link.html.twig new file mode 100644 index 0000000..c0c8be0 --- /dev/null +++ b/templates/Scrum/link.html.twig @@ -0,0 +1,72 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{{scrum.name}}

+ +
+ + + + +
+ +
+ + + +
+ + + +{% endblock %} + +{% block localjavascript %} + $(document).ready(function() { + $("#issue").select2(); + $("#block").select2(); + }); + + function lock() { + console.log($("#issue").val()); + console.log($("#block").val()); + + $.ajax({ + method: "POST", + url: "{{path("app_scrumissue_block")}}", + data: { + id:$("#issue").val(), + issueblocked:$("#block").val(), + }, + success: function(data) { + } + }); + } + + function unlock() { + $.ajax({ + method: "POST", + url: "{{path("app_scrumissue_unblock")}}", + data: { + id:$("#issue").val(), + }, + success: function(data) { + } + }); + } +{% endblock %} \ No newline at end of file