Merge commit 'dadc1f39' into feature/1.4.3_dev

* commit 'dadc1f39':
  #19123 Fix Refresh button

app/script/check.js

@@ -126,7 +126,7 @@ var msgMap = { // velocity?
 	dashboardSettingDashboardHomeTitle: { ja: "ダッシュボードをホーム画面にする", ko: "Dashboard Home", en: "Dashboard Home"},
 	labelPickUp: { ja: "ピックアップ", ko: "Pick up", en: "Pick up" },
 	labelNewReport: { ja: "新規報告", ko: "New report", en: "New report" },
-	labelContinueWork: { ja: "工程作業", ko: "Process work", en: "Process work" },
+	labelContinousWork: { ja: "工程作業", ko: "Process work", en: "Process work" },
 	labelReportWithWarning: { ja: "警告を含む報告", ko: "Reports with warnings", en: "Reports with warnings" }
 };
 
@@ -627,6 +627,7 @@ CHK.initOperationList = function() {
 		//作業一覧描画
 		console.log("json.operationList",JSON.stringify( json.operationList) );
 		CHK.createOperationList(CHK.operation.operationList);
+		CHK_pu.initOperationList(CHK.operation.operationList);
 	});
 
 	// コミュニケーションデータJSONデータ

app/script/check_pu.js

@@ -94,20 +94,27 @@ CHK_pu.settingActivePickup = function(pickupActive) {
 	$('#liTabContinousWork').removeClass('on');
 	$('#liTabReportWithWarning').removeClass('on');
 
+	$('#tab-content-NewReport').removeClass('on');
+	$('#tab-content-ContinousWork').removeClass('on');
+	$('#tab-content-ReportWithWarning').removeClass('on');
+
 	if(pickupActive == "newReport")
 	{
 		$('#liTabNewReport').addClass('on');
+		$('#tab-content-NewReport').addClass('on');
 		return;
 	}
 
 	if(pickupActive == "continousWork")
 	{
 		$('#liTabContinousWork').addClass('on');
+		$('#tab-content-ContinousWork').addClass('on');
 		return;
 	}
 	if(pickupActive == "reportWarning")
 	{
 		$('#liTabReportWithWarning').addClass('on');
+		$('#tab-content-ReportWithWarning').addClass('on');
 		return;
 	}
 }
@@ -120,8 +127,20 @@ CHK_pu.goBack = function() {
 
 CHK_pu.setCountElementInPickup =  function() {
 	console.log("setCountElementInPickup" , CHK_pu.countNewReportList, CHK_pu.countContinousWorkReport, CHK_pu.countReportWithWarning  );
-	$("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
-	$("#count-ContinousWork")[0].innerHTML = CHK_pu.countContinousWorkReport;
+	if($("#count-NewReport"))
+	{
+	    $("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
+	}
+	if($("#count-ContinousWork"))
+    {
+        $("#count-ContinousWork")[0].innerHTML = CHK_pu.countContinousWorkReport;
+    }
+    if($("#count-NewReport"))
+    {
+        $("#count-NewReport")[0].innerHTML = CHK_pu.countNewReportList;
+    }
+
+
 	$("#count-ReportWithWarning")[0].innerHTML = CHK_pu.countReportWithWarning;
 }
 
@@ -243,8 +262,8 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
 			switch (operationList[i].reportType)
 			{
 				case 0:
-					operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
-						+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+					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
 						+ "');\" 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> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
@@ -252,16 +271,16 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
 						+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
 					break;
 				case 1:
-					operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
-						+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+					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
 						+ "');\" 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>  <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].operationStartDate + "	 /	" + operationList[i].operationEndDate
 						+ "</div></div> </div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
 					break;
 				case 2:
-					operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'taskkey_" + operationList[i].warningReportList[j].taskKey
-						+ "'><a href=\"javascript:CHK_L.sendAppCommand('goOperation', '" + operationList[i].warningReportList[j].taskKey
+					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
 						+ "');\" 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> <div class='sub-title-wrap'> <div class='fs-8 text-secondary mr-2'><div class='data'>" + operationList[i].warningReportList[j].taskCode
@@ -269,9 +288,9 @@ CHK_pu.createReportWithWarning = function(operationList, isSearched = false) {
 						+ "</div></div> <i class='fas fa-chevron-right fs-12''></i> </a></li>");
 					break;
 				case 3:
-					operationNameLi = $("<li class='item list-unstyled rounded border mb-2' name = 'operationId_" + operationList[i].operationId
+					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
-	                        + "');\" class='d-block px-3 py-2 text-decoration-none text-dark'>"
+							+ "');\" 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].processList[0].processName
 	            		    + "</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].warningReportList[j].taskCode