Index: arms/html/reqReviewDetail/content-container.html =================================================================== diff -u -r959af33bb23a5b89c2ef88364fee946c6c425747 -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 --- arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 959af33bb23a5b89c2ef88364fee946c6c425747) +++ arms/html/reqReviewDetail/content-container.html (.../content-container.html) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) @@ -236,7 +236,7 @@ font-size: 11px; } - .timeline-item--summary { + .timeline-item-summary { width: 100%; margin-top: 10px; } Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r62766d768d11ec839b7339692fc7f178602dd132 -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 62766d768d11ec839b7339692fc7f178602dd132) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) @@ -165,7 +165,7 @@ const dateFormat = (time = 0) => { let date = time ? new Date(time).toISOString() : new Date().toISOString(); - return date.split("T")[0]; + return date; }; const ajaxGet = (url) => Index: arms/js/reqReviewDetail.js =================================================================== diff -u -r62766d768d11ec839b7339692fc7f178602dd132 -r5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8 --- arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 62766d768d11ec839b7339692fc7f178602dd132) +++ arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision 5c690d7e44ecc88e8ccd13c0efc30ea98dd4f2a8) @@ -9,26 +9,209 @@ "requirement-elements-collapse" ); - getJsonForPrototype("./js/reviewDetailHistory.json", makeHistory); + //getJsonForPrototype("./js/reviewDetailHistory.json", makeHistory); includeDiff(); + + getPdService(); + + //getVersion(); + + + getReqReviewHistory(); + + getReqAdd(); + + getReqAddLog(); + }; +function getPdService() { + var searchParams = new URLSearchParams(location.search); + console.log(searchParams.get('c_id')); + + $.ajax({ + url: "/auth-user/api/arms/pdService/getNode.do", + data: { + c_id: searchParams.get('c_review_pdservice_link') + }, + 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() { + }); +} + +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"; + }, + }, + }).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() { + }); +} + +function getReqAdd() { + + 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", + 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"; + }, + }, + }).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() { + }); +} + +function getReqReviewHistory() { + + var searchParams = new URLSearchParams(location.search); + console.log(searchParams.get('c_id')); + + getJsonForPrototype("/auth-user/api/arms/reqReviewLog/getHistory.do?reqID=" + searchParams.get('c_id'), 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"); + + let lists = ""; + data.forEach((item, index) => { + lists += ` +
  • + + ${item.c_method} + +
    ${item.c_state}
    + +
    + ID:[${item.c_review_req_link}]-${item.c_review_req_name} +
    +
  • + `; + }); + + historys.innerHTML = ``; +}; + const makeHistory = function (data) { const historys = document.querySelector(".review-history"); let lists = ""; - data.history.forEach((item, index) => { + data.forEach((item, index) => { lists += `
  • ${item.status}
    ${item.title}
    -
    - ${historySummary(item.summary)} +
    + ${item.summary}
  • `;