From 799d8178d5bf8256c2334d2ff95a24f326a68534 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 19:23:42 +0900
Subject: [PATCH] - 이슈 수정시 사용자가 담당부서에 속해있으면 수정 가능 - 프로젝트 관리 권한이 있는데 프로젝트 수정 항목이 표시 안되는 문제 수정
---
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 04eae5d..d6ea913 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -55,25 +55,50 @@
options.monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
break;
}
-
if (angular.isDefined($attrs["rangeType"])) {
- $($element).daterangepicker({
- timePicker: false,
- autoUpdateInput: true,
- autoApply : true,
- minDate : minDate,
- maxDate : maxDate,
- parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "body",
- locale: {
- format: 'YYYY-MM-DD',
- separator: " ~ ",
- applyLabel: options.applyLabel,
- cancelLabel: options.cancelLabel,
- daysOfWeek: options.daysOfWeek,
- monthNames: options.monthNames
- },
- opens : "center"
- });
+ if ($attrs["rangeType"] === "date")
+ {
+ $($element).daterangepicker({
+ timePicker: false,
+ autoUpdateInput: true,
+ autoApply: true,
+ minDate: minDate,
+ maxDate: maxDate,
+ parentEl: $scope.parentEl !== undefined ? $scope.parentEl : "body",
+ locale: {
+ format: 'YYYY-MM-DD',
+ separator: " ~ ",
+ applyLabel: options.applyLabel,
+ cancelLabel: options.cancelLabel,
+ daysOfWeek: options.daysOfWeek,
+ monthNames: options.monthNames
+ },
+ opens: "center"
+ });
+ } else if ($attrs["rangeType"] === "singleDate") {
+ $($element).daterangepicker({
+ timePicker: true,
+ timePickerSeconds : true,
+ autoUpdateInput: true,
+ autoApply : true,
+ singleDatePicker : true,
+ isSingle : true,
+
+ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
+ locale: {
+ format: 'YYYY-MM-DD/hh-mm-ss A',
+ 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 {
$($element).daterangepicker({
--
Gitblit v1.8.0