Index: arms/html/reqReviewDetail/content-container.html =================================================================== diff -u -r5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9 -rcc1af1d2d4b44e87a3926edd2a260ee5385b04bc --- arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9) +++ arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision cc1af1d2d4b44e87a3926edd2a260ee5385b04bc) @@ -28,44 +28,19 @@
-
#4346345 / 14 Aug 2013
- Some Invoice number description or whatever + 보류 + 거절 + 승인
-
-

Company Information

-

Wrapbootstrap LLC

-
- 2 Infinite Loop
- Minsk, Belarus 220004
- 088.253.5345
- e-mail: - email@example.com
- phone: (012) 345-678-901
- fax: (012) 678-132-901 -
+
-
-

Client Information

-

Veronica Niasvizhskaja

-
- Consultant at Allspana
- e-mail: - maryna@allspana.by
- phone: (012) 345-678-901
- fax: (012) 678-132-901 -
-

- Note:
Some nights I stay up cashing in my bad - luck. Some nights I call it a draw -

-
+
@@ -258,7 +233,7 @@ width: 100%; } .history-profile--name { - flex-basis: 110px; + flex-basis: 100%; } .history-profile .fa { width: 16px; Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 -rcc1af1d2d4b44e87a3926edd2a260ee5385b04bc --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision cc1af1d2d4b44e87a3926edd2a260ee5385b04bc) @@ -154,6 +154,15 @@ }); } +function getStrLimit(inputStr, limitCnt){ + if(isEmpty(inputStr)){ + return ""; + }else if(inputStr.length >= limitCnt){ + return inputStr.substr(0,limitCnt)+"..."; + }else{ + return inputStr; + } +} //서버 바인딩 할 수가 없어서 프로토타입 목적으로 json 을 만들어서 로드하는 함수 const getJsonForPrototype = function (url, bindTemplate) { Index: arms/js/reqReviewDetail.js =================================================================== diff -u -r5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9 -rcc1af1d2d4b44e87a3926edd2a260ee5385b04bc --- arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 5bab2aa3f64bd76a111e36245f7ffe197c2d3bb9) +++ arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision cc1af1d2d4b44e87a3926edd2a260ee5385b04bc) @@ -13,71 +13,71 @@ includeDiff(); - getPdService(); - - //getVersion(); - - getReqReviewHistory(); getReqAdd(); - getReqAddLog(); - }; -function getPdService() { +function getReqAdd() { var searchParams = new URLSearchParams(location.search); console.log(searchParams.get('c_id')); $.ajax({ - url: "/auth-user/api/arms/pdService/getNode.do", + url: "/auth-user/api/arms/reqAdd/T_ARMS_REQADD_" + searchParams.get('c_review_pdservice_link') + "/getNode.do", data: { - c_id: searchParams.get('c_review_pdservice_link') + c_id: searchParams.get('c_review_req_link') }, type: "GET", progress: true, statusCode: { 200: function (json) { - console.log(json); - }, - 401: function (n) { - location.href = "/sso/login"; - }, - }, - }).done(function(data) { + getReqStatus(json.c_issue_link); - for(var key in data){ - var value = data[key]; - console.log(key + "=" + value); - } + ////////////////////////////////////////////////////////////////////////// + var history = document.querySelector(".pdServiceInfo"); - var loopCount = 3; - for (var i = 0; i < loopCount ; i++) { - console.log( "loop check i = " + i ); - } + let lists = ""; + lists += ` +

Review Information

