Merge commit 'f953fd3d' into feature/1.4.3_dev

* commit 'f953fd3d':
  #19123 fix bug new report list

app/script/check.js

@@ -592,7 +592,7 @@ CHK.loadDashboardBatch = function(operationList) {
 	CHK.dashboardBatch.reportWarning = 0;
 	CHK.dashboardBatch.reportWarning = 0;
 	for (var i = 0; i < operationList.length; i++) {
 	for (var i = 0; i < operationList.length; i++) {
 		let operation = operationList[i];
 		let operation = operationList[i];
-		if(!( operationList[i].enableAddReport != 1 || (operationList[i].newReportFlg != 1 && operationList[i].reportType == 3) || (operationList[i].enableReportEdit != 1 && operationList[i].reportType == 2)) ){
+		if(!( operationList[i].enableAddReport != 1 || (operationList[i].reportType == 3 && operationList[i].newReportFlg == 0) || (operationList[i].reportType == 2 && operationList[i].enableReportEdit == 0 )) ){
 			CHK.dashboardBatch.newReport += 1;
 			CHK.dashboardBatch.newReport += 1;
 		}
 		}
 		if (operation.reportType == 3) {
 		if (operation.reportType == 3) {

app/script/check_pu.js

@@ -153,9 +153,8 @@ CHK_pu.createNewReportList = function(operationList, isSearched = false) {
     $('#notFoundNewReport').addClass('d-none');
     $('#notFoundNewReport').addClass('d-none');
 
 
 	for (var i = 0; i < operationList.length; i++) {
 	for (var i = 0; i < operationList.length; i++) {
-		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 転移処理
+		if(operationList[i].enableAddReport != 1 || (operationList[i].reportType == 3 && operationList[i].newReportFlg == 0) || (operationList[i].reportType == 2 && operationList[i].enableReportEdit == 0 ) ) continue;
+		//TODO aタグlist.html 転移処理operationList[i].reportType == 2 && operationList[i].enableReportEdit == 0 
 		var messageli = $("<li class='item list-unstyled rounded border mb-2'name = 'operationId_" + operationList[i].operationId + "' ></li>");
 		var messageli = $("<li class='item list-unstyled rounded border mb-2'name = 'operationId_" + operationList[i].operationId + "' ></li>");
 		var ahrefRequiredFlg ;
 		var ahrefRequiredFlg ;
 		if (operationList[i].permitCodeRequiredFlg == 1)
 		if (operationList[i].permitCodeRequiredFlg == 1)