fix: 연감 표기를 staticValues export에 따라 수정

2022-03-23 23:45:29 +09:00
parent a3fbaa0038
commit 7ebdef3116
2 changed files with 26 additions and 20 deletions
@@ -109,17 +109,19 @@ $nations = $history['nations'];
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printCSS('css/history.css') ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues' => [
+            'startYear' => $s_year,
+            'startMonth' => $s_month,
+            'lastYear' => $e_year,
+            'lastMonth' => $e_month,
+            'selectYear' => $year,
+            'selectMonth' => $month,
+            'nations' => $nations ? JSON::encode($history['nations']) : '{}'
+        ]
+    ])?>
    <?= WebUtil::printDist('ts', ['common', 'history']) ?>

-    <script>
-        var startYear = <?= $s_year ?>;
-        var startMonth = <?= $s_month ?>;
-        var lastYear = <?= $e_year ?>;
-        var lastMonth = <?= $e_month ?>;
-        var selectYear = <?= $year ?>;
-        var selectMonth = <?= $month ?>;
-        var nations = <?= $nations ? JSON::encode($history['nations']) : '{}' ?>;
-    </script>
 </head>

 <body>
@@ -3,25 +3,29 @@ import '@/map';
 import { joinYearMonth } from './util/joinYearMonth';
 import { parseYearMonth } from './util/parseYearMonth';

-declare const startYear:number;
-declare const startMonth:number;
+declare const staticValues: {
+    startYear:number;
+    startMonth:number;
+
+    lastYear: number;
+    lastMonth: number;
+
+    selectYear: number;
+    selectMonth: number;
+}

-declare const lastYear: number;
-declare const lastMonth: number;

-declare const selectYear: number;
-declare const selectMonth: number;

 $(function ($) {
-    let currYear = startYear;
-    let currMonth = startMonth;
-    const selectDate = joinYearMonth(selectYear, selectMonth);
+    let currYear = staticValues.startYear;
+    let currMonth = staticValues.startMonth;
+    const selectDate = joinYearMonth(staticValues.selectYear, staticValues.selectMonth);

    const $yearMonth = $('#yearmonth');
    let $elements = $();

-    const endDate = joinYearMonth(lastYear, lastMonth) + 1;//연감 마지막 + 1(현재)
-    let currDate = joinYearMonth(startYear, startMonth);
+    const endDate = joinYearMonth(staticValues.lastYear, staticValues.lastMonth) + 1;//연감 마지막 + 1(현재)
+    let currDate = joinYearMonth(staticValues.startYear, staticValues.startMonth);
    while (currDate <= endDate) {
        let sel = '';
        if (currDate == selectDate) {