ソート初期値変更、RFIDとバーコード関連修正

app/index.html

@@ -108,8 +108,8 @@
                         </a>
                         </a>
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                         <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                             <a class="dropdown-item sort-type" data-sort="0" onclick="CHK.changeSortType(this);">作業名順</a>
                             <a class="dropdown-item sort-type" data-sort="0" onclick="CHK.changeSortType(this);">作業名順</a>
-                            <a class="dropdown-item sort-type" data-sort="1" onclick="CHK.changeSortType(this);">作業期間が新しい順</a>
-                            <a class="dropdown-item sort-type active" data-sort="2" id="defaultSort" onclick="CHK.changeSortType(this);">作業期間が古い順</a>
+                            <a class="dropdown-item sort-type active" data-sort="1" id="defaultSort" onclick="CHK.changeSortType(this);">作業期間が新しい順</a>
+                            <a class="dropdown-item sort-type" data-sort="2" onclick="CHK.changeSortType(this);">作業期間が古い順</a>
                             <a class="dropdown-item sort-type" data-sort="3" onclick="CHK.changeSortType(this);">報告タイプ順</a>
                             <a class="dropdown-item sort-type" data-sort="3" onclick="CHK.changeSortType(this);">報告タイプ順</a>
                             <a class="dropdown-item sort-type" data-sort="4" onclick="CHK.changeSortType(this);">閲覧日が新しい順</a>
                             <a class="dropdown-item sort-type" data-sort="4" onclick="CHK.changeSortType(this);">閲覧日が新しい順</a>
                         </div>
                         </div>

app/script/check.js

@@ -2989,10 +2989,13 @@ CHK.scanClose = function() {
 }
 }
 
 
 CHK.scanResult = function(scannedCode, scanType) {
 CHK.scanResult = function(scannedCode, scanType) {
+    if (scannedCode == null || !(scannedCode.length)) {
+        return;
+    }
     CHK.scanClose();
     CHK.scanClose();
     var operationList = CHK.operation.searchOperationList;
     var operationList = CHK.operation.searchOperationList;
     var scannedOperation = operationList.filter(function(operation) {
     var scannedOperation = operationList.filter(function(operation) {
-        return operation.permitCode == scannedCode;
+        return operation.permitCode == scannedCode.substring(4);
     })[0];
     })[0];
     if (scannedOperation != null) {
     if (scannedOperation != null) {
         CHK.sendScanResult('goOperation', scannedOperation.operationId, scannedOperation.contentId, scanType);
         CHK.sendScanResult('goOperation', scannedOperation.operationId, scannedOperation.contentId, scanType);