Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r0c4eda37bf3bd766bf8c2ddd616fbd217b3bf563 -r1d88ed39812f3057f696084e8651ad09e16ef6f6 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 0c4eda37bf3bd766bf8c2ddd616fbd217b3bf563) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 1d88ed39812f3057f696084e8651ad09e16ef6f6) @@ -144,13 +144,15 @@ //인증관련 공통 변수 //////////////////////////////////////////////////////////////////////////////////////// var userName; +var fullName; var userApplicationRoles; var userAttributes; var userEnabled; var userGroups; var userID; var userRealmRoles; var permissions; +var userEmail; //////////////////////////////////////////////////////////////////////////////////////// // 상단 페이지 로드 프로그래스바 설정 @@ -220,6 +222,8 @@ userName = json.preferred_username; permissions = json.realm_access.roles; userID = json.sub; + userEmail = json.email; + fullName = json.name; var account_html = ""; account_html = account_html + "user : " + json.preferred_username + ""; Index: arms/js/detail.js =================================================================== diff -u -r4d8d94d2bd9c8e946c394a00094bbcf65401dbc7 -r1d88ed39812f3057f696084e8651ad09e16ef6f6 --- arms/js/detail.js (.../detail.js) (revision 4d8d94d2bd9c8e946c394a00094bbcf65401dbc7) +++ arms/js/detail.js (.../detail.js) (revision 1d88ed39812f3057f696084e8651ad09e16ef6f6) @@ -94,7 +94,7 @@ window.addEventListener('scroll', scrollApiFunc); // 계정 정보 - getAccountInfo(); + bindAccountInfo(); // 메뉴 클릭 이벤트 menuClick(); @@ -229,32 +229,12 @@ }; // ------------------ 계정 정보 ------------------ // -function getAccountInfo() { +function bindAccountInfo() { - var accountInfo; + $("#user-name").html(userName); + $("#user-name-detail").html(fullName + ' (' + userName + ')'); + $("#user-email").html(userEmail); - $.ajax({ - url: "/auth-user/me", - type: "GET", - timeout: 7313, - global: false, - statusCode: { - 200: function (json) { - accountInfo = json; - console.log("계정 정보: ", accountInfo); - - name = json.name; - userName = json.preferred_username; - userEmail = json.email; - - $("#user-name").html(userName); - $("#user-name-detail").html(name + ' (' + userName + ')'); - $("#user-email").html(userEmail); - } - } - }); - - return accountInfo; } // ------------------ 메뉴 클릭 이벤트 ------------------ // @@ -464,7 +444,7 @@ $("#version-start-date").text(json.c_pds_version_start_date); $("#version-end-date").text(json.c_pds_version_end_date); $("#version-desc").slimscroll({ - height: "500px" + height: "300px" }); $("#version-desc").html(json.c_pds_version_contents); }) @@ -843,61 +823,48 @@ 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} -
-
-
`); + var iconPosition = (sender !== userName) ? 'left' : 'right'; + var position = (sender !== userName) ? '' : 'on-left'; + var personIcon = (sender !== userName) ? 'bi-person-fill' : 'bi-person'; + var buttonsHtml = ''; + + if (sender === userName) { + buttonsHtml = `
+ + +
`; } - else { - $newHtml = $(`
-
-
- -
+ + $newHtml = $(`
+
+
+
-
- -
- ${date}   \t - ${sender} -
-
- ${title} -
- - -
-
+
+
+ +
+ ${(position === "on-left") ? `${date}   \t` : ''} + ${sender} + ${(position === "") ? `   ${date}` : ''}
-
`); - } +
+ ${title} + ${buttonsHtml} +
+
+
`); $chatMessages.append($newHtml); } - // $("#close_pdservice").trigger("click"); - //데이터 테이블 데이터 재 로드 + calledAPIs["reqCommentListAPI"] = true; } },