Skip to content

D
design
Commit b2d97501 by NGUYEN HOANG SON
Options

fix continous work, warning list with type pdf, 360

parent 76a8beaa
Showing with 12 additions and 2 deletions
app/script/check_pu.js
...@@ -200,6 +200,7 @@ CHK_pu.sortContinousWorkList = function(operationList) { ...@@ -200,6 +200,7 @@ CHK_pu.sortContinousWorkList = function(operationList) {
if(operationList[i].processList[j].phaseList[g].phaseStatus != 999) if(operationList[i].processList[j].phaseList[g].phaseStatus != 999)
{ {
var item = {reportType: operationList[i].reportType, var item = {reportType: operationList[i].reportType,
operationType: operationList[i].operationType,
phaseList: operationList[i].processList[j].phaseList, phaseList: operationList[i].processList[j].phaseList,
processKey: operationList[i].processList[j].processKey, processKey: operationList[i].processList[j].processKey,
permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg, permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg,
...@@ -247,6 +248,7 @@ CHK_pu.sortWarningList = function(operationList) { ...@@ -247,6 +248,7 @@ CHK_pu.sortWarningList = function(operationList) {
for( var j = 0; j < operationList[i].warningReportList.length; j++ ) for( var j = 0; j < operationList[i].warningReportList.length; j++ )
{ {
var item = {reportType: operationList[i].reportType, var item = {reportType: operationList[i].reportType,
operationType: operationList[i].operationType,
permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg, permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg,
operationId: operationList[i].operationId, operationId: operationList[i].operationId,
contentId: operationList[i].contentId, contentId: operationList[i].contentId,
...@@ -292,6 +294,10 @@ CHK_pu.createContinousWorkList = function(operationListOld, isSearched = false) ...@@ -292,6 +294,10 @@ CHK_pu.createContinousWorkList = function(operationListOld, isSearched = false)
$('#notFoundContinousWork').addClass('d-none'); $('#notFoundContinousWork').addClass('d-none');
for (var i = 0; i < operationList.length; i++) { for (var i = 0; i < operationList.length; i++) {
var directKey = operationList[i].processKey;
if (operationList[i].operationType == CHK.OPERATION_TYPE.VTOUR || operationList[i].operationType == CHK.OPERATION_TYPE.PDF) {
directKey = operationList[i].taskKey;
}
var messageli = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].processKey + "'></li>") ; var messageli = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].processKey + "'></li>") ;
var ahrefRequiredFlg ; var ahrefRequiredFlg ;
if (operationList[i].permitCodeRequiredFlg == 1) if (operationList[i].permitCodeRequiredFlg == 1)
...@@ -301,7 +307,7 @@ CHK_pu.createContinousWorkList = function(operationListOld, isSearched = false) ...@@ -301,7 +307,7 @@ CHK_pu.createContinousWorkList = function(operationListOld, isSearched = false)
else else
{ {
ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId ahrefRequiredFlg = $("<a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].operationId + "', '" + operationList[i].contentId
+ " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + operationList[i].processKey + "','" + operationList[i].phaseNo + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>"); + " ', null ,'DETAIL_FORM_INPUT' ,'CONTINOUS_WORK','" + directKey + "','" + operationList[i].phaseNo + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'></a>");
} }
var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>"); var divTitle = $("<div class='title'>" + operationList[i].operationName + "</div>");
var divSubTitleWrap = $("<div class='sub-title-wrap'> </div>"); var divSubTitleWrap = $("<div class='sub-title-wrap'> </div>");
...@@ -392,9 +398,13 @@ CHK_pu.createReportWithWarning = function(operationListOld, isSearched = false) ...@@ -392,9 +398,13 @@ CHK_pu.createReportWithWarning = function(operationListOld, isSearched = false)
operationNameLi.append(ahrefRequiredFlg); operationNameLi.append(ahrefRequiredFlg);
break; break;
case 3: case 3:
var directKey = operationList[i].processKey;
if (operationList[i].operationType == CHK.OPERATION_TYPE.VTOUR || operationList[i].operationType == CHK.OPERATION_TYPE.PDF) {
directKey = operationList[i].taskKey;
}
operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].taskKey operationNameLi = $("<li class='item list-unstyled rounded border mb-2' id = 'list_" + operationList[i].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].processKey + "','" + operationList[i].phaseNo + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>" + " ', null ,'DETAIL_FORM_INPUT' ,'REPORT_WARNING','" + directKey + "','" + operationList[i].phaseNo + "');\" 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].phaseName +"<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].phaseName
+ "</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].taskCode + "</div> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].taskCode
......
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