충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 src/main/webapp/scripts/main.js

@@ -49,8 +49,8 @@
        'htmlDiff' : '/bower_components/htmldiff/js/htmldiff',  //  이슈 내용 변경 비교를 위해 사용
        'bootstrapUtil' : '../custom_components/bootstrap/js/dist/util',    //  도움말 툴팁을 위해 사용
        'tooltip' : '../custom_components/bootstrap/js/dist/tooltip',   //  도움말 툴입을 위해 사용


        'googleChartLoader' : '../custom_components/google-chart/loader', // 구글 차트 로더
        'googleChart' : '../custom_components/google-chart/googleChart.directive', // 구글 차트 로더

        'angularTranslate' : '../custom_components/angular-translate/angular-translate', //  다국어 처리에 사용
        'commonController' : 'app/common/common.controller', //  공통 컨트롤러
@@ -101,6 +101,7 @@
        'memberProgressWidget' : '../custom_components/widget/member-progress-widget/member-progress-widget.directive', //  멤버별 진행률 차트를 넣는데 사용한다.
        'projectProgressWidget' : '../custom_components/widget/project-progress-widget/project-progress-widget.directive',  //  진행 중인 프로젝트 현황 차트를 넣는데 사용한다.
        'projectMemberListController' : '../custom_components/widget/project-progress-widget/projectMemberList.controller', //  진행 중인 프로젝트 현황 차트에서 팀원 확인에 사용한다.
        'projectDepartmentListController' : '../custom_components/widget/project-progress-widget/projectDepartmentList.controller',
        'issueStatisticsWidget' : '../custom_components/widget/issue-statistics-widget/issue-statistics-widget.directive',  //  전체 이슈 현황 차트를 넣는데 사용한다.
        'workflowWidget' : '../custom_components/widget/workflow-widget/workflow-widget.directive', //  워크플로우 차트를 넣는데 사용한다.
        'issueTypeWidget' : '../custom_components/widget/issue-type-widget/issue-type-widget.directive',    //  이슈 타입 별 이슈 현황 차트를 넣는데 사용한다.
@@ -183,15 +184,19 @@
        'issueImportExcelController' : 'app/issue/issueImportExcel.controller',    //  이슈 엑셀 대량 import
        'issueModifyStatusController' : 'app/issue/issueModifyStatus.controller',   //  이슈 다중 상태 변경 컨트롤러
        'issueAddTableConfigController' : 'app/issue/issueAddTableConfig.controller',   //  이슈 테이블 설정 컨트롤러
        'issueSendMailController' : 'app/issue/issueSendMail.controller',   //  이슈 이메일 발송 컨트롤러
        'issueAddRelationTableConfigController' : 'app/issue/issueAddRelationTableConfig.controller',   //  이슈 테이블 설정 컨트롤러
        'issueAddDownTableConfigController' : 'app/issue/issueAddDownTableConfig.controller',   //  이슈 테이블 설정 컨트롤러
        'issueSendMailPartnersController' : 'app/issue/issueSendMailPartners.controller',   //  이슈 이메일 발송 컨트롤러
        'issueVersionViewController' : 'app/issue/issueVersionView.controller', //  이슈 버전 확인 컨트롤러
        'issueReservationController' : 'app/issue/issueReservation.controller', //  이슈 발생 예약 컨트롤러
        'issueModifyUserController' : 'app/issue/issueModifyUser.controller', // 이슈 담당자 컨트롤러
        'issueModifyDepartmentController' : 'app/issue/issueModifyDepartment.controller', // 이슈 담당부서 컨트롤러
        'issueService' : 'components/issue/issue.service', //  이슈에 관련된 통신을 담당한다.
        'issueVersionService' : 'components/issueVersion/issueVersion.service', //  이슈 버전에 관련된 통신을 담당한다.
        'issueReservationService' : 'components/issueReservation/issueReservation.service', //  이슈 발생 예약에 관련된 통신을 담당한다.
        'issueRelationService' : 'components/issueRelation/issueRelation.service', //  관련 이슈에 관련된 통신을 담당한다.
        'issueUserService' : 'components/issueUser/issueUser.service', // 이슈 담당자 관련 통신을 담당한다.
        'issueDepartmentService' : 'components/issueDepartment/issueDepartment.service', // 이슈 담당자 관련 통신을 담당한다.

        /* 할일 관련 */

@@ -224,11 +229,13 @@
        'workspacePaymentModifyController' : 'app/workspace/workspacePaymentModify.controller', //  결재 수정 컨트롤러
        'workspacePaymentAddController' : 'app/workspace/workspacePaymentAdd.controller',   //  추가 결제 컨트롤러
        'workspacePaymentAgreeTermController' : 'app/workspace/workspacePaymentAgreeTerm.controller', //  업무 공간 이용 약관 확인 컨트롤러
        'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller',  //  사용자 관리 컨트롤러
        'workspaceUserLevelController' : 'app/workspace/workspaceUserLevelConfig.controller',  //  사용자 등급 관리 컨트롤러
        'workspaceLevelAddController' : 'app/workspace/workspaceLevelAdd.controller',  //  사용자 등급 추가 컨트롤러
        'levelModifyController' : 'app/workspace/levelModify.controller',  //  사용자 등급 수정 컨트롤러
        'workspaceLevelModifyController' : 'app/workspace/workspaceLevelModify.controller',  //  사용자 등급 수정 컨트롤러
        'workspaceDepartmentModifyController' : 'app/workspace/workspaceDepartmentModify.controller',  //  부서 수정 컨트롤러
        'workspaceDepartmentAddController' : 'app/workspace/workspaceDepartmentAdd.controller',  //  부서 추가 컨트롤러
        'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller',  //  사용자 부서 관리 컨트롤러
        'workspaceDepartmentConfigController' : 'app/workspace/workspaceDepartmentConfig.controller',  //  부서 관리 컨트롤러
        'workspaceUserDepartmentModifyController' : 'app/workspace/workspaceUserDepartmentModify.controller',  //  사용자 부서 수정 컨트롤러
        'workspaceService' : 'components/workspace/workspace.service',  //  업무 공간에 관련된 통신을 담당한다.
        'paymentService' : 'components/payment/payment.service',    //  결재에 관련된 통신을 담당한다.

@@ -323,9 +330,31 @@

        /* api */
        'apiRoute' : 'app/api/api',  //  api route 정보
        'apiService' : 'components/api/api.service',  // api 관련된 통신 담당
        'apiAuthController' :'app/api/apiAuth.controller',   // api 인증 컨트롤러
        'apiSettingController' : 'app/api/apiSetting.controller',    // api 설정 컨트롤러
        'apiMonitorController' : 'app/api/apiMonitor.controller', // api 모니터링 컨트롤러

        /* 업체 */
        'companyFieldRoute' : 'app/companyField/companyField',   // 업체 route 정보
        'companyFieldService' : 'components/companyField/companyField.service',  // 업체 관련된 통신 담당
        'companyFieldListController' : 'app/companyField/companyFieldList.controller', // 업체 목록 컨트롤러
        'companyFieldAddController' : 'app/companyField/companyFieldAdd.controller', // 업체 생성 컨트롤러
        'companyFieldModifyController' : 'app/companyField/companyFieldModify.controller', // 업체 수정 컨트롤러

        /* ISP */
        'ispFieldRoute' : 'app/ispField/ispField',   // ISP route 정보
        'ispFieldService' : 'components/ispField/ispField.service',  // ISP 관련된 통신 담당
        'ispFieldListController' : 'app/ispField/ispFieldList.controller', // ISP 목록 컨트롤러
        'ispFieldAddController' : 'app/ispField/ispFieldAdd.controller', // ISP 생성 컨트롤러
        'ispFieldModifyController' : 'app/ispField/ispFieldModify.controller', // ISP 수정 컨트롤러

        /* 호스팅 */
        'hostingFieldRoute' : 'app/hostingField/hostingField',   // 호스팅 route 정보
        'hostingFieldService' : 'components/HostingField/hostingField.service',  // 호스팅 관련된 통신 담당
        'hostingFieldListController' : 'app/hostingField/hostingFieldList.controller', // 호스팅 목록 컨트롤러
        'hostingFieldAddController' : 'app/hostingField/hostingFieldAdd.controller', // 호스팅 생성 컨트롤러
        'hostingFieldModifyController' : 'app/hostingField/hostingFieldModify.controller', // 호스팅 수정 컨트롤러
    },
    shim : {
        'jquery-ui' : {
@@ -479,6 +508,7 @@
    'summerNote-ja-JP', //  이슈 만들기에서 사용
    'summerNote-vi-VN', //  이슈 만들기에서 사용
    'issueUserService',
    'issueDepartmentService',
    'jsShortCut',
    'languageService',
    'principalService',
@@ -493,6 +523,7 @@
    'authService',
    'userInviteService',
    'projectService',
    'customFieldService',
    'loginRoute',
    'projectRoute',
    'issueStatusRoute',
@@ -513,6 +544,9 @@
    'supportRoute',
    'ganttRoute',
    'apiRoute',
    'companyFieldRoute',
    'ispFieldRoute',
    'hostingFieldRoute',
    'ganttService',
    'workflowService',
    'issueSearchService',
@@ -524,8 +558,11 @@
    'qnaService',
    'taskService',
    'taskCommentService',
    'workflowStatusService'

    'workflowStatusService',
    'companyFieldService',
    'ispFieldService',
    'hostingFieldService',
    'userWorkspaceService'
], function ($, angular, domReady, app, sortable, crypto) {
    //  대시보드에서 Sortable 인식 못하는 문제 해결
    window.Sortable = sortable;