From cf040e6bca99cd39d79f06ac5151ff0b2afa44fa Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 2 Jun 2023 11:52:21 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20trailing=20slash=E3=81=AE=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=80=81logout=E3=81=AB=E3=82=82=E3=81=82=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/error/exception_handler.py            |  2 +-
 .../src/templates/bioSearchList.html          | 44 +++++++++----------
 ecs/jskult-webapp/src/templates/menu.html     |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ecs/jskult-webapp/src/error/exception_handler.py b/ecs/jskult-webapp/src/error/exception_handler.py
index 679f7ebd..1b8cb59c 100644
--- a/ecs/jskult-webapp/src/error/exception_handler.py
+++ b/ecs/jskult-webapp/src/error/exception_handler.py
@@ -12,4 +12,4 @@ def http_exception_handler(request: Request, exc: HTTPException):
         raise exc
     error_detail = exc.detail if hasattr(exc, 'detail') else ''
     reason = parse.quote(error_detail)
-    return RedirectResponse(f'/logout?reason={reason}', status_code=status.HTTP_303_SEE_OTHER)
+    return RedirectResponse(f'/logout/?reason={reason}', status_code=status.HTTP_303_SEE_OTHER)
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index cc208efd..232a51ef 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -37,7 +37,7 @@
                         <select class="text search_dropdown" name="ctrl_wholesaler" value="" onChange="formBtDisabled();">
                             <option value=""></option>
                             {% for whs_name in bio.display_wholesaler_names() %}
-                                <option 
+                                <option
                                     value="{{whs_name}}"
                                     {{bio.is_selected_whs_name(whs_name)}}>
                                     {{whs_name}}
@@ -61,7 +61,7 @@
                         onblur="autoModifyDate(this)"
                         >
                         ～
-                        <input type="text" id="shoribi_end" class="date_picker" name="ctrl_rec_ymd_to" 
+                        <input type="text" id="shoribi_end" class="date_picker" name="ctrl_rec_ymd_to"
                             value="{{bio.is_input_rec_ymd_to()}}"
                             onchange="formBtDisabled()"
                             onblur="autoModifyDate(this)"
@@ -71,8 +71,8 @@
                 <tr>
                     <td>ロット番号：</td>
                     <td class="search_tb">
-                        <input class="text" type="text" id="lot_tb" name="ctrl_rec_lot_num" style="ime-mode:disabled" maxlength="10" 
-                        value="{{bio.is_input_lot_num()}}" 
+                        <input class="text" type="text" id="lot_tb" name="ctrl_rec_lot_num" style="ime-mode:disabled" maxlength="10"
+                        value="{{bio.is_input_lot_num()}}"
                         oninput="checkSpaceForm(this); checkAimaiSearhForm(this); formBtDisabled()">
                     </td>
                     <td>データ区分：</td>
@@ -88,7 +88,7 @@
                         <select class="text search_dropdown" name="ctrl_maker_cd" value="" onChange="formBtDisabled();">
                             <option value=""></option>
                             {% for phm in bio.phm_models %}
-                            <option 
+                            <option
                                 value="{{phm['mkr_cd_nm']}}" {{bio.is_selected_maker_cd(phm['mkr_cd_nm'])}}>
                                 {{phm['mkr_cd_nm']}}
                             </option>
@@ -99,13 +99,13 @@
                 <tr>
                     <td>発伝年月日：</td>
                     <td colspan="3">
-                        <input type="text" id="shoribi_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_from" 
+                        <input type="text" id="shoribi_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_from"
                             value="{{bio.is_input_rev_hsdnymd_srk_from()}}"
                             onchange="formBtDisabled()"
                             onblur="autoModifyDate(this)"
                         >
                         ～
-                        <input type="text" id="shoribi_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_to" 
+                        <input type="text" id="shoribi_start" class="date_picker" name="ctrl_rev_hsdnymd_srk_to"
                             value="{{bio.is_input_rev_hsdnymd_srk_to()}}"
                             onchange="formBtDisabled()"
                             onblur="autoModifyDate(this)"
@@ -198,7 +198,7 @@
             // 検索パラメータを取得
             const formData = $('#bio_search').serializeArray()
             // リクエスト用に加工
-            const searchParams = {} 
+            const searchParams = {}
             for (let i = 0; i < formData.length; i++) {
                 searchParams[formData[i].name] = formData[i].value
             }
