chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Plugin: zoom fix recording list links BT#17288

Browse Source
pull/3425/head
Julio Montoya 5 years ago
parent d79a8c403d
commit fd3f1afd4f
4 changed files with 32 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      plugin/zoom/lib/RecordingEntityRepository.php
  2. 11
      plugin/zoom/lib/ZoomPlugin.php
  3. 9
      plugin/zoom/meetings.php
  4. 51
      plugin/zoom/view/list.tpl

7
plugin/zoom/lib/RecordingEntityRepository.php
Unescape View File

@ -20,9 +20,7 @@ class RecordingEntityRepository extends EntityRepository
{
$matching = [];
foreach ($this->findAll() as $candidate) {
if ($candidate->startDateTime >= $startDate
&& $candidate->startDateTime <= $endDate
) {
if ($candidate->startDateTime >= $startDate && $candidate->startDateTime <= $endDate) {
$matching[] = $candidate;
}
}
@ -60,8 +58,7 @@ class RecordingEntityRepository extends EntityRepository
{
return $this->userRecordings($user)->filter(
function ($meeting) use ($start, $end) {
return $meeting->startDateTime >= $start
&& $meeting->startDateTime <= $end;
return $meeting->startDateTime >= $start && $meeting->startDateTime <= $end;
}
);
}

11
plugin/zoom/lib/ZoomPlugin.php
Unescape View File

@ -309,8 +309,7 @@ class ZoomPlugin extends Plugin
$form->setRequired($durationNumeric);
}
$form->addTextarea('agenda', get_lang('Agenda'), ['maxlength' => 2000]);
$form->addLabel(get_lang('Password'), $meeting->getMeetingInfoGet()->password);
//$form->addLabel(get_lang('Password'), $meeting->getMeetingInfoGet()->password);
// $form->addText('password', get_lang('Password'), false, ['maxlength' => '10']);
$form->addButtonUpdate(get_lang('Update'));
if ($form->validate()) {
@ -497,7 +496,6 @@ class ZoomPlugin extends Plugin
'%s.%s (%s)',
$file->recording_type,
$file->file_type,
//$file->formattedFileSize
$file->file_size
),
'value' => $file->id,
@ -537,7 +535,10 @@ class ZoomPlugin extends Plugin
try {
$this->createLinkToFileInCourse($meeting, $file, $name);
Display::addFlash(
Display::return_message($this->get_lang('LinkToFileWasCreatedInCourse'), 'success')
Display::return_message(
$this->get_lang('LinkToFileWasCreatedInCourse'),
'success'
)
);
} catch (Exception $exception) {
Display::addFlash(
@ -720,7 +721,7 @@ class ZoomPlugin extends Plugin
$form->getSubmitValue('duration'),
$form->getSubmitValue('topic'),
$form->getSubmitValue('agenda'),
api_get_unique_id()
substr(uniqid('z', true),0, 10)
);
Display::addFlash(

9
plugin/zoom/meetings.php
Unescape View File

@ -19,16 +19,9 @@ $endDate = new DateTime($form->getElement('end')->getValue());
$scheduleForm = $plugin->getScheduleMeetingForm($user);
$tpl = new Template();
$tpl->assign('meetings', $plugin->getMeetingRepository()->periodUserMeetings($startDate, $endDate, $user));
if ('true' === $plugin->get('enableCloudRecording')) {
$tpl->assign(
'recordings',
$plugin->getRecordingRepository()->getPeriodUserRecordings($startDate, $endDate)
);
}
$tpl->assign('allow_recording', 'true' === $plugin->get('enableCloudRecording'));
$tpl->assign('actions', $plugin->getToolbar());
$tpl->assign('search_form', $form->returnForm());
$tpl->assign('schedule_form', $scheduleForm->returnForm());
$tpl->assign('type', 'user');
$tpl->assign('content', $tpl->fetch('zoom/view/list.tpl'));
$tpl->display_one_col_template();

51
plugin/zoom/view/list.tpl
Unescape View File

@ -1,8 +1,6 @@
{% import "default/document/recycle.tpl" as macro %}
{{ schedule_form }}
{{ search_form }}
{% if meetings.count %}
@ -15,8 +13,8 @@
<th>{{ 'ForEveryone'|get_plugin_lang('ZoomPlugin') }}</th>
{# <th>{{ 'Course'|get_lang }}</th>#}
{# <th>{{ 'Session'|get_lang }}</th>#}
{% if recordings %}
<th>{{ 'Recordings'|get_plugin_lang('ZoomPlugin') }}</th>
{% if allow_recording %}
<th>{{ 'Recordings'|get_plugin_lang('ZoomPlugin') }}</th>
{% endif %}
<th></th>
</tr>
@ -29,32 +27,29 @@
<td>{{ meeting.user ? 'No' : 'Yes' }}</td>
{# <td>{{ meeting.course ? meeting.course : '-' }}</td>#}
{# <td>{{ meeting.session ? meeting.session : '-' }}</td>#}
{% if recordings %}
<td>
{% for recording in recordings %}
{% if recording.recordingMeeting.id == meeting.meetingId %}
<dl>
<dt>
{{ recording.formattedStartTime }}
({{ recording.formattedDuration }})
</dt>
<dd>
<ul>
{% for file in recording.recordingMeeting.recording_files %}
<li>
<td>
{% if allow_recording and meeting.recordings.count > 0 %}
{% for recording in meeting.recordings %}
<dl>
<dt>
{{ recording.formattedStartTime }} ({{ recording.formattedDuration }})
</dt>
<dd>
<ul>
{% for file in recording.recordingMeeting.recording_files %}
<li>
<a href="{{ file.play_url }}" target="_blank">
{{ file.recording_type }}.{{ file.file_type }}
({{ macro.bytesToSize(file.file_size) }})
</a>
</li>
{% endfor %}
</ul>
</dd>
</dl>
{% endif %}
{% endfor %}
</td>
{{ file.recording_type }}.{{ file.file_type }}
({{ macro.bytesToSize(file.file_size) }})
</a>
</li>
{% endfor %}
</ul>
</dd>
</dl>
{% endfor %}
{% endif %}
</td>
<td>
<a class="btn btn-primary" href="meeting.php?meetingId={{ meeting.meetingId }}">
{{ 'Details'|get_lang }}

Write Preview
Loading…
Cancel
Save