Portfolio: fix index page

Author: AngelFQC

public/main/inc/lib/PortfolioController.php

@@ -521,23 +521,18 @@ public function addItem(): void
 
         if ($form->validate()) {
             $values = $form->exportValues();
-            $currentTime = new DateTime(
-                api_get_utc_datetime(),
-                new DateTimeZone('UTC')
-            );
 
             $portfolio = new Portfolio();
             $portfolio
                 ->setTitle($values['title'])
                 ->setContent($values['content'])
-                ->setUser($this->owner)
-                ->setCourse($this->course)
-                ->setSession($this->session)
+                ->setCreator($this->owner)
+                ->setParent($this->owner)
+                ->addCourseLink($this->course, $this->session)
                 ->setCategory(
                     $this->em->find(PortfolioCategory::class, $values['category'])
                 )
-                ->setCreationDate($currentTime)
-                ->setUpdateDate($currentTime);
+            ;
 
             $this->em->persist($portfolio);
             $this->em->flush();
@@ -549,9 +544,9 @@ public function addItem(): void
 
             $this->processAttachments(
                 $form,
-                $portfolio->getUser(),
+                $this->owner,
                 $portfolio->getId(),
-                PortfolioAttachment::TYPE_ITEM
+                Portfolio::TYPE_ITEM
             );
 
             Container::getEventDispatcher()->dispatch(
@@ -561,7 +556,7 @@ public function addItem(): void
 
             if (1 == api_get_course_setting('email_alert_teachers_new_post')) {
                 if ($this->session) {
-                    $messageCourseTitle = "{$this->course->getTitle()} ({$this->session->getName()})";
+                    $messageCourseTitle = "{$this->course->getTitle()} ({$this->session->getTitle()})";
 
                     $teachers = SessionManager::getCoachesByCourseSession(
                         $this->session->getId(),
@@ -825,7 +820,7 @@ public function editItem(Portfolio $item): void
                 $form,
                 $item->getUser(),
                 $item->getId(),
-                PortfolioAttachment::TYPE_ITEM
+                Portfolio::TYPE_ITEM
             );
 
             Display::addFlash(
@@ -2149,7 +2144,7 @@ public function exportPdf(HttpRequest $httpRequest)
             $pdfContent .= '<p>'.get_lang('Course').': ';
 
             if ($this->session) {
-                $pdfContent .= $this->session->getName().' ('.$this->course->getTitle().')';
+                $pdfContent .= $this->session->getTitle().' ('.$this->course->getTitle().')';
             } else {
                 $pdfContent .= $this->course->getTitle();
             }
@@ -2376,7 +2371,7 @@ public function exportZip(HttpRequest $httpRequest)
                 $item->getComments()->count(),
                 $item->getScore(),
                 $itemCourse->getTitle(),
-                $itemSession ? $itemSession->getName() : null,
+                $itemSession ? $itemSession->getTitle() : null,
             ];
         }
 
@@ -2638,11 +2633,11 @@ public function downloadAttachment(HttpRequest $httpRequest)
 
         $originOwnerId = 0;
 
-        if (PortfolioAttachment::TYPE_ITEM === $attachment->getOriginType()) {
+        if (Portfolio::TYPE_ITEM === $attachment->getOriginType()) {
             $item = $em->find(Portfolio::class, $attachment->getOrigin());
 
             $originOwnerId = $item->getUser()->getId();
-        } elseif (PortfolioAttachment::TYPE_COMMENT === $attachment->getOriginType()) {
+        } elseif (Portfolio::TYPE_COMMENT === $attachment->getOriginType()) {
             $comment = $em->find(PortfolioComment::class, $attachment->getOrigin());
 
             $originOwnerId = $comment->getAuthor()->getId();
@@ -2692,11 +2687,11 @@ public function deleteAttachment(HttpRequest $httpRequest)
         $originOwnerId = 0;
         $itemId = 0;
 
-        if (PortfolioAttachment::TYPE_ITEM === $attachment->getOriginType()) {
+        if (Portfolio::TYPE_ITEM === $attachment->getOriginType()) {
             $item = $em->find(Portfolio::class, $attachment->getOrigin());
             $originOwnerId = $item->getUser()->getId();
             $itemId = $item->getId();
-        } elseif (PortfolioAttachment::TYPE_COMMENT === $attachment->getOriginType()) {
+        } elseif (Portfolio::TYPE_COMMENT === $attachment->getOriginType()) {
             $comment = $em->find(PortfolioComment::class, $attachment->getOrigin());
             $originOwnerId = $comment->getAuthor()->getId();
             $itemId = $comment->getItem()->getId();
@@ -2724,7 +2719,7 @@ public function deleteAttachment(HttpRequest $httpRequest)
 
             $url = $this->baseUrl.http_build_query(['action' => 'view', 'id' => $itemId]);
 
-            if (PortfolioAttachment::TYPE_COMMENT === $attachment->getOriginType() && isset($comment)) {
+            if (Portfolio::TYPE_COMMENT === $attachment->getOriginType() && isset($comment)) {
                 $url .= '#comment-'.$comment->getId();
             }
 
@@ -3046,7 +3041,7 @@ public function editComment(PortfolioComment $comment)
                 $form,
                 $comment->getAuthor(),
                 $comment->getId(),
-                PortfolioAttachment::TYPE_COMMENT
+                Portfolio::TYPE_COMMENT
             );
 
             Container::getEventDispatcher()->dispatch(
@@ -4018,7 +4013,7 @@ private function createCommentForm(Portfolio $item): string
                 $form,
                 $comment->getAuthor(),
                 $comment->getId(),
-                PortfolioAttachment::TYPE_COMMENT
+                Portfolio::TYPE_COMMENT
             );
 
             Container::getEventDispatcher()->dispatch(
@@ -4191,7 +4186,7 @@ private function getItemsInHtmlFormatted(array $items): array
             $metadata = '<ul class="list-unstyled text-muted">';
 
             if ($itemSession) {
-                $metadata .= '<li>'.get_lang('Course').': '.$itemSession->getName().' ('
+                $metadata .= '<li>'.get_lang('Course').': '.$itemSession->getTitle().' ('
                     .$itemCourse->getTitle().') </li>';
             } elseif ($itemCourse) {
                 $metadata .= '<li>'.get_lang('Course').': '.$itemCourse->getTitle().'</li>';

src/CoreBundle/Entity/Portfolio.php

@@ -20,8 +20,6 @@
 #[ORM\Entity]
 class Portfolio extends AbstractResource implements ResourceInterface, Stringable
 {
-    use UserTrait;
-
     public const TYPE_ITEM = 1;
     public const TYPE_COMMENT = 2;