Commit cfd24def by Lee Munkyeong

Merge branch 'feature/1.4.0_kim-ec' into 'feature/1.4.0'

問題課題表#116カテゴリー整列をCMSと同じく変更対応

See merge request !16
parents edcdda20 bd62feeb
......@@ -128,7 +128,7 @@
<table class="table">
<thead>
<tr>
<th class="multi-lang" data-msg="headerItemName">項目</th>
<th class="multi-lang" data-msg="headerItemName">作業</th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerStartDate">開始日</th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerEndDate">終了日</th>
<th>VR</th>
......
......@@ -46,7 +46,6 @@ CHK.scanResultCode; //スキャンしたRFID,バーコード
CHK.scanType; //スキャン種別(0:バーコード、1:RFID)
var pageLang; // ページ設定言語
var isSetCategory = true
var CATEGORY_HEIGHT; //カテゴリー描画用固定値(高さ)
var msgMap = { // velocity?
all:{ja:"全て", ko:"전체", en:"All"},
......@@ -440,42 +439,38 @@ CHK.initReport = function(callback) {
* @param callback コールバック
*/
CHK.initReportApp = function (callback) {
CHK.isSearched = false;
CHK.operationGroupMasterId = 0;
// 作業一覧JSONデータ
CHK.loadJson(CHK.jsonPath.operationList, function (json) {
//カテゴリー高さ変更
$(window).resize(function() {
CHK.setCategoryHeight();
});
CHK.isSearched = false;
CHK.operationGroupMasterId = 0;
// 作業一覧JSONデータ
CHK.loadJson(CHK.jsonPath.operationList, function (json) {
CHK.operation = json;
$('#operationTable').empty();
CHK.operation.searchOperationList = json.operationList;
$('#operationTable').empty();
CHK.operation.searchOperationList = json.operationList;
//作業一覧描画
CHK.createOperationList(CHK.operation.operationList);
//カテゴリー高さ固定
if(isSetCategory){
CATEGORY_HEIGHT = $('footer').offset().top - $('#category-menu').offset().top;
console.log(CATEGORY_HEIGHT);
isSetCategory = false
}
$("#category-menu").css("overflow", "scroll");
$('#category-menu').height(CATEGORY_HEIGHT - 16);
$('#overlayDiv').height(CATEGORY_HEIGHT);
});
// カテゴリーJSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterList, function (json) {
});
// カテゴリーJSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterList, function (json) {
CHK.operationGroupMaster = json;
//カテゴリー設定
CHK.createCategory(CHK.operationGroupMaster.operationGroupMasterList);
});
});
// 作業・カテゴリー関係JSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterRelationList, function (json) {
CHK.operationGroupMasterRelation = json;
});
// 作業・カテゴリー関係JSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterRelationList, function (json) {
CHK.operationGroupMasterRelation = json;
});
// コミュニケーションデータJSONデータ
CHK.loadJson(CHK.jsonPath.pushMessageList, function (json) {
// コミュニケーションデータJSONデータ
CHK.loadJson(CHK.jsonPath.pushMessageList, function (json) {
});
});
}
/**
......@@ -483,12 +478,10 @@ CHK.initReportApp = function (callback) {
*/
CHK.setCategoryHeight = function() {
//カテゴリー高さ固定
if(isSetCategory){
CATEGORY_HEIGHT = $('main').height();
console.log(CATEGORY_HEIGHT);
isSetCategory = false
}
$('#category-menu').height(CATEGORY_HEIGHT);
CATEGORY_HEIGHT = $('footer').offset().top - $('#category-menu').offset().top;
console.log(CATEGORY_HEIGHT);
$("#category-menu").css("overflow", "scroll");
$('#category-menu').height(CATEGORY_HEIGHT - 16);
$('#overlayDiv').height(CATEGORY_HEIGHT);
}
......@@ -2835,7 +2828,11 @@ CHK.createCategory = function(operationGroupMasterList) {
}
//サイドメニューカテゴリー構造作成
operationGroupMasterList.sort((a, b) => (a.operationGroupMasterId > b.operationGroupMasterId) ? 1 : -1);
operationGroupMasterList.sort(function(a, b) {
if (a.operationGroupMasterLevel < b.operationGroupMasterLevel) return -1;
if (a.operationGroupMasterLevel > b.operationGroupMasterLevel) return 1;
return 1;
});
var noCategory = $("<dl id='groupMasterId_0' class='group-category-list'><dt><a onclick='CHK.changeOperationGroupMaster(0);'>全て</a></dt></dl>");
$('#category-menu').append(noCategory);
//TODO operationGroupMasterId順番と深さの仕様確認要
......
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