record single task states transition and add them in timeline

This commit is contained in:
2018-05-03 23:38:08 +02:00
parent 57169b3148
commit 86f7188d4a
17 changed files with 645 additions and 7 deletions

View File

@@ -86,6 +86,11 @@ abstract class AbstractTask implements HasScopeInterface, HasCenterInterface
* @ORM\Column(name="closed", type="boolean", options={ "default"=false })
*/
private $closed = false;
public function __construct()
{
}
/**
* Set type

View File

@@ -4,6 +4,7 @@ namespace Chill\TaskBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
use Doctrine\Common\Collections\Collection;
/**
* SingleTask
@@ -58,8 +59,25 @@ class SingleTask extends AbstractTask
* )
*/
private $recurringTask;
/**
*
* @var \Doctrine\Common\Collections\Collection
* @ORM\OneToMany(
* targetEntity="\Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent",
* mappedBy="task"
* )
*/
private $taskPlaceEvents;
public function __construct()
{
$this->taskPlaceEvents = $events = new \Doctrine\Common\Collections\ArrayCollection;
parent::__construct();
}
/**
* Get id
*
@@ -174,6 +192,16 @@ class SingleTask extends AbstractTask
$this->recurringTask = $recurringTask;
}
public function getTaskPlaceEvents(): Collection
{
return $this->taskPlaceEvents;
}
public function setTaskPlaceEvents(Collection $taskPlaceEvents)
{
$this->taskPlaceEvents = $taskPlaceEvents;
return $this;
}
}

View File

@@ -0,0 +1,154 @@
<?php
namespace Chill\TaskBundle\Entity\Task;
use Doctrine\ORM\Mapping as ORM;
use Chill\MainBundle\Entity\User;
/**
* AbstractTaskPlaceEvent
*
* @ORM\MappedSuperclass()
*/
class AbstractTaskPlaceEvent
{
/**
* @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var datetime_immutable
*
* @ORM\Column(name="datetime", type="datetime_immutable")
*/
private $datetime;
/**
* @var string
*
* @ORM\Column(name="transition", type="string", length=255)
*/
private $transition = '';
/**
* @var string
*
* @ORM\Column(name="data", type="json")
*/
private $data = [];
/**
*
* @var User
* @ORM\ManyToOne(
* targetEntity="\Chill\MainBundle\Entity\User"
* )
*/
private $author;
public function __construct()
{
$this->datetime = new \DateTimeImmutable('now');
}
/**
* Get id.
*
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* Set datetime.
*
* @param datetime_immutable $datetime
*
* @return AbstractTaskPlaceEvent
*/
public function setDatetime($datetime)
{
$this->datetime = $datetime;
return $this;
}
/**
* Get datetime.
*
* @return datetime_immutable
*/
public function getDatetime()
{
return $this->datetime;
}
/**
* Set transition.
*
* @param string $transition
*
* @return AbstractTaskPlaceEvent
*/
public function setTransition($transition)
{
$this->transition = $transition;
return $this;
}
/**
* Get transition.
*
* @return string
*/
public function getTransition()
{
return $this->transition;
}
/**
* Set data.
*
* @param string $data
*
* @return AbstractTaskPlaceEvent
*/
public function setData($data)
{
$this->data = $data;
return $this;
}
/**
* Get data.
*
* @return string
*/
public function getData()
{
return $this->data;
}
public function getAuthor(): User
{
return $this->author;
}
public function setAuthor(User $author)
{
$this->author = $author;
return $this;
}
}

View File

@@ -0,0 +1,56 @@
<?php
/*
* Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Chill\TaskBundle\Entity\Task;
use Doctrine\ORM\Mapping as ORM;
use Chill\TaskBundle\Entity\SingleTask;
/**
*
*
* @ORM\Table("chill_task.single_task_place_event")
* @ORM\Entity()
*
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
class SingleTaskPlaceEvent extends AbstractTaskPlaceEvent
{
/**
*
* @var SingleTask
* @ORM\ManyToOne(
* targetEntity="\Chill\TaskBundle\Entity\SingleTask",
* inversedBy="taskPlaceEvents"
* )
*/
protected $task;
public function getTask(): SingleTask
{
return $this->task;
}
public function setTask(SingleTask $task)
{
$this->task = $task;
return $this;
}
}