Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js
===================================================================
diff -u -r19f54f3fdc1ef0f050e34673a5c66b1d5466e684 -rbe8be796123f78c7b4630f02d7d096b2636bc6b2
--- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 19f54f3fdc1ef0f050e34673a5c66b1d5466e684)
+++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision be8be796123f78c7b4630f02d7d096b2636bc6b2)
@@ -29,8 +29,8 @@
proxies: [
{
context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'],
- // host: 'www.313.co.kr',
- host: '127.0.0.1',
+ host: 'www.313.co.kr',
+ // host: '127.0.0.1',
port: 13131,
https: false,
changeOrigin: true
Index: arms/html/pdServiceVersion/content-container.html
===================================================================
diff -u -r19f54f3fdc1ef0f050e34673a5c66b1d5466e684 -rbe8be796123f78c7b4630f02d7d096b2636bc6b2
--- arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 19f54f3fdc1ef0f050e34673a5c66b1d5466e684)
+++ arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision be8be796123f78c7b4630f02d7d096b2636bc6b2)
@@ -350,7 +350,7 @@
내용
-
@@ -368,7 +368,7 @@
-
Index: arms/js/pdServiceVersion.js
===================================================================
diff -u -r68ab300bf0062df683ef80ffcf285525292258f4 -rbe8be796123f78c7b4630f02d7d096b2636bc6b2
--- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 68ab300bf0062df683ef80ffcf285525292258f4)
+++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision be8be796123f78c7b4630f02d7d096b2636bc6b2)
@@ -4,7 +4,7 @@
// --- 에디터 설정 --- //
CKEDITOR.replace("input_pdservice_editor");
-CKEDITOR.replace("modal-editor");
+CKEDITOR.replace("extendModalEditor");
@@ -70,13 +70,15 @@
// --- 팝업 띄울때 사이즈 조정 -- //
function modalPopup(id) {
- // modalPopupId = 신규버전
+ // modalPopupId = 신규버전
if (id === 'modalPopupId') {
$("#modalTitle").text('제품(서비스) 신규 버전 등록 팝업');
$("#modalSub").text('선택한 제품(서비스)에 버전을 등록합니다.');
+
} else {
$("#modalTitle").text('제품(서비스) 버전 등록 / 변경');
$("#modalSub").text('선택한 제품(서비스)에 버전을 등록/변경 합니다.');
+
}
var height = $(document).height() - 800;
@@ -112,13 +114,6 @@
// 데이터 테이블 구성 이후 꼭 구현해야 할 메소드 : 열 클릭시 이벤트
function dataTableClick(selectedData) {
- //
- selectedIndex = selectedData.selectedIndex;
- selectedPage = selectedData.selectedPage;
- selectId = selectedData.c_id;
- //pdServiceVersionDataTableClick(selectedData.c_id);
- //pdServiceName/
- //
$("#versionContents").html("");
selectId = selectedData.c_id;
@@ -127,131 +122,7 @@
dataLoad(selectedData.c_id, selectedData.c_title);
}
-//제품(서비스) 클릭할 때 동작하는 함수
-//1. 상세보기 데이터 바인딩
-//2. 편집하기 데이터 바인딩
-function pdServiceVersionDataTableClick(c_id) {
- selectVersion = c_id;
-
- $.ajax({
- url: "/auth-user/api/arms/pdservice/getNode.do", // 클라이언트가 HTTP 요청을 보낼 서버의 URL 주소
- data: { c_id: c_id }, // HTTP 요청과 함께 서버로 보낼 데이터
- method: "GET", // HTTP 요청 메소드(GET, POST 등)
- dataType: "json", // 서버에서 보내줄 데이터의 타입
- })
- // HTTP 요청이 성공하면 요청한 데이터가 done() 메소드로 전달됨.
- .done(function (json) {
-
- $("#detailView-pdService-name").text(json.c_title);
- if (json.c_owner == null || json.c_owner == "none") {
- $("#detailView-pdService-owner").text("책임자가 존재하지 않습니다.");
- } else {
- $("#detailView-pdService-owner").text(json.c_owner);
- }
-
- if (json.c_reviewer01 == null || json.c_reviewer01 == "none") {
- $("#detailView-pdService-reviewer01").text("리뷰어(연대책임자)가 존재하지 않습니다.");
- } else {
- $("#detailView-pdService-reviewer01").text(json.c_reviewer01);
- }
-
- if (json.c_reviewer02 == null || json.c_reviewer02 == "none") {
- } else {
- $("#detailView-pdService-reviewer02").text(json.c_reviewer02);
- }
-
- if (json.c_reviewer03 == null || json.c_reviewer03 == "none") {
- } else {
- $("#detailView-pdService-reviewer03").text(json.c_reviewer03);
- }
-
- if (json.c_reviewer04 == null || json.c_reviewer04 == "none") {
- } else {
- $("#detailView-pdService-reviewer04").text(json.c_reviewer04);
- }
-
- if (json.c_reviewer05 == null || json.c_reviewer05 == "none") {
- } else {
- $("#detailView-pdService-reviewer05").text(json.c_reviewer05);
- }
- $("#detailView-pdService-contents").html(json.c_contents);
-
- $("#editView-pdService-name").val(json.c_title);
-
- //clear
- $('#editView-pdService-owner').val(null).trigger('change');
-
- if (json.c_owner == null || json.c_owner == "none") {
- console.log("pdServiceDataTableClick :: json.c_owner empty");
- } else {
- var newOption = new Option(json.c_owner, json.c_owner, true, true);
- $('#editView-pdService-owner').append(newOption).trigger('change');
- }
- //clear
- $('#editView-pdService-reviewers').val(null).trigger('change');
-
- var reviewer01Option = new Option(json.c_reviewer01, json.c_reviewer01, true, true);
- var reviewer02Option = new Option(json.c_reviewer02, json.c_reviewer02, true, true);
- var reviewer03Option = new Option(json.c_reviewer03, json.c_reviewer03, true, true);
- var reviewer04Option = new Option(json.c_reviewer04, json.c_reviewer04, true, true);
- var reviewer05Option = new Option(json.c_reviewer05, json.c_reviewer05, true, true);
-
- var multifyValue = 1;
- if (json.c_reviewer01 == null || json.c_reviewer01 == "none") {
- console.log("pdServiceDataTableClick :: json.c_reviewer01 empty");
- } else {
- multifyValue = multifyValue + 1;
- $('#editView-pdService-reviewers').append(reviewer01Option);
- }
- if (json.c_reviewer02 == null || json.c_reviewer02 == "none") {
- console.log("pdServiceDataTableClick :: json.c_reviewer02 empty");
- } else {
- multifyValue = multifyValue + 1;
- $('#editView-pdService-reviewers').append(reviewer02Option);
- }
- if (json.c_reviewer03 == null || json.c_reviewer03 == "none") {
- console.log("pdServiceDataTableClick :: json.c_reviewer03 empty");
- } else {
- multifyValue = multifyValue + 1;
- $('#editView-pdService-reviewers').append(reviewer03Option);
- }
- if (json.c_reviewer04 == null || json.c_reviewer04 == "none") {
- console.log("pdServiceDataTableClick :: json.c_reviewer04 empty");
- } else {
- multifyValue = multifyValue + 1;
- $('#editView-pdService-reviewers').append(reviewer04Option);
- }
- if (json.c_reviewer05 == null || json.c_reviewer05 == "none") {
- console.log("pdServiceDataTableClick :: json.c_reviewer05 empty");
- } else {
- multifyValue = multifyValue + 1;
- $('#editView-pdService-reviewers').append(reviewer05Option);
- }
-
- $('#editView-pdService-reviewers').trigger('change');
-
- CKEDITOR.instances.input_pdservice_editor.setData(json.c_contents);
-
- $('#editView-pdService-reviewer').css('height', '20px');
- setTimeout(function () {
- var heightValue = $('#editView-pdService-reviewer').height();
- var resultValue = heightValue + (20 * multifyValue);
- $('#editView-pdService-reviewer').css('height', resultValue + 'px');
- }, 250);
- })
- // HTTP 요청이 실패하면 오류와 상태에 관한 정보가 fail() 메소드로 전달됨.
- .fail(function (xhr, status, errorThrown) {
- console.log(xhr + status + errorThrown);
- })
- //
- .always(function (xhr, status) {
- $("#text").html("요청이 완료되었습니다!");
- console.log(xhr + status);
- });
-}
-
-
// 버전 삭제 버튼
$("#delVersion").click(function () {
console.log("delete btn");
@@ -289,6 +160,7 @@
statusCode: {
200: function () {
console.log("성공!");
+ jSuccess("데이터가 변경되었습니다.");
//모달 팝업 끝내고
$('#close-version').trigger('click');
//버전 데이터 재 로드
@@ -298,7 +170,33 @@
});
});
+// 버전 팝업 업데이트
+$("#extendUpdate-pdService-version").click(function () {
+ console.log("update btn");
+ $.ajax({
+ url: "/auth-user/api/arms/pdversion/updateVersionNode.do",
+ type: "POST",
+ data: {
+ c_id: selectVersion,
+ c_title: $("#tooltip-enabled-service-version").val(),
+ c_contents: CKEDITOR.instances["extendModalEditor"].getData(),
+ c_start_date: $("#btn-enabled-date").val(),
+ c_end_date: $("#btn-end-date").val(),
+ },
+ statusCode: {
+ 200: function () {
+ console.log("성공!");
+ jSuccess("데이터가 변경되었습니다.");
+ //모달 팝업 끝내고
+ $('#close-version').trigger('click');
+ //버전 데이터 재 로드
+ dataLoad(selectId, selectName);
+ },
+ },
+ });
+});
+
// 신규 버전 등록 버튼
$("#regist-version").click(function () {
console.log("save btn");
@@ -339,6 +237,30 @@
$(".list-group-item").text(selectedText);
$("#tooltip-enabled-service-name").val(selectedText);
+ // 상세보기
+ selectVersion = json[0].c_id;
+ $("#pdServiceName").text(selectedText);
+ $("#pdServiceVersion").text(json[0].c_title);
+ $("#versionStartDate").text(json[0].c_start_date);
+ $("#versionEndDate").text(json[0].c_end_date);
+ $("#versionContents").html(json[0].c_contents);
+
+ // 상세보기 편집하기
+ $("#input_pdserviceName").val(selectedText);
+ $("#input_pdserviceVersion").val(json[0].c_title);
+ $("#input_pdservice_start_date").val(json[0].c_start_date);
+ $("#input_pdservice_end_date").val(json[0].c_end_date);
+ CKEDITOR.instances.input_pdservice_editor.setData(json[0].c_contents);
+
+ //편집하기 팝업
+ $("#tooltip-enabled-service-name").val(selectedText);
+ $("#tooltip-enabled-service-version").val(json[0].c_title);
+ $("#btn-enabled-date").val(json[0].c_start_date);
+ $("#btn-end-date").val(json[0].c_end_date);
+ CKEDITOR.instances.extendModalEditor.setData(json[0].c_contents);
+
+
+
//데이터 로드를 사용자에게 알리기
Messenger().post({
message: 'Version Data 조회를 완료하였습니다.',
@@ -377,8 +299,8 @@
class="btn btn-primary btn-block"
id="modalPopupId"
data-toggle="modal"
- data-target="#myModal2"
- onClick="modalPopup(modalPopupId)"
+ data-target="#myModal2"
+ onClick="modalPopup(modalPopupId)"
>신규 버전 등록하기`;
for (let i = 0; i < menu.length; i++) {
@@ -400,7 +322,6 @@
//2. 편집하기 데이터 바인딩
function versionClick(c_id) {
selectVersion = c_id;
-
$.ajax({
url: "/auth-user/api/arms/pdversion/getNode.do", // 클라이언트가 HTTP 요청을 보낼 서버의 URL 주소
data: { c_id: c_id }, // HTTP 요청과 함께 서버로 보낼 데이터