Commit 585bfc60 by Kim Eunchul

#43898 #43897 【Check CMS 1.4.0】検索の期間で、開始日・終了日を個別にクリアできない

parent 7ad798e8
......@@ -20202,12 +20202,13 @@ button {
.alert-area {
border-radius: 15px;
z-index: 1032;
height: calc(40%);
height:auto;
width: 60%;
position: absolute;
top: 10%;
left: 20%;
background-color: white;
word-wrap: break-word;
}
.loading-spinner {
......
......@@ -79,7 +79,7 @@
<div class="form-group">
<label>開始日</label>
<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-text"><i class="far fa-calendar"></i></div>
</div>
......@@ -88,7 +88,7 @@
<div class="form-group">
<label>終了日</label>
<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-text"><i class="far fa-calendar"></i></div>
</div>
......@@ -178,7 +178,7 @@
</div>
<div class="alert-area d-none">
<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>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
......
......@@ -63,6 +63,7 @@ var msgMap = { // velocity?
onlyRfid:{ja:"RFID又はバーコードが設定されています。<br/>該当コードを読み込んでください。", ko:"RFID또는 바코드가 설정되어있습니다. <br/>해당코드를 스캔해주십시오.", en:"RFID or barcode is set. <br/>Please scan the code."},
notExistCode:{ja:"読み込んだコードと一致しません。<br/>コードを確認してもう一度お願いします。<br/>", ko:"스캔된코드와 일치하는 작업이 존재하지않습니다. <br/>코드를 확인하고 한번도 시도해주세요. <br/>", en:"No action exists that matches the scanned code. <br/>Please check the code and try it once. <br/>"},
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."},
};
// 言語取得
......@@ -2960,6 +2961,11 @@ CHK.search = function() {
var operationGroupMasterId = CHK.operationGroupMasterId;
var searchResult;
if(searchStartDate > searchEndDate){
CHK.displayAlert("dateError");
return;
}
searchResult = CHK.operation.operationList.filter(function(operation) {
var result = true;
if (searchKeyword.length) {
......@@ -3085,12 +3091,19 @@ CHK.sendScanResult = function (command, operationId, contentId, scanType) {
CHK.alertClose = function() {
$(".alert-overlay").addClass("d-none");
$(".alert-area").addClass("d-none");
$("body").css("overflow", "visible");
}
CHK.displayAlert = function(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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment