Merge branch 'release-15.15.0'

oat-sa · Mar 1, 2024 · acbca04 · acbca04
2 parents e7f459b + 00c7704
commit acbca04
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 29 deletions.
diff --git a/controller/DeliveryServer.php b/controller/DeliveryServer.php
@@ -116,32 +116,7 @@ public function index()
         }
         $this->setData('availableDeliveries', $deliveryData);
 
-        /**
-         * Header & footer info
-         */
-        $this->setData('showControls', $this->showControls());
-        $this->setData('userLabel', tao_helpers_Display::htmlEscape($session->getUserLabel()));
-
-        // Require JS config
-        $this->setData('client_config_url', $this->getClientConfigUrl());
-        $this->setData('client_timeout', $this->getClientTimeout());
-
-        $loaderRenderer = new \Renderer(Template::getTemplate('DeliveryServer/blocks/loader.tpl', 'taoDelivery'));
-        $loaderRenderer->setData('client_config_url', $this->getClientConfigUrl());
-        $loaderRenderer->setData('parameters', ['messages' => $this->getViewDataFromRequest()]);
-
-        /* @var $urlRouteService DefaultUrlService */
-        $urlRouteService = $this->getServiceManager()->get(DefaultUrlService::SERVICE_ID);
-        $this->setData('logout', $urlRouteService->getUrl('logoutDelivery', []));
-
-        /**
-         * Layout template + real template inclusion
-         */
-        $this->setData('additional-header', $loaderRenderer);
-        $this->setData('content-template', 'DeliveryServer/index.tpl');
-        $this->setData('content-extension', 'taoDelivery');
-        $this->setData('title', __('TAO: Test Selection'));
-        $this->setView('DeliveryServer/layout.tpl', 'taoDelivery');
+        $this->setTemplate('DeliveryServer/index.tpl', __('TAO: Test Selection'));
     }
 
     /**
@@ -245,6 +220,17 @@ public function initDeliveryExecution(): void
      */
     public function runDeliveryExecution(): void
     {
+        if ($this->hasGetParameter('waitingPage')) {
+            $this->setData('delivery-execution-url', $this->getGetParameter('deliveryExecutionUrl'));
+            $this->setData('block-title', __('Authorized, you may proceed'));
+            $this->setData('scope', 'waiting-page');
+            $this->setData('hideHomeButton', true);
+            $this->setData('hideLogoutButton', true);
+            $this->setTemplate('DeliveryServer/waiting_page.tpl', __('Waiting page'));
+
+            return;
+        }
+
         $deliveryExecution = $this->getCurrentDeliveryExecution();
 
         if (!in_array($deliveryExecution->getState()->getUri(), $this->getDeliveryServer()->getResumableStates())) {
@@ -345,6 +331,38 @@ public function finishDeliveryExecution()
         $this->redirect($this->getReturnUrl());
     }
 
+    private function setTemplate(string $template, string $title)
+    {
+        $session = common_session_SessionManager::getSession();
+
+        /**
+         * Header & footer info
+         */
+        $this->setData('showControls', $this->showControls());
+        $this->setData('userLabel', tao_helpers_Display::htmlEscape($session->getUserLabel()));
+
+        // Require JS config
+        $this->setData('client_config_url', $this->getClientConfigUrl());
+        $this->setData('client_timeout', $this->getClientTimeout());
+
+        $loaderRenderer = new \Renderer(Template::getTemplate('DeliveryServer/blocks/loader.tpl', 'taoDelivery'));
+        $loaderRenderer->setData('client_config_url', $this->getClientConfigUrl());
+        $loaderRenderer->setData('parameters', ['messages' => $this->getViewDataFromRequest()]);
+
+        /* @var $urlRouteService DefaultUrlService */
+        $urlRouteService = $this->getServiceManager()->get(DefaultUrlService::SERVICE_ID);
+        $this->setData('logout', $urlRouteService->getUrl('logoutDelivery', []));
+
+        /**
+         * Layout template + real template inclusion
+         */
+        $this->setData('additional-header', $loaderRenderer);
+        $this->setData('content-template', $template);
+        $this->setData('content-extension', 'taoDelivery');
+        $this->setData('title', $title);
+        $this->setView('DeliveryServer/layout.tpl', 'taoDelivery');
+    }
+
     /**
      * Initialize the result server using the delivery configuration and for this results session submission
      *

diff --git a/views/css/delivery.css b/views/css/delivery.css
diff --git a/views/css/delivery.css.map b/views/css/delivery.css.map
diff --git a/views/scss/delivery.scss b/views/scss/delivery.scss
@@ -69,4 +69,12 @@ html {
             }
         }
     }
+
+}
+
+.waiting-page {
+    .content-wrap{
+        display: flex;
+        flex-direction: column;
+    }
 }
diff --git a/views/templates/DeliveryServer/layout.tpl b/views/templates/DeliveryServer/layout.tpl
@@ -24,7 +24,7 @@ use oat\tao\model\theme\Theme;
             ? get_data('additional-header')->render()
             : '' ?>
     </head>
-    <body class="delivery-scope">
+    <body class="delivery-scope <?= get_data('scope') ?>">
     <?php Template::inc('blocks/requirement-check.tpl', 'tao'); ?>
 
         <div class="content-wrap<?php if (!get_data('showControls')) :?> no-controls<?php endif; ?>">

diff --git a/views/templates/DeliveryServer/waiting_page.tpl b/views/templates/DeliveryServer/waiting_page.tpl
@@ -0,0 +1,14 @@
+<main class="test-listing">
+    <ul class="entry-point-box plain">
+        <li>
+            <div class="block entry-point entry-point-all-deliveries" data-launch_url="<?= get_data('delivery-execution-url') ?>" tabindex="-1">
+                <h3><?= _dh(get_data('block-title')) ?></h3>
+                <div class="clearfix">
+                    <span class="action" tabindex="0" role="button" aria-label="<?= __('Start this test') ?>">
+                        <span class="icon-play"></span> <?= __('Start') ?>
+                    </span>
+                </div>
+            </div>
+        </li>
+    </ul>
+</main>