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 57f49a15..080149de 100644 --- a/ecs/jskult-webapp/src/model/view/bio_view_model.py +++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py @@ -9,7 +9,7 @@ from src.model.db.pharmacy_product_master import PharmacyProductMasterModel from src.model.db.wholesaler_master import WholesalerMasterModel from src.model.request.bio import BioModel from src.model.view.bio_disp_model import BisDisplayModel -from src.system_var import environment +from src.system_var import constants, environment class BioViewModel(BaseModel): @@ -52,8 +52,15 @@ class BioViewModel(BaseModel): def bio_data_json_str(self): def date_handler(obj): + """json.dumpsの日付項目のフォーマットハンドラ""" return obj.isoformat() if hasattr(obj, 'isoformat') else obj - return json.dumps([model.dict() for model in self.bio_data], ensure_ascii=False, default=date_handler) + + search_data_list = [model.dict() for model in self.bio_data] + search_data_len = len(search_data_list) + # 1ページあたりの表示件数単位で、リストにPUSH + part_page_size = constants.BIO_SEARCH_LIST_PAGE_SIZE + for i in range(0, search_data_len, part_page_size): + yield json.dumps(search_data_list[i:i + part_page_size], ensure_ascii=False, default=date_handler) def make_whs_name(self): if not self.is_form_submitted(): diff --git a/ecs/jskult-webapp/src/system_var/constants.py b/ecs/jskult-webapp/src/system_var/constants.py index 495abe86..fbcb1016 100644 --- a/ecs/jskult-webapp/src/system_var/constants.py +++ b/ecs/jskult-webapp/src/system_var/constants.py @@ -5,6 +5,9 @@ BATCH_STATUS_PROCESSING = '1' # 日付テーブル.dump取得状態区分:未処理 DUMP_STATUS_UNPROCESSED = '0' +# 生物由来照会 + +BIO_SEARCH_LIST_PAGE_SIZE = 100 BIO_TEMPORARY_FILE_DIR_PATH = path.join(path.curdir, 'src', 'data') BIO_EXCEL_TEMPLATE_FILE_PATH = path.join(BIO_TEMPORARY_FILE_DIR_PATH, 'BioData_template.xlsx') diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index fa1e004a..5f25dc0f 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -5,7 +5,7 @@ {% include '_header.html' %} {% endwith %} - +