+
{{ evaluation.evaluation.title.fr }}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
new file mode 100644
index 000000000..7b602ba22
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20220128133039.php
@@ -0,0 +1,51 @@
+addSql('DROP SEQUENCE chill_person_accompanying_period_user_history_id_seq CASCADE');
+ $this->addSql('DROP TABLE chill_person_accompanying_period_user_history');
+ }
+
+ public function getDescription(): string
+ {
+ return 'Add table for tracking user history on accompanying period';
+ }
+
+ public function up(Schema $schema): void
+ {
+ $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_user_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+ $this->addSql('CREATE TABLE chill_person_accompanying_period_user_history (id INT NOT NULL, user_id INT, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, accompanyingPeriod_id INT, PRIMARY KEY(id))');
+ $this->addSql('CREATE INDEX IDX_6C258C49D7FA8EF0 ON chill_person_accompanying_period_user_history (accompanyingPeriod_id)');
+ $this->addSql('CREATE INDEX IDX_6C258C49A76ED395 ON chill_person_accompanying_period_user_history (user_id)');
+ $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_user_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+ $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_user_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C49A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CHECK (startdate <= enddate)');
+ $this->addSql('INSERT INTO chill_person_accompanying_period_user_history (id, user_id, accompanyingperiod_id, startDate, endDate) ' .
+ 'SELECT nextval(\'chill_person_accompanying_period_user_history_id_seq\'), user_id, id, openingDate, null FROM chill_person_accompanying_period WHERE user_id IS NOT NULL');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL;');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD createdBy_id INT DEFAULT NULL;');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ALTER user_id SET NOT NULL;');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ALTER accompanyingperiod_id SET NOT NULL;');
+ $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_user_history.createdAt IS \'(DC2Type:datetime_immutable)\';');
+ $this->addSql('ALTER TABLE chill_person_accompanying_period_user_history ADD CONSTRAINT FK_6C258C493174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE;');
+ $this->addSql('CREATE INDEX IDX_6C258C493174800F ON chill_person_accompanying_period_user_history (createdBy_id);');
+ }
+}
diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
index 490d50da1..b4b6727b2 100644
--- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
@@ -13,6 +13,8 @@ namespace Chill\TaskBundle\Controller;
use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\MainBundle\Serializer\Model\Counter;
use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
use Chill\MainBundle\Timeline\TimelineBuilder;
@@ -31,6 +33,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\Exception\BadRequestException;
+use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -431,10 +435,15 @@ final class SingleTaskController extends AbstractController
* @return Response
* @Route(
* "/{_locale}/task/single-task/list/my",
- * name="chill_task_singletask_my_tasks"
+ * name="chill_task_singletask_my_tasks",
+ * defaults={"_format": "html"}
+ * )
+ * @Route(
+ * "/api/1.0/task/single-task/list/my",
+ * defaults={"_format": "json"}
* )
*/
- public function myTasksAction()
+ public function myTasksAction(string $_format, Request $request)
{
$this->denyAccessUnlessGranted('ROLE_USER');
@@ -447,6 +456,13 @@ final class SingleTaskController extends AbstractController
$filterOrder->getQueryString(),
$flags
);
+
+ if ('json' === $_format && $request->query->getBoolean('countOnly')) {
+ return $this->json(
+ new Counter($nb),
+ );
+ }
+
$paginator = $this->paginatorFactory->create($nb);
$tasks = $this->singleTaskAclAwareRepository->findByCurrentUsersTasks(
$filterOrder->getQueryString(),
@@ -459,11 +475,27 @@ final class SingleTaskController extends AbstractController
]
);
- return $this->render('@ChillTask/SingleTask/List/index_my_tasks.html.twig', [
- 'tasks' => $tasks,
- 'paginator' => $paginator,
- 'filter_order' => $filterOrder,
- ]);
+ switch ($_format) {
+ case 'html':
+ return $this->render('@ChillTask/SingleTask/List/index_my_tasks.html.twig', [
+ 'tasks' => $tasks,
+ 'paginator' => $paginator,
+ 'filter_order' => $filterOrder,
+ ]);
+
+ case 'json':
+ $collection = new Collection($tasks, $paginator);
+
+ return $this->json(
+ $collection,
+ JsonResponse::HTTP_OK,
+ [],
+ ['groups' => ['read']]
+ );
+
+ default:
+ throw new BadRequestException("format not supported: {$_format}");
+ }
}
/**
diff --git a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
index 8b44ebf8f..267bd8bcd 100644
--- a/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+++ b/src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\User;
use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\PersonBundle\Entity\Person;
use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
use Symfony\Component\Validator\Constraints as Assert;
use function array_fill_keys;
@@ -27,6 +28,9 @@ use function array_keys;
* AbstractTask.
*
* @ORM\MappedSuperclass
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
+ * "single_task": SingleTask::class
+ * })
*/
abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
{
@@ -35,6 +39,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
* @ORM\ManyToOne(
* targetEntity="\Chill\MainBundle\Entity\User"
* )
+ * @Serializer\Groups({"read"})
*/
private $assignee;
@@ -49,12 +54,14 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
/**
* @var bool
* @ORM\Column(name="closed", type="boolean", options={ "default": false })
+ * @Serializer\Groups({"read"})
*/
private $closed = false;
/**
* @var AccompanyingPeriod
* @ORM\ManyToOne(targetEntity="\Chill\PersonBundle\Entity\AccompanyingPeriod")
+ * @Serializer\Groups({"read"})
*/
private $course;
@@ -62,6 +69,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
* @var json
*
* @ORM\Column(name="current_states", type="json")
+ * @Serializer\Groups({"read"})
*/
private $currentStates = [];
@@ -69,6 +77,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
* @var string
*
* @ORM\Column(name="description", type="text")
+ * @Serializer\Groups({"read"})
*/
private $description = '';
@@ -77,6 +86,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
* @ORM\ManyToOne(
* targetEntity="\Chill\PersonBundle\Entity\Person"
* )
+ * @Serializer\Groups({"read"})
*/
private $person;
@@ -85,6 +95,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
*
* @ORM\Column(name="title", type="text")
* @Assert\NotBlank
+ * @Serializer\Groups({"read"})
*/
private $title = '';
@@ -92,6 +103,7 @@ abstract class AbstractTask implements HasCenterInterface, HasScopeInterface
* @var string
*
* @ORM\Column(name="type", type="string", length=255)
+ * @Serializer\Groups({"read"})
*/
private $type;