diff --git a/plugin/zoom/Entity/Meeting.php b/plugin/zoom/Entity/Meeting.php index f030075d0e..51fe380780 100644 --- a/plugin/zoom/Entity/Meeting.php +++ b/plugin/zoom/Entity/Meeting.php @@ -119,7 +119,6 @@ class Meeting * @var MeetingActivity[]|ArrayCollection * * @ORM\OneToMany(targetEntity="MeetingActivity", mappedBy="meeting", cascade={"persist", "remove"}) - * */ protected $activities; @@ -127,7 +126,6 @@ class Meeting * @var Registrant[]|ArrayCollection * * @ORM\OneToMany(targetEntity="Registrant", mappedBy="meeting", cascade={"persist", "remove"}) - * */ protected $registrants; diff --git a/plugin/zoom/Entity/MeetingActivity.php b/plugin/zoom/Entity/MeetingActivity.php index f25bab979e..494bc9abea 100644 --- a/plugin/zoom/Entity/MeetingActivity.php +++ b/plugin/zoom/Entity/MeetingActivity.php @@ -4,22 +4,8 @@ namespace Chamilo\PluginBundle\Zoom; -use Chamilo\CoreBundle\Entity\Course; -use Chamilo\CoreBundle\Entity\CourseRelUser; -use Chamilo\CoreBundle\Entity\Session; -use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; -use Chamilo\CourseBundle\Entity\CGroupInfo; -use Chamilo\PluginBundle\Zoom\API\MeetingInfoGet; -use Chamilo\PluginBundle\Zoom\API\MeetingListItem; -use Chamilo\PluginBundle\Zoom\API\MeetingSettings; -use Chamilo\UserBundle\Entity\User; -use Database; -use DateInterval; use DateTime; -use DateTimeZone; -use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; -use Exception; /** * Class Meeting. @@ -63,8 +49,16 @@ class MeetingActivity */ protected $event; + /** + * @var \DateTime + * + * @ORM\Column(name="created_at", type="datetime", nullable=false) + */ + protected $createdAt; + public function __construct() { + $this->createdAt = new \DateTime(); } /** @@ -143,6 +137,14 @@ class MeetingActivity return $this; } + /** + * @return DateTime + */ + public function getCreatedAt() + { + return $this->createdAt; + } + /** * @return string */ @@ -171,6 +173,4 @@ class MeetingActivity return $this; } - - } diff --git a/plugin/zoom/lang/english.php b/plugin/zoom/lang/english.php index 1c9e799cdc..7e704f869f 100755 --- a/plugin/zoom/lang/english.php +++ b/plugin/zoom/lang/english.php @@ -140,3 +140,4 @@ $strings['Meetings'] = "Meetings"; $strings['ConferenceType'] = "Conference type"; $strings['ForEveryone'] = "Everyone"; $strings['SomeUsers'] = "Some users (Select later)"; +$strings['Activity'] = "Activity"; diff --git a/plugin/zoom/lang/french.php b/plugin/zoom/lang/french.php index 2f4f646b17..65ce9677cf 100755 --- a/plugin/zoom/lang/french.php +++ b/plugin/zoom/lang/french.php @@ -134,3 +134,4 @@ $strings['Recordings'] = "Enregistrements"; $strings['CreateGlobalVideoConference'] = "Créer une conférence global"; $strings['JoinURLNotAvailable'] = "URL pas disponible"; $strings['Meetings'] = "Conférences"; +$strings['Activity'] = "Activité"; diff --git a/plugin/zoom/lang/spanish.php b/plugin/zoom/lang/spanish.php index 1c70f9a8d6..99ca8219f8 100644 --- a/plugin/zoom/lang/spanish.php +++ b/plugin/zoom/lang/spanish.php @@ -134,3 +134,4 @@ $strings['Recordings'] = "Grabaciones"; $strings['CreateGlobalVideoConference'] = "Crear una videoconferencia global"; $strings['JoinURLNotAvailable'] = "URL no disponible"; $strings['Meetings'] = "Conferencias"; +$strings['Activity'] = "Actividad"; diff --git a/plugin/zoom/view/activity.tpl b/plugin/zoom/view/activity.tpl index 38e8ae3175..cb2b1c4eca 100644 --- a/plugin/zoom/view/activity.tpl +++ b/plugin/zoom/view/activity.tpl @@ -2,25 +2,39 @@ {{ meeting.typeName }} {{ meeting.meetingId }} + + {{ 'Edit'|get_lang }} + + - - - - - + + + + + + {% for activity in meeting.activities %} + {% endfor %} diff --git a/plugin/zoom/view/meeting.tpl b/plugin/zoom/view/meeting.tpl index ae0b74aae6..d380b8f054 100644 --- a/plugin/zoom/view/meeting.tpl +++ b/plugin/zoom/view/meeting.tpl @@ -17,7 +17,7 @@ {% endif %} - + {{ 'Activity'|get_plugin_lang('ZoomPlugin') }} {% endif %}
{{ 'Name'|get_plugin_lang('ZoomPlugin') }}{{ 'Type'|get_lang }}{{ 'Event'|get_lang }}
{{ 'Type'|get_lang }}{{ 'Action'|get_plugin_lang('ZoomPlugin') }}{{ 'Date'|get_lang }}{{ 'Details'|get_lang }}
+ {{ activity.type }} + {{ activity.name }} - {{ activity.type }} + {{ activity.createdAt }} - {{ activity.eventDecoded }} + {% if activity.eventDecoded.registrant %} + {{ 'User' | get_lang }} : + {{ activity.eventDecoded.registrant.first_name }} - + {{ activity.eventDecoded.registrant.last_name }} - + {{ activity.eventDecoded.registrant.email }} - + {{ activity.eventDecoded.registrant.status }} + {% endif %}