From bfb7e19d367cef0bd4242c55dd0e612d2c84c588 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 21:29:21 +0900
Subject: [PATCH] 이슈 리스트 프로젝트 이름 두개 셋팅 수정 달력 크기 수정 진행중
---
src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js | 8 +++++++-
src/main/webapp/views/issue/issueListNormal.html | 4 ----
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 1 +
src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js | 2 +-
src/main/webapp/scripts/app/issue/issueList.controller.js | 1 +
src/main/webapp/assets/styles/main.css | 12 ++++++++++++
6 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index cd20d76..fd21901 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -11329,10 +11329,22 @@
min-width: 540px;
}
+body .daterangepicker-single {
+ -webkit-box-shadow: 3px 25px 50px rgba(77, 76, 132, 0.34);
+ box-shadow: 3px 25px 50px rgba(77, 76, 132, 0.34);
+ font-family: "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+ border: none;
+ padding: 15px;
+}
+
+
@media screen and (max-width: 767px) {
body .daterangepicker {
min-width: 300px;
}
+
+ body .daterangepicker-single {
+ }
}
diff --git a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
index e67d2dc..70477aa 100644
--- a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
+++ b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
@@ -52,6 +52,7 @@
this.autoUpdateInput = true;
this.alwaysShowCalendars = false;
this.ranges = {};
+ this.isSingle = false;
this.opens = 'right';
if (this.element.hasClass('pull-right'))
@@ -94,8 +95,13 @@
options = $.extend(this.element.data(), options);
//html template for the picker UI
+ var single = '';
+ if ( options.isSingle) {
+ single = '-single';
+ }
+
if (typeof options.template !== 'string' && !(options.template instanceof $))
- options.template = '<div class="daterangepicker dropdown-menu">' +
+ options.template = '<div class="daterangepicker' + single + ' dropdown-menu">' +
'<div class="calendar left">' +
'<div class="daterangepicker_input">' +
'<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index bc60109..e9fbec7 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -489,6 +489,7 @@
if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
var find = findProjectSearch($rootScope.workProject.id);
if (!find) {
+ $scope.vm.projects = [];
$scope.vm.projects.push($rootScope.workProject);
}
}
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index d6367d5..7acb44c 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -81,6 +81,7 @@
autoUpdateInput: true,
autoApply : true,
singleDatePicker : true,
+ isSingle : true,
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
format: 'YYYY-MM-DD',
diff --git a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
index 23f8234..5f59bb8 100644
--- a/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
+++ b/src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js
@@ -55,7 +55,7 @@
}
- makeTag += "<span ng-click='fn.remove(" + list.id + ")'>횞</span>";
+ // makeTag += "<span ng-click='fn.remove(" + list.id + ")'>횞</span>";
makeTag += "</p>";
});
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 7e16daa..7575114 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -39,10 +39,6 @@
<issue-search-array-view-element lists="vm.projects"
type="'project'"></issue-search-array-view-element>
- <p ng-if="$root.isDefined(vm.projectName)">
- {{vm.projectName}}
- <span ng-click="vm.projectName = ''">횞</span>
- </p>
<!-- �씠�뒋 ���엯 -->
<issue-search-field-key-view-element lists="vm.issueTypes"
keys="vm.search.issueTypeIds"></issue-search-field-key-view-element>
--
Gitblit v1.8.0