Index: arms/html/reqReviewDetail/content-container.html =================================================================== diff -u -ra61066c5c24b7585a8eae25949e1c205439cc749 -r6614b86af0c8a024c66d60b3dcec8a971824c336 --- arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision a61066c5c24b7585a8eae25949e1c205439cc749) +++ arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 6614b86af0c8a024c66d60b3dcec8a971824c336) @@ -20,7 +20,7 @@ Specification
  • - Code diff + Requirement Info
    • @@ -78,7 +78,168 @@ -
    +
    + +
    +
    +
    + 보류 + 거절 + 승인 +
    +
    +
    +
    +

    Requirement Information

    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    +
    + + + +
    +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    + +
    +
    +
    +
    + +
    + + +   +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    + 문서로 보기 : +
    +


    +
    +
    +
    +
    @@ -193,9 +354,107 @@ .d2h-file-name-wrapper > svg { width: 22px; } + + + .modalDarkBack{ + background: rgb(51 51 51 / 94%) !important; + border: 1px solid rgb(51 51 51) !important; + } + + .new-tab-open .product-handler, + .new-tab-open .pull-right { + display: none; + } + + .product-handler { + display: flex; + justify-content: space-between; + } + .product-handler__group { + display: flex; + gap: 7px; + } + .product-handler .btn-block { + margin: 0; + max-width: 160px; + } + .btn:focus, + .btn:active:focus { + outline: 0px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + .input-wrap { + display: flex; + height: 30px; + margin-bottom: 7px; + } + .input-wrap .input-group-addon { + width: 40px; + height: 30px; + } + .input-wrap .select2-selection--single, + .input-wrap .select2-selection--multiple { + height: 30px !important; + min-height: 30px !important; + } + .input-wrap .select2-selection__placeholder { + padding-left: 2px !important; + } + .input-wrap .select2-selection--multiple ul { + padding-left: 10px !important; + } + .input-wrap .select2-search--inline, + .input-wrap .select2-search--inline input { + width: 100% !important; + } + .form-control:focus { + box-shadow: none; + } + + #service-reviewers, + #service-reviewers a { + display: flex; + align-items: center; + gap: 10px; + padding: 0; + } + + #service-reviewers a { + gap: 5px; + } + + .profile-image { + width: 24px; + height: 24px; + border-radius: 50%; + overflow: hidden; + } + .profile-image img { + width: 100%; + } + + .btn-transparent.active { + color: white; + background: rgba(51, 51, 51, 0.55); + color: #ffffff; + background-color: #e5603b; + border-color: rgba(0, 0, 0, 0.15); + } + .btn:focus, .btn.focus, .btn:active:focus, .btn:active.focus, .btn.active:focus, .btn.active.focus { + outline: 0px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + .select2-search__field::-webkit-input-placeholder, + .select2-search__field::placeholder { + color: #999 !important; + padding-left: 6px; + } + + + +> \ No newline at end of file Index: arms/js/reqReviewDetail.js =================================================================== diff -u -ra61066c5c24b7585a8eae25949e1c205439cc749 -r6614b86af0c8a024c66d60b3dcec8a971824c336 --- arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision a61066c5c24b7585a8eae25949e1c205439cc749) +++ arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 6614b86af0c8a024c66d60b3dcec8a971824c336) @@ -11,18 +11,176 @@ //getJsonForPrototype("./js/reviewDetailHistory.json", makeHistory); - includeDiff(); + //includeDiff(); getReqReviewHistory(); getReqAdd(); getReqComment(); + setDetailAndEditViewTab(); + }; +/////////////////////////////////////////////////////////////////////////////// +// pdService 정보 가져오기 +/////////////////////////////////////////////////////////////////////////////// +function getPdServiceInfo() { + //정보 셋팅 + var searchParams = new URLSearchParams(location.search); + var c_review_pdservice_link = searchParams.get('c_review_pdservice_link'); + var c_review_req_link = searchParams.get('c_review_req_link'); + $.ajax({ + url: "/auth-user/api/arms/pdService/getNode.do", + data: { + c_id: c_review_pdservice_link, + }, + type: "GET", + progress: true + }).done(function(data) { + + var selectedPdServiceText = data.c_title; + if(isEmpty(selectedPdServiceText)){ + $('#detailView-req-pdService-name').text(""); + }else{ + $('#detailView-req-pdService-name').text(selectedPdServiceText); + } + + }).fail(function(e) { + }).always(function() { + }); + +}; + /////////////////////////////////////////////////////////////////////////////// +// version 정보 가져오기 +/////////////////////////////////////////////////////////////////////////////// +function getVersionInfo(c_version_link) { + //정보 셋팅 + //특수 문자 중에 콤마는 빼고 지움 + var reg = /[\{\}\[\]\/?.;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi; + c_version_link_str = c_version_link.replace(reg,''); + + $.ajax({ + url: "/auth-user/api/arms/pdServiceVersion/getVersions.do", + data: { + c_ids: c_version_link_str, + }, + type: "GET", + progress: true + }).done(function(data) { + + // for(var key in data){ + // var value = data[key]; + // console.log(key + "=" + value); + // } + + var list = ""; + for (var i = 0; i < data.length ; i++) { + console.log( "loop check i = " + i ); + list = list + data[i].c_title; + if( i == data.length-1){ + + }else{ + list = list + " , "; + } + } + + $('#detailView-req-pdService-version').text(list); + + }).fail(function(e) { + }).always(function() { + }); + +}; + + + +//////////////////////////////////////////////////////////////////////////////////////// +//상세 보기 탭 & 편집 탭 +//////////////////////////////////////////////////////////////////////////////////////// +function setDetailAndEditViewTab(){ + + //정보 셋팅 + var searchParams = new URLSearchParams(location.search); + var c_id = searchParams.get('c_id'); + var c_review_pdservice_link = searchParams.get('c_review_pdservice_link'); + var c_review_req_link = searchParams.get('c_review_req_link'); + + var tableName = "T_ARMS_REQADD_" + c_review_pdservice_link; + $.ajax({ + url: "/auth-user/api/arms/reqAdd/" + tableName + "/getNode.do?c_id=" + c_review_req_link, + type: "GET", + contentType: "application/json;charset=UTF-8", + dataType : "json", + progress: true + }).done(function(data) { + + // ------------------ 상세보기 ------------------ // + bindDataDetailTab(data); + + }).fail(function(e) { + }).always(function() { + }); +} + +// ------------------ 상세보기 ------------------ // +function bindDataDetailTab(ajaxData){ + + //제품(서비스) 데이터 바인딩 + getPdServiceInfo(); + + //Version 데이터 바인딩 + if(isEmpty(ajaxData.c_version_link)){ + $('#detailView-req-pdService-version').text("요구사항에 등록된 버전이 없습니다."); + }else{ + getVersionInfo(ajaxData.c_version_link); + } + + + $('#detailView-req-id').text(ajaxData.c_id); + $('#detailView-req-name').text(ajaxData.c_title); + + //우선순위 셋팅 + $('#detailView-req-priority').children('.btn.active').removeClass("active"); + var slectReqPriorityID = "detailView-req-priority-option" + ajaxData.c_priority; + $('#'+slectReqPriorityID).parent().addClass("active"); + + $('#detailView-req-status').text(ajaxData.c_req_status); + $('#detailView-req-writer').text(ajaxData.c_writer); + $('#detailView-req-write-date').text(`${getStrLimit(ajaxData.c_writer_date,35)}`); + + if (ajaxData.c_reviewer01 == null || ajaxData.c_reviewer01 == "none") { + $("#detailView-req-reviewer01").text("리뷰어(연대책임자)가 존재하지 않습니다."); + } else { + $("#detailView-req-reviewer01").text(`${getStrLimit(ajaxData.c_reviewer01,40)}`); + } + if (ajaxData.c_reviewer02 == null || ajaxData.c_reviewer02 == "none") { + $("#detailView-req-reviewer02").text(""); + } else { + $("#detailView-req-reviewer02").text(`${getStrLimit(ajaxData.c_reviewer02,40)}`); + } + if (ajaxData.c_reviewer03 == null || ajaxData.c_reviewer03 == "none") { + $("#detailView-req-reviewer03").text(""); + } else { + $("#detailView-req-reviewer03").text(`${getStrLimit(ajaxData.c_reviewer03,40)}`); + } + if (ajaxData.c_reviewer04 == null || ajaxData.c_reviewer04 == "none") { + $("#detailView-req-reviewer04").text(""); + } else { + $("#detailView-req-reviewer04").text(`${getStrLimit(ajaxData.c_reviewer04,40)}`); + } + if (ajaxData.c_reviewer05 == null || ajaxData.c_reviewer05 == "none") { + $("#detailView-req-reviewer05").text(""); + } else { + $("#detailView-req-reviewer05").text(`${getStrLimit(ajaxData.c_reviewer05,40)}`); + } + $("#detailView-req-contents").html(ajaxData.c_contents); +} + +/////////////////////////////////////////////////////////////////////////////// // 커멘트 조회 /////////////////////////////////////////////////////////////////////////////// function getReqComment() { @@ -49,7 +207,24 @@ history.innerHTML = ''; - let lists = ""; + let lists = "
    \n" + + "\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t\t\"\"\n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t\t3 min\n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t\n" + + "\t\t\t\t\t\t\t\t\t\t\t
    Cenhelm Houston
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t\t\tPretty good. Doing my homework.. No one rejects, dislikes, or avoids\n" + + "\t\t\t\t\t\t\t\t\t\t\t\tpleasure itself, because it is pleasure, but because\n" + + "\t\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t\t
    \n" + + "\t\t\t\t\t\t\t\t\t
    "; data.forEach((item, index) => { lists += `
    @@ -431,7 +606,7 @@ progress: true }).done(function(data) { - includeDiff(); + //includeDiff(); getReqReviewHistory(); @@ -468,7 +643,7 @@ jSuccess("커멘트가 입력되었습니다."); - includeDiff(); + //includeDiff(); getReqReviewHistory(); @@ -480,4 +655,4 @@ }).always(function() { }); -}); \ No newline at end of file +}); Index: arms/reqReviewDetail.html =================================================================== diff -u -rf9616555dc6fd93e23f0ed767ab67b8ef066fca1 -r6614b86af0c8a024c66d60b3dcec8a971824c336 --- arms/reqReviewDetail.html (.../reqReviewDetail.html) (revision f9616555dc6fd93e23f0ed767ab67b8ef066fca1) +++ arms/reqReviewDetail.html (.../reqReviewDetail.html) (revision 6614b86af0c8a024c66d60b3dcec8a971824c336) @@ -1,420 +1,346 @@ - - Atlassian RMS + - - - - + Atlassian RMS - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - + + + - - - - + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - + -
    -
    +
    -
    -
    +
    -
    +
    -
    -
    +
    -
    - -
    -
    +
    -
    - 맨위로 -
    +
    - - - - - - +
    - - - - - - - - - - - - - - - - - +
    + +
    - - - +
    - - - - - - - +
    맨위로
    - - + + + + + + + - - + + + + + + - - + + + + + + + + + + + + + + + + + - - - - + + + - - + + + + + + + - - - - - - + + - - - - - - - + + - - - - - + + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file