Index: arms/js/analysisScope.js =================================================================== diff -u -r99e4ce9983ecbaf635751da844bc4e381559367c -rf7c54055257c45004cc8e02257766fbcaac3e326 --- arms/js/analysisScope.js (.../analysisScope.js) (revision 99e4ce9983ecbaf635751da844bc4e381559367c) +++ arms/js/analysisScope.js (.../analysisScope.js) (revision f7c54055257c45004cc8e02257766fbcaac3e326) @@ -1652,6 +1652,8 @@ .DataTable() .columns.adjust() .responsive.recalc(); + + $(window).scrollTop(scrollPos); } $("#copychecker").on("click", function () { @@ -1668,201 +1670,4 @@ }); $("#pdfchecker").on("click", function () { reqStatusDataTable.button(".buttons-pdf").trigger(); -}); - -function click_issue_key(c_jira_server_link, c_issue_key) { - - console.log("clicked_issue_name ==> " + c_issue_key); - if (c_issue_key !== "" || c_issue_key !== undefined) { - //selectedIssueKey = name; // 쓸일 없음. - } - - var endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() - + "/getIssueAndSubLinks.do?serverId=" + c_jira_server_link - + "&issueKey=" + c_issue_key; - getLinkedIssueAndSubtask(endPointUrl); // 데이터테이블 그리기 -} - -function getLinkedIssueAndSubtask(endPointUrl) { - var columnList = [ - { - name: "issueID", - title: "이슈아이디", - data: "issueID", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: false - }, - { - name: "key", - title: "요구사항 이슈 키", - data: "key", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "summary", - title: "요구사항", - data: "summary", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "parentReqKey", - title: "부모이슈 키", - data: "parentReqKey", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: false - }, - { - name: "priority", - title: "이슈 우선순위", - data: "priority.priority_name", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "status.status_name", - title: "이슈 상태", - data: "status.status_name", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "reporter", - title: "이슈 보고자", - data: "reporter.reporter_accountId", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "assignee", - title: "이슈 할당자", - data: "assignee.assignee_accountId", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "created", - title: "이슈 생성일자", - data: "created", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + dateFormat(data) + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - }, - { - name: "updated", - title: "이슈 최근 업데이트 일자", - data: "updated", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + dateFormat(data) + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true - } - ]; - - var rowsGroupList = []; - var columnDefList = [ - { - orderable: false, - className: "select-checkbox", - targets: 0 - } - ]; - var orderList = [[1, "asc"]]; - var jquerySelector = "#linkedIssueAndSubtaskTable"; - var ajaxUrl = "/auth-user/api/arms/reqStatus" + endPointUrl; - var jsonRoot = ""; - var buttonList = []; - var selectList = {}; - var isServerSide = false; - - reqStatusDataTable = dataTable_build( - jquerySelector, - ajaxUrl, - jsonRoot, - columnList, - rowsGroupList, - columnDefList, - selectList, - orderList, - buttonList, - isServerSide - ); -} +}); \ No newline at end of file Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -rf8821fdcea864873ff242f60193719881af65869 -rf7c54055257c45004cc8e02257766fbcaac3e326 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision f8821fdcea864873ff242f60193719881af65869) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision f7c54055257c45004cc8e02257766fbcaac3e326) @@ -14,7 +14,7 @@ let userRealmRoles; let permissions; let userEmail; - +let scrollPos = 0; //////////////////////////////////////////////////////////////////////////////////////// //Document Ready //////////////////////////////////////////////////////////////////////////////////////// @@ -1137,6 +1137,10 @@ var tempDataTable = $(jQueryElementID).DataTable(options); + $(jQueryElementID).on('page.dt', function() { + scrollPos = $(window).scrollTop(); + }); + /*var tempDataTable = $(jQueryElementID).DataTable({ ajax: { url: ajaxUrl,