From d1ec77ce0819d009f9ddcd3527854ded962e2b3b Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Thu, 24 Aug 2023 16:02:58 +0900
Subject: [PATCH] =?UTF-8?q?fix:=206500=E4=BB=B6=E5=88=B6=E9=99=90=E3=80=81?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=81=AB=E3=82=82=E8=A1=A8=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-webapp/src/model/view/bio_view_model.py |  1 +
 ecs/jskult-webapp/src/templates/_modal.html        | 14 +++++++++-----
 ecs/jskult-webapp/src/templates/bioSearchList.html |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ecs/jskult-webapp/src/model/view/bio_view_model.py b/ecs/jskult-webapp/src/model/view/bio_view_model.py
index bd43cd7a..7ad9e8cb 100644
--- a/ecs/jskult-webapp/src/model/view/bio_view_model.py
+++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py
@@ -19,6 +19,7 @@ class BioViewModel(BaseModel):
     phm_models: list[PharmacyProductMasterModel]
     bio_data: Optional[list[BisDisplayModel]] = None
     form_data: BioModel = None
+    excel_max_lines: int = str(environment.BIO_EXCEL_RESULT_MAX_COUNT)
 
     def display_wholesaler_names(self):
         display_names = [
diff --git a/ecs/jskult-webapp/src/templates/_modal.html b/ecs/jskult-webapp/src/templates/_modal.html
index 6477db10..31d7df97 100644
--- a/ecs/jskult-webapp/src/templates/_modal.html
+++ b/ecs/jskult-webapp/src/templates/_modal.html
@@ -1,4 +1,4 @@
-{% with 
+{% with
     icon_data = {
         'info': {
             'alert': 'alert-primary',
@@ -18,10 +18,14 @@
           <button type="button" id="{{modal_id}}_close" onclick="{{modal_close_event}}" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div class="modal-body">
-          <img src="{{icon_data[icon_key]['icon_src']}}" loading="lazy" style="width: 50px;">
-          {% autoescape False %}
-          {{message}}
-          {% endautoescape %}
+          <div style="display: inline-block;">
+            <img src="{{icon_data[icon_key]['icon_src']}}" loading="lazy" style="width: 50px;">
+          </div>
+          <div style="display: inline-block;">
+            {% autoescape False %}
+            {{message}}
+            {% endautoescape %}
+          </div>
         </div>
         <div class="modal-footer">
           {% for button in buttons%}
diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index efbd3633..ac910b1b 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -381,7 +381,7 @@
     {% with
         modal_id='modal_xlsx',
         modal_title='確認',
-        message='生物由来卸販売データ一覧をExcel出力しますか？',
+        message='生物由来卸販売データ一覧をExcel出力しますか？<br>※出力件数が' + bio.excel_max_lines + '件に制限されます。全件出力したい場合はCSVで出力してください。',
         icon_key='info',
         modal_close_event='',
         buttons = [