oprava zobrazeni detailu programu (#763)

skaut · Nov 10, 2020 · cea7b30 · cea7b30
1 parent 0b2fac0
commit cea7b30
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/AdminModule/Presenters/AdminBasePresenter.php b/app/AdminModule/Presenters/AdminBasePresenter.php
@@ -125,8 +125,6 @@ public function beforeRender() : void
 
         $this->template->settings = $this->settingsService;
 
-        $this->template->containerAttributes = '';
-
         $skautIsUserId                = $this->dbuser->getSkautISUserId();
         $skautIsRoles                 = $this->skautIsService->getUserRoles($skautIsUserId);
         $skautIsRoleSelectedId        = $this->skautIsService->getUserRoleId();

diff --git a/app/AdminModule/Presenters/templates/@layout.latte b/app/AdminModule/Presenters/templates/@layout.latte
@@ -20,7 +20,7 @@
         {include main-menu}
     </div>
 
-    <div class="container-fluid" {$containerAttributes|noescape}>
+    <div class="container-fluid">
         <div id="content" class="row">
             <div id="sidebar" class="col-3" n:ifcontent>
                 {ifset #sidebar}

diff --git a/app/AdminModule/ProgramModule/Presenters/SchedulePresenter.php b/app/AdminModule/ProgramModule/Presenters/SchedulePresenter.php
@@ -22,7 +22,6 @@ class SchedulePresenter extends ProgramBasePresenter
      */
     public function renderDefault() : void
     {
-        $this->template->containerAttributes     = 'ng-app="scheduleApp" ng-controller="AdminScheduleCtrl"';
         $this->template->isAllowedModifySchedule = $this->settingsService->getBoolValue(Settings::IS_ALLOWED_MODIFY_SCHEDULE);
     }
 }
diff --git a/app/assets/web/schedule/Calendar.vue b/app/assets/web/schedule/Calendar.vue
@@ -9,13 +9,13 @@
                     </div>
                     <div class="modal-body">
                         <ul class="list-unstyled">
-                            <li ng-if="event.block.category">
+                            <li v-if="selectedEventInfo.event.extendedProps.block.category">
                                 <strong>Kategorie: </strong>
                                 {{ selectedEventInfo.event.extendedProps.block.category }}
                             </li>
-                            <li ng-if="event.room">
+                            <li v-if="selectedEventInfo.event.getResources().length > 0">
                                 <strong>Místnost: </strong>
-                                {{ selectedEventInfo.event.getResources().length > 0 ? selectedEventInfo.event.getResources()[0].title : ''}}
+                                {{ selectedEventInfo.event.getResources()[0].title }}
                             </li>
                             <li>
                                 <strong>Obsazenost: </strong>
@@ -26,7 +26,7 @@
                             </li>
                         </ul>
 
-                        <div ng-if="event.block.lectors">
+                        <div v-if="selectedEventInfo.event.extendedProps.block.lectors.length > 0">
                             <h6>Lektoři</h6>
                             <div v-for="lector in selectedEventInfo.event.extendedProps.block.lectors">
                                 <b>{{ lector.name }}</b>
@@ -166,7 +166,8 @@
                 ],
                 defaultView: localStorage.getItem("fcDefaultView") || "timeGridSeminar",
                 selectedEventInfo: null,
-                userAllowedRegisterPrograms: userAllowedRegisterPrograms
+                userAllowedRegisterPrograms: userAllowedRegisterPrograms,
+                basePath: basePath
             }
         },
         computed: {