Index: arms/html/pdService/content-container.html =================================================================== diff -u -r5e6dea3b09334ea479485189ad9080520feb35e2 -r099810fe63d8a944c7a0b165886f8232057c4244 --- arms/html/pdService/content-container.html (.../content-container.html) (revision 5e6dea3b09334ea479485189ad9080520feb35e2) +++ arms/html/pdService/content-container.html (.../content-container.html) (revision 099810fe63d8a944c7a0b165886f8232057c4244) @@ -418,8 +418,8 @@ - Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r59476480449f0f45fd8cfa02a051fbc5abbea766 -r099810fe63d8a944c7a0b165886f8232057c4244 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 59476480449f0f45fd8cfa02a051fbc5abbea766) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 099810fe63d8a944c7a0b165886f8232057c4244) @@ -219,6 +219,12 @@ } var selectedData = tempDataTable.row(this).data(); + selectedData.selectedIndex = $(this).closest('tr').index(); + + var info = tempDataTable.page.info(); + console.log( 'Showing page: '+info.page+' of '+info.pages ); + selectedData.selectedPage = info.page; + dataTableClick(selectedData); }); Index: arms/js/pdService.js =================================================================== diff -u -r5e6dea3b09334ea479485189ad9080520feb35e2 -r099810fe63d8a944c7a0b165886f8232057c4244 --- arms/js/pdService.js (.../pdService.js) (revision 5e6dea3b09334ea479485189ad9080520feb35e2) +++ arms/js/pdService.js (.../pdService.js) (revision 099810fe63d8a944c7a0b165886f8232057c4244) @@ -1,5 +1,7 @@ let selectId; // 제품 아이디 let selectName; // 제품 이름 +let selectedIndex; // 데이터테이블 선택한 인덱스 +let selectedPage; // 데이터테이블 선택한 인덱스 let selectVersion; // 선택한 버전 아이디 let dataTableRef; // 데이터테이블 참조 변수 @@ -16,7 +18,7 @@ .css("height", height + "px"); }); $("#extendModalPopupId").click(function () { - var height = $(document).height() - 700; + var height = $(document).height() - 1000; $(".modal-body") .find(".cke_contents:eq(0)") .css("height", height + "px"); @@ -28,17 +30,100 @@ var selectedId = $('#pdserviceTable').DataTable().rows('.selected').data()[0].c_id; console.log("selectedId ->" + selectedId); + // 제품(서비스) 이름 $("#extend-editView-pdService-name").val($("#editView-pdService-name").val()); - // c_id: $('#pdserviceTable').DataTable().rows('.selected').data()[0].c_id, - // c_title: $("#editView-pdService-name").val(), - // c_owner: $('#editView-pdService-owner').select2('data')[0].text, - // c_reviewer01: reviewers01, - // c_reviewer02: reviewers02, - // c_reviewer03: reviewers03, - // c_reviewer04: reviewers04, - // c_reviewer05: reviewers05, - // c_contents: CKEDITOR.instances["input_pdservice_editor"].getData(), + // 오너 + // clear + $('#extend-editView-pdService-owner').val(null).trigger('change'); + + // 부모 페이지에서 데이터 로드 + var owner = "none"; + if($('#editView-pdService-owner').select2('data')[0] != undefined){ + owner = $('#editView-pdService-owner').select2('data')[0].text; + } + + // Modal 창에 데이터 셋팅 + if( owner == null || owner == "none"){ + console.log("pdServiceDataTableClick :: json.c_owner empty"); + }else { + var newOption = new Option(owner, owner, true, true); + $('#extend-editView-pdService-owner').append(newOption).trigger('change'); + } + + // 리뷰어 + //clear + $('#extend-editView-pdService-reviewers').val(null).trigger('change'); + + var reviewer01 = "none"; + var reviewer02 = "none"; + var reviewer03 = "none"; + var reviewer04 = "none"; + var reviewer05 = "none"; + + if($('#editView-pdService-reviewers').select2('data')[0] != undefined){ + reviewer01 = $('#editView-pdService-reviewers').select2('data')[0].text; + } + if($('#editView-pdService-reviewers').select2('data')[1] != undefined){ + reviewer02 = $('#editView-pdService-reviewers').select2('data')[1].text; + } + if($('#editView-pdService-reviewers').select2('data')[2] != undefined){ + reviewer03 = $('#editView-pdService-reviewers').select2('data')[2].text; + } + if($('#editView-pdService-reviewers').select2('data')[3] != undefined){ + reviewer04 = $('#editView-pdService-reviewers').select2('data')[3].text; + } + if($('#editView-pdService-reviewers').select2('data')[4] != undefined){ + reviewer05 = $('#editView-pdService-reviewers').select2('data')[4].text; + } + + var reviewer01Option = new Option(reviewer01, reviewer01, true, true); + var reviewer02Option = new Option(reviewer02, reviewer02, true, true); + var reviewer03Option = new Option(reviewer03, reviewer03, true, true); + var reviewer04Option = new Option(reviewer04, reviewer04, true, true); + var reviewer05Option = new Option(reviewer05, reviewer05, true, true); + + var multifyValue = 1; + if(reviewer01 == null || reviewer01 == "none"){ + console.log("extendModalPopupId Click :: reviewer01 empty"); + }else{ + multifyValue = multifyValue + 1; + $('#extend-editView-pdService-reviewers').append(reviewer01Option); + } + if(reviewer02 == null || reviewer02 == "none"){ + console.log("extendModalPopupId Click :: reviewer02 empty"); + }else{ + multifyValue = multifyValue + 1; + $('#extend-editView-pdService-reviewers').append(reviewer02Option); + } + if(reviewer03 == null || reviewer03 == "none"){ + console.log("extendModalPopupId Click :: reviewer03 empty"); + }else{ + multifyValue = multifyValue + 1; + $('#extend-editView-pdService-reviewers').append(reviewer03Option); + } + if(reviewer04 == null || reviewer04 == "none"){ + console.log("extendModalPopupId Click :: reviewer04 empty"); + }else{ + multifyValue = multifyValue + 1; + $('#extend-editView-pdService-reviewers').append(reviewer04Option); + } + if(reviewer05 == null || reviewer05 == "none"){ + console.log("extendModalPopupId Click :: reviewer05 empty"); + }else{ + multifyValue = multifyValue + 1; + $('#extend-editView-pdService-reviewers').append(reviewer05Option); + } + + $('#extend-editView-pdService-reviewers').trigger('change'); + + $('#extend-editView-pdService-reviewer').css('height','20px'); + setTimeout(function () { + var heightValue = $('#extend-editView-pdService-reviewer').height(); + var resultValue = heightValue + ( 20 * multifyValue ); + $('#extend-editView-pdService-reviewer').css('height',resultValue+'px'); + }, 250); + }); // --- select2 (사용자 자동완성 검색 ) 설정 --- // @@ -223,6 +308,9 @@ // 데이터 테이블 구성 이후 꼭 구현해야 할 메소드 : 열 클릭시 이벤트 function dataTableClick(selectedData){ + + selectedIndex = selectedData.selectedIndex; + selectedPage = selectedData.selectedPage; selectId = selectedData.c_id; $('#fileIdLink').val(selectedData.c_id); selectName = selectedData.c_title; @@ -445,6 +533,11 @@ // 제품(서비스) 변경 저장 버튼 $("#pdServiceUpdate").click(function () { + var owner = "none"; + if($('#editView-pdService-owner').select2('data')[0] != undefined){ + owner = $('#editView-pdService-owner').select2('data')[0].text; + } + var reviewers01 = "none"; var reviewers02 = "none"; var reviewers03 = "none"; @@ -472,7 +565,7 @@ data: { c_id: $('#pdserviceTable').DataTable().rows('.selected').data()[0].c_id, c_title: $("#editView-pdService-name").val(), - c_owner: $('#editView-pdService-owner').select2('data')[0].text, + c_owner: owner, c_reviewer01: reviewers01, c_reviewer02: reviewers02, c_reviewer03: reviewers03, @@ -486,4 +579,81 @@ }, }, }); +}); + + +// 팝업에서 제품(서비스) 변경 저장 버튼 +$("#extendUpdate-pdService").click(function () { + + var owner = "none"; + if($('#extend-editView-pdService-owner').select2('data')[0] != undefined){ + owner = $('#extend-editView-pdService-owner').select2('data')[0].text; + } + + var reviewers01 = "none"; + var reviewers02 = "none"; + var reviewers03 = "none"; + var reviewers04 = "none"; + var reviewers05 = "none"; + if($('#extend-editView-pdService-reviewers').select2('data')[0] != undefined){ + reviewers01 = $('#extend-editView-pdService-reviewers').select2('data')[0].text; + } + if($('#extend-editView-pdService-reviewers').select2('data')[1] != undefined){ + reviewers02 = $('#extend-editView-pdService-reviewers').select2('data')[1].text; + } + if($('#extend-editView-pdService-reviewers').select2('data')[2] != undefined){ + reviewers03 = $('#extend-editView-pdService-reviewers').select2('data')[2].text; + } + if($('#extend-editView-pdService-reviewers').select2('data')[3] != undefined){ + reviewers04 = $('#extend-editView-pdService-reviewers').select2('data')[3].text; + } + if($('#extend-editView-pdService-reviewers').select2('data')[4] != undefined){ + reviewers05 = $('#extend-editView-pdService-reviewers').select2('data')[4].text; + } + + $.ajax({ + url: "/auth-user/api/arms/pdservice/updatePdServiceNode.do", + type: "POST", + data: { + c_id: $('#pdserviceTable').DataTable().rows('.selected').data()[0].c_id, + c_title: $("#extend-editView-pdService-name").val(), + c_owner: owner, + c_reviewer01: reviewers01, + c_reviewer02: reviewers02, + c_reviewer03: reviewers03, + c_reviewer04: reviewers04, + c_reviewer05: reviewers05, + c_contents: CKEDITOR.instances["extendModalEditor"].getData(), + }, + statusCode: { + 200: function () { + //모달 팝업 끝내고 + $('#extendClose-pdService').trigger('click'); + + jSuccess($("#extend-editView-pdService-name").val() + "의 데이터가 변경되었습니다."); + + $('#fileIdLink').val(selectId); + pdServiceDataTableClick(selectId); + + //파일 업로드 관련 레이어 보이기 처리 + $('.body-middle').show(); + + //파일 리스트 초기화 + $("table tbody.files").empty(); + // Load existing files: + var $fileupload = $('#fileupload'); + // Load existing files: + $.ajax({ + // Uncomment the following to send cross-domain cookies: + //xhrFields: {withCredentials: true}, + url: '/auth-user/api/arms/fileRepository/getFilesByNode.do', + data: { fileIdLink: selectId }, + dataType: 'json', + context: $fileupload[0] + }).done(function (result) { + $(this).fileupload('option', 'done').call(this, null, {result: result}); + }); + }, + }, + }); }); \ No newline at end of file