From 29131334d4111e454ff9dc029eabc89693758481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=9C=A8=E8=A6=81?= <x.takagi.k@nds-tyo.co.jp>
Date: Mon, 24 Jul 2023 17:48:25 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=A9=E3=82=B8=E3=82=AA=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92=E7=B6=AD?=
 =?UTF-8?q?=E6=8C=81=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81sessionStorage?=
 =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/function/businessLogicScript.js    |  1 +
 .../src/templates/instEmpCsvUL.html           | 44 ++++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index 768a0ac1..d68e4d86 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -222,6 +222,7 @@ function checkNumberOnlyForm($this)
 // メニューへボタンの関数
 // 機能概要：マスターメンテメニュー画面に遷移する
 function backToMainteMenu(){
+    sessionStorage.clear();
     location.href = "/masterMainte/masterMainteMenu/";
 }
 
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
index 04b2f798..c4f2ca75 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
@@ -7,16 +7,47 @@
     <link href="/static/css/masterMainte.css" rel="stylesheet" />
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <script type="text/javascript">
+        window.onload = function(){
+            if (document.getElementById("insert") !== null) {
+                sessionStorage.clear();
+            }
+            if (sessionStorage["ctrl_select_function"]) {
+                var element = document.getElementById("upload_form");                
+                if (sessionStorage["ctrl_select_function"] === "new") {
+                    element.function_new.checked = true;
+                }
+                else if (sessionStorage["ctrl_select_function"] === "change") {
+                    element.function_change.checked = true;
+                }
+            }
+            if (sessionStorage["ctrl_select_table"]) {
+                var element = document.getElementById("upload_form");                
+                if (sessionStorage["ctrl_select_table"] === "dummy") {
+                    element.dummy_table.checked = true;
+                }
+                else if (sessionStorage["ctrl_select_table"] === "real") {
+                    element.real_table.checked = true;
+                }
+            }
+        }        
         function Form_Submit(){
+            sessionStorage.clear();
+            var element = document.getElementById("upload_form")                
+            sessionStorage.setItem("ctrl_select_function", element.ctrl_select_function.value);
+            sessionStorage.setItem("ctrl_select_table", element.ctrl_select_table.value);
             document.getElementById("loading").style.display = "block";
-            document.getElementById("ulMsg").style.display = "none";
+            if (document.getElementById("ulMsg") !== null) {
+                document.getElementById("ulMsg").style.display = "none";
+            }
         }
 
         function Form_Submit_Disp_Dialog(){
             var msg = '{{ mainte_csv_up.select_function_message }}';
             if (confirmDialog(msg)) {
                 document.getElementById("loading").style.display = "block";
-                document.getElementById("ulMsg").style.display = "none";
+                if (document.getElementById("ulMsg") !== null) {
+                    document.getElementById("ulMsg").style.display = "none";
+                }
             } else {
                 return false;
             }
@@ -48,6 +79,7 @@
         {% else %}
             onsubmit="Form_Submit();"
         {% endif %}
+        id="upload_form"
     >
         <table class="inputTable">
             <tbody>
@@ -57,7 +89,7 @@
                     <td class="inputLabelTd">機能：</td>
                     <td class="inputTd">
                         <label>
-                            <input type="radio" name="ctrl_select_function" value="new"
+                            <input type="radio" name="ctrl_select_function" value="new" id="function_new"
                                 {{ "checked " if mainte_csv_up.select_function == 'new' or mainte_csv_up.is_select_function_empty() }}
                                 {{ "disabled" if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() }}
                             >
@@ -66,7 +98,7 @@
                     </td>
                     <td class="inputTd">
                         <label>
-                            <input type="radio" name="ctrl_select_function" value="change"
+                            <input type="radio" name="ctrl_select_function" value="change" id="function_change"
                                 {{ "checked " if mainte_csv_up.select_function == 'change' }}
                                 {{ "disabled" if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() }}
                             >
@@ -80,7 +112,7 @@
                     <td class="inputLabelTd">登録テーブル：</td>
                     <td class="inputTd">
                         <label>
-                            <input type="radio" name="ctrl_select_table" value="dummy"
+                            <input type="radio" name="ctrl_select_table" value="dummy" id="dummy_table"
                                 {{ "checked " if mainte_csv_up.select_table == 'dummy' or mainte_csv_up.is_select_table_empty() }}
                                 {{ "disabled" if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() }}
                             >
@@ -89,7 +121,7 @@
                     </td>
                     <td class="inputTd">
                         <label>
-                            <input type="radio" name="ctrl_select_table" value="real"
+                            <input type="radio" name="ctrl_select_table" value="real" id="real_table"
                                 {{ "checked " if mainte_csv_up.select_table == 'real' }}
                                 {{ "disabled" if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() }}
                             >