@@ -219,12 +219,12 @@
                 success: function(data) {
                     try {
                         if (data.status === 'batch_processing') {
-                            location.href('/logout?reason=batchProcessing')
+                            location.href('/logout/?reason=batchProcessing')
                             return
                         }
 
                         if (data.status === 'session_expired') {
-                            location.href('/logout?reason=session_expired')
+                            location.href('/logout/?reason=session_expired')
                             return
                         }
                         // データが存在しない場合の考慮が必要
@@ -295,7 +295,7 @@
                 }
             })
         });
-        
+
         function pagination_content(datas) {
             const display_keys = [
                 'slip_org_kbn',
@@ -349,7 +349,7 @@
     </script>
 
     <!-- Excel出力モーダル -->
-    {% with 
+    {% with
         modal_id='modal_xlsx',
         modal_title='確認',
         message='生物由来卸販売データ一覧をExcel出力しますか？',
@@ -373,7 +373,7 @@
     {% include '_modal.html' %}
     {% endwith %}
     <!-- CSV出力モーダル -->
-    {% with 
+    {% with
         modal_id='modal_csv',
         modal_title='確認',
         message='生物由来卸販売データ一覧をCSV出力しますか？',
@@ -397,36 +397,36 @@
     {% include '_modal.html' %}
     {% endwith %}
     <!-- AWS環境異常エラーモーダル -->
-    {% with 
+    {% with
         modal_id='ErrorModal_AWS',
         modal_title='エラー',
         message='ＡＷＳ環境に異常が発生しました。管理者にお問い合わせください。',
         icon_key='warning',
-        modal_close_event='location.href="/logout?reason="',
+        modal_close_event='location.href="/logout/?reason="',
         buttons = [
             {
                 'id': 'error_modal_aws',
                 'class': 'btn btn-primary',
                 'text': 'OK',
-                'onclick_event': 'location.href="/logout?reason=''"'
+                'onclick_event': 'location.href="/logout/?reason=''"'
             }
         ]
     %}
     {% include '_modal.html' %}
     {% endwith %}
     <!-- DB接続失敗エラーモーダル -->
-    {% with 
+    {% with
         modal_id='ErrorModal_DB',
         modal_title='エラー',
         message='DB接続に失敗しました。管理者にお問い合わせください。',
         icon_key='warning',
-        modal_close_event='location.href="/logout?reason="',
+        modal_close_event='location.href="/logout/?reason="',
         buttons = [
             {
                 'id': 'error_modal_db',
                 'class': 'btn btn-primary',
                 'text': 'OK',
-                'onclick_event': 'location.href="/logout?reason=''"'
+                'onclick_event': 'location.href="/logout/?reason=''"'
             }
         ]
     %}
@@ -434,18 +434,18 @@
     {% endwith %}
 
     <!-- エラーモーダル -->
-    {% with 
+    {% with
         modal_id='ErrorModal_Unexpected',
         modal_title='エラー',
         message='サーバーエラーが発生しました。管理者にお問い合わせください。',
         icon_key='warning',
-        modal_close_event='location.href="/logout?reason="',
+        modal_close_event='location.href="/logout/?reason="',
         buttons = [
             {
                 'id': 'error_modal_unexpected',
                 'class': 'btn btn-primary',
                 'text': 'OK',
-                'onclick_event': 'location.href="/logout?reason=''"'
+                'onclick_event': 'location.href="/logout/?reason=''"'
             }
         ]
     %}
diff --git a/ecs/jskult-webapp/src/templates/menu.html b/ecs/jskult-webapp/src/templates/menu.html
index beda056b..276eb643 100644
--- a/ecs/jskult-webapp/src/templates/menu.html
+++ b/ecs/jskult-webapp/src/templates/menu.html
@@ -22,7 +22,7 @@
         {% else %}
           <div class="notUseBioMsg">生物由来データ参照は <br> 日次バッチ処理中のため利用出来ません</div>
         {% endif %}
-      {% endif %}    
+      {% endif %}
       {% if menu.is_available_master_maintenance_menu() %}
         {% if not menu.is_batch_processing() %}
           <a href="{{masterMaintePath}}" class="btn btn-primary btn-lg btn_width">マスターメンテメニュー</a><br><br>