From 1d25659a05d5bc4f500bd3fd63aa6d8375006d43 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 20:11:11 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/customField/customFieldAdd.html | 6 +++---
src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js | 23 +++++++++++++++++------
src/main/java/kr/wisestone/owl/vo/IssueTypeCustomFieldVo.java | 9 +++++++++
src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java | 9 +++++++++
src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | 5 +++++
src/main/webapp/scripts/app/project/projectAdd.controller.js | 2 +-
6 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
index ce67e51..8c4dc82 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeCustomFieldServiceImpl.java
@@ -166,6 +166,15 @@
issueTypeCustomFieldVo.setCustomFieldVo(customFieldVo);
issueTypeCustomFieldVo.setFieldOption(issueTypeCustomField.getFieldOption());
issueTypeCustomFieldVo.setChecked(issueTypeCustomField.getFieldOption().equals(IssueTypeCustomField.FIELD_OPTION_Y)); // �솕硫댁뿉�꽌 �샃�뀡 泥댄겕�릺�룄濡� checked �뿉 媛� �뀑�똿
+
+ List<IssueCustomFieldValue> issueCustomFieldValues= this.issueCustomFieldValueService.findByCustomFieldId(issueTypeCustomField.getCustomField());
+ if(issueCustomFieldValues != null && issueCustomFieldValues.size()>0){
+ for(IssueCustomFieldValue issueCustomFieldValue : issueCustomFieldValues){
+ if(issueCustomFieldValue.getIssueTypeCustomField().getId().equals(issueTypeCustomField.getId())){
+ issueTypeCustomFieldVo.setUseValue(true);
+ }
+ }
+ }
issueTypeCustomFieldVos.add(issueTypeCustomFieldVo);
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueTypeCustomFieldVo.java b/src/main/java/kr/wisestone/owl/vo/IssueTypeCustomFieldVo.java
index 7a9b3cf..5b3e6c4 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueTypeCustomFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueTypeCustomFieldVo.java
@@ -7,6 +7,7 @@
private Long id;
private String fieldOption;
private CustomFieldVo customFieldVo;
+ private Boolean useValue;
public IssueTypeCustomFieldVo(){}
@@ -33,4 +34,12 @@
public void setCustomFieldVo(CustomFieldVo customFieldVo) {
this.customFieldVo = customFieldVo;
}
+
+ public Boolean getUseValue() {
+ return useValue;
+ }
+
+ public void setUseValue(Boolean useValue) {
+ this.useValue = useValue;
+ }
}
diff --git a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
index 8f6fbdb..764f07e 100644
--- a/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
+++ b/src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js
@@ -382,16 +382,28 @@
}
if (this.singleDatePicker) {
+
+
this.container.addClass('single');
this.container.find('.calendar.left').addClass('single');
this.container.find('.calendar.left').show();
this.container.find('.calendar.right').hide();
this.container.find('.daterangepicker_input input, .daterangepicker_input > i').hide();
- if (this.timePicker) {
- this.container.find('.ranges ul').hide();
- } else {
- this.container.find('.ranges').hide();
- }
+ this.container.find('.calendar').on('focus.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsBlurred, this))
+ //this.container.find('.ranges ul').show();
+ this.container.find('.ranges').show();
+ //this.container.find('.applyBtn, .cancelBtn').addClass('hide');
+ //this.container.find('.ranges').on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
+ //this.container.find('.applyBtn, .cancelBtn').addClass(this.buttonClasses);
+ //this.container.find('.cancelBtn').addClass(this.cancelClass);
+ //this.container.find('.applyBtn').html(this.locale.applyLabel);
+ //this.container.find('.cancelBtn').html(this.locale.cancelLabel);
+
+ // if (this.timePicker) {
+ // this.container.find('.ranges ul').hide();
+ // } else {
+ // this.container.find('.ranges').hide();
+ // }
}
if ((typeof options.ranges === 'undefined' && !this.singleDatePicker) || this.alwaysShowCalendars) {
@@ -413,7 +425,6 @@
this.container.find('.cancelBtn').addClass(this.cancelClass);
this.container.find('.applyBtn').html(this.locale.applyLabel);
this.container.find('.cancelBtn').html(this.locale.cancelLabel);
-
//
// event listeners
//
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index 0ea3ea5..ab7ba34 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -121,7 +121,7 @@
if (result.data.message.status === "success") {
$scope.fn.cancel();
- $rootScope.user.lastProjectId = result.data.data.id;
+ // $rootScope.user.lastProjectId = result.data.data.id;
// 紐⑸줉 �솕硫� 媛깆떊
$rootScope.$broadcast("getProjectList", {});
}
diff --git a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
index 7acb44c..7be0571 100644
--- a/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
+++ b/src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -82,6 +82,7 @@
autoApply : true,
singleDatePicker : true,
isSingle : true,
+
//parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "",
locale: {
format: 'YYYY-MM-DD',
@@ -92,6 +93,10 @@
},
opens : "center"
});
+ // singleDate 痍⑥냼 踰꾪듉 (媛� 珥덇린�솕)
+ $($element).on('cancel.daterangepicker', function(ev, picker) {
+ $scope.ngModel = "";
+ });
}
}
else {
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index 53b129e..0610908 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -112,14 +112,14 @@
<input ng-if="vm.form.customFieldType == 'DATETIME'"
name="dateTime"
class="form-control input-readonly"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
ng-model="vm.form.defaultValue"
modal-form-auto-scroll
range-type="singleDate"
- onfocus="this.blur()"
date-range-picker>
<div class="row">
<div class="col-xs-12">
- <div id="createdWidget" class="bootstrap-datepicker"></div>
+ <div id="createdWidget" class="bootstrap-datepicker "></div>
</div>
</div>
@@ -205,4 +205,4 @@
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
-</div>
+</div>
\ No newline at end of file
--
Gitblit v1.8.0