Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss
===================================================================
diff -u -rcc1af1d2d4b44e87a3926edd2a260ee5385b04bc -ra9f8075d959c506a9c24f717cc7bc950705cfb06
--- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision cc1af1d2d4b44e87a3926edd2a260ee5385b04bc)
+++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision a9f8075d959c506a9c24f717cc7bc950705cfb06)
@@ -171,12 +171,33 @@
});
};
+function dateFormat(timestamp) {
+ var d = new Date(timestamp ), // Convert the passed timestamp to milliseconds
+ yyyy = d.getFullYear(),
+ mm = ('0' + (d.getMonth() + 1)).slice(-2), // Months are zero based. Add leading 0.
+ dd = ('0' + d.getDate()).slice(-2), // Add leading 0.
+ hh = d.getHours(),
+ h = hh,
+ min = ('0' + d.getMinutes()).slice(-2), // Add leading 0.
+ ampm = 'AM',
+ time;
-const dateFormat = (time = 0) => {
- let date = time ? new Date(time).toISOString() : new Date().toISOString();
- return date;
-};
+ if (hh > 12) {
+ h = hh - 12;
+ ampm = 'PM';
+ } else if (hh === 12) {
+ h = 12;
+ ampm = 'PM';
+ } else if (hh == 0) {
+ h = 12;
+ }
+ // ie: 2013-02-18, 8:35 AM
+ time = yyyy + '년' + mm + '월' + dd + '일 - ' + h + ':' + min + ' ' + ampm;
+
+ return time;
+}
+
const ajaxGet = (url) =>
$.ajax({
url,
Index: arms/js/reqReviewDetail.js
===================================================================
diff -u -rcc1af1d2d4b44e87a3926edd2a260ee5385b04bc -ra9f8075d959c506a9c24f717cc7bc950705cfb06
--- arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision cc1af1d2d4b44e87a3926edd2a260ee5385b04bc)
+++ arms/js/reqReviewDetail.js (.../reqReviewDetail.js) (revision a9f8075d959c506a9c24f717cc7bc950705cfb06)
@@ -38,6 +38,8 @@
//////////////////////////////////////////////////////////////////////////
var history = document.querySelector(".pdServiceInfo");
+ history.innerHTML = '';
+
let lists = "";
lists += `
Review Information
@@ -117,6 +119,8 @@
//////////////////////////////////////////////////////////////////////////////////
var history = document.querySelector(".Review-Detail-Div");
+ history.innerHTML = '';
+
let lists = "Review - Jira Issue
";
json.forEach((item, index) => {
lists += `
@@ -173,6 +177,8 @@
var buildHistory = function (data) {
var history = document.querySelector(".review-history");
+ history.innerHTML = '';
+
let lists = "";
data.forEach((item, index) => {
lists += `
@@ -181,7 +187,7 @@
${item.c_method}
${item.c_state}
-
+
STATE: ${item.c_review_result_state}
ID: [${item.c_review_req_link}]-${item.c_review_req_name}
@@ -326,3 +332,54 @@
diff2htmlUi.highlightCode();
diff2htmlUi.fileListToggle(false);
};
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+// 요구사항 - 승인 클릭
+///////////////////////////////////////////////////////////////////////////////
+$("#show-info-accept").click(function () {
+ set_Review_Result("Accept");
+});
+
+$("#show-info-reject").click(function () {
+ set_Review_Result("Reject");
+});
+
+$("#show-info-delay").click(function () {
+ set_Review_Result("Delay");
+});
+
+function set_Review_Result(reviewResult){
+ //정보 셋팅
+ 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 + "/withReqReview/updateNode.do",
+ data: {
+ c_id: c_id,
+ c_review_pdservice_link: c_review_pdservice_link,
+ c_review_req_link: c_review_req_link,
+ c_review_result_state: reviewResult
+ },
+ type: "POST",
+ progress: true
+ }).done(function(data) {
+
+ includeDiff();
+
+ getReqReviewHistory();
+
+ getReqAdd();
+
+ }).fail(function(e) {
+ }).always(function() {
+ });
+
+}
\ No newline at end of file