Commit d6a4e8c9 by Lee JaeWon

43780 カテゴリー一覧が画面上部でしか表示されない

parent 269de07f
......@@ -36,7 +36,7 @@
</header>
<section class="category-menu">
<div class="overlay"></div>
<div id="overlayDiv" class="overlay"></div>
<nav id="category-menu" class="drawer-menu">
<div class="d-flex justify-content-between border-bottom">
<h2 class="text-nowrap font-weight-bold fs-13 p-3 mb-0">カテゴリー</h2>
......
......@@ -43,6 +43,8 @@ CHK.operationGroupMasterRelation; //作業・カテゴリー関係データ
CHK.pushMessage; //コミュニケーションデータ
var pageLang; // ページ設定言語
var isSetCategory = true
var CATEGORY_HEIGHT; //カテゴリー描画用固定値(高さ)
var msgMap = { // velocity?
all:{ja:"全て", ko:"전체", en:"All"},
inputLoginInfo: {ja:"ログイン情報を入力してください", ko:"로그인 정보를 입력해주세요.", en:"Please enter your login information"},
......@@ -410,6 +412,14 @@ CHK.initReportApp = function (callback) {
CHK.operation.searchOperationList = json.operationList;
//作業一覧描画
CHK.createOperationList(CHK.operation.operationList);
//カテゴリー高さ固定
if(isSetCategory){
CATEGORY_HEIGHT = $('main').height();
console.log(CATEGORY_HEIGHT);
isSetCategory = false
}
$('#category-menu').height(CATEGORY_HEIGHT);
$('#overlayDiv').height(CATEGORY_HEIGHT);
});
// カテゴリーJSONデータ
......@@ -2836,7 +2846,6 @@ CHK.changeSortType = function(sortType) {
* 作業一覧描画
*/
CHK.createOperationList = function(operationList, isSearched = false) {
var displayHeightForCategry = $('#operationTable').height();
$('#operationTable').empty();
if (isSearched) {
operationList = CHK.operation.searchOperationList;
......@@ -2925,12 +2934,6 @@ CHK.createOperationList = function(operationList, isSearched = false) {
$(".table tbody").append(operationTR);
}
if(displayHeightForCategry == 0) {
var baseHeight = window.innerHeight;
$('#operationTable').height(baseHeight - $("body").height() - $("footer").height());
} else {
$('#operationTable').height(displayHeightForCategry);
}
};
/**Oper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment