#49824 【Check(ダッシュボード) CMS 1.4.3.2】自身が「報告(回答)」作業の「回答」側になっている報告で、回答できる報告があった際、ダッシュボードのバッチにプラスされている

app/script/check.js

@@ -602,6 +602,13 @@ CHK.initPushMessageList = function() {
 	});
 	});
 }
 }
 
 
+CHK.isNewReport = function(operation) {
+	if(operation && operation.enableAddReport == 1 &&
+		(operation.newReportFlg == 1 || (operation.reportType != CHK.REPORT_TYPE.WORKFLOW && operation.reportType != CHK.REPORT_TYPE.WITHREPLY)))
+		return true;
+	return false;
+}
+
 CHK.loadDashboardBatch = function(operationList) {
 CHK.loadDashboardBatch = function(operationList) {
 	if (!operationList) return;
 	if (!operationList) return;
 	CHK.dashboardBatch.newReport = 0;
 	CHK.dashboardBatch.newReport = 0;
@@ -609,7 +616,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].reportType == 3 && operationList[i].newReportFlg == 0) || (operationList[i].reportType == 2 && operationList[i].enableReportEdit == 0 )) ){
+		if(CHK.isNewReport(operation)) {
 			CHK.dashboardBatch.newReport += 1;
 			CHK.dashboardBatch.newReport += 1;
 		}
 		}
 		if (operation.reportType == 3) {
 		if (operation.reportType == 3) {

app/script/check_pu.js

@@ -152,7 +152,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].reportType == CHK.REPORT_TYPE.WORKFLOW || operationList[i].reportType == CHK.REPORT_TYPE.WITHREPLY) && operationList[i].newReportFlg == 0) ) continue;
+		//if(operationList[i].enableAddReport != 1 || ((operationList[i].reportType == CHK.REPORT_TYPE.WORKFLOW || operationList[i].reportType == CHK.REPORT_TYPE.WITHREPLY) && operationList[i].newReportFlg == 0) ) continue;
+		if (!CHK.isNewReport(operationList[i])) continue;
 		//TODO aタグlist.html 転移処理operationList[i].reportType == 2 && operationList[i].enableReportEdit == 0 
 		//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 ;