From 86b4df0f9574626b1955f339b67a03c9c5f33152 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 6 Sep 2023 17:48:34 +0900
Subject: [PATCH] =?UTF-8?q?datepicker=20=EC=88=98=EC=A0=95(=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=EC=A7=80=EC=9A=B0=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=97=B0=EC=9B=94=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9D=BC=20=EC=84=A0=ED=83=9D=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3rd-party/jquery-ui/1.13.2/jquery-ui.js     | 16 ++++++++++++++++
 .../js/fims/framework/cmm/initAfterPageLoad.js  | 17 ++++++++++++++++-
 .../fims/framework/datepicker/datepicker.css    |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js b/src/main/webapp/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js
index 513c8d72..eb750fbe 100644
--- a/src/main/webapp/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js
+++ b/src/main/webapp/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js
@@ -11427,6 +11427,10 @@ $.extend( Datepicker.prototype, {
 				today: function() {
 					$.datepicker._gotoToday( id );
 				},
+				/** 함수 추가(지우기 버튼) */
+				clear: function() {
+					$.datepicker._clearDate( id );
+				},
 				selectDay: function() {
 					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
 					return false;
@@ -11590,6 +11594,18 @@ $.extend( Datepicker.prototype, {
 						} )
 						.text( currentText ) :
 					"" )
+				/** 지우기 버튼 추가 */
+				.append ( this._isInRange( inst, gotoDate ) ?
+					$( "<button>" )
+						.attr( {
+							type: "button",
+							"class": "ui-datepicker-clear ui-state-default ui-priority-secondary ui-corner-all",
+							"data-handler": "clear",
+							"data-event": "click"
+						} )
+						.text("지우기") :
+					""
+				)
 				.append( isRTL ? "" : controls )[ 0 ].outerHTML;
 		}
 
diff --git a/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
index 8259e0b1..66d1c3d9 100644
--- a/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
+++ b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js
@@ -6,7 +6,22 @@ function initDatepicker(elementId){
     executionArea.find(".form-date").datepicker({
         changeMonth: true,
         changeYear: true,
-        showButtonPanel: true
+        showButtonPanel: true,
+		onChangeMonthYear : function(year, month, inst){
+			
+			/** 기능 추가 : 연월 변경시 일 선택 */
+			
+			var result = "" + year + "-"+(""+month).padStart(2,'0') + "-";
+			
+			var endDay = DateUtil.getEndOfMonthDay(year, month);
+			if(inst.selectedDay > endDay){
+				result += (""+endDay).padStart(2,'0');
+			} else {
+				result += (""+inst.selectedDay).padStart(2,'0');
+			}
+
+			$(this).datepicker("setDate", result);
+		}
     });
 
     executionArea.find(".form-date").next("button.bx-calendar").on("click", function() {
diff --git a/src/main/webapp/resources/lib/fims/framework/datepicker/datepicker.css b/src/main/webapp/resources/lib/fims/framework/datepicker/datepicker.css
index 293c9665..eb63f7f7 100644
--- a/src/main/webapp/resources/lib/fims/framework/datepicker/datepicker.css
+++ b/src/main/webapp/resources/lib/fims/framework/datepicker/datepicker.css
@@ -36,6 +36,7 @@ display: none; /* 화살표 없애기 for IE10, 11*/
 .ui-datepicker td, .ui-datepicker th { border: 0 }
 .ui-datepicker .ui-datepicker-buttonpane button { float: right; cursor: pointer; width: auto; margin: 0.5em 0.2em 0.4em; padding: 0.2em 0.6em 0.3em; overflow: visible; }
 .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float: left; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-clear { float: left; }
 .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
 .ui-corner-all { border-radius: 3px; }
 .ui-icon { display: block; width: 16px; height: 16px; }