Commit ff2ceaf7 by NGUYEN HOANG SON

Merge commit '896f2f94' into feature/1.4.3_dev

* commit '896f2f94':
  #19123 update count pickup in dashboard
  #19123 fix bug not show icon notfound
  #19123 fix bug show new report list for continuos work and report answer
parents bd66ccee 896f2f94
......@@ -592,7 +592,7 @@ CHK.loadDashboardBatch = function(operationList) {
CHK.dashboardBatch.reportWarning = 0;
for (var i = 0; i < operationList.length; i++) {
let operation = operationList[i];
if (operation.enableAddReport == 1) {
if(!( operationList[i].enableAddReport != 1 || (operationList[i].newReportFlg != 1 && operationList[i].reportType == 3) || (operationList[i].enableReportEdit != 1 && operationList[i].reportType == 2)) ){
CHK.dashboardBatch.newReport += 1;
}
if (operation.reportType == 3) {
......
......@@ -153,7 +153,8 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
$('#notFoundNewReport').addClass('d-none');
for (var i = 0; i < operationList.length; i++) {
if(operationList[i].enableAddReport != 1 ) continue;
if(operationList[i].enableAddReport != 1 || (operationList[i].newReportFlg != 1 && operationList[i].reportType == 3) || (operationList[i].enableReportEdit != 1 && operationList[i].reportType == 2) ) continue;
//TODO aタグlist.html 転移処理
var messageli = $("<li class='item list-unstyled rounded border mb-2'name = 'operationId_" + operationList[i].operationId + "' ></li>");
var ahrefRequiredFlg ;
......@@ -176,7 +177,10 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
CHK_pu.countNewReportList = CHK_pu.countNewReportList + 1;
}
// show not found if
if (CHK_pu.countNewReportList == 0) {
$('#notFoundNewReport').removeClass('d-none');
}
if(CHK.isAndroid) {
android.hideLoading();
}
......
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