From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경

---
 src/main/webapp/views/api/apiMonitor.html |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/api/apiMonitor.html b/src/main/webapp/views/api/apiMonitor.html
index 3db8e70..8dca8b6 100644
--- a/src/main/webapp/views/api/apiMonitor.html
+++ b/src/main/webapp/views/api/apiMonitor.html
@@ -12,23 +12,40 @@
             </h6>
 
             <div class="element-box">
-                <select class="form-control form-control-sm rounded width-30 d-inline-block mb-10" ng-model="vm.search.searchPeriod" ng-change="fn.changeSearchPeriod()">
-                    <option value="LAST_SEVEN_DAYS" translate="common.last7Days">理쒓렐 7�씪</option>
-                    <option value="THIS_WEEK" translate="common.thisWeek">�씠踰� 二�</option>
-                    <option value="LAST_WEEK" translate="common.lastWeek">吏��궃 二�</option>
-                    <option value="THIS_MONTH" translate="common.thisMonth">�씠踰� �떖</option>
-                    <option value="LAST_MONTH" translate="common.lastMonth">吏��궃 �떖(1�씪~留먯씪)</option>
-                    <option value="LAST_THIRTY_DAYS" translate="common.last30Days">理쒓렐 30�씪</option>
-                    <option value="CUSTOM_INPUT" translate="common.directInput">吏곸젒�엯�젰</option>
-                </select>
+                <div>
+                    <select class="form-control form-control-sm rounded width-30 d-inline-block mb-10" ng-model="vm.search.searchPeriod" ng-change="fn.changeSearchPeriod()">
+                        <option value="LAST_SEVEN_DAYS" translate="common.last7Days">理쒓렐 7�씪</option>
+                        <option value="THIS_WEEK" translate="common.thisWeek">�씠踰� 二�</option>
+                        <option value="LAST_WEEK" translate="common.lastWeek">吏��궃 二�</option>
+                        <option value="THIS_MONTH" translate="common.thisMonth">�씠踰� �떖</option>
+                        <option value="LAST_MONTH" translate="common.lastMonth">吏��궃 �떖(1�씪~留먯씪)</option>
+                        <option value="LAST_THIRTY_DAYS" translate="common.last30Days">理쒓렐 30�씪</option>
+                        <option value="CUSTOM_INPUT" translate="common.directInput">吏곸젒�엯�젰</option>
+                    </select>
 
+                    <input type="text"
+                           ng-show="vm.search.searchPeriod == 'CUSTOM_INPUT'"
+                           class="form-control form-control-sm rounded col-md-4 d-inline-block input-readonly"
+                           ng-model="vm.search.startEndDateRange"
+                           modal-form-auto-scroll
+                           parent-el="'#createdWidget'"
+                           range-type="date"
+                           onfocus="this.blur()"
+                           style="height: 32px !important; padding: 0.25rem 0.5rem; font-size: 0.8rem; line-height: 1.5;"
+                           date-range-picker>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <div id="createdWidget" class="bootstrap-datepicker"></div>
+                        </div>
+                    </div>
 
-                <div class="no-cont1"
-                     ng-if="vm.chartData.columns.length < 1"
-                     translate="common.noRecord">
-                    湲곕줉�씠 �뾾�뒿�땲�떎.
+                    <div class="no-cont1"
+                         ng-if="vm.chartData.columns.length < 1"
+                         translate="common.noRecord">
+                        湲곕줉�씠 �뾾�뒿�땲�떎.
+                    </div>
+
                 </div>
-
                 <div  ng-if="vm.chartData.columns.length > 0">
                     <google-chart
                                   columns="vm.chartData.columns"

--
Gitblit v1.8.0