Skip to content

D
design
Commit fc242179 by NGO THI HONG
Options

#49091 Update operation list

parent fc7965f0
Showing with 63 additions and 36 deletions
app/css/style.css
...@@ -259,6 +259,10 @@ ...@@ -259,6 +259,10 @@
.tab-label.on { .tab-label.on {
color: var(--blue); color: var(--blue);
} }
.tab-label.on .task-cnt{
font-weight: normal;
color: var(--secondary);
}
.tab-content.on{ .tab-content.on{
display: block; display: block;
animation: show .3s linear 0s; animation: show .3s linear 0s;
......
app/operationList.json
This source diff could not be displayed because it is too large. You can view the blob instead.
app/pickup.html
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
<header > <header >
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100"> <nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<a class="navbar-brand category-btn lht-0"> <a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i> <i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonBack"> <span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonBack">
戻る 戻る
</span> </span>
</a> </a>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="labelPickUp">ピックアップ</h1> <h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="labelPickUp">ピックアップ</h1>
<a href="#" class="nav-link text-white lht-0 p-1"> <a class="nav-link text-white lht-0 p-1">
<img class="icon" src="img/icon_update.svg" alt="更新"> <img class="icon" src="img/icon_update.svg" alt="更新">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonRefresh"> <span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonRefresh" onclick="CHK_pu.init();">
更新 更新
</span> </span>
</a> </a>
...@@ -49,21 +49,15 @@ ...@@ -49,21 +49,15 @@
<input id="tab-ContinueWork" type="radio" name="tab-task" class="tab-switch" checked> <input id="tab-ContinueWork" type="radio" name="tab-task" class="tab-switch" checked>
<input id="tab-ReportWithWarning" type="radio" name="tab-task" class="tab-switch"> <input id="tab-ReportWithWarning" type="radio" name="tab-task" class="tab-switch">
<ul class="tab-menu pl-0"> <ul class="tab-menu pl-0">
<li class="tab-label list-unstyled on"><label class="tab-label-NewReport fs-9 multi-lang" data-msg="labelNewReport" for="tab-NewReport">新規報告<div class="task-cnt">10</div></label></li> <li class="tab-label list-unstyled on"><label class="tab-label-NewReport fs-9 multi-lang" data-msg="labelNewReport" for="tab-NewReport" >新規報告</label><div class="task-cnt" id="count-NewReport"></div></li>
<li class="tab-label list-unstyled"><label class="tab-label-ContinueWork fs-9 multi-lang" data-msg="labelContinueWork" for="tab-ContinueWork">工程作業<div class="task-cnt">99+</div></label></li> <li class="tab-label list-unstyled"><label class="tab-label-ContinueWork fs-9 multi-lang" data-msg="labelContinueWork" for="tab-ContinueWork" >工程作業</label><div class="task-cnt" id="count-ContinueWork"></div></li>
<li class="tab-label list-unstyled"><label class="tab-label-ReportWithWarning fs- multi-lang" data-msg="labelReportWithWarning" for="tab-ReportWithWarning">警告を含む報告<div class="task-cnt">10</div></label></li> <li class="tab-label list-unstyled"><label class="tab-label-ReportWithWarning fs- multi-lang" data-msg="labelReportWithWarning" for="tab-ReportWithWarning" >警告を含む報告</label><div class="task-cnt" id="count-ReportWithWarning"></div></li>
</ul> </ul>
<div class="tab-content-area"> <div class="tab-content-area">
<!-- 新規報告 --> <!-- 新規報告 -->
<div id="tab-content-NewReport" class="tab-content on"> <div id="tab-content-NewReport" class="tab-content on">
<div class="container-fluid"> <div class="container-fluid">
<ul class="task-list p-0 mt-3" id="newReport-list"> <ul class="task-list p-0 mt-3" id="newReport-list">
<li class='item list-unstyled rounded border mb-2' name = 'operationId_x5489'>
<a href="#" class="d-block px-3 py-3 text-decoration-none text-dark">
<div class="title">作業名が入ります。</div>
<i class="fas fa-chevron-right fs-12"></i>
</a>
</li>
</ul> </ul>
</div> </div>
</div> </div>
......
app/script/check_pu.js
...@@ -26,19 +26,15 @@ CHK_pu.init = function() { ...@@ -26,19 +26,15 @@ CHK_pu.init = function() {
CHK_pu.createNewReportList(CHK.operation.operationList); CHK_pu.createNewReportList(CHK.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList); CHK_pu.createContinueWorkList(CHK.operation.operationList);
CHK_pu.createReportWithWarning(CHK.operation.operationList); CHK_pu.createReportWithWarning(CHK.operation.operationList);
CHK_pu.setCountElementInPickup();
}); });
} }
CHK_pu.getPickup = function(operationList) { CHK_pu.setCountElementInPickup = function() {
for (var i = 0; i < operationList.length; i++) { $("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
if (operationList[i].reportType == 3 ) { $("#count-ContinueWork")[0].innerHTML = CHK_pu.countContinueWorkReport;
CHK_pu.countContinueWorkReport = CHK_pu.countContinueWorkReport + 1; $("#count-ReportWithWarning")[0].innerHTML = CHK_pu.countReportWithWarning;
CHK_pu.continueWorkReport.push(operationList[i]);
}
CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1;
}
CHK_pu.newReportList.list_0 = operationList;
} }
CHK_pu.createNewReportList = function(operationList, isSearched = false) { CHK_pu.createNewReportList = function(operationList, isSearched = false) {
...@@ -61,12 +57,13 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) { ...@@ -61,12 +57,13 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
} }
$("#newReport-list").append(operationNameLi); $("#newReport-list").append(operationNameLi);
CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1;
} }
if(CHK.isAndroid) { if(CHK.isAndroid) {
android.hideLoading(); android.hideLoading();
} }
console.log("CHK_pu.countNewReportList " , CHK_pu.countNewReportList );
console.log("end createNewReportList" ); console.log("end createNewReportList" );
}; };
...@@ -82,7 +79,7 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) { ...@@ -82,7 +79,7 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) {
if (operationList[i].permitCodeRequiredFlg == 1) { if (operationList[i].permitCodeRequiredFlg == 1) {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "'><a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001"
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName + "</div></div> <div class='sub-title'>" + operationList[i].operationName
...@@ -91,7 +88,7 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) { ...@@ -91,7 +88,7 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) {
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001"
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName + "</div></div> <div class='sub-title'>" + operationList[i].operationName
...@@ -99,44 +96,75 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) { ...@@ -99,44 +96,75 @@ CHK_pu.createContinueWorkList = function(operationList, isSearched = false) {
} }
$("#continueWork-list").append(operationNameLi); $("#continueWork-list").append(operationNameLi);
CHK_pu.countContinueWorkReport = CHK_pu.countContinueWorkReport + 1;
} }
} }
if(CHK.isAndroid) { if(CHK.isAndroid) {
android.hideLoading(); android.hideLoading();
} }
console.log("CHK_pu.countContinueWorkReport " , CHK_pu.countContinueWorkReport );
}; };
CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
console.log("createReportWithWarning" ); console.log("createReportWithWarning" );
for (var i = 0; i < operationList.length; i++) { for (var i = 0; i < operationList.length; i++) {
if (operationList[i].reportType === 3) console.log("lengh", operationList[i].warningReportList.length );
{ if(operationList[i].warningReportList.length === 0) continue;
//TODO aタグlist.html 転移処理 //TODO aタグlist.html 転移処理
var operationNameLi; var operationNameLi;
if (operationList[i].permitCodeRequiredFlg == 1) { for (var j = 0; j < operationList[i].warningReportList.length; j++)
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId {
+ "'><a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
switch (operationList[i].reportType)
{
case 0:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
} else { break;
case 1:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + " / " + operationList[i].operationEndDate
+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break;
case 2:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].task_key
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].task_key
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].task_name
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break;
case 3:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId + "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].process_list[0].process_name
+ "</div> <div class='title'>" + operationList[i].operationName + "</div> <div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + "code-0001" + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].task_code
+ "</div></div> <div class='sub-title'>" + operationList[i].operationName + "</div></div> <div class='sub-title'>" + operationList[i].operationName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
} break;
}
$("#reportWithWarning-list").append(operationNameLi); $("#reportWithWarning-list").append(operationNameLi);
CHK_pu.countReportWithWarning = CHK_pu.countReportWithWarning + 1;
} }
} }
if(CHK.isAndroid) { if(CHK.isAndroid) {
android.hideLoading(); android.hideLoading();
} }
console.log("CHK_pu.countReportWithWarning " , CHK_pu.countReportWithWarning );
console.log("End createReportWithWarning" );
}; };
\ No newline at end of file
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