Ajout notion de tâche active, et affichage uniquement des taches active lors de la création d'événements #55
This commit is contained in:
@@ -55,6 +55,7 @@ class TaskController extends AbstractController
|
|||||||
$data = new Entity();
|
$data = new Entity();
|
||||||
$defaultnature = $em->getRepository("App:Nature")->findOneBy(['name' => 'Prestation']);
|
$defaultnature = $em->getRepository("App:Nature")->findOneBy(['name' => 'Prestation']);
|
||||||
$data->setNature($defaultnature);
|
$data->setNature($defaultnature);
|
||||||
|
$data->setActive(true);
|
||||||
// Création du formulaire
|
// Création du formulaire
|
||||||
$form = $this->createForm(Form::class,$data,array("mode"=>"submit"));
|
$form = $this->createForm(Form::class,$data,array("mode"=>"submit"));
|
||||||
|
|
||||||
|
@@ -70,7 +70,11 @@ class Task
|
|||||||
* @ORM\OneToMany(targetEntity="Penalty", mappedBy="task", cascade={"persist"}, orphanRemoval=false)
|
* @ORM\OneToMany(targetEntity="Penalty", mappedBy="task", cascade={"persist"}, orphanRemoval=false)
|
||||||
*/
|
*/
|
||||||
private $penaltys;
|
private $penaltys;
|
||||||
|
/**
|
||||||
|
* @ORM\Column(name="active", type="boolean")
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private $active;
|
||||||
/**
|
/**
|
||||||
* Calculate Displayname
|
* Calculate Displayname
|
||||||
*/
|
*/
|
||||||
@@ -227,6 +231,19 @@ class Task
|
|||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getActive(): ?bool
|
||||||
|
{
|
||||||
|
return $this->active;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setActive(bool $active): self
|
||||||
|
{
|
||||||
|
$this->active = $active;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection|Penalty[]
|
* @return Collection|Penalty[]
|
||||||
|
@@ -56,6 +56,13 @@ class TaskType extends AbstractType
|
|||||||
"choice_label" => "name",
|
"choice_label" => "name",
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$builder->add("active",
|
||||||
|
ChoiceType::class,[
|
||||||
|
"label" => "Actif",
|
||||||
|
"choices" => ["Non"=>false, "Oui"=>true]
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
$builder->add('color',
|
$builder->add('color',
|
||||||
TextType::class, [
|
TextType::class, [
|
||||||
|
@@ -99,7 +99,9 @@
|
|||||||
{% for project in projects|sort((a, b) => a.displayname <=> b.displayname) %}
|
{% for project in projects|sort((a, b) => a.displayname <=> b.displayname) %}
|
||||||
<optgroup label="{{project.displayname}}">
|
<optgroup label="{{project.displayname}}">
|
||||||
{% for task in project.tasks|sort((a, b) => a.displayname <=> b.displayname) %}
|
{% for task in project.tasks|sort((a, b) => a.displayname <=> b.displayname) %}
|
||||||
|
{% if task.active %}
|
||||||
<option value="{{task.id}}">{{task.displayname}}</option>
|
<option value="{{task.id}}">{{task.displayname}}</option>
|
||||||
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</optgroup>
|
</optgroup>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@@ -54,6 +54,7 @@
|
|||||||
{{ form_row(form.name) }}
|
{{ form_row(form.name) }}
|
||||||
{{ form_row(form.project) }}
|
{{ form_row(form.project) }}
|
||||||
{{ form_row(form.nature) }}
|
{{ form_row(form.nature) }}
|
||||||
|
{{ form_row(form.active) }}
|
||||||
{{ form_row(form.quantity) }}
|
{{ form_row(form.quantity) }}
|
||||||
{{ form_row(form.color) }}
|
{{ form_row(form.color) }}
|
||||||
</div>
|
</div>
|
||||||
|
@@ -63,6 +63,7 @@
|
|||||||
<th width="100px">Nature</th>
|
<th width="100px">Nature</th>
|
||||||
<th width="100px">Projet</th>
|
<th width="100px">Projet</th>
|
||||||
<th>Tâche</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">Estimation</th>
|
||||||
<th width="100px" class="text-center no-string">Validé</th>
|
<th width="100px" class="text-center no-string">Validé</th>
|
||||||
<th width="100px" class="text-center no-string">Planifié</th>
|
<th width="100px" class="text-center no-string">Planifié</th>
|
||||||
@@ -99,6 +100,7 @@
|
|||||||
<td>{{task.nature.name}}</td>
|
<td>{{task.nature.name}}</td>
|
||||||
<td>{{task.project.name}}</td>
|
<td>{{task.project.name}}</td>
|
||||||
<td>{{task.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">{{task.quantity|number_format(2, '.', ' ')}}</td>
|
||||||
<td class="text-right">{{(totvalidate*-1)|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>
|
<td class="text-right">{{((totplanified-totvalidate)*-1)|number_format(2, '.', ' ')}}</td>
|
||||||
|
Reference in New Issue
Block a user