From 79b9e1b22aa40ae6c00e05230b34d1d28c9c897a Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 23 Mar 2022 23:51:29 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=97=B0=EA=B0=90=20staticValues=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_history.php | 10 +++-------
 hwe/ts/history.ts |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hwe/a_history.php b/hwe/a_history.php
index 5932b08d..d20c8cf8 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -117,7 +117,9 @@ $nations = $history['nations'];
             'lastMonth' => $e_month,
             'selectYear' => $year,
             'selectMonth' => $month,
-            'nations' => $nations ? JSON::encode($history['nations']) : '{}'
+            'nations' => $nations ? $history['nations'] : [],
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
         ]
     ])?>
     <?= WebUtil::printDist('ts', ['common', 'history']) ?>
@@ -205,12 +207,6 @@ $nations = $history['nations'];
             <td><?= banner() ?> </td>
         </tr>
     </table>
-    <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-        ]
-    ])?>
     <script>
         <?php if($isCurrent): ?>
         reloadWorldMap({
diff --git a/hwe/ts/history.ts b/hwe/ts/history.ts
index 52d9b527..2e2a84a2 100644
--- a/hwe/ts/history.ts
+++ b/hwe/ts/history.ts
@@ -25,7 +25,7 @@ $(function ($) {
     let $elements = $();
 
     const endDate = joinYearMonth(staticValues.lastYear, staticValues.lastMonth) + 1;//연감 마지막 + 1(현재)
-    let currDate = joinYearMonth(staticValues.startYear, staticValues.startMonth);
+    let currDate = joinYearMonth(currYear, currMonth);
     while (currDate <= endDate) {
         let sel = '';
         if (currDate == selectDate) {