Merge branch 'TYPO3-10.x'

tollwerk · Mar 27, 2020 · 9c36225 · 9c36225
2 parents 23e8e73 + 67c196e
commit 9c36225
Show file tree

Hide file tree

Showing 13 changed files with 304 additions and 68 deletions.
diff --git a/Classes/Domain/Model/Coverage.php b/Classes/Domain/Model/Coverage.php
@@ -27,7 +27,7 @@ class Coverage extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Title
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $title = '';
 
@@ -36,14 +36,14 @@ class Coverage extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Type
      *
      * @var int
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $type = 0;
     /**
      * URL
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $url = '';
     /**

diff --git a/Classes/Domain/Model/Event.php b/Classes/Domain/Model/Event.php
@@ -53,6 +53,24 @@ class Event extends AbstractEntity
      * @var string
      */
     const STAGE_UNKNOWN = 'unknown';
+    /**
+     * Attendance modes
+     *
+     * @var int
+     */
+    const ATTENDANCE_OFFLINE = 0;
+    const ATTENDANCE_ONLINE = 1;
+    const ATTENDANCE_MIXED = 2;
+    /**
+     * Event status
+     *
+     * @var int
+     */
+    const STATUS_SCHEDULED = 0;
+    const STATUS_RESCHEDULED = 1;
+    const STATUS_POSTPONED = 2;
+    const STATUS_MOVEDONLINE = 3;
+    const STATUS_CANCELLED = 4;
     /**
      * Presentation page
      *
@@ -63,35 +81,47 @@ class Event extends AbstractEntity
      * Name
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $name = '';
     /**
      * Event Start
      *
      * @var \DateTime
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $eventStart = null;
     /**
      * Event End
      *
      * @var \DateTime
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $eventEnd = null;
+    /**
+     * Event status
+     *
+     * @var int
+     */
+    protected $status = self::STATUS_SCHEDULED;
+    /**
+     * Attendance mode
+     *
+     * @var int
+     */
+    protected $attendanceMode = self::ATTENDANCE_OFFLINE;
     /**
      * description
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $description = '';
     /**
      * Summary
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $summary = '';
     /**
@@ -112,6 +142,12 @@ class Event extends AbstractEntity
      * @var string
      */
     protected $ticketUrl = '';
+    /**
+     * Website URL
+     *
+     * @var string
+     */
+    protected $website = '';
     /**
      * Facebook URL
      *
@@ -146,21 +182,21 @@ class Event extends AbstractEntity
      * Livestream Start
      *
      * @var \DateTime
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $livestreamStart = null;
     /**
      * Livestream End
      *
      * @var \DateTime
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $livestreamEnd = null;
     /**
      * Downloads
      *
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
-     * @cascade remove
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade remove
      */
     protected $downloads = null;
     /**
@@ -185,15 +221,15 @@ class Event extends AbstractEntity
      * Presentations
      *
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Tollwerk\TwEvents\Domain\Model\Presentation>
-     * @cascade remove
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade remove
      */
     protected $presentations = null;
     /**
      * Coverage
      *
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\Tollwerk\TwEvents\Domain\Model\Coverage>
-     * @cascade remove
-     * @lazy
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade remove
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
      */
     protected $coverage = null;
 
@@ -289,6 +325,46 @@ public function setEventEnd(\DateTime $eventEnd): void
         $this->eventEnd = $eventEnd;
     }
 
+    /**
+     * Return the status
+     *
+     * @return int status
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * Set the status
+     *
+     * @param int $status Status
+     */
+    public function setStatus(int $status): void
+    {
+        $this->status = $status;
+    }
+
+    /**
+     * Return the attendance mode
+     *
+     * @return int Attendance mode
+     */
+    public function getAttendanceMode(): int
+    {
+        return $this->attendanceMode;
+    }
+
+    /**
+     * Set the attendance mode
+     *
+     * @param int $attendanceMode Attendance mode
+     */
+    public function setAttendanceMode(int $attendanceMode): void
+    {
+        $this->attendanceMode = $attendanceMode;
+    }
+
     /**
      * Returns the description
      *
@@ -399,6 +475,28 @@ public function setTicketUrl($ticketUrl)
         $this->ticketUrl = $ticketUrl;
     }
 
+    /**
+     * Returns the website
+     *
+     * @return string $website
+     */
+    public function getWebsite()
+    {
+        return $this->website;
+    }
+
+    /**
+     * Sets the website
+     *
+     * @param string $website
+     *
+     * @return void
+     */
+    public function setWebsite($website)
+    {
+        $this->website = $website;
+    }
+
     /**
      * Returns the facebook
      *

diff --git a/Classes/Domain/Model/Organization.php b/Classes/Domain/Model/Organization.php
@@ -27,71 +27,71 @@ class Organization extends AbstractEntity
      * Name
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $name = '';
 
     /**
      * Label
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $label = '';
 
     /**
      * Street Address
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $streetAddress = '';
 
     /**
      * Postal Code
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $postalCode = '';
 
     /**
      * Locality
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $locality = '';
 
     /**
      * Region
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $region = '';
 
     /**
      * Country
      *
      * @var \SJBR\StaticInfoTables\Domain\Model\Country
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $country = 0;
 
     /**
      * Latitude
      *
      * @var float
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $latitude = 0.0;
 
     /**
      * Longitude
      *
      * @var float
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $longitude = 0.0;
 
@@ -141,16 +141,16 @@ class Organization extends AbstractEntity
      * Logo
      *
      * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference
-     * @validate NotEmpty
-     * @cascade  remove
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade  remove
      */
     protected $logo = null;
 
     /**
      * Photos
      *
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference>
-     * @cascade remove
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade remove
      */
     protected $photos = null;
 

diff --git a/Classes/Domain/Model/Person.php b/Classes/Domain/Model/Person.php
@@ -25,7 +25,7 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * Name
      *
      * @var string
-     * @validate NotEmpty
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
      */
     protected $givenName = '';
 
@@ -40,8 +40,8 @@ class Person extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      * photo
      *
      * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference
-     * @validate NotEmpty
-     * @cascade  remove
+     * @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
+     * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade  remove
      */
     protected $photo = null;