diff --git a/controllers/api.php b/controllers/api.php index 776f1b9818b446e528819f75103f5d344ed23621..abd855925205426d19b534de4466b05c314b906e 100644 --- a/controllers/api.php +++ b/controllers/api.php @@ -29,7 +29,7 @@ class ApiController extends StudipController 'type' => $assignment->type, 'icon' => $assignment->getTypeIcon()->getShape(), 'start' => date('d.m.Y, H:i', strtotime($assignment->start)), - 'end' => date('d.m.Y, H:i', strtotime($assignment->end)), + 'end' => $assignment->end ? date('d.m.Y, H:i', strtotime($assignment->end)) : null, 'active' => $assignment->active, 'block' => $assignment->block_id ? $assignment->block->name : null ]; @@ -67,7 +67,7 @@ class ApiController extends StudipController 'type' => $assignment->type, 'icon' => $assignment->getTypeIcon()->getShape(), 'start' => date('d.m.Y, H:i', strtotime($assignment->start)), - 'end' => date('d.m.Y, H:i', strtotime($assignment->end)), + 'end' => $assignment->end ? date('d.m.Y, H:i', strtotime($assignment->end)) : null, 'active' => $assignment->active, 'block' => $assignment->block_id ? $assignment->block->name : null, 'reset_allowed' => $assignment->isRunning($user_id) && $assignment->isResetAllowed(), diff --git a/js/test-block.js b/js/test-block.js index 25efc11b24855d151ff6127e38a4dd450bb273a6..68758bfc0a1598333e5a4689f9decb76c7dcba56 100644 --- a/js/test-block.js +++ b/js/test-block.js @@ -77,19 +77,19 @@ const CoursewareTestBlock = { class="cw-vs-select" > <template #open-indicator="selectAttributes"> - <studip-icon shape="arr_1down" size="10"/> + <studip-icon shape="arr_1down" size="16"/> </template> <template #no-options="{}"> <translate>Es steht keine Auswahl zur Verfügung</translate> </template> <template #selected-option="{title, icon, start, end}"> - <studip-icon :shape="icon" role="info"/> - {{title}} ({{start}} - {{end}}) + <studip-icon v-if="icon" :shape="icon" role="info"/> + {{title}} ({{start}}{{ end ? ' - ' + end : '' }}) </template> <template #option="{title, icon, start, end, block}"> - <studip-icon :shape="icon" role="info"/> + <studip-icon v-if="icon" :shape="icon" role="info"/> {{ block ? block + ' / ' + title : title }}<br> - <small>{{start}} - {{end}}</small> + <small>{{start}}{{ end ? ' - ' + end : '' }}</small> </template> </studip-select> </label>