Merge branch 'feature/1.4.0' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0

# Conflicts:
#	app/index.html

app/index.html

@@ -24,12 +24,12 @@
                 <i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i>
                 <span class="d-none d-md-inline fs-10">カテゴリー</span>
             </a>
-            <a class="navbar-brand lht-0" href="#" style="margin: 0 10px 0 10px;float: right;">
-                <i class="fa fa-redo fs-12 p-1" id="updateButton" onclick="CHK_L.sendAppCommand('refreshContent');"></i>
+            <a class="navbar-brand lht-0" href="javascript:CHK_L.sendAppCommand('refreshContent');" style="margin: 0 10px 0 10px;float: right;">
+                <i class="fa fa-redo fs-12 p-1" id="updateButton"></i>
                 <span class="d-none d-md-inline fs-10">更新</span>
             </a>
-            <a class="navbar-brand lht-0 d-none" href="#" style="margin: 0 10px 0 10px;float: right;">
-                <i class="fa fa-wifi fs-12 p-1" id="rfidScanButton" onclick="CHK.startScan();"></i>
+            <a class="navbar-brand lht-0 d-none" href="javascript:CHK.startScan();" style="margin: 0 10px 0 10px;float: right;">
+                <i class="fa fa-wifi fs-12 p-1" id="rfidScanButton"></i>
                 <span class="d-none d-md-inline fs-10">スキャン</span>
             </a>
         </nav>
@@ -150,19 +150,19 @@
                 <i class="fas fa-home fs-14 p-1"></i>
                 <div class="fs-7">ホーム</div>
             </a>
-            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" onclick="CHK_L.sendAppCommand('goRelationContent');">
+            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" href="javascript:CHK_L.sendAppCommand('goRelationContent');">
                 <i class="fas fa-folder fs-14 p-1"></i>
                 <div class="fs-7">関連資料</div>
             </a>
-            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" onclick="CHK_L.sendAppCommand('goCommunication');">
+            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" href="javascript:CHK_L.sendAppCommand('goCommunication');">
                 <i class="fas fa-comment-dots fs-14 p-1"></i>
                 <div class="fs-7">コミュ<span class="d-none d-sm-inline">ニケーション</span></div>
             </a>
-            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary">
+            <!--<a class="d-block w-100 text-center py-2 text-decoration-none text-secondary">
                 <i class="fas fa-clipboard-list fs-14 p-1"></i>
                 <div class="fs-7">帳票確認</div>
-            </a>
-            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" onclick="CHK_L.sendAppCommand('goSetting');">
+            </a>-->
+            <a class="d-block w-100 text-center py-2 text-decoration-none text-secondary" href="javascript:CHK_L.sendAppCommand('goSetting');">
                 <i class="fas fa-cog fs-14 p-1"></i>
                 <div class="fs-7">設定</div>
             </a>

app/script/check-list.js

@@ -121,6 +121,9 @@ CHK_L.init = function() {
         });
 
         CHK_L.sendAppCommand("finishInit");
+        if (CHK.isWindows) {
+            CHK.createOperationListBySavedSortType();
+        }
 	}
 
 	if (CHK.isWeb) {

app/script/check.js

@@ -138,6 +138,7 @@ CHK.apiCmd = {
     goPanoramaEdit: "goPanoramaEdit",           //パノラマ作業資料編集
     refreshContent: "refreshContent",           //新着更新
     resetSearch: "resetSearch",                 //検索条件初期化
+    saveSortType: "saveSortType",               //並び替え保存
 	editAttached: "editAttached",				//添付ファイル編集
 	saveAttached: "saveAttached",               //添付ファイル保存
 	insertReport: "insertTaskReport",           //作業報告保存
@@ -274,11 +275,16 @@ CHK.initCommon = function() {
 	CHK.isWeb = urlParam.is_web;
 	CHK.isWindows = urlParam.app && urlParam.app == "windows"; // windowsアプリの対応追加 v1.1.0
 	CHK.isAndroid = urlParam.app && urlParam.app == "android";
-	CHK.isIOS = urlParam.app && urlParam.app == "ios";
+    CHK.isIOS = urlParam.app && urlParam.app == "ios";
+    CHK.sortIndex = urlParam.sortIndex;
 	// ウェブの場合、作業一覧の表示広さを変更
 	if (CHK.isWeb) {
 		$("#checkList").addClass("web");
-	}
+    }
+    // Windowsの場合、RFID未使用
+    if (CHK.isWindows) {
+        $("#rfidScanButton").parent().hide();
+    }
 	CHK.debug = urlParam.debug;
 	CHK.isMobile = urlParam.mobile_flg && urlParam.mobile_flg == "1";
 	if (CHK.isCms) {
@@ -2801,8 +2807,13 @@ CHK.createCategory = function(operationGroupMasterList) {
 	if (CHK.isIOS) {
 		sortIndex = CHK_iOS.getSortType();
 	} else if (CHK.isAndroid) {
-		sortIndex = android.getSortType();
-	}
+        sortIndex = android.getSortType();
+    } else if (CHK.isWindows) {
+        if (CHK.sortIndex !== undefined) {
+            console.log("CHK.sortIndex:" + CHK.sortIndex);
+            sortIndex = CHK.sortIndex;
+        }
+    }
 	let sortType = document.getElementsByClassName("sort-type")[sortIndex];
 	CHK.changeSortType(sortType);
 }
@@ -2824,10 +2835,15 @@ CHK.createOperationList = function(operationList, isSearched = false) {
     if (operationList.length > 1) {
         var sortType = $(".sort-type.active").data("sort");
 		if (isSearched) {
-			if (CHK.isIOS) {
-				webkit.messageHandlers.saveSortType.postMessage(sortType);
-			} else if (CHK.isAndroid) {
-				android.setSortType(sortType);
+            if (CHK.isIOS) {
+                webkit.messageHandlers.saveSortType.postMessage(sortType);
+            } else if (CHK.isAndroid) {
+                android.setSortType(sortType);
+            } else {
+                var param = {};
+                param.cmd = CHK.getCommand("saveSortType");
+                param.sortType = sortType;
+                CHK.sendABookCheckApi(param);
 			}
 		}
         switch(sortType) {