Index: arms/detail.html =================================================================== diff -u -r8660eb8c0251c30b523e91ea8e4a48e73ed572ee -rbd47d827ffe7da32f6b81b8462e748b7fd34f72b --- arms/detail.html (.../detail.html) (revision 8660eb8c0251c30b523e91ea8e4a48e73ed572ee) +++ arms/detail.html (.../detail.html) (revision bd47d827ffe7da32f6b81b8462e748b7fd34f72b) @@ -605,156 +605,152 @@

요구사항 목록

+
+
+ 제품(서비스) :  +
-
- 제품(서비스) :  +
+
- -
-

해당 상세 정보

-
- 최신 버전 :  -
-
-
    - -
  • -
    - 요구사항 연관 버전 -
    -
    -
    -
    -
    +
    +
    + 최신 버전 :  +
    +
    +
      + +
    • +
      + 요구사항 연관 버전
      -
    -
    • - -
  • -
    - 요구사항 아이디 -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    • -
  • -
    - 요구사항 제목 -
    -
    -
    -
    -
    +
    • + +
  • +
    + 요구사항 아이디
    -
- -
  • -
    - 요구사항 작성자 -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    • -
  • -
    - 요구사항 최근 작성일 -
    -
    -
    -
    -
    +
    • +
  • +
    + 요구사항 제목
    -
    • - -
  • -
    - 제품(서비스) 리뷰어 -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    • - -
  • -
    -
    -
    -
    -
    -
    +
    • +
  • +
    + 요구사항 작성자
    -
    • - - -
  • -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    • - -
  • -
    -
    -
    -
    -
    -
    +
    • +
  • +
    + 요구사항 최근 작성일
    - -
    • - -
  • -
    -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    -
    -
    • + +
  • +
    + 제품(서비스) 리뷰어 +
    +
    +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    +
    +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    +
    +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    +
    +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    +
    +
    +
    +
    +
    +
    +
    • -
  • -
    - 요구사항 상세 -
    -
    - -
    -
    • - +
  • +
    + 요구사항 상세 +
    +
    +
    +
    • + + - - - Index: arms/html/armsDetailExceptTemplate/assets/css/detail.css =================================================================== diff -u -r8660eb8c0251c30b523e91ea8e4a48e73ed572ee -rbd47d827ffe7da32f6b81b8462e748b7fd34f72b --- arms/html/armsDetailExceptTemplate/assets/css/detail.css (.../detail.css) (revision 8660eb8c0251c30b523e91ea8e4a48e73ed572ee) +++ arms/html/armsDetailExceptTemplate/assets/css/detail.css (.../detail.css) (revision bd47d827ffe7da32f6b81b8462e748b7fd34f72b) @@ -8,9 +8,11 @@ } .shadow-box { + padding: 12px 10px 12px 10px; border-top: 3px solid #d2d6de; box-shadow: 0 0.525rem 2.55rem rgba(0,0,0,.075) !important; } + /* 파일 관련 CSS */ .portfolio .portfolio-wrap .portfolio-info { overflow-wrap: anywhere; @@ -52,6 +54,11 @@ height:712px !important; } +.jstree-lightblue4 .jstree-hovered { color: #ffffff; background-color: rgba(255, 106, 0, 0.60) !important; border-color: rgba(0, 0, 0, 0.15); padding:0 2px 0 1px; } +.jstree-lightblue4 .jstree-clicked { color: #ffffff; background-color: #ffee58!important; border-color: rgba(0, 0, 0, 0.15); padding:0 2px 0 1px; } +.about .content ul li:last-child { + margin-bottom: 0px!important; +} /* QnA 게시판 관련 CSS */ .chat-btn { Index: arms/html/armsDetailExceptTemplate/assets/css/style.css =================================================================== diff -u -ra905b3c4fbe0bdeab85e0a82ba6115de5499e3fd -rbd47d827ffe7da32f6b81b8462e748b7fd34f72b --- arms/html/armsDetailExceptTemplate/assets/css/style.css (.../style.css) (revision a905b3c4fbe0bdeab85e0a82ba6115de5499e3fd) +++ arms/html/armsDetailExceptTemplate/assets/css/style.css (.../style.css) (revision bd47d827ffe7da32f6b81b8462e748b7fd34f72b) @@ -300,7 +300,7 @@ #home .social-links a:hover { color: #0563bb; } -@media (max-width: 992px) { +@media (max-width: 768px) { /* 원래 992px */ #home { text-align: center; } Index: arms/js/detail.js =================================================================== diff -u -ra905b3c4fbe0bdeab85e0a82ba6115de5499e3fd -rbd47d827ffe7da32f6b81b8462e748b7fd34f72b --- arms/js/detail.js (.../detail.js) (revision a905b3c4fbe0bdeab85e0a82ba6115de5499e3fd) +++ arms/js/detail.js (.../detail.js) (revision bd47d827ffe7da32f6b81b8462e748b7fd34f72b) @@ -242,9 +242,16 @@ fileLoadByPdService(); } else if (element === "#question") { + + if (callAPI("reqCommentAPI")) { + return; + } + getTotalCount(); getReqCommentList(1); + + calledAPIs["reqCommentAPI"] = true; } visibilityStatus[element] = true; @@ -566,21 +573,122 @@ var serviceNameForURL = "/auth-user/api/arms/reqAdd/T_ARMS_REQADD_" + selectedPdService; // common.js에 정의되어있는 함수 - jsTreeBuild(jQueryElementID, serviceNameForURL); + detailTreeBuild(jQueryElementID, serviceNameForURL); calledAPIs["allReqListAPI"] = true; } +function detailTreeBuild(jQueryElementID, serviceNameForURL) { + console.log("common :: detailTreeBuild : ( jQueryElementID ) → " + jQueryElementID); + console.log("common :: detailTreeBuild : ( serviceNameForURL ) → " + serviceNameForURL); + console.log("common :: detailTreeBuild : ( href ) → " + $(location).attr("href")); + console.log("common :: detailTreeBuild : ( protocol ) → " + $(location).attr("protocol")); + console.log("common :: detailTreeBuild : ( host ) → " + $(location).attr("host")); + console.log("common :: detailTreeBuild : ( pathname ) → " + $(location).attr("pathname")); + console.log("common :: detailTreeBuild : ( search ) → " + $(location).attr("search")); + console.log("common :: detailTreeBuild : ( hostname ) → " + $(location).attr("hostname")); + console.log("common :: detailTreeBuild : ( port ) → " + $(location).attr("port")); + + $(jQueryElementID) + .bind("before.jstree", function (e, data) { + $("#alog").append(data.func + "
    "); + $("li:not([rel='drive']).jstree-open > a > .jstree-icon").css( + "background-image", + "url(../reference/jquery-plugins/jstree-v.pre1.0/themes/open_folder.png)" + ); + $("li:not([rel='drive']).jstree-closed > a > .jstree-icon").css( + "background-image", + "url(../reference/jquery-plugins/jstree-v.pre1.0/themes/folder.png)" + ); + }) + .jstree({ + // List of active plugins + plugins: ["themes", "json_data", "ui", "types"], + themes: { theme: ["lightblue4"] }, + json_data: { + ajax: { + url: serviceNameForURL + "/getChildNode.do", + cache: false, + data: function (n) { + console.log("[ common :: detailTreeBuild ] :: json data load = " + JSON.stringify(n)); + return { + c_id: n.attr ? n.attr("id").replace("node_", "").replace("copy_", "") : 1 + }; + }, + success: function (n) { + jSuccess("Product(service) Data Load Complete"); + } + } + }, + types: { + max_depth: -1, + max_children: -1, + valid_children: ["drive"], + types: { + default: { + valid_children: "none", + icon: { + image: "../reference/jquery-plugins/jstree-v.pre1.0/themes/search.png" + } + }, + folder: { + valid_children: ["default", "folder"], + icon: { + image: "../reference/jquery-plugins/jstree-v.pre1.0/themes/folder.png" + } + }, + drive: { + valid_children: ["default", "folder"], + icon: { + image: "../reference/jquery-plugins/jstree-v.pre1.0/themes/root.png" + }, + start_drag: false, + move_node: false, + delete_node: false, + remove: false + } + } + }, + ui: { + initially_select: ["node_4"] + }, + core: { + initially_open: ["node_2"] + } + }) + .bind("select_node.jstree", function (event, data) { + // `data.rslt.obj` is the jquery extended node that was clicked + if ($.isFunction(detailTreeClick)) { + console.log("[ detailTreeBuild :: select_node ] :: data.rslt.obj.data('id')" + data.rslt.obj.attr("id")); + console.log("[ detailTreeBuild :: select_node ] :: data.rslt.obj.data('rel')" + data.rslt.obj.attr("rel")); + console.log("[ detailTreeBuild :: select_node ] :: data.rslt.obj.data('class')" + data.rslt.obj.attr("class")); + console.log("[ detailTreeBuild :: select_node ] :: data.rslt.obj.children('a')" + data.rslt.obj.children("a")); + console.log("[ detailTreeBuild :: select_node ] :: data.rslt.obj.children('ul')" + data.rslt.obj.children("ul")); + detailTreeClick(data.rslt.obj); + } + }) + .bind("loaded.jstree", function (event, data) { + /* setTimeout(function () { + $(jQueryElementID).jstree("open_all"); + }, 1500);*/ + + $(jQueryElementID).slimscroll({ + height: "545px" + }); + }); +} + /* 수정 - 김찬호 작성일 - 0929 +수정일 - 1010(박현민) - 메소드 명 수정 트리에서 해당 요구사항 클릭시 해당 요구사항 아이디 조회 */ -function jsTreeClick(selectedNode) { +function detailTreeClick(selectedNode) { - console.log("[ reqAdd :: jsTreeClick ] :: selectedNode "); + console.log("[ detail :: detailTreeClick ] :: selectedNode "); selectedJsTreeId = selectedNode.attr("id").replace("node_", "").replace("copy_", "");//요구사항 아이디 selectedJsTreeName = $("#req_tree").jstree("get_selected").text(); @@ -778,7 +886,9 @@ dataType: "json" }).done(function (result) { console.log(result.files); + calledAPIs["fileAPI"] = true; + /* 데이터가 없을 때 처리 */ if (result.files.length === 0) { let $container = $('#files-container'); @@ -871,7 +981,6 @@ } jSuccess("파일 조회가 완료 되었습니다."); - calledAPIs["fileAPI"] = true; }); } @@ -890,9 +999,15 @@ // ------------------ QnA 게시판보기 ------------------ // function reqCommentListViewTabClick() { $("#get_req_comment_list").click(function () { - getTotalCount(); + if (callAPI("reqCommentAPI")) { + return; + } + + getTotalCount(); getReqCommentList(1); + + calledAPIs["reqCommentAPI"] = true; }); } @@ -938,7 +1053,7 @@ console.log(totalReqCommentCount); - if (totalReqCommentCount !== null|| totalReqCommentCount !== 0) { + if (totalReqCommentCount !== null && totalReqCommentCount > 0) { totalPages = Math.ceil(totalReqCommentCount / pageSize); console.log("totalPages : " + totalPages); @@ -949,6 +1064,13 @@ } else{ //alert("검색되는 주소없음") + var $chatMessages = $('#chat_messages'); + $chatMessages.empty(); + + var $noDataHtml = $(`

    + 등록된 글이 없습니다. +

    `); + $chatMessages.append($noDataHtml); return; } Index: reference/jquery-plugins/jstree-v.pre1.0/themes/folder.png =================================================================== diff -u Binary files differ Index: reference/jquery-plugins/jstree-v.pre1.0/themes/open_folder.png =================================================================== diff -u Binary files differ Index: reference/jquery-plugins/jstree-v.pre1.0/themes/root.png =================================================================== diff -u Binary files differ Index: reference/jquery-plugins/jstree-v.pre1.0/themes/search.png =================================================================== diff -u Binary files differ