From 03a0d4556fb01d409a5630b3c002e259fe32c407 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 화, 08 2월 2022 10:49:00 +0900 Subject: [PATCH] - api 이슈 추가시 종료 상태인 상위 이슈에도 추가가 되도록 수정 - 종료 처리된 상위이슈에 하위이슈로 추가 될 경우 상위 이슈를 자동으로 대기 상태로 변경하도록 수정 --- src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js index 7be0571..b5f5eaf 100644 --- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js +++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js @@ -77,7 +77,9 @@ }); } else if ($attrs["rangeType"] === "singleDate") { $($element).daterangepicker({ - timePicker: false, + timePicker: true, + timePicker24Hour : true, + timePickerSeconds : true, autoUpdateInput: true, autoApply : true, singleDatePicker : true, @@ -85,7 +87,33 @@ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "", locale: { - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DD H:mm:ss', + separator: "~", + applyLabel: options.applyLabel, + cancelLabel: options.cancelLabel, + daysOfWeek: options.daysOfWeek, + monthNames: options.monthNames + }, + opens : "center" + }); + // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕) + $($element).on('cancel.daterangepicker', function(ev, picker) { + $scope.ngModel = ""; + }); + } else if ($attrs["rangeType"] === "multiDate") { + $($element).daterangepicker({ + timePicker: true, + timePicker24Hour : true, + timePickerSeconds : true, + autoUpdateInput: true, + autoApply : true, + singleDatePicker : false, + isSingle : false, + + //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "", + locale: { + format: 'YYYY-MM-DD H:mm:ss', + separator: "~", applyLabel: options.applyLabel, cancelLabel: options.cancelLabel, daysOfWeek: options.daysOfWeek, -- Gitblit v1.8.0