From e60f829f9d975a88673f0e6922f1c9c1228f89ea Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 18:30:33 +0900
Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정

---
 src/main/webapp/scripts/app/project/projectAdd.controller.js |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index 05d486b..ab7ba34 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -16,6 +16,7 @@
                     formSubmit : formSubmit,    //  �뤌 �쟾�넚
                     formCheck : formCheck,   //  �뤌 泥댄겕
                     removeUsr : removeUsr,  //  �씪諛� �궗�슜�옄 �젣嫄�
+                    removeDepartment : removeDepartment  //  遺��꽌 �젣嫄�
                 };
 
                 $scope.vm = {
@@ -63,12 +64,13 @@
                     $scope.vm.form.users.splice(index, 1);
                 }
 
+                //  �떞�떦遺��꽌 �궘�젣
+                function removeDepartment(index) {
+                    $scope.vm.form.departments.splice(index, 1);
+                }
+
                 function formCheck(formInvalid) {
                     if (formInvalid) {
-                        return true;
-                    }
-
-                    if (!$rootScope.isDefined($scope.vm.form.startEndDateRange)) {
                         return true;
                     }
 
@@ -94,17 +96,20 @@
                             });
                             return managerIds;
                         })(),
-                        //遺��꽌id 異붽� �븘�슂
+                        // 遺��꽌 id 異붽� �븘�슂
                         departmentIds : (function () {
                             var departmentIds = [];
-                            angular.forEach($scope.vm.form.users, function (user) {
-                                departmentIds.push(user.id);
+                            angular.forEach($scope.vm.form.departments, function (department) {
+                                departmentIds.push(department.id);
                             });
                             return departmentIds;
                         })()
                     };
 
-                    if ($rootScope.isDefined($scope.vm.form.startEndDateRange)) {
+                    if ($scope.vm.form.startEndDateRange === null || $scope.vm.form.startEndDateRange === "") {
+                        content.startDate = "";
+                        content.endDate = "";
+                    } else {
                         var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
                         content.startDate = startEndDateRange[0].trim();
                         content.endDate = startEndDateRange[1].trim();
@@ -116,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", {});
                         }

--
Gitblit v1.8.0