#ticket 49113, 49114, 49115, 49118

app/js/common.js

+// トグル切り替え
+$(".toggle").on("click", function() {
+    $(this).toggleClass("checked");
+    if(!$('input[name="check"]').prop("checked")) {
+      $(".toggle input").prop("checked", true);
+    } else {
+      $(".toggle input").prop("checked", false);
+    }
+});
+
+// タブ切り替え
+$('.tab-wrap .tab-label').on('click', function () {
+  var tab_index = $(this).parent().find('.tab-label').index(this);
+  $(this).parent().parent().find('.tab-label, .tab-content').removeClass('on');
+  $(this).parent().parent().find('.tab-label').eq(tab_index).addClass('on');
+  $(this).parent().parent().find('.tab-content').eq(tab_index).addClass('on');
+});
+
+$(function(){
+  var myTarget = $(".tab-label.on");
+  var myIndex = $(".tab-wrap .tab-label").index(myTarget);
+  var scrollvalue = 130 * myIndex;
+  $('.tab-menu').scrollLeft(scrollvalue);
+});
\ No newline at end of file

app/script/check.js

@@ -68,6 +68,7 @@ var msgMap = { // velocity?
 
     buttonCategory: { ja: "カテゴリー", ko: "카테고리", en: "Category" },
     buttonRefresh: { ja: "更新", ko: "갱신", en: "Refresh" },
+    buttonBack: { ja: "戻る", ko: "Back", en: "Back" },
     buttonScan: { ja: "スキャン", ko: "스캔", en: "Scan" },
     placeholderOperationName: { ja: "作業名", ko: "작업명", en: "Working Name" },
     labelPeriod: { ja: "期間", ko: "기간", en: "Period" },
@@ -102,6 +103,10 @@ var msgMap = { // velocity?
 	sendMessageTitle: { ja: "メッセージ送信", ko: "Send Message", en: "Send Message" },
 	distanceSupportTitle: { ja: "遠隔支援", ko: "Distance Support", en: "Distance Support" },
 	chatTitle: { ja: "チャット", ko: "Chat", en: "Chat" },
+	labelPickUp: { ja: "ピックアップ", ko: "Pick up", en: "Pick up" },
+	labelNewReport: { ja: "新規報告", ko: "New report", en: "New report" },
+	labelContinueWork: { ja: "工程作業", ko: "Process work", en: "Process work" },
+	labelReportWithWarning: { ja: "警告を含む報告", ko: "Reports with warnings", en: "Reports with warnings" }
 };
 
 // 言語取得
@@ -460,7 +465,7 @@ CHK.initReportApp = function (callback) {
 	CHK.operationGroupMasterId = 0;
 	// 作業一覧JSONデータ
 	CHK.initOperationList();
-	
+
 	// カテゴリーJSONデータ
 	CHK.loadJson(CHK.jsonPath.operationGroupMasterList, function (json) {
 		CHK.operationGroupMaster = json;
@@ -490,6 +495,8 @@ CHK.initOperationList = function() {
 		CHK.operation.searchOperationList = json.operationList;
 		//作業一覧描画
 		CHK.createOperationList(CHK.operation.operationList);
+		CHK_pu.createNewReportList(CHK.operation.operationList);
+		CHK_pu.createContinueWorkList(CHK.operation.operationList);
 	});
 }
 
@@ -2916,6 +2923,7 @@ CHK.changeSortType = function(sortType) {
  * 作業一覧描画
  */
 CHK.createOperationList = function(operationList, isSearched = false) {
+	//alert("hongnt CHK.createOperationList ");
     var searchKeyword = $("#searchTaskName").val();
     var searchStartDate = $("#searchStartDate").val();
     var searchEndDate = $("#searchEndDate").val();
@@ -3113,6 +3121,7 @@ CHK.search = function() {
     CHK.isSearched = true;
     CHK.operation.searchOperationList = searchResult;
     CHK.createOperationList(searchResult, CHK.isSearched);
+    CHK_PU.createOperationList(searchResult, CHK.isSearched);
 };
 
 /**
@@ -3191,7 +3200,7 @@ CHK.scanClose = function() {
 
 document.addEventListener('visibilitychange', () => {
 	// バックグラウンド遷移時
-	if (document.visibilityState === 'hidden') {	
+	if (document.visibilityState === 'hidden') {
 		CHK.scanClose();
 	}
 });