Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-18 f01dc01ba632addc8e893fea0843a3d77aac7e25

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

 src/main/webapp/bower_components/bootstrap-daterangepicker/daterangepicker.js

@@ -99,7 +99,7 @@
                '<div class="calendar left">' +
                    '<div class="daterangepicker_input">' +
                      '<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
                      '<i class="fa fa-calendar glyphicon glyphicon-calendar">' +
                      '<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
                      '<div class="calendar-time">' +
                        '<div></div>' +
                        '<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +

 src/main/webapp/scripts/app/issue/issueAdd.controller.js

@@ -375,22 +375,6 @@
                    var content = {
                        title : $rootScope.preventXss($scope.vm.form.title),    //  제목
                        description : $rootScope.preventXss($scope.vm.form.description),   //  내용
                        //
                        // companyManager : $rootScope.preventXss($scope.vm.companyManager),   //  내용
                        // companyTel : $rootScope.preventXss($scope.vm.companyTel),   //  내용
                        // companyEmail : $rootScope.preventXss($scope.vm.companyEmail),   //  내용
                        // companyMemo : $rootScope.preventXss($scope.vm.companyMemo),   //  내용
                        ispCode : $rootScope.preventXss($scope.vm.ispCode),   //  내용
                        ispManager : $rootScope.preventXss($scope.vm.ispManager),   //  내용
                        ispTel : $rootScope.preventXss($scope.vm.ispTel),   //  내용
                        ispEmail : $rootScope.preventXss($scope.vm.ispEmail),   //  내용
                        ispMemo : $rootScope.preventXss($scope.vm.ispMemo),   //  내용
                        hostingCode : $rootScope.preventXss($scope.vm.hostingCode ),   //  내용
                        hostingManager : $rootScope.preventXss($scope.vm.hostingManager),   //  내용
                        hostingTel : $rootScope.preventXss($scope.vm.hostingTel),   //  내용
                        hostingEmail : $rootScope.preventXss($scope.vm.hostingEmail),   //  내용
                        hostingMemo : $rootScope.preventXss($scope.vm.hostingMemo),   //  내용
                        //
                        projectId : (function () {   //  프로젝트 아이디
                            var projectId = "";

@@ -446,6 +430,7 @@

                            return departmentIds;
                        })(),

                        attachedFileIds : (function () {
                            var attachedFileIds = [];

@@ -457,6 +442,7 @@

                            return attachedFileIds;
                        })(),

                        startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
                        detectingDateRange : $scope.vm.form.detectingDateRange,


 src/main/webapp/scripts/app/issue/issueModify.controller.js

@@ -450,6 +450,79 @@
                            return attachedFileIds;
                        })(),
                        startCompleteDateRange : $scope.vm.form.startCompleteDateRange,

                        companyFields : (function () {
                            var companyFields = [];

                            angular.forEach($scope.vm.form.companyFields, function (companyField) {
                                var useValues = [];

                                if (angular.isArray(companyField.useValues)) {
                                    angular.forEach(companyField.useValues, function (useValue) {
                                        useValues.push(useValue.value);
                                    });
                                }
                                else {
                                    useValues.push(companyField.useValues);
                                }

                                //  useValues 를 배열로 변환한다.
                                var temp = angular.copy(companyField);
                                temp.useValues = useValues;
                                companyFields.push(temp);
                            });

                            return companyFields;
                        })(),

                        ispFields : (function () {
                            var ispFields = [];

                            angular.forEach($scope.vm.form.ispFields, function (ispField) {
                                var useValues = [];

                                if (angular.isArray(ispField.useValues)) {
                                    angular.forEach(ispField.useValues, function (useValue) {
                                        useValues.push(useValue.value);
                                    });
                                }
                                else {
                                    useValues.push(ispField.useValues);
                                }

                                //  useValues 를 배열로 변환한다.
                                var temp = angular.copy(ispField);
                                temp.useValues = useValues;
                                ispFields.push(temp);
                            });

                            return ispFields;
                        })(),

                        hostingFields : (function () {
                            var hostingFields = [];

                            angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
                                var useValues = [];

                                if (angular.isArray(hostingField.useValues)) {
                                    angular.forEach(hostingField.useValues, function (useValue) {
                                        useValues.push(useValue.value);
                                    });
                                }
                                else {
                                    useValues.push(hostingField.useValues);
                                }

                                //  useValues 를 배열로 변환한다.
                                var temp = angular.copy(hostingField);
                                temp.useValues = useValues;
                                hostingFields.push(temp);
                            });

                            return hostingFields;
                        })(),

                        issueCustomFields : (function () {    //  이슈에서 사용되는 사용자 정의 필드
                            var issueCustomFields = [];


 src/main/webapp/views/issue/issueAdd.html

@@ -210,6 +210,7 @@
                    </div>
                </div>
            </div>
            <hr>
            <div class="row">
                <div class="col-lg-4 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">탐지정보</span></label>

 src/main/webapp/views/issue/issueModify.html

@@ -210,6 +210,7 @@
                    </div>
                </div>
            </div>
            <hr>
            <div class="row">
                <div class="col-lg-4 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">탐지정보</span></label>