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

Merge pull request #263 feature-NEWDWH2021-1200 into develop

Browse Source
This commit is contained in:
朝倉 明日香 2023-08-28 11:34:30 +09:00
commit 461cb9ad36
7 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ecs/jskult-webapp/src/static/css/bioStyle.css
View File

@ -48,6 +48,9 @@ table{
width: 40%;
}
.toMenu_bt{
width: 130px;
}
.search_table {
margin-bottom: 1%;

29
ecs/jskult-webapp/src/static/css/ultStyle.css
View File

@ -5,6 +5,7 @@
}
body {
margin: 8px;
background-color: LightCyan;
font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;
}
@ -27,6 +28,10 @@ table{
margin-left: 78.5%;
}
.toMenu_bt{
width: 130px;
}
.search_textbox{
width: 100%;
}
@ -79,7 +84,7 @@ table{
}
.info_bt{
width: 10%
width: 120px;
}
.search_bt{
@ -144,7 +149,7 @@ table{
.instSearchHeaderTdRight{
text-align: right;
padding-right: 2%;
padding-right: 120px;
}
.instSearchButchMsg{
@ -270,6 +275,22 @@ table{
height: 30px;
}
.pageMoveBt{
min-width: 35px;
}
.doctorSearchBt{
min-width: 180px;
}
.doctorInfoBt{
min-width: 105px;
}
.instSearchBt{
min-width: 180px;
}
.instHeaderTable{
margin-left: 40%;
}
@ -366,7 +387,7 @@ table{
.docHeaderTdRight{
text-align: right;
padding-right: 2%;
padding-right: 120px;
}
.docButchMsg{
@ -411,7 +432,7 @@ table{
}
.allOnOffButton{
width: 6%;
width: 75px;
}
/*医師情報*/

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

@ -24,7 +24,7 @@
<td class="headerTd"><h1>{{bio.subtitle}}</h1></td>
<td class="headerTdCenter headerTdCenter"></td>
<td class="headerTd headerTdRight">
<button class="header_bt" onclick="backToMenu()">メニューへ</button>
<button class="header_bt toMenu_bt" onclick="backToMenu()">メニューへ</button>
</td>
</tr>
</table>

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

@ -47,13 +47,13 @@
<input type="hidden" name="doc_id" value="{{ultmarc.doc_id}}">
<input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
<td class="instHeaderTd">
<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
<input type="button" name="prev" id="prev" value="前" class="transitionBt pageMoveBt" {{ultmarc.is_disabled_prev()}}>
</td>
<td class="instHeaderTd">
{{ultmarc.is_page_num_view()}}／{{ultmarc.post_cnt}}
</td>
<td class="instHeaderTd">
<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
<input type="button" name="next" id="next" value="次" class="transitionBt pageMoveBt" {{ultmarc.is_disabled_next()}}>
</td>
</form>
<form id="instSearch" name="instSearch" method="post" action="/ultmarc/docSearch" onsubmit="showLoading()">
@ -71,7 +71,7 @@
</script>
<td class="instHeaderTd">
<input type="submit" name="ctrl_docBackBt" class="transitionBt" value="医師検索一覧へ">
<input type="submit" name="ctrl_docBackBt" class="transitionBt doctorSearchBt" value="医師検索一覧へ">
</td>
</form>
</tr>

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

@ -32,7 +32,7 @@
<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
{% endif %}
</td>
<td class="docHeaderTd docHeaderTdRight"><button class="docHeader_bt" onclick="backToMenu()">メニューへ</button></td>
<td class="docHeaderTd docHeaderTdRight"><button class="header_bt toMenu_bt" onclick="backToMenu()">メニューへ</button></td>
</tr>
</table>
<form id="doctor_search" class="_form" name="search" action="/ultmarc/docSearch" method="POST" onsubmit="showLoading()">

8
ecs/jskult-webapp/src/templates/instInfo.html
View File

@ -43,20 +43,20 @@
<td class="instHeaderTd">
<input type="hidden" name="ctrl_dcf_dsf_inst_cd" value="{{ultmarc.inst_info_data.dcf_dsf_inst_cd or ''}}">
<input type="hidden" name="use_stop_div_ctrl" value="true">
<input name="docSearchBt" class="transitionBt" type="submit" value="勤務医師" {{ultmarc.is_disabled_doctor_wrkplace()}}>
<input name="docSearchBt" class="transitionBt doctorInfoBt" type="submit" value="勤務医師" {{ultmarc.is_disabled_doctor_wrkplace()}}>
</td>
</form>
<form id="instInfo" name="instInfo" method="post" action="/ultmarc/instInfo" onsubmit="showLoading()">
<input type="hidden" name="inst_id" value="{{ultmarc.inst_id}}">
<input type="hidden" name="page_num" id="page_num" value="{{ultmarc.page_num}}">
<td class="instHeaderTd">
<input type="button" name="prev" id="prev" value="前" class="transitionBt" {{ultmarc.is_disabled_prev()}}>
<input type="button" name="prev" id="prev" value="前" class="transitionBt pageMoveBt" {{ultmarc.is_disabled_prev()}}>
</td>
<td class="instHeaderTd">
{{ultmarc.is_page_num_view()}}／{{ultmarc.post_cnt}}
</td>
<td class="instHeaderTd">
<input type="button" name="next" id="next" value="次" class="transitionBt" {{ultmarc.is_disabled_next()}}>
<input type="button" name="next" id="next" value="次" class="transitionBt pageMoveBt" {{ultmarc.is_disabled_next()}}>
</td>
</form>
<form id="instSearch" name="instSearch" method="" action="/ultmarc/instSearch" onsubmit="chg_send_method()">
@ -75,7 +75,7 @@
</script>
<td class="instHeaderTd">
<input type="submit" name="instSearchBt" class="transitionBt" value="施設検索一覧へ">
<input type="submit" name="instSearchBt" class="transitionBt instSearchBt" value="施設検索一覧へ">
</td>
</form>
<script>

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

@ -33,7 +33,7 @@
<div class="docButchMsg">日次バッチ処理中のため、データが正しく表示されない可能性があります</div>
{% endif %}
</td>
<td class="instSearchHeaderTd instSearchHeaderTdRight"><button class="instSearchHeader_bt" onclick="backToMenu()">メニューへ</button></td>
<td class="instSearchHeaderTd instSearchHeaderTdRight"><button class="header_bt toMenu_bt" onclick="backToMenu()">メニューへ</button></td>
</tr>
</table>
<!-- 入力フォーム -->