Index: .prettierrc =================================================================== diff -u -r926ea7c6260f705883b293bdebd7fc973b3452dd -rf63505b9bbb59d8bb340a5e38e813047f998b7f8 --- .prettierrc (.../.prettierrc) (revision 926ea7c6260f705883b293bdebd7fc973b3452dd) +++ .prettierrc (.../.prettierrc) (revision f63505b9bbb59d8bb340a5e38e813047f998b7f8) @@ -4,5 +4,9 @@ "singleQuote": true, "trailingComma": "none", "useTabs": true, - "bracketSameLine": true + "bracketSameLine": true, + "singleAttributePerLine": true, + "bracketSpacing": true, + "jsxBracketSameLine": true, + "semi": true } Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js =================================================================== diff -u -rdc28d75ad1fff075c2ab87d2d2191d441204ef4b -rf63505b9bbb59d8bb340a5e38e813047f998b7f8 --- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision dc28d75ad1fff075c2ab87d2d2191d441204ef4b) +++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision f63505b9bbb59d8bb340a5e38e813047f998b7f8) @@ -26,27 +26,27 @@ ].concat(defaultMiddleware); } }, - // proxies: [ - // // 선생님용 - // { - // context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], - // host: '127.0.0.1', - // port: 13131, - // https: false, - // changeOrigin: true - // } - // ] - proxies: [ - // 주희 용 + // 선생님용 { context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], - host: 'www.313.co.kr', - port: 80, + host: '127.0.0.1', + port: 13131, https: false, changeOrigin: true } ] + + // proxies: [ + // // 주희 용 + // { + // context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], + // host: 'www.313.co.kr', + // port: 80, + // https: false, + // changeOrigin: true + // } + // ] }, }, watch: { Index: plugins/ckeditor/plugins/specialchar/dialogs/lang/ku.js =================================================================== diff -u -r5101b035a6ee18be64dfd48fffbe9958aaefe915 -rf63505b9bbb59d8bb340a5e38e813047f998b7f8 --- plugins/ckeditor/plugins/specialchar/dialogs/lang/ku.js (.../ku.js) (revision 5101b035a6ee18be64dfd48fffbe9958aaefe915) +++ plugins/ckeditor/plugins/specialchar/dialogs/lang/ku.js (.../ku.js) (revision f63505b9bbb59d8bb340a5e38e813047f998b7f8) @@ -21,4 +21,6 @@ >npm install grunt-contrib-connect --save-dev >npm install grunt-connect-proxy --save-dev >npm install serve-static --save-dev ->npm install grunt-contrib-compass --save-dev \ No newline at end of file +>npm install grunt-contrib-compass --save-dev +> +>npm install --save-dev --save-exact prettier \ No newline at end of file Index: arms/html/reqStatus/content-container.html =================================================================== diff -u -r165198804422f6fb05c042ee5c33e5c382877188 -rf63505b9bbb59d8bb340a5e38e813047f998b7f8 --- arms/html/reqStatus/content-container.html (.../content-container.html) (revision 165198804422f6fb05c042ee5c33e5c382877188) +++ arms/html/reqStatus/content-container.html (.../content-container.html) (revision f63505b9bbb59d8bb340a5e38e813047f998b7f8) @@ -2,19 +2,44 @@

- 요구사항 리스트 + + 요구사항 리스트 +

- - - - + + + +
-
+
@@ -25,24 +50,21 @@ 1. Service 를 선택해 주세요
+ class="control-group" + class="darkBack" + style="padding-bottom: 10px; border: 0">
+ class="controls form-group" + class="darkBack" + style="margin-bottom: 5px !important">
@@ -53,32 +75,33 @@ 1. Service 를 선택해 주세요
+ class="control-group darkBack" + style="padding-bottom: 10px; border: 0">
+ class="controls form-group darkBack" + style="margin-bottom: 5px !important"> + multiple="multiple" + id="multiversion" + class="multiple-select btn-block darkBack" + placeholder="  Select Version">
1. Service 를 선택해 주세요
-
-
- +
+
+
@@ -87,101 +110,135 @@
-
-
+

- Host List + + Host List +

- - - - + + + +
-
+
-
+
-
+
1. Service 를 선택해 주세요
-
-
- - - - -
-
- - - -
+ id="reqstatustable" + class="display" + style="width: 100%; border-top: 1px dashed rgba(51, 51, 51, 0.3)">
-
Index: arms/js/reqStatus.js =================================================================== diff -u -r0cf28c152c9f55f098cc89d6f60c8928dd07564a -rf63505b9bbb59d8bb340a5e38e813047f998b7f8 --- arms/js/reqStatus.js (.../reqStatus.js) (revision 0cf28c152c9f55f098cc89d6f60c8928dd07564a) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision f63505b9bbb59d8bb340a5e38e813047f998b7f8) @@ -6,150 +6,134 @@ var dataTableRef; function execDocReady() { - //좌측 메뉴 - setSideMenu( - "sidebar_menu_requirement", - "sidebar_menu_requirement_status", - "requirement-elements-collapse" - ); + setSideMenu('sidebar_menu_requirement', 'sidebar_menu_requirement_status', 'requirement-elements-collapse'); //제품(서비스) 셀렉트 박스 이니시에이터 makePdServiceSelectBox(); //버전 멀티 셀렉트 박스 이니시에이터 makeVersionMultiSelectBox(); - } //////////////////////////////////////////////////////////////////////////////////////// //제품 서비스 셀렉트 박스 //////////////////////////////////////////////////////////////////////////////////////// -function makePdServiceSelectBox(){ +function makePdServiceSelectBox() { //제품 서비스 셀렉트 박스 이니시에이터 - $(".chzn-select").each(function(){ + $('.chzn-select').each(function () { $(this).select2($(this).data()); }); //제품 서비스 셀렉트 박스 데이터 바인딩 $.ajax({ - url: "/auth-user/api/arms/pdService/getPdServiceMonitor.do", - type: "GET", - contentType: "application/json;charset=UTF-8", - dataType : "json", + url: '/auth-user/api/arms/pdService/getPdServiceMonitor.do', + type: 'GET', + contentType: 'application/json;charset=UTF-8', + dataType: 'json', progress: true - }).done(function(data) { - - for(var k in data){ - var obj = data[k]; - var newOption = new Option(obj.c_title, obj.c_id, false, false); - $('#country').append(newOption).trigger('change'); - } - }).fail(function(e) { - }).always(function() { - }); - + }) + .done(function (data) { + for (var k in data) { + var obj = data[k]; + var newOption = new Option(obj.c_title, obj.c_id, false, false); + $('#country').append(newOption).trigger('change'); + } + }) + .fail(function (e) {}) + .always(function () {}); } // end makePdServiceSelectBox() -$('#country').on("select2:open", function () { +$('#country').on('select2:open', function () { //슬림스크롤 - makeSlimScroll(".select2-results__options"); + makeSlimScroll('.select2-results__options'); }); // --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // $('#country').on('select2:select', function (e) { // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 // 디폴트는 base version 을 선택하게 하고 ( select all ) -//~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 + //~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 bind_VersionData_By_PdService(); var checked = $('#checkbox1').is(':checked'); - var endPointUrl = ""; + var endPointUrl = ''; - if(checked){ - endPointUrl = "/T_ARMS_REQSTATUS_" + $('#country').val() + "/getStatusMonitor.do?disable=true"; - }else{ - endPointUrl = "/T_ARMS_REQSTATUS_" + $('#country').val() + "/getStatusMonitor.do?disable=false"; + if (checked) { + endPointUrl = '/T_ARMS_REQSTATUS_' + $('#country').val() + '/getStatusMonitor.do?disable=true'; + } else { + endPointUrl = '/T_ARMS_REQSTATUS_' + $('#country').val() + '/getStatusMonitor.do?disable=false'; } common_dataTableLoad($('#country').val(), endPointUrl); - }); - - //////////////////////////////////////////////////////////////////////////////////////// //버전 멀티 셀렉트 박스 //////////////////////////////////////////////////////////////////////////////////////// -function makeVersionMultiSelectBox(){ +function makeVersionMultiSelectBox() { //버전 선택 셀렉트 박스 이니시에이터 $('.multiple-select').multipleSelect({ filter: true, onClose: function () { console.log('onOpen event fire!\n'); var checked = $('#checkbox1').is(':checked'); - var endPointUrl = ""; + var endPointUrl = ''; var versionTag = $('.multiple-select').val(); - - if(checked){ - - endPointUrl = "/T_ARMS_REQSTATUS_" + $('#country').val() + "/getStatusMonitor.do?disable=true&versionTag=" + versionTag; + if (checked) { + endPointUrl = + '/T_ARMS_REQSTATUS_' + $('#country').val() + '/getStatusMonitor.do?disable=true&versionTag=' + versionTag; common_dataTableLoad($('#country').val(), endPointUrl); - - }else{ - - endPointUrl = "/T_ARMS_REQSTATUS_" + $('#country').val() + "/getStatusMonitor.do?disable=false&versionTag=" + versionTag; + } else { + endPointUrl = + '/T_ARMS_REQSTATUS_' + $('#country').val() + '/getStatusMonitor.do?disable=false&versionTag=' + versionTag; common_dataTableLoad($('#country').val(), endPointUrl); - } - } }); } -function bind_VersionData_By_PdService(){ - $(".multiple-select option").remove(); +function bind_VersionData_By_PdService() { + $('.multiple-select option').remove(); $.ajax({ - url: "/auth-user/api/arms/pdServiceVersion/getVersion.do?c_id=" + $('#country').val(), - type: "GET", - contentType: "application/json;charset=UTF-8", - dataType : "json", + url: '/auth-user/api/arms/pdServiceVersion/getVersion.do?c_id=' + $('#country').val(), + type: 'GET', + contentType: 'application/json;charset=UTF-8', + dataType: 'json', progress: true, statusCode: { - 200: function(data) { - + 200: function (data) { ////////////////////////////////////////////////////////// - for(var k in data){ + for (var k in data) { var obj = data[k]; var $opt = $('