Index: arms/html/jiraConnection/content-container.html =================================================================== diff -u -r18fe88beb998d9fd95a97719c4e3ee226a3f0cd7 -r90586071569a527fae484e7bd7ebe1b5645cddd0 --- arms/html/jiraConnection/content-container.html (.../content-container.html) (revision 18fe88beb998d9fd95a97719c4e3ee226a3f0cd7) +++ arms/html/jiraConnection/content-container.html (.../content-container.html) (revision 90586071569a527fae484e7bd7ebe1b5645cddd0) @@ -340,6 +340,16 @@ 지라(서버) 삭제 +
@@ -359,6 +369,12 @@
  • + + 지라 프로젝트 + +
    • +
  • 삭제 하기 @@ -390,7 +406,7 @@ class="form-control parsley-validated font13 darkBack" style="color: #a4c6ff; background: rgba(50, 50, 50, 0.99) !important" placeholder="JIRA SERVER NAME" - required="required" /> + required="required" readonly/> INFO: 서버 이름은 중복될 수 없습니다. @@ -409,14 +425,14 @@
    -
    +
    • @@ -592,8 +611,8 @@ class="form-control parsley-validated font13 darkBack" style="color: #a4c6ff; background: rgba(50, 50, 50, 0.99) !important" placeholder="JIRA BASE URL" - required="required" /> - @@ -665,6 +684,21 @@
    + @@ -1025,7 +1060,7 @@ data-placement="top" data-original-title="jira_server_url" required="required" - placeholder="JIRA BASE URL" /> + placeholder="JIRA BASE URL" readonly/> INFO : 등록할 지라 URL을 입력 Index: arms/js/jiraConnection.js =================================================================== diff -u -rbe19db8867a1d1c81ec30c11d10e6d60d3f9444d -r90586071569a527fae484e7bd7ebe1b5645cddd0 --- arms/js/jiraConnection.js (.../jiraConnection.js) (revision be19db8867a1d1c81ec30c11d10e6d60d3f9444d) +++ arms/js/jiraConnection.js (.../jiraConnection.js) (revision 90586071569a527fae484e7bd7ebe1b5645cddd0) @@ -71,12 +71,14 @@ try { // 카드 덱(서버 목록) 이니시에이터 makeJiraServerCardDeck(); + projectDataTable(""); clearInterval(waitCardDeck); } catch (err) { console.log("지라 서버 데이터 로드가 완료되지 않아서 초기화 재시도 중..."); } }, 313 /* milli */); + // --- 에디터 설정 --- // var waitCKEDITOR = setInterval( function () { try { @@ -102,6 +104,7 @@ popup_size_setting(); popup_update_btn_click(); + }) .catch(function() { console.error('플러그인 로드 중 오류 발생'); @@ -123,7 +126,7 @@ /////////////////// insert Card /////////////////////// var obj = data.response; - console.log(obj); + //console.log(obj); console.log(typeof data.response); draw_card_deck(obj); } }, @@ -177,7 +180,8 @@ -

    ISSUE(배포/수집): 1(임시) / ${cardList[i].jiraIssueStatusEntities.length} 65.00%(임시)

    +

    불러온 프로젝트 수: ${cardList[i].jiraProjectEntities.length} + 갱신하기

    @@ -206,9 +210,9 @@ var columnList = [ { name: "c_id", title: "지라(서버) 아이디", data: "c_id", visible: false }, { - name: "c_jira_server_name", - title: "지라(서버) 이름", - data: "c_title", //"c_jira_server_name" + name: "c_jira_name", + title: "프로젝트 이름", + data: "jiraProjectEntities", render: function (data, type, row, meta) { if (type === "display") { return '"; @@ -242,7 +246,6 @@ var buttonList = []; var jquerySelector = "#jira_connection_table"; // - //var ajaxUrl = "/auth-user/api/arms/pdService/getPdServiceMonitor.do"; var ajaxUrl = "/auth-user/api/arms/jiraServer/getJiraServerMonitor.do"; // 사용 예정 var jsonRoot = "response"; var isServerSide = false; @@ -290,8 +293,23 @@ }) // HTTP 요청이 성공하면 요청한 데이터가 done() 메소드로 전달됨. .done(function (json) { + //console.log(json); console.log(json.jiraProjectEntities); - + //지라 프로젝트 데이터테이블 + projectDataTable(json.jiraProjectEntities); + + //지라 프로젝트 갱신버튼 c_id 설정 + $("#jira_project_renew_div").html(""); + var renewProjectBtnHtml = ` + + `; + $("#jira_project_renew_div").html(renewProjectBtnHtml); + // Sender 설정 var selectedHtml = `
    @@ -462,7 +480,10 @@ $("#regist_jira_server").click(function () { if($("#popup_editview_jira_server_name").val() !== "") { // 서버 이름 if($("#popup_editview_jira_server_type input[name='options']:checked").val() !== undefined) { // 지라환경 선택여부 - + console.log("Base URL==> " + $("#popup_editview_jira_server_base_url").val()); + console.log("c_jira_server_type==> " + $("#popup_editview_jira_server_type input[name='options']:checked").val()); + console.log("c_jira_server_connect_id==> " + $("#popup_editview_jira_server_connect_id").val()); + console.log("c_jira_server_connect_pw==> " + $("#popup_editview_jira_pass_token").val()); $.ajax({ url: "/auth-user/api/arms/jiraServer/addJiraServerNode.do", type: "POST", @@ -520,8 +541,8 @@ c_id: selectId, c_title: $("#editview_jira_server_name").val(), c_jira_server_name: $("#editview_jira_server_name").val(), - c_jira_server_base_url: $("#editview_jira_server_base_url").val(), - c_jira_server_type: $("#editview_jira_server_type input[name='options']:checked").val(), //cloud, on-premise +// c_jira_server_base_url: $("#editview_jira_server_base_url").val(), +// c_jira_server_type: $("#editview_jira_server_type input[name='options']:checked").val(), //cloud, on-premise c_jira_server_connect_id: $("#editview_jira_server_connect_id").val(), c_jira_server_connect_pw: $("#editview_jira_pass_token").val(), c_jira_server_contents: CKEDITOR.instances.input_jira_server_editor.getData() @@ -550,8 +571,8 @@ c_id: selectId, c_title: $("#extend_editview_jira_server_name").val(), c_jira_server_name: $("#extend_editview_jira_server_name").val(), - c_jira_server_base_url: $("#extend_editview_jira_server_base_url").val(), - c_jira_server_type: $("#extend_editview_jira_server_type input[name='options']:checked").val(), //cloud, on-premise +// c_jira_server_base_url: $("#extend_editview_jira_server_base_url").val(), +// c_jira_server_type: $("#extend_editview_jira_server_type input[name='options']:checked").val(), //cloud, on-premise c_jira_server_connect_id: $("#extend_editview_jira_server_connect_id").val(), c_jira_server_connect_pw: $("#editview_jira_pass_token").val(), c_jira_server_contents: CKEDITOR.instances.extend_modal_editor.getData() @@ -612,6 +633,7 @@ $("#jira_server_details_popup_div").addClass("hidden"); $("#jira_server_update_div").addClass("hidden"); $("#jira_server_delete_div").removeClass("hidden"); + $("#jira_project_renew_div").addClass("hidden"); $(".body-middle").hide(); @@ -622,12 +644,17 @@ $("#jira_server_details_popup_div").addClass("hidden"); $("#jira_server_update_div").removeClass("hidden"); $("#jira_server_delete_div").addClass("hidden"); - - } else { + $("#jira_project_renew_div").addClass("hidden"); + } else if (target == "#related_project") { + $("#jira_server_details_popup_div").addClass("hidden"); + $("#jira_server_update_div").addClass("hidden"); + $("#jira_server_delete_div").addClass("hidden"); + $("#jira_project_renew_div").removeClass("hidden"); + } else { // 상세보기, 처음화면 $("#jira_server_details_popup_div").removeClass("hidden"); $("#jira_server_update_div").addClass("hidden"); $("#jira_server_delete_div").addClass("hidden"); - + $("#jira_project_renew_div").addClass("hidden"); if (selectId == undefined) { $(".body-middle").hide(); } else { @@ -636,3 +663,22 @@ } }); } + +// 갱신 버튼 (예상: all, project, issueType, issuePriority, issueResolution, issueStatus 등..) +function jira_renew(renewJiraType, serverId) { // 서버 c_id + if (serverId == undefined) { serverId = "서버 아이디 정보 없음"; } + if (renewJiraType === undefined) { renewJiraType = "갱신할 지라 타입 없음"; } + console.log("갱신버튼을 눌렀습니다. 갱신할 종류(서버아이디) : " + renewJiraType+"("+serverId+")"); +} + +function projectDataTable(data) { + $("#jira_project_tabble").DataTable({ + data: data, + columns: [ + { data: "c_jira_name", title:"프로젝트 이름"}, + { data: "c_jira_key", title:"프로젝트 키"}, + { data: "c_desc", title:"프로젝트 아이디"} + ], + destroy: true, // 다시 불러올때 초기화 + }); +} \ No newline at end of file Index: reference/jquery-plugins/select2-4.0.2/dist/css/jira_server_connection.css =================================================================== diff -u -r81ae24a4b1343f9093d65e53de9e8dd919e2c689 -r90586071569a527fae484e7bd7ebe1b5645cddd0 --- reference/jquery-plugins/select2-4.0.2/dist/css/jira_server_connection.css (.../jira_server_connection.css) (revision 81ae24a4b1343f9093d65e53de9e8dd919e2c689) +++ reference/jquery-plugins/select2-4.0.2/dist/css/jira_server_connection.css (.../jira_server_connection.css) (revision 90586071569a527fae484e7bd7ebe1b5645cddd0) @@ -169,6 +169,11 @@ .mb-3 { margin-bottom: 0.75rem !important;} .mb-4 { margin-bottom: 1rem !important;} +.btn-disabled { + pointer-events: none; + cursor: default; +} + /* text */ .text-muted { color: #878a99 !important;; @@ -264,7 +269,11 @@ color: #0AB39C; border-radius: 1rem; background-color: rgba(10, 179, 156, 0.15); + cursor: pointer; } +.card-body .text-success:hover { + background-color: rgba(10, 179, 156, 0.5); +} .d-flex-sb-11 { display: flex; justify-content: space-between;