Skip to content

D
design
Commit af66b452 by Lee JaeWon
Options

#43131 作業一覧画面JSON対応 (jsonから工程一覧作成)

parent 1584ba6b
Showing with 48 additions and 96 deletions
app/index.html
......@@ -28,81 +28,11 @@
<section class="category-menu">
<div class="overlay"></div>
<nav class="drawer-menu">
<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>
<a class="category-btn p-3" href="#"><i class="fa fa-times"></i></a>
</div>
<dl>
<dt class="menu-ttl"><a href="">カテゴリー</a></dt>
<dd>
<ul>
<li class="drawer-menu2">
<p class="sub-menu-ttl"><a href="">サブカテゴリー</a></p>
<ul class="drawer-menu3">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</li>
<li class="drawer-menu2">
<p class="sub-menu-ttl"><a href="">サブカテゴリー</a></p>
<ul class="drawer-menu3">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</li>
<li class="drawer-menu2">
<p class="sub-menu-ttl"><a href="">サブカテゴリー</a></p>
<ul class="drawer-menu3">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</li>
</ul>
</dd>
</dl>
<dl>
<dt class="menu-ttl"><a href="">カテゴリー</a></dt>
<dd>
<ul class="drawer-menu2 menu-link">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</dd>
</dl>
<dl>
<dt class="menu-ttl"><a href="">カテゴリー</a></dt>
<dd>
<ul class="drawer-menu2 menu-link">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</dd>
</dl>
<dl><dt class=""><a href="">カテゴリー</a></dt></dl>
<dl>
<dt class="menu-ttl"><a href="">カテゴリー</a></dt>
<dd>
<ul class="drawer-menu2 menu-link">
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
<li><a href="">サブカテゴリー</a></li>
</ul>
</dd>
</dl>
</nav>
</section>
......
app/script/check.js
......@@ -34,11 +34,16 @@ CHK.pdf_pageNum;
CHK.deleteName; //削除ホットスポット名保持用
CHK.reportBasePath = "./"; // レポートデータのベースパス
CHK.operation; //作業一覧データ
CHK.operationGroupMaster; //カテゴリーデータ
CHK.operationGroupMasterRelation; //作業・カテゴリー関係データ
CHK.pushMessage; //コミュニケーションデータ
//JSONファイルパス
CHK.jsonPath = {
operationList: "operationList.json", // 作業一覧JSONデータ
operationGroupMasterList: "operationGroupMasterList.json", // カテゴリJSONデータ
operationGroupMasterRelationList: "operationGroupMasterRelationList.json", // 作業・カテゴリ関係JSONデータ
operationGroupMasterList: "operationGroupMasterList.json", // カテゴリーJSONデータ
operationGroupMasterRelationList: "operationGroupMasterRelationList.json", // 作業・カテゴリー関係JSONデータ
pushMessageList: "pushMessageList.json" // コミュニケーションデータJSONデータ
};
//アプリ送信用コマンド
......@@ -283,15 +288,19 @@ CHK.initReport = function(callback) {
CHK.initReportApp = function (callback) {
// 作業一覧JSONデータ
CHK.loadJson(CHK.jsonPath.operationList, function (json) {
CHK.operation = json;
//作業一覧描画
CHK.createOperationList(CHK.operation.operationList);
});
// カテゴリJSONデータ
// カテゴリーJSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterList, function (json) {
CHK.operationGroupMaster = json;
//カテゴリー設定
CHK.createCategory(CHK.operationGroupMaster.operationGroupMasterList);
});
// 作業・カテゴリ関係JSONデータ
// 作業・カテゴリー関係JSONデータ
CHK.loadJson(CHK.jsonPath.operationGroupMasterRelationList, function (json) {
});
......@@ -2598,34 +2607,47 @@ CHK.showWhiteFrame = function() {
$("#whiteFrame").show();
}
function createCategory(){
//category test
var categoryJson ={"operationGroupMasterList":[{"operationGroupMasterId":763,"operationGroupMasterName":"#40942 test","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/763","countOperation":1},{"operationGroupMasterId":795,"operationGroupMasterName":"test-repeat-row","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/795","countOperation":3},{"operationGroupMasterId":796,"operationGroupMasterName":"test-repeat-row-page1","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/796","countOperation":1},{"operationGroupMasterId":797,"operationGroupMasterName":"test-repeat-row-page1-book","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/797","countOperation":1},{"operationGroupMasterId":90,"operationGroupMasterName":"全体","operationGroupMasterLevel":0,"parentOperationGroupMasterId":0,"treePath":"90","countOperation":1},{"operationGroupMasterId":781,"operationGroupMasterName":"本日のテスト20200225","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/781","countOperation":3},{"operationGroupMasterId":551,"operationGroupMasterName":"計算確認 Book","operationGroupMasterLevel":1,"parentOperationGroupMasterId":90,"treePath":"90/551","countOperation":2}]}
/**
* カテゴリー設定
*/
CHK.createCategory = function(operationGroupMasterList) {
//パンくずリスト初期表示（全体）
$('.breadcrumb li').eq(1).hide();
$('.breadcrumb li').eq(2).hide();
//todo1 作業・カテゴリー関係に合わせて画面表示
//todo2 カテゴリー整列（parentOperationGroupMasterId or operationGroupMasterLevel）sort(function)
//operationGroupMasterLevel 0 全体
//operationGroupMasterLevel 1 カテゴリー, サブカテゴリー?
for (var i = 0; i < categoryJson.operationGroupMasterList.length; i++) {
var categoryDt = $(".menu-ttl");
//categoryDt.text(setOperationDate(categoryJson.operationGroupMasterList[i].operationGroupMasterName));
//サイドメニューカテゴリー構造作成
operationGroupMasterList.sort((a, b) => (a.operationGroupMasterId > b.operationGroupMasterId) ? 1 : -1);
//TODO operationGroupMasterId順番と深さの仕様確認要
for (var i = 0; i < operationGroupMasterList.length; i++) {
if (operationGroupMasterList[i].operationGroupMasterLevel == 0 ){ //0 : カテゴリー全体
var categoryParent = $("<dl id=groupMasterId_"+ operationGroupMasterList[i].operationGroupMasterId +"><dt class='menu-ttl'><a href=''>"+ operationGroupMasterList[i].operationGroupMasterName +"</a></dt></dl>");
$('#category-menu').append(categoryParent);
} else {
if($('#groupMasterId_'+operationGroupMasterList[i].parentOperationGroupMasterId).length > 0){
var categoryChild;
if ($('#groupMasterId_'+ operationGroupMasterList[i].parentOperationGroupMasterId +'>dd').length > 0){
categoryChild = $("<li class='drawer-menu2'><a href=''>"+ operationGroupMasterList[i].operationGroupMasterName +"</a></li>");
$('#groupMasterId_'+operationGroupMasterList[i].parentOperationGroupMasterId+' >dd >ul').append(categoryChild);
} else {
categoryChild = $("<dd style='display:none;'><ul class='drawer-menu2 menu-link'><li class='drawer-menu2'><a href=''>"+ operationGroupMasterList[i].operationGroupMasterName +"</a></li></ul></dd>");
$('#groupMasterId_'+operationGroupMasterList[i].parentOperationGroupMasterId).append(categoryChild);
}
}
}
}
};
/**
* 作業一覧描画
*/
function createOperationList(){
//sampleTest
var json = {"operationList":[{"operationId":1077,"operationName":"1月作業、会議室リニューアル","operationDescriptions":"","operationType":2,"operationStartDate":"2020-01-21T00:00:00","operationEndDate":"2020-01-31T00:00:00","lastEditDate":"2020-06-23T10:03:42","needSyncFlg":true,"reportType":0,"reportCycle":0,"enableReportUpdate":0,"enableReportHistory":0,"enableAddReport":1,"quickReport":false,"contentId":1171},{"":1125,"operationName":"360 setting","operationDescriptions":"","operationType":2,"operationStartDate":"2020-01-22T00:00:00","operationEndDate":"2020-05-30T00:00:00","lastEditDate":"2020-05-26T11:14:27","needSyncFlg":true,"reportType":0,"reportCycle":0,"enableReportUpdate":0,"enableReportHistory":0,"enableAddReport":1,"quickReport":false,"contentId":1223},{"operationId":2431,"operationName":"uwp_sample","operationDescriptions":"","operationType":0,"operationStartDate":"2020-07-07T00:00:00","operationEndDate":"2020-07-31T00:00:00","lastEditDate":"2020-07-07T12:17:19","needSyncFlg":true,"reportType":0,"reportCycle":0,"enableReportUpdate":0,"enableReportHistory":0,"enableAddReport":1,"quickReport":false,"contentId":2647},{"operationId":2432,"operationName":"計算テスト Base","operationDescriptions":"","operationType":0,"operationStartDate":"2020-07-07T00:00:00","operationEndDate":"2020-07-31T00:00:00","lastEditDate":"2020-07-07T12:44:16","needSyncFlg":true,"reportType":0,"reportCycle":0,"enableReportUpdate":0,"enableReportHistory":0,"enableAddReport":1,"quickReport":true,"contentId":2653},{"operationId":2433,"operationName":"計算領域","operationDescriptions":"","operationType":0,"operationStartDate":"2020-07-07T00:00:00","operationEndDate":"2020-07-31T00:00:00","lastEditDate":"2020-07-07T12:44:15","needSyncFlg":true,"reportType":0,"reportCycle":0,"enableReportUpdate":0,"enableReportHistory":0,"enableAddReport":1,"quickReport":true,"contentId":2652}]};
for (var i = 0; i < json.operationList.length; i++) {
CHK.createOperationList = function(operationList) {
for (var i = 0; i < operationList.length; i++) {
var operationTR = $("<tr/>");
//TODO aタグlist.html 転移処理
var operationNameTd = $("<td class='operationId_"+ json.operationList[i].operationId +"'><a href='list.html' class='d-block text-black text-decoration-none mb-1'>"+ json.operationList[i].operationName +"</a></td>");
var operationStartDateTd = $("<td/>", {class: "operationStartDate"}).text(setOperationDate(json.operationList[i].operationStartDate));
var operationEndDateTd = $("<td/>", {class: "operationEndDate"}).text(setOperationDate(json.operationList[i].operationEndDate));
var iconTd = json.operationList[i].operationType == CHK.OPERATION_TYPE.VTOUR ? $("<td class='p-2'> <button class='btn btn-outline-primary fs-8 py-2'>VR</button> </td>") : "";
var operationNameTd = $("<td class='operationId_"+ operationList[i].operationId +"'><a href='list.html' class='d-block text-black text-decoration-none mb-1'>"+ operationList[i].operationName +"</a></td>");
var operationStartDateTd = $("<td/>", {class: "operationStartDate"}).text(setOperationDate(operationList[i].operationStartDate));
var operationEndDateTd = $("<td/>", {class: "operationEndDate"}).text(setOperationDate(operationList[i].operationEndDate));
var iconTd = operationList[i].operationType == CHK.OPERATION_TYPE.VTOUR ? $("<td class='p-2'> <button class='btn btn-outline-primary fs-8 py-2'>VR</button> </td>") : "";
operationTR.append(operationNameTd);
operationTR.append(operationStartDateTd);
......
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