Commit 0d93f066 by NGUYEN HOANG SON

Merge commit '79d144f5' into feature/1.4.3_dev

* commit '79d144f5':
  #19123 fix show wrong title operation name
parents 91785afc 79d144f5
......@@ -272,7 +272,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
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
+ " ', 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='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + 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> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName
+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
......@@ -281,7 +281,7 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
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
+ " ', 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='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + 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> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
break;
......@@ -292,11 +292,11 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
var liTagTitle ;
if( operationList[i].warningReportList[j].taskType == 0 )
{
liTagTitle = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName + msgLevelReport + "</div>") ;
liTagTitle = $("<div class='title'>" + operationList[i].operationName + msgLevelReport + "</div>") ;
}
else
{
liTagTitle = $("<div class='tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1'>" + operationList[i].operationName + msgLevelAnswer + "</div>") ;
liTagTitle = $("<div class='title'>" + operationList[i].operationName + 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
+ "</div></div> <div class='sub-title'>" + operationList[i].warningReportList[j].taskName + "</div></div>");
......
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