Index: arms/js/searchEngine.js
===================================================================
diff -u -r376a8ea83b170ab4d1deb4223f8625f84dd876f7 -r9ca6d084e8511eb36885be98d1dad65ba090b1b1
--- arms/js/searchEngine.js (.../searchEngine.js) (revision 376a8ea83b170ab4d1deb4223f8625f84dd876f7)
+++ arms/js/searchEngine.js (.../searchEngine.js) (revision 9ca6d084e8511eb36885be98d1dad65ba090b1b1)
@@ -132,19 +132,19 @@
searchRangeType = rangeTypeId; // 검색 레인지 타입아이디
SearchApiModule.setRangeDateAsync(rangeTypeId).then(() => {
+ //날짜 구간 세팅
let rangeDate = SearchApiModule.getRangeDate();
console.log(rangeDate["start-date"]);
console.log(rangeDate["end-date"]);
-
- let start = (rangeDate["start-date"] ? new Date(rangeDate["start-date"]).toLocaleString('ko-KR', {timeZone: 'Asia/Seoul'}) : "");
+ let start = (rangeDate["start-date"] ? SearchApiModule.setMidnightToZero(rangeDate["start-date"]) : "" );
let end = (rangeDate["end-date"] ? new Date(rangeDate["end-date"]).toLocaleString('ko-KR', {timeZone: 'Asia/Seoul'}) : "");
let rangeText = start+ " ~ " + end;
-
$("#filter_list").html("");
$("#filter_list").append(
`
${rangeText}`
);
- if(searchString) {
+
+ if(searchString) { //검색 실행
search_with_date(searchString, rangeDate);
}
}).catch((error) => {
@@ -386,6 +386,7 @@
$("#filter_list").append(
`${rangeText}`
);
+
if(!searchString) {
let searchTerm = $("#search-input").val();
if(searchTerm && searchTerm.trim()) {
Index: arms/js/searchEngine/searchApiModule.js
===================================================================
diff -u -r649b321dfccf1eb49df01b0301800a80f4130806 -r9ca6d084e8511eb36885be98d1dad65ba090b1b1
--- arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision 649b321dfccf1eb49df01b0301800a80f4130806)
+++ arms/js/searchEngine/searchApiModule.js (.../searchApiModule.js) (revision 9ca6d084e8511eb36885be98d1dad65ba090b1b1)
@@ -12,15 +12,15 @@
var setRangeDate = function (rangeTypeId) {
let today = new Date();
- let today_ISOString = today.toISOString();
- searchRangeDate["end-date"] = today_ISOString.slice(0,10);
+ let today_ISOString = today.toISOString(); // UTC+00:00 기준으로 "2024-03-12T12:25:27.525Z"
+ searchRangeDate["end-date"] = setEndTimeOfTheDay(today_ISOString);
console.log("[searchApiModule :: setRangeDate] :: today => " + today);
console.log("[searchApiModule :: setRangeDate] :: today.ISOString => " + today.toISOString());
switch (rangeTypeId) {
case "custom-range" :
- searchRangeDate["start-date"] = $("#date_timepicker_start").val();
- searchRangeDate["end-date"] = ($("#date_timepicker_end").val() === null ? today.toISOString() : $("#date_timepicker_end").val());
+ searchRangeDate["start-date"] = ($("#date_timepicker_start").val() === null ? null : setStartTimeOfTheDay($("#date_timepicker_start").val()));
+ searchRangeDate["end-date"] = ($("#date_timepicker_end").val() === null ? setEndTimeOfTheDay(today.toISOString()) : setEndTimeOfTheDay($("#date_timepicker_end").val()));
break;
case "all-time":
searchRangeDate["start-date"] = null;
@@ -32,24 +32,57 @@
break;
case "previous-day":
let oneDayAgo = new Date(today.getTime() - 1 * 24 * 60 * 60 * 1000);
- searchRangeDate["start-date"] = oneDayAgo.toISOString().slice(0,10);
+ searchRangeDate["start-date"] = setStartTimeOfTheDay(oneDayAgo);
break;
case "previous-week":
let oneWeekAgo = new Date(today.getTime() - 7 * 24 * 60 * 60 * 1000);
- searchRangeDate["start-date"] = oneWeekAgo.toISOString().slice(0,10);
+ searchRangeDate["start-date"] = setStartTimeOfTheDay(oneWeekAgo);
break;
case "previous-month":
let oneMonthAgo = new Date(today.getFullYear(), today.getMonth() - 1, today.getDate());
- searchRangeDate["start-date"] = oneMonthAgo.toISOString().slice(0,10);
+ searchRangeDate["start-date"] = setStartTimeOfTheDay(oneMonthAgo);
break;
case "previous-year":
let oneYearAgo = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate());
- searchRangeDate["start-date"] = oneYearAgo.toISOString().slice(0,10);
+ searchRangeDate["start-date"] = setStartTimeOfTheDay(oneYearAgo);
break;
}
+ };
+ // 끝_날짜 시간 23:59:59 설정
+ var setEndTimeOfTheDay = function (dateString) {
+ let date = new Date(dateString);
+ date.setHours(23);
+ date.setMinutes(59);
+ date.setSeconds(59);
+ date.setMilliseconds(0);
+ return date.toISOString();
};
+ // 시작_날짜 끝 시간 23:59:59 설정
+ var setStartTimeOfTheDay = function (dateString) {
+ let date = new Date(dateString);
+ date.setHours(0);
+ date.setMinutes(0);
+ date.setSeconds(0);
+ date.setMilliseconds(0);
+ //date.toISOString().slice(0,10);
+ return date.toISOString();
+ };
+ // 자정 24:00:00 -> 00:00:00 으로 변경
+ var setMidnightToZero = function(dateString) {
+ let date = new Date(dateString);
+ let formattedDate;
+ // 시간을 자정인 경우 "오전 00:00:00"으로 수정
+ if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
+ const parts = ['오전', '00:00:00'];
+ formattedDate = `${date.getFullYear()}. ${date.getMonth() + 1}. ${date.getDate()}. ${parts.join(' ')}`;
+ return formattedDate;
+ } else {
+ formattedDate = date.toLocaleString('ko-KR', {timeZone: 'Asia/Seoul'});
+ return formattedDate;
+ }
+ };
var setRangeDateAsync = function(rangeTypeId) {
return new Promise( (resolve, reject) => {
setRangeDate(rangeTypeId);
@@ -162,7 +195,6 @@
if(search_section === 'jiraissue') {
$("#jiraissue_section .search_result_group .search_result_items").html("");
- console.log("[searchApiModule :: appendSearchResultSections] :: search_result_arr길이 =>" +search_result_arr.length);
if(search_result_arr && search_result_arr.length !== 0) {
search_result_arr.forEach(function (content, index) {
var highlight_stringify = "";
@@ -213,8 +245,6 @@
}
else if (search_section === 'log') {
$("#log_section .search_result_group .search_result_items").html("");
- console.log("[searchApiModule :: appendSearchResultSections_fluentd] :: search_result_arr길이 =>" +search_result_arr.length);
-
if(search_result_arr && search_result_arr.length !== 0) {
search_result_arr.forEach(function (content, index) {
var highlight_stringify = "";
@@ -409,7 +439,7 @@
return {
// 날짜 구간 설정
- setRangeDate, getRangeDate, setRangeDateAsync,
+ setRangeDate, getRangeDate, setRangeDateAsync, setMidnightToZero,
// 검색 결과
setSearchResult, getSearchResult, getHitsTotal,
// 페이지 변경