+
+ 요구사항 명 : ${json.c_title}
+ 요구사항 상태 : ${json.c_req_status}
+
+
  • + 리뷰어의 리뷰상황 +
    • +
  • + + ${getStrLimit(json.c_reviewer01,30)} + ${historyReviewerStatus(json.c_reviewer01_status)} +
    • +
  • + + ${getStrLimit(json.c_reviewer02,30)} + ${historyReviewerStatus(json.c_reviewer02_status)} +
    • +
  • + + ${getStrLimit(json.c_reviewer03,30)} + ${historyReviewerStatus(json.c_reviewer03_status)} +
    • +
  • + + ${getStrLimit(json.c_reviewer04,30)} + ${historyReviewerStatus(json.c_reviewer04_status)} +
    • +
  • + + ${getStrLimit(json.c_reviewer05,30)} + ${historyReviewerStatus(json.c_reviewer05_status)} +
    • + `; - }).fail(function(e) { - }).always(function() { - }); -} + history.innerHTML = `${lists}`; + ////////////////////////////////////////////////////////////////////////// -function getReqAddLog() { - - var searchParams = new URLSearchParams(location.search); - console.log(searchParams.get('c_id')); - - $.ajax({ - url: "/auth-user/api/arms/reqAddLog/T_ARMS_REQADD_" + searchParams.get('c_review_pdservice_link') + "/getHistory.do", - data: { - c_id: searchParams.get('c_review_req_link') - }, - type: "GET", - progress: true, - statusCode: { - 200: function (json) { - console.log(json); }, 401: function (n) { location.href = "/sso/login"; @@ -100,21 +100,40 @@ }); } -function getReqAdd() { +function getReqStatus(c_issue_link) { var searchParams = new URLSearchParams(location.search); - console.log(searchParams.get('c_id')); $.ajax({ - url: "/auth-user/api/arms/reqAdd/T_ARMS_REQADD_" + searchParams.get('c_review_pdservice_link') + "/getNode.do", + url: "/auth-user/api/arms/reqStatus/T_ARMS_REQSTATUS_" + searchParams.get('c_review_pdservice_link') + "/getStatusChildNode.do", data: { - c_id: searchParams.get('c_review_req_link') + c_ids: c_issue_link }, type: "GET", progress: true, statusCode: { 200: function (json) { console.log(json); + ////////////////////////////////////////////////////////////////////////////////// + var history = document.querySelector(".Review-Detail-Div"); + + let lists = "

    Review - Jira Issue

    "; + json.forEach((item, index) => { + lists += ` +
    + 제품(서비스): ${getStrLimit(item.c_pdservice_name,20)}
    + 버전: ${getStrLimit(item.c_version_name,20)}
    + 지라 프로젝트: ${getStrLimit(item.c_jira_project_name,20)}
    + 지라 버전: ${getStrLimit(item.c_jira_version_name,20)}
    + 지라 이슈: ${getStrLimit(item.c_jira_req_issue_key,20)}
    +
    +
    + `; + }); + + history.innerHTML = `${lists}`; + ////////////////////////////////////////////////////////////////////////////////// + }, 401: function (n) { location.href = "/sso/login"; @@ -149,40 +168,10 @@ getJsonForPrototype("/auth-user/api/arms/reqReviewLog/getHistory.do" + param, buildHistory); - // $.ajax({ - // url: "/auth-user/api/arms/reqReviewLog/getHistory.do", - // data: { - // reqID: searchParams.get('c_id') - // }, - // type: "GET", - // progress: true, - // statusCode: { - // 200: function (json) { - // console.log(json); - // }, - // 401: function (n) { - // location.href = "/sso/login"; - // }, - // }, - // }).done(function(data) { - // - // for(var key in data){ - // var value = data[key]; - // console.log(key + "=" + value); - // } - // - // var loopCount = 3; - // for (var i = 0; i < loopCount ; i++) { - // console.log( "loop check i = " + i ); - // } - // - // }).fail(function(e) { - // }).always(function() { - // }); } -const buildHistory = function (data) { - const historys = document.querySelector(".review-history"); +var buildHistory = function (data) { + var history = document.querySelector(".review-history"); let lists = ""; data.forEach((item, index) => { @@ -196,30 +185,30 @@
    STATE: ${item.c_review_result_state}
    ID: [${item.c_review_req_link}]-${item.c_review_req_name}
    - IN: ${item.c_review_responder}
    - OUT: ${item.c_review_sender} + RES: ${getStrLimit(item.c_review_responder,15)} - (${historyReviewerStatus(item.c_review_result_state)})
    + REQ: ${getStrLimit(item.c_review_sender,15)}
    `; }); - historys.innerHTML = ``; + history.innerHTML = ``; }; const makeHistory = function (data) { const historys = document.querySelector(".review-history"); let lists = ""; - data.forEach((item, index) => { + data.history.forEach((item, index) => { lists += `
  • ${item.status}
    ${item.title}
    -
    - ${item.summary} +
    + ${historySummary(item.summary)}
    • `; @@ -256,13 +245,12 @@ const historyReviewerStatus = (status) => { let icon = "fa-spinner"; switch (status) { - case "reject": + case "Reject": icon = "fa-ban"; break; - case "pass": + case "Accept": icon = "fa-check"; break; - case "none": default: break; } @@ -304,7 +292,6 @@ case "delete": label = "important"; break; - case "start": default: break; }