From 2ba143e5a2775e0a64dfe72a51d8904b890cc621 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Thu, 17 Dec 2020 10:53:52 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20notion=20de=20t=C3=A2che=20active,=20et?=
 =?UTF-8?q?=20affichage=20uniquement=20des=20taches=20active=20lors=20de?=
 =?UTF-8?q?=20la=20cr=C3=A9ation=20d'=C3=A9v=C3=A9nements=20#55?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/TaskController.php         |  1 +
 src/schedule-2.0/src/Entity/Task.php          | 19 ++++++++++++++++++-
 src/schedule-2.0/src/Form/TaskType.php        |  7 +++++++
 .../templates/Event/list.html.twig            |  2 ++
 .../templates/Task/edit.html.twig             |  1 +
 .../templates/Task/list.html.twig             |  2 ++
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/schedule-2.0/src/Controller/TaskController.php b/src/schedule-2.0/src/Controller/TaskController.php
index fb27118..6828d2f 100755
--- a/src/schedule-2.0/src/Controller/TaskController.php
+++ b/src/schedule-2.0/src/Controller/TaskController.php
@@ -55,6 +55,7 @@ class TaskController extends AbstractController
         $data = new Entity();
         $defaultnature = $em->getRepository("App:Nature")->findOneBy(['name' => 'Prestation']);
         $data->setNature($defaultnature);
+        $data->setActive(true);
         // Création du formulaire
         $form = $this->createForm(Form::class,$data,array("mode"=>"submit"));
 
diff --git a/src/schedule-2.0/src/Entity/Task.php b/src/schedule-2.0/src/Entity/Task.php
index 3a9f470..89577f4 100644
--- a/src/schedule-2.0/src/Entity/Task.php
+++ b/src/schedule-2.0/src/Entity/Task.php
@@ -70,7 +70,11 @@ class Task
      * @ORM\OneToMany(targetEntity="Penalty", mappedBy="task", cascade={"persist"}, orphanRemoval=false)
      */
     private $penaltys;
-
+    /**
+     * @ORM\Column(name="active", type="boolean")
+     *
+     */
+    private $active;
     /**
      * Calculate Displayname
      */
@@ -227,6 +231,19 @@ class Task
 
         return $this;
     }
+    
+    public function getActive(): ?bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
+
 
     /**
      * @return Collection|Penalty[]
diff --git a/src/schedule-2.0/src/Form/TaskType.php b/src/schedule-2.0/src/Form/TaskType.php
index e861bfd..bbf56f9 100644
--- a/src/schedule-2.0/src/Form/TaskType.php
+++ b/src/schedule-2.0/src/Form/TaskType.php
@@ -56,6 +56,13 @@ class TaskType extends AbstractType
                 "choice_label" => "name",
             ]
         );
+        
+        $builder->add("active",
+            ChoiceType::class,[
+                "label"             => "Actif",
+                "choices"           => ["Non"=>false, "Oui"=>true]
+            ]
+        );   
 
         $builder->add('color',
             TextType::class, [
diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/src/schedule-2.0/templates/Event/list.html.twig
index e9dbf6d..1996800 100644
--- a/src/schedule-2.0/templates/Event/list.html.twig
+++ b/src/schedule-2.0/templates/Event/list.html.twig
@@ -99,7 +99,9 @@
                             {% for project in projects|sort((a, b) => a.displayname <=> b.displayname) %}
                                 <optgroup label="{{project.displayname}}">
                                 {% for task in project.tasks|sort((a, b) => a.displayname <=> b.displayname) %}
+                                    {% if task.active %}
                                     <option value="{{task.id}}">{{task.displayname}}</option>
+                                    {% endif  %}
                                 {% endfor %}
                                 </optgroup>
                             {% endfor %}
diff --git a/src/schedule-2.0/templates/Task/edit.html.twig b/src/schedule-2.0/templates/Task/edit.html.twig
index 2bf54ae..7d6b4fb 100755
--- a/src/schedule-2.0/templates/Task/edit.html.twig
+++ b/src/schedule-2.0/templates/Task/edit.html.twig
@@ -54,6 +54,7 @@
             {{ form_row(form.name) }}
             {{ form_row(form.project) }}
             {{ form_row(form.nature) }}
+            {{ form_row(form.active) }}
             {{ form_row(form.quantity) }}
             {{ form_row(form.color) }}
         </div>
diff --git a/src/schedule-2.0/templates/Task/list.html.twig b/src/schedule-2.0/templates/Task/list.html.twig
index a53d1ad..188522e 100644
--- a/src/schedule-2.0/templates/Task/list.html.twig
+++ b/src/schedule-2.0/templates/Task/list.html.twig
@@ -63,6 +63,7 @@
                                     <th width="100px">Nature</th>
                                     <th width="100px">Projet</th>
                                     <th>Tâche</th>
+                                    <th>Actif</th>
                                     <th width="100px" class="text-center no-string">Estimation</th>
                                     <th width="100px" class="text-center no-string">Validé</th>
                                     <th width="100px" class="text-center no-string">Planifié</th>
@@ -99,6 +100,7 @@
                                                     <td>{{task.nature.name}}</td>
                                                     <td>{{task.project.name}}</td>
                                                     <td>{{task.name}}</td>
+                                                    <td>{{task.active ? "actif":"non-actif"}}</td>
                                                     <td class="text-right">{{task.quantity|number_format(2, '.', ' ')}}</td>
                                                     <td class="text-right">{{(totvalidate*-1)|number_format(2, '.', ' ')}}</td>
                                                     <td class="text-right">{{((totplanified-totvalidate)*-1)|number_format(2, '.', ' ')}}</td>