nik/newdwh2021
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

指摘事項修正３

Browse Source
This commit is contained in:
野間 2023-06-19 10:12:15 +09:00
parent e61296dc1e
commit ca26e78b59
9 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecs/jskult-webapp/src/controller/ultmarc.py
View File

@ -141,7 +141,7 @@ def ultmarc_inst_info_view(
return templates_response
@ router.post('/instInfo')
@router.post('/instInfo')
def ultmarc_inst_info_search(
request: Request,
ultmarc_inst_form: Optional[UltmarcInstInfoModel] = Depends(UltmarcInstInfoModel.as_form),

6
ecs/jskult-webapp/src/model/request/ultmarc_doctor.py
View File

@ -19,7 +19,7 @@ class UltmarcDoctorSearchModel(BaseModel):
trt_course_name: Optional[str]
alma: Optional[str]
grad_y: Optional[str]
pagination_pageNumber: Optional[int]
pagination_page_number: Optional[int]
@classmethod
def as_form(
@ -35,7 +35,7 @@ class UltmarcDoctorSearchModel(BaseModel):
ctrl_trt_course_name: str = Form(None),
ctrl_alma: str = Form(None),
ctrl_grad_y: str = Form(None),
pagination_pageNumber: str = Form(None)
pagination_page_number: str = Form(None)
):
return cls(
@ -50,7 +50,7 @@ class UltmarcDoctorSearchModel(BaseModel):
trt_course_name=ctrl_trt_course_name,
alma=ctrl_alma,
grad_y=ctrl_grad_y,
pagination_pageNumber=pagination_pageNumber
pagination_page_number=pagination_page_number
)

6
ecs/jskult-webapp/src/model/request/ultmarc_inst.py
View File

@ -17,7 +17,7 @@ class UltmarcInstSearchModel(BaseModel):
prefc_cd: Optional[str]
delFlg: Optional[str]
inst_addr: Optional[str]
pagination_pageNumber: Optional[int]
pagination_page_number: Optional[int]
@classmethod
def as_form(
@ -31,7 +31,7 @@ class UltmarcInstSearchModel(BaseModel):
ctrl_prefc_cd: str = Form(None),
delFlg_ctrl: str = Form(None),
ctrl_inst_addr: str = Form(None),
pagination_pageNumber: str = Form(None)
pagination_page_number: str = Form(None)
):
return cls(
dcf_dsf_inst_cd=ctrl_dcf_dsf_inst_cd,
@ -43,7 +43,7 @@ class UltmarcInstSearchModel(BaseModel):
prefc_cd=ctrl_prefc_cd,
delFlg=delFlg_ctrl,
inst_addr=ctrl_inst_addr,
pagination_pageNumber=pagination_pageNumber
pagination_page_number=pagination_page_number
)

7
ecs/jskult-webapp/src/model/view/ultmarc_doctor_info_view_model.py
View File

@ -42,14 +42,9 @@ class UltmarcDoctorInfoViewModel(BaseModel):
return ''
# 生年月日
def is_input_birthday_fromat(self):
def is_input_birthday_format(self):
return self._format_date_string(self.doctor_info_data.birthday)
def is_input_ymd_fromat(self, ymd):
if ymd is None:
return ''
return ymd.strftime('%Y/%m/%d')
def is_input_trt_course_data_size(self):
return len(self.trt_coursed_data)

6
ecs/jskult-webapp/src/model/view/ultmarc_doctor_view_model.py
View File

@ -22,10 +22,12 @@ class UltmarcDoctorViewModel(BaseModel):
return json.dumps([model.dict() for model in self.doctor_data], ensure_ascii=False, default=date_handler)
# ページネーションのページ番号
def is_input_pagination_pageNumber(self):
# 検索時は最初のページを表示する
# 詳細画面からの遷移時は、元のページを表示する
def init_pagination_page_number(self):
if not self.is_form_submitted():
return 1
return self.form_data.pagination_pageNumber or 1
return self.form_data.pagination_page_number or 1
# 医師コード
def is_input_dcf_pcf_dr_cd(self):

6
ecs/jskult-webapp/src/model/view/ultmarc_inst_view_model.py
View File

@ -24,10 +24,12 @@ class UltmarcInstViewModel(BaseModel):
return json.dumps([model.dict() for model in self.inst_data], ensure_ascii=False, default=date_handler)
# ページネーションのページ番号
def is_input_pagination_pageNumber(self):
# 検索時は最初のページを表示する
# 詳細画面からの遷移時は、元のページを表示する
def init_pagination_page_number(self):
if not self.is_form_submitted():
return 1
return self.form_data.pagination_pageNumber or 1
return self.form_data.pagination_page_number or 1
# ULT施設コード
def is_input_dcf_dsf_inst_cd(self):

2
ecs/jskult-webapp/src/templates/docInfo.html
View File

@ -94,7 +94,7 @@
<td class="docInfoTd">性別：</td>
<td><input type="text" readonly="readonly" value="{{ultmarc.doctor_info_data.sex or ''}}"></td>
<td>生年月日:</td>
<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_fromat()}}"></td>
<td><input type="text" readonly="readonly" value="{{ultmarc.is_input_birthday_format()}}"></td>
</tr>
<tr>
<td colspan="6" class="docInfoTd">

6
ecs/jskult-webapp/src/templates/docSearch.html
View File

@ -182,13 +182,13 @@
sessionStorage.setItem('ctrl_grad_y','{{ultmarc.is_input_grad_y()}}');
// ページネーションのページ番号取得
let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
let pagination_page_number = Number('{{ultmarc.init_pagination_page_number()}}');
$(".pagination").pagination({
dataSource: function(done) {
done(searchResultData)
},
pageNumber: pagination_pageNumber, // 初期ページ番号
pageNumber: pagination_page_number, // 初期ページ番号
pageSize: 50, //表示するコンテンツ数
pageRange: 1, //選択されているページネーション番号の両隣に表示する個数
ellipsisText: '...', //省略文字
@ -197,7 +197,7 @@
showNavigator: true,
formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
callback: function(data, pagination) {
sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
sessionStorage.setItem('pagination_page_number',pagination.pageNumber);
$('#result_data').html(pagination_content(data));
}
})

6
ecs/jskult-webapp/src/templates/instSearch.html
View File

@ -182,13 +182,13 @@
sessionStorage.setItem('ctrl_inst_addr','{{ultmarc.is_input_inst_addr()}}');
// ページネーションのページ番号取得
let pagination_pageNumber = Number('{{ultmarc.is_input_pagination_pageNumber()}}');
let pagination_page_number = Number('{{ultmarc.init_pagination_page_number()}}');
$(".pagination").pagination({
dataSource: function(done) {
done(searchResultData)
},
pageNumber: pagination_pageNumber, // 初期ページ番号
pageNumber: pagination_page_number, // 初期ページ番号
pageSize: 50, //表示するコンテンツ数
pageRange: 2, //選択されているページネーション番号の両隣に表示する個数
ellipsisText: '...', //省略文字
@ -197,7 +197,7 @@
showNavigator: true,
formatNavigator: '件数: <%= totalNumber %>件 ページ数: <%= totalPage %>',
callback: function(data, pagination) {
sessionStorage.setItem('pagination_pageNumber',pagination.pageNumber);
sessionStorage.setItem('pagination_page_number',pagination.pageNumber);
$('#result_data').html(pagination_content(data))
}
})