Merge branch 'feature/1.4.0' into feature/1.4.0_miura

# Conflicts:
#	app/script/check.js

app/css/app.css

@@ -20202,12 +20202,13 @@ button {
 .alert-area {
 .alert-area {
     border-radius: 15px;
     border-radius: 15px;
     z-index: 1032;
     z-index: 1032;
-    height: calc(40%);
+    height:auto;
     width: 60%;
     width: 60%;
     position: absolute;
     position: absolute;
     top: 10%;
     top: 10%;
     left: 20%;
     left: 20%;
     background-color: white;
     background-color: white;
+    word-wrap: break-word;
 }
 }
 
 
 .loading-spinner {
 .loading-spinner {

app/index.html

@@ -79,7 +79,7 @@
                                         <div class="form-group">
                                         <div class="form-group">
                                             <label>開始日</label>
                                             <label>開始日</label>
                                             <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
                                             <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
-                                                <input type="text" name="start" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" placeholder="選択" inputmode="none" id="searchStartDate">
+                                                <input type="search" name="start" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" placeholder="選択" inputmode="none" id="searchStartDate">
                                                 <div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
                                                 <div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
                                                     <div class="input-group-text"><i class="far fa-calendar"></i></div>
                                                     <div class="input-group-text"><i class="far fa-calendar"></i></div>
                                                 </div>
                                                 </div>
@@ -88,7 +88,7 @@
                                         <div class="form-group">
                                         <div class="form-group">
                                             <label>終了日</label>
                                             <label>終了日</label>
                                             <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
                                             <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
-                                                <input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" inputmode="none" id="searchEndDate">
+                                                <input type="search" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" inputmode="none" id="searchEndDate">
                                                 <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
                                                 <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
                                                     <div class="input-group-text"><i class="far fa-calendar"></i></div>
                                                     <div class="input-group-text"><i class="far fa-calendar"></i></div>
                                                 </div>
                                                 </div>
@@ -178,7 +178,7 @@
     </div>
     </div>
     <div class="alert-area d-none">
     <div class="alert-area d-none">
         <i class="text-right fas fa-times fa-2x loading-close" onclick="CHK.alertClose();"></i>
         <i class="text-right fas fa-times fa-2x loading-close" onclick="CHK.alertClose();"></i>
-        <div class="fs-13 mt-4 text-center" id="alertMsg"></div>
+        <div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
     </div>
     </div>
     <script type="text/javascript" src="js/app.js" defer></script>
     <script type="text/javascript" src="js/app.js" defer></script>
 </body>
 </body>

app/script/check.js

@@ -64,6 +64,7 @@ var msgMap = { // velocity?
     No: {ja:"いいえ", ko:"No", en:"No"},
     No: {ja:"いいえ", ko:"No", en:"No"},
     onlyRfid:{ja:"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。", ko:"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.", en:"RFID or barcode is set.\nPlease scan the code."},
     onlyRfid:{ja:"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。", ko:"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.", en:"RFID or barcode is set.\nPlease scan the code."},
     overwriteCheck: {ja:"未公開のバージョンの簡易帳票が存在します。<br/>上書きしますか？", ko:"미공개 버전의 간이 서류가 존재합니다. <br/>덮어 쓰시겠습니까？", en:"There is an unpublished version of the quick report. <br/>Do you want to overwrite?"},
     overwriteCheck: {ja:"未公開のバージョンの簡易帳票が存在します。<br/>上書きしますか？", ko:"미공개 버전의 간이 서류가 존재합니다. <br/>덮어 쓰시겠습니까？", en:"There is an unpublished version of the quick report. <br/>Do you want to overwrite?"},
+    dateError: {ja:"検索日が不正です。", ko:"잘못된 검색일입니다.", en:"Please enter correct search date."},
 };
 };
 
 
 // 言語取得
 // 言語取得
@@ -2952,6 +2953,9 @@ CHK.createOperationList = function(operationList, isSearched = false) {
 		operationTR.append(iconTd);
 		operationTR.append(iconTd);
 
 
 		$(".table tbody").append(operationTR);
 		$(".table tbody").append(operationTR);
+		if(CHK.isAndroid) {
+		    android.hideLoading();
+		}
 	}
 	}
 };
 };
 
 
@@ -2973,6 +2977,11 @@ CHK.search = function() {
     var operationGroupMasterId = CHK.operationGroupMasterId;
     var operationGroupMasterId = CHK.operationGroupMasterId;
     var searchResult;
     var searchResult;
 
 
+	if(searchStartDate > searchEndDate){
+		CHK.displayAlert("dateError");
+		return;
+	}
+
     searchResult = CHK.operation.operationList.filter(function(operation) {
     searchResult = CHK.operation.operationList.filter(function(operation) {
         var result = true;
         var result = true;
         if (searchKeyword.length) {
         if (searchKeyword.length) {
@@ -3106,6 +3115,7 @@ CHK.sendScanResult = function (command, operationId, contentId, scanType) {
 CHK.alertClose = function() {
 CHK.alertClose = function() {
     $(".alert-overlay").addClass("d-none");
     $(".alert-overlay").addClass("d-none");
     $(".alert-area").addClass("d-none");
     $(".alert-area").addClass("d-none");
+	$("body").css("overflow", "visible");
 }
 }
 
 
 CHK.displayAlert = function(msgCode) {
 CHK.displayAlert = function(msgCode) {
@@ -3118,6 +3128,15 @@ CHK.displayAlert = function(msgCode) {
 	} else {
 	} else {
 		alert(getMsg(msgCode));
 		alert(getMsg(msgCode));
 	}
 	}
+    $("#alertMsg").html(getMsg(msgCode));
+    $(".alert-overlay").removeClass("d-none");
+    $(".alert-area").removeClass("d-none");
+	var positionY = $(document).scrollTop() + screen.height/8;
+	var height = screen.height/4;
+
+	$(".alert-area").css("top", positionY);
+	$(".alert-area").css("min-height", height);
+	$("body").css("overflow", "hidden");
 }
 }
 
 
 CHK.resetSearch = function() {
 CHK.resetSearch = function() {