-
-
-
-
Index: arms/html/armsDetailExceptTemplate/assets/css/qna.css
===================================================================
diff -u -re3d75e88b63bb05bffc73ce955625048c5d22cdd -rb8b0719157c73db2d6393d4097e01828094700ee
--- arms/html/armsDetailExceptTemplate/assets/css/qna.css (.../qna.css) (revision e3d75e88b63bb05bffc73ce955625048c5d22cdd)
+++ arms/html/armsDetailExceptTemplate/assets/css/qna.css (.../qna.css) (revision b8b0719157c73db2d6393d4097e01828094700ee)
@@ -1,15 +1,9 @@
-.glyphicon-user:before {
- content: "\e008"
-}
-
.chat-btn {
margin-right: 10px;
display: inline-block;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
- padding: 2px 4px;
- line-height: 14px;
text-shadow: none;
font-weight: normal;
font-size: 11.05px;
@@ -18,20 +12,66 @@
text-align: center;
white-space: nowrap;
vertical-align: baseline;
- border-radius: 0.25em;
border: none;
+ border-color: rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25);
+ padding: 2px 6px;
+ line-height: 1.5;
+ border-radius: 0;
}
.edit-chat-btn {
background-color: #56bc76;
+ transition: background-color 0.2s;
}
.delete-chat-btn {
background-color: #e5603b;
}
+.send-btn {
+ width: 100%;
+ display: inline-block;
+ font-weight: 400;
+ line-height: 1.5;
+ color: #212529;
+ text-align: center;
+ text-decoration: none;
+ vertical-align: middle;
+ cursor: pointer;
+ /* -webkit-user-select: none; */
+ -moz-user-select: none;
+ /* user-select: none; */
+ /* background-color: transparent; */
+ border: 1px solid transparent;
+ padding: 0.375rem 0.75rem;
+ font-size: 1rem;
+ border-radius: 0.25rem;
+ transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+
+.send-chat-btn {
+ display: block;
+ width: 100%;
+ padding: 0.375rem 0.75rem;
+ font-size: 1rem;
+ font-weight: 400;
+ line-height: 1.5;
+ color: #fff;
+ background: rgba(51,51,51,0.4);
+ background-clip: padding-box;
+ border: 1px solid #ced4da;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
+ border-radius: 0.25rem;
+ transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+
+ cursor: pointer;
+
+}
+
.user-id {
- color: #618fb0;
+ color: #3264bf;
font-weight: bolder;
text-decoration: none;
}
@@ -174,9 +214,9 @@
.chat-message-body {
margin-left: 63px;
padding: 8px 10px;
- background: #e9e9e9;
+ background: #dedede;
position: relative;
- border-left: 2px solid #666;
+ border-left: 3px solid #666;
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
-ms-border-radius: 1px;
@@ -187,7 +227,8 @@
margin-left: 0;
margin-right: 63px;
border-left: none;
- border-right: 2px solid #666;
+ border-right: 3px solid #666;
+ background: #e9ecef;
}
.chat-message-body.on-left .arrow {
left: auto;
@@ -217,24 +258,3 @@
.col-xs-3 {
width: 25%;
}
-
-.send-btn {
- width: 100%;
- display: inline-block;
- font-weight: 400;
- line-height: 1.5;
- color: #212529;
- text-align: center;
- text-decoration: none;
- vertical-align: middle;
- cursor: pointer;
- /* -webkit-user-select: none; */
- -moz-user-select: none;
- /* user-select: none; */
- /* background-color: transparent; */
- border: 1px solid transparent;
- padding: 0.375rem 0.75rem;
- font-size: 1rem;
- border-radius: 0.25rem;
- transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-}
\ No newline at end of file
Index: arms/js/detail.js
===================================================================
diff -u -r6eead70aab5d19e2e5c8399bd71c182631126b08 -rb8b0719157c73db2d6393d4097e01828094700ee
--- arms/js/detail.js (.../detail.js) (revision 6eead70aab5d19e2e5c8399bd71c182631126b08)
+++ arms/js/detail.js (.../detail.js) (revision b8b0719157c73db2d6393d4097e01828094700ee)
@@ -105,16 +105,19 @@
// 요구사항 전체정보 탭 클릭 이벤트
allReqListViewTabClick();
+ // 요구사항 전체 목록 탭 제품(서비스)리뷰어 클릭시 아코디언 효과
+ resize_reviewer();
+
// 제품관련 파일 탭 클릭 이벤트
filesViewTabClick();
- // reqCommentListViewTabClick();
+ // QnA 채팅 게시판 탭 클릭 이벤트
+ reqCommentListViewTabClick();
// save_post_btn_click();
- // 요구사항 전체 목록 탭 제품(서비스)리뷰어 클릭시 아코디언 효과
- resize_reviewer();
+
})
.catch(function (errorMessage) {
console.error(errorMessage);
@@ -170,8 +173,6 @@
return true;
}
- calledAPIs[apiName] = true;
-
return false;
}
@@ -193,7 +194,7 @@
}
var scrollApiFunc = function () {
- for (const element in visibilityStatus) {
+ for (var element in visibilityStatus) {
if (!visibilityStatus[element] && checkVisible(element)) {
if(element === "#detail") {
getDetailViewTab();
@@ -210,7 +211,7 @@
fileLoadByPdService();
}
else if (element === "#question") {
- // getReqCommentList();
+ getReqCommentList();
}
visibilityStatus[element] = true;
@@ -271,10 +272,12 @@
//////////////////////////////////////////////////////////
console.log(data);
console.table(data);
+
// ------------------ 상세보기 ------------------ //
bindDataDetailTab(data);
//////////////////////////////////////////////////////////
jSuccess("요구사항 조회가 완료 되었습니다.");
+ calledAPIs["detailAPI"] = true;
}
},
beforeSend: function () {
@@ -366,6 +369,8 @@
$("#version-product-name").html(json.c_title);
$("#version-accordion").jsonMenu(selectedPdServiceVersion, json.pdServiceVersionEntities, { speed: 5000 });
+
+ calledAPIs["versionAPI"] = true;
});
}
@@ -466,6 +471,7 @@
// common.js에 정의되어있는 함수
jsTreeBuild(jQueryElementID, serviceNameForURL);
+ calledAPIs["allReqListAPI"] = true;
}
@@ -634,17 +640,17 @@
*/
function resize_reviewer(){
$(".toggle-content").click(function(){
- if ($('#additional-item2').hasClass('d-none')) {
- $('#additional-item2').removeClass('d-none');
- $('#additional-item3').removeClass('d-none');
- $('#additional-item4').removeClass('d-none');
- $('#additional-item5').removeClass('d-none');
- } else {
- $('#additional-item2').addClass('d-none');
- $('#additional-item3').addClass('d-none');
- $('#additional-item4').addClass('d-none');
- $('#additional-item5').addClass('d-none');
- }
+ if ($('#additional-item2').hasClass('d-none')) {
+ $('#additional-item2').removeClass('d-none');
+ $('#additional-item3').removeClass('d-none');
+ $('#additional-item4').removeClass('d-none');
+ $('#additional-item5').removeClass('d-none');
+ } else {
+ $('#additional-item2').addClass('d-none');
+ $('#additional-item3').addClass('d-none');
+ $('#additional-item4').addClass('d-none');
+ $('#additional-item5').addClass('d-none');
+ }
});
}
@@ -702,9 +708,9 @@
var thumbnailUrl = file.thumbnailUrl;
var fileSize = formatBytes(file.size, 3);
// var fileSize = file.size;
-/*
- var imageLinkHtml = file.contentType.includes("image") ? `
` : '';
-*/
+ /*
+ var imageLinkHtml = file.contentType.includes("image") ? `
` : '';
+ */
var imageLinkHtml = '';
var $newHtml = $(`
@@ -751,6 +757,8 @@
portfolioIsotope.arrange();
});
}
+
+ calledAPIs["fileAPI"] = true;
});
}
@@ -769,7 +777,7 @@
// ------------------ QnA 게시판보기 ------------------ //
function reqCommentListViewTabClick() {
$("#get_req_comment_list").click(function () {
- // getReqCommentList();
+ getReqCommentList();
});
}
@@ -796,15 +804,69 @@
statusCode: {
200: function (data) {
//모달 팝업 끝내고
+ var $chatMessages = $('#chat_messages');
+
console.log(data.response);
for (var k in data.response) {
- var obj = data.response[k];
- // console.log(obj);
+ var comment = data.response[k];
+
+ console.log(comment);
// var newOption = new Option(obj.c_title, obj.c_id, false, false);
// $("#selected_pdService").append(newOption).trigger("change");
+ var sender = comment.c_req_comment_sender;
+ var date = comment.c_req_comment_date;
+ var title = comment.c_title;
+ var contents = comment.c_req_comment_contents;
+ var $newHtml;
+ /* 로그인한 사용자 일 경우 우측으로 아닐 경우 좌측으로 보이게 하기 */
+ if (sender !== 'kch') {
+ $newHtml = $(`
+
+
+
+
+ ${sender}
+ ${date}
+
+
+ ${title}
+
+
+
`);
+ }
+ else {
+ $newHtml = $(`
+
+
+
+
+ ${date} \t
+ ${sender}
+
+
+ ${title}
+
+
+
+
+
+
+
`);
+ }
+
+ $chatMessages.append($newHtml);
}
// $("#close_pdservice").trigger("click");
//데이터 테이블 데이터 재 로드
+ calledAPIs["reqCommentListAPI"] = true;
}
},
beforeSend: function () {