temp

mdziekon · Feb 5, 2020 · b1f248a · b1f248a
1 parent 44a0143
commit b1f248a
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 3 deletions.
diff --git a/includes/functions/LaboratoryPage.php b/includes/functions/LaboratoryPage.php
@@ -2,6 +2,7 @@
 
 use UniEngine\Engine\Modules\Development\Components\ModernQueue;
 use UniEngine\Engine\Modules\Development\Screens\ResearchListPage\ModernQueuePlanetInfo;
+use UniEngine\Engine\Modules\Development\Screens\ResearchListPage\ModernQueueLabUpgradeInfo;
 use UniEngine\Engine\Includes\Helpers\Planets;
 use UniEngine\Engine\Includes\Helpers\Users;
 
@@ -177,6 +178,9 @@ function LaboratoryPage(&$CurrentPlanet, $CurrentUser, $InResearch, $ThePlanet)
         ),
         'timestamp'         => $Now,
     ]);
+    $labsUpgradeInfoComponent = ModernQueueLabUpgradeInfo\render([
+        'planetsWithUnfinishedLabUpgrades' => []
+    ]);
 
     $queueComponent = ModernQueue\render([
         'user'              => &$CurrentUser,
@@ -187,7 +191,8 @@ function LaboratoryPage(&$CurrentPlanet, $CurrentUser, $InResearch, $ThePlanet)
         'queueMaxLength'    => Users\getMaxResearchQueueLength($CurrentUser),
         'timestamp'         => $Now,
         'infoComponents'    => [
-            $planetInfoComponent['componentHTML']
+            $planetInfoComponent['componentHTML'],
+            $labsUpgradeInfoComponent['componentHTML']
         ],
 
         'getQueueElementCancellationLinkHref' => function ($queueElement) {

diff --git a/language/en/buildings.lang b/language/en/buildings.lang
@@ -91,7 +91,7 @@ $_Lang['InfoBox_ResearchTime']                  = 'Research time';
 $_Lang['Queue_Cancel_Research']                 = 'Cancel research';
 $_Lang['Queue_ResearchOn']                      = 'Research conducted on ';
 $_Lang['Queue_CantCancel_Premium_Lab']          = 'You cannot cancel research which required Dark Energy!';
-$_Lang['Queue_LabInQueue']                      = 'Queue is locked!<br/>Research lab is being upgraded on planets:<br/>%s';
+$_Lang['Queue_LabInQueue']                      = 'Queue is locked!<br/>Research lab is being upgraded on planets:';
 
 $_Lang['Queue_ListView_Info']                   = 'Research queue is available only when using the Grid Layout!';
 

diff --git a/language/pl/buildings.lang b/language/pl/buildings.lang
@@ -89,7 +89,7 @@ $_Lang['InfoBox_ResearchTime']          = 'Czas badania';
 $_Lang['Queue_Cancel_Research']         = 'Przerwij badanie';
 $_Lang['Queue_ResearchOn']              = 'Badanie przeprowadzane na';
 $_Lang['Queue_CantCancel_Premium_Lab']  = 'Nie można przerwać badania, które wymagało Ciemnej Energii!';
-$_Lang['Queue_LabInQueue']              = 'Kolejka zablokowana!<br/>Laboratorium w rozbudowie na Planetach:<br/>%s';
+$_Lang['Queue_LabInQueue']              = 'Kolejka zablokowana!<br/>Laboratorium w rozbudowie na Planetach:';
 
 $_Lang['Queue_ListView_Info']           = 'Kolejka Badań jest dostępna tylko w Wyglądzie Kafelkowym!';
 

diff --git a/modules/development/_includes.php b/modules/development/_includes.php
@@ -12,6 +12,7 @@
     include($includePath . './components/ModernQueue/ModernQueue.component.php');
 
     include($includePath . './screens/ResearchListPage/ModernQueuePlanetInfo/ModernQueuePlanetInfo.component.php');
+    include($includePath . './screens/ResearchListPage/ModernQueueLabUpgradeInfo/ModernQueueLabUpgradeInfo.component.php');
 
 });
 

diff --git a/...creens/ResearchListPage/ModernQueueLabUpgradeInfo/ModernQueueLabUpgradeInfo.component.php b/...creens/ResearchListPage/ModernQueueLabUpgradeInfo/ModernQueueLabUpgradeInfo.component.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Development\Screens\ResearchListPage\ModernQueueLabUpgradeInfo;
+
+//  Arguments
+//      - $props (Object)
+//          - planetsWithUnfinishedLabUpgrades
+//
+//  Returns: Object
+//      - componentHTML (String)
+//
+function render ($props) {
+    global $_Lang;
+
+    includeLang('worldElements.detailed');
+
+    $localTemplateLoader = createLocalTemplateLoader(__DIR__);
+
+    $planetsWithUnfinishedLabUpgrades = &$props['planetsWithUnfinishedLabUpgrades'];
+
+    $hasPlanetsWithUnfinishedLabUpgrades = !empty($planetsWithUnfinishedLabUpgrades);
+
+    $tplBodyCache = [
+        'queue_topinfo_planetlink' => $localTemplateLoader('row_infobox_planetlink'),
+        'queue_topinfo_otherplanetbox' => $localTemplateLoader('row_infobox_otherplanetbox'),
+    ];
+
+    if (!$hasPlanetsWithUnfinishedLabUpgrades) {
+        return [
+            'componentHTML' => ''
+        ];
+    }
+
+    $planetLinks = array_map(
+        function ($planet) use (&$tplBodyCache) {
+            $subcomponentTPLData = [
+                'Data_planetID' => $planet['id'],
+                'Data_planetName' => $planet['name'],
+                'Data_planetCoords_galaxy' => $planet['galaxy'],
+                'Data_planetCoords_system' => $planet['system'],
+                'Data_planetCoords_planet' => $planet['planet'],
+            ];
+
+            return parsetemplate(
+                $tplBodyCache['queue_topinfo_planetlink'],
+                $subcomponentTPLData
+            );
+        },
+        $planetsWithUnfinishedLabUpgrades
+    );
+    $planetLinksHTML = implode('<br/>', $planetLinks);
+
+    return [
+        'componentHTML' => parsetemplate(
+            $tplBodyCache['queue_topinfo_otherplanetbox'],
+            [
+                'Lang_LabInQueue' => $_Lang['Queue_LabInQueue'],
+                'Data_planetLinks' => $planetLinksHTML
+            ]
+        )
+    ];
+}
+
+?>
diff --git a/modules/development/screens/ResearchListPage/ModernQueueLabUpgradeInfo/index.php b/modules/development/screens/ResearchListPage/ModernQueueLabUpgradeInfo/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/...lopment/screens/ResearchListPage/ModernQueueLabUpgradeInfo/row_infobox_otherplanetbox.tpl b/...lopment/screens/ResearchListPage/ModernQueueLabUpgradeInfo/row_infobox_otherplanetbox.tpl
@@ -0,0 +1,9 @@
+<tr>
+    <th
+        class="pad5 red"
+        colspan="2"
+    >
+        {Lang_LabInQueue}:<br/>
+        {Data_planetLinks}
+    </th>
+</tr>
diff --git a/...development/screens/ResearchListPage/ModernQueueLabUpgradeInfo/row_infobox_planetlink.tpl b/...development/screens/ResearchListPage/ModernQueueLabUpgradeInfo/row_infobox_planetlink.tpl
@@ -0,0 +1,4 @@
+<a class="orange" href="?cp={Data_planetID}&amp;re=0">
+    {Data_planetName}
+    [{Data_planetCoords_galaxy}:{Data_planetCoords_system}:{Data_planetCoords_planet}]
+</a>