Index: arms/js/reqStatus.js
===================================================================
diff -u -r208ec2195511a132824387e9e79d6a6ea4adb91f -r372f7f7b8b3ba9e4810e03f693f7745fc1fe9c07
--- arms/js/reqStatus.js (.../reqStatus.js) (revision 208ec2195511a132824387e9e79d6a6ea4adb91f)
+++ arms/js/reqStatus.js (.../reqStatus.js) (revision 372f7f7b8b3ba9e4810e03f693f7745fc1fe9c07)
@@ -431,10 +431,25 @@
title: "요구사항 구분",
data: "isReq",
render: function (data, type, row, meta) {
+ let upperKey = row.upperKey;
+ if (row.connectType === "subtask") {
+ upperKey += "의 하위 이슈";
+ } else {
+ upperKey += "의 연결 이슈";
+ }
+
+ if (row.deleted) {
+ if(row.deleted.deleted_isDeleted === true){
+ upperKey = "" + upperKey + "";
+ }else if(row.deleted.deleted_isDeleted === false){
+ upperKey = "
" + upperKey + "
";
+ }
+ }
+
if (row.connectType === "subtask") {
- return "" + row.upperKey + "의 하위 이슈
";
+ return "" + upperKey + "
";
} else {
- return "" + row.upperKey + "의 연결 이슈
";
+ return "" + upperKey + "
";
}
return data;
},
@@ -449,7 +464,16 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ }
+ else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return ("" + displayText + "
");
}
return data;
},
@@ -464,16 +488,22 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- let verNameList = [];
- let verHtml =``;
- data.forEach(version_id => {
- let versionInfo = versionListData.find(version => version["c_id"] === version_id);
- if(versionInfo) {
- verNameList.push(versionInfo["c_title"]);
- verHtml+= versionInfo["c_title"]+`
`;
- }
- });
- return "" + verHtml + "
";
+ let verNameList = [];
+ let verHtml =``;
+ data.forEach(version_id => {
+ let versionInfo = versionListData.find(version => version["c_id"] === version_id);
+ if(versionInfo) {
+ verNameList.push(versionInfo["c_title"]);
+ verHtml+= versionInfo["c_title"]+`
`;
+ }
+ });
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ verHtml = "" + verHtml + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + verHtml + "
";
}
return data;
},
@@ -489,10 +519,14 @@
return "N/A
";
} else {
let displayText = data;
- if (row.deleted) {
- displayText = "" + data + "";
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
}
- return "" + displayText + "
";
+
+ return "" + displayText + "
";
}
return data;
},
@@ -507,7 +541,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -522,7 +563,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -537,7 +585,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
},
className: "dt-body-left",
@@ -551,7 +606,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -566,7 +628,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + data + "
";
+ let displayText = data;
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -581,7 +650,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + dateFormat(data) + "
";
+ let displayText = dateFormat(data);
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + dateFormat(data) + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -596,7 +672,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + dateFormat(data) + "
";
+ let displayText = dateFormat(data);
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + dateFormat(data) + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ color = "#808080";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -611,7 +694,14 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- return "" + dateFormat(data) + "
";
+ let displayText = dateFormat(data);
+ let color = "#f8f8f8"; // 기본 텍스트 색상
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + displayText + "";
+ } else if (row.deleted && row.deleted.deleted_isDeleted === false) {
+ displayText = "" + displayText + "
";
+ }
+ return "" + displayText + "
";
}
return data;
},
@@ -714,30 +804,34 @@
if (isEmpty(data) || data === "false") {
return "N/A
";
} else {
- let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let displayText = data;
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
let btn_data_row1 = {
pdServiceVersions : row.pdServiceVersions.join(","),
cReqLink : row.creqLink
};
// 삭제 여부
- if (row.deleted && row.deleted.deleted_isDeleted === true) {
- displayText = "" + data + "";
- }
+ if (row.deleted && row.deleted.deleted_isDeleted === true) {
+ displayText = "" + data + "";
+ }
else if (row.deleted && row.deleted.deleted_isDeleted === false) {
- color = "#808080";
- }
+ color = "#808080";
+ }
// 요구사항 이슈 여부
- if (!isEmpty(row.isReq) && row.isReq === true) {
- color = "#a4c6ff";
+ if (!isEmpty(row.isReq) && row.isReq === true) {
return ("" + displayText +
$("")
.append($(''))
.attr("data-toggle", "modal")
.attr("data-target","#reqIssue_alongWith_modal")
.attr("data-row", JSON.stringify(btn_data_row1)).prop("outerHTML") +
"
");
- } else {
+ } else {
return ("" + displayText + "
");
}
}
@@ -763,15 +857,19 @@
verHtml+= versionInfo["c_title"]+`
`;
}
});
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
+
if (row.deleted && row.deleted.deleted_isDeleted === true) {
verHtml = "" + verHtml + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
+
return "" + verHtml + "
";
}
return data;
@@ -788,15 +886,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -813,15 +913,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -838,15 +940,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -863,15 +967,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
},
@@ -887,15 +993,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -912,15 +1020,17 @@
return "N/A
";
} else {
let displayText = data;
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + data + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -937,15 +1047,17 @@
return "N/A
";
} else {
let displayText = dateFormat(data);
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + dateFormat(data) + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -962,15 +1074,17 @@
return "N/A
";
} else {
let displayText = dateFormat(data);
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + dateFormat(data) + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -987,15 +1101,17 @@
return "N/A
";
} else {
let displayText = dateFormat(data);
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + displayText + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
color = "#808080";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;
@@ -1012,15 +1128,17 @@
return "N/A
";
} else {
let displayText = dateFormat(data);
- let color = "#f8f8f8"; // 기본 텍스트 색상
+ let color;
+ if (!isEmpty(row.isReq) && row.isReq == true) {
+ color = "#a4c6ff";
+ }else{
+ color = "#f8f8f8"; // 기본 텍스트 색상
+ }
if (row.deleted && row.deleted.deleted_isDeleted === true) {
displayText = "" + displayText + "";
} else if (row.deleted && row.deleted.deleted_isDeleted === false) {
displayText = "" + displayText + "
";
}
- if (!isEmpty(row.isReq) && row.isReq == true) {
- color = "#a4c6ff";
- }
return "" + displayText + "
";
}
return data;