Skip to content

D
design
Commit 86e1f87f by NGUYEN THI MY DUYEN
Options

Merge branch 'feature/1.4.3_dev_19123' into feature/1.4.3_dev

parents 22800a20 d2f6e290
Showing with 12 additions and 10 deletions
app/script/check_pu.js
...@@ -259,9 +259,9 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -259,9 +259,9 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
return; return;
} }
$('#notFoundReportWithWarning').addClass('d-none'); $('#notFoundReportWithWarning').addClass('d-none');
var msgLevelReport = " [" + getMsg("reportLevelReport") + "]"; var msgLevelReport = getMsg("reportLevelReport") ;
console.log("msgLevelReport :" + msgLevelReport); console.log("msgLevelReport :" + msgLevelReport);
var msgLevelAnswer = " [" + getMsg("reportLevelAnswer") + "]"; var msgLevelAnswer = getMsg("reportLevelAnswer") ;
console.log("msgLevelAnswer :" + msgLevelAnswer); console.log("msgLevelAnswer :" + msgLevelAnswer);
for (var i = 0; i < operationList.length; i++) { for (var i = 0; i < operationList.length; i++) {
if(!operationList[i].warningReportList || operationList[i].warningReportList.length === 0) continue; if(!operationList[i].warningReportList || operationList[i].warningReportList.length === 0) continue;
...@@ -279,33 +279,35 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -279,33 +279,35 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
+"<div class='title'>" + operationList[i].operationName +"<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].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
+ "</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; break;
case 1: case 1:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey
+ "'><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
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+"<div class='title'>" + operationList[i].operationName +"<div class='title'>" + operationList[i].operationName
+ "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='period'>" + CHK_pu.getInspectDate(operationList[i].warningReportList[j].reportStartDateString) + " ～ " + CHK_pu.getInspectDate(operationList[i].warningReportList[j].reportEndDateString) + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='sub-title'>" + CHK_pu.getInspectDate(operationList[i].warningReportList[j].reportStartDateString) + " ～ " + CHK_pu.getInspectDate(operationList[i].warningReportList[j].reportEndDateString)
+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>"); + "</div></div> </div> <i class='fas fa-chevron-right fs-12'></i> </a></li>");
break; break;
case 2: case 2:
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey + "'></li>"); operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].warningReportList[j].taskKey + "'></li>");
var ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId var ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "','" + operationList[i].warningReportList[j].taskType + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>"); + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + operationList[i].warningReportList[j].taskKey + "','" + operationList[i].warningReportList[j].taskType + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
var liTagTitle ; var liTagTitle = $("<div class='title'>" + operationList[i].operationName + "</div>") ;
var liTagReportType;
if( operationList[i].warningReportList[j].taskType == 0 ) if( operationList[i].warningReportList[j].taskType == 0 )
{ {
liTagTitle = $("<div class='title'>" + operationList[i].operationName + msgLevelReport + "</div>") ; liTagReportType = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + msgLevelReport + "</div>") ;
} }
else else
{ {
liTagTitle = $("<div class='title'>" + operationList[i].operationName + msgLevelAnswer + "</div>") ; liTagReportType = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + msgLevelAnswer + "</div>") ;
} }
var divCode = $("<div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode var divCode = $("<div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div>"); + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div>");
var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>"); var iIcon = $("<i class='fas fa-chevron-right fs-12'></i>");
ahrefRequiredFlg.append(liTagReportType);
ahrefRequiredFlg.append(liTagTitle); ahrefRequiredFlg.append(liTagTitle);
ahrefRequiredFlg.append(divCode); ahrefRequiredFlg.append(divCode);
ahrefRequiredFlg.append(iIcon); ahrefRequiredFlg.append(iIcon);
...@@ -319,7 +321,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) { ...@@ -319,7 +321,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
+ "</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'>" + operationList[i].warningReportList[j].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
+ "</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; break;
} }
......
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