Index: arms/html/reqReview/content-container.html =================================================================== diff -u -rc1e8cd171e7450013b727f44a7ea6d70a9f61a1e -rd20188204c0c1ea92b2026722c9c65b4acf624cc --- arms/html/reqReview/content-container.html (.../content-container.html) (revision c1e8cd171e7450013b727f44a7ea6d70a9f61a1e) +++ arms/html/reqReview/content-container.html (.../content-container.html) (revision d20188204c0c1ea92b2026722c9c65b4acf624cc) @@ -1,76 +1,39 @@ -
+

- 제품(서비스) 조회 + Reviews

-
- -
- -
-
- 설명 -
+
    +
  • 전체0
    • +
  • 요청한 리뷰0
    • +
  • 요청받은 리뷰0
    • +
  • 중요 리뷰0
    • +
-
-
-
- - 제품(서비스) Version 조회 -
-
-
-
-
-
-
-
+

- 요구사항 리스트 + 리뷰 리스트

-
- - - - -
-
- 상세 보기는 리스트 클릭 -
- +
@@ -81,26 +44,6 @@
- -
-
-
-
- -
-
-
- -
-
- - -
-
-
-
- - - \ No newline at end of file Index: arms/html/reqReview/content-header.html =================================================================== diff -u -rc1e8cd171e7450013b727f44a7ea6d70a9f61a1e -rd20188204c0c1ea92b2026722c9c65b4acf624cc --- arms/html/reqReview/content-header.html (.../content-header.html) (revision c1e8cd171e7450013b727f44a7ea6d70a9f61a1e) +++ arms/html/reqReview/content-header.html (.../content-header.html) (revision d20188204c0c1ea92b2026722c9c65b4acf624cc) @@ -1,7 +1,7 @@

Requirement.service List

\ No newline at end of file Index: arms/js/reqReview.js =================================================================== diff -u -r992d2e99001e3e74d312d1988ae49d0c34047f81 -rd20188204c0c1ea92b2026722c9c65b4acf624cc --- arms/js/reqReview.js (.../reqReview.js) (revision 992d2e99001e3e74d312d1988ae49d0c34047f81) +++ arms/js/reqReview.js (.../reqReview.js) (revision d20188204c0c1ea92b2026722c9c65b4acf624cc) @@ -21,375 +21,14 @@ },1000); } -// --- jstree 설정 -- // -function jsTreeClick(selectedNodeID) { - console.log(selectedNodeID); -} - -$(function() { - pdServiceJsTreeBuild(); -}); - -function pdServiceJsTreeBuild(){ - - console.log("href: "+$(location).attr('href')); - console.log("protocol: "+$(location).attr('protocol')); - console.log("host: "+$(location).attr('host')); - console.log("pathname: "+$(location).attr('pathname')); - console.log("search: "+$(location).attr('search')); - console.log("hostname: "+$(location).attr('hostname')); - console.log("port: "+$(location).attr('port')); - var isDevelopingToRoute = "/auth-user"; - - $("#pdServiceTree").bind( - "before.jstree", - function(e, data) { - $("#alog").append(data.func + "
"); - $("li:not([rel='drive']).jstree-open > a > .jstree-icon").css('background-image', - 'url(http://www.a-rms.net/313devgrp/reference/jquery-plugins/jstree-v.pre1.0/themes/toolbar_open.png)'); - $("li:not([rel='drive']).jstree-closed > a > .jstree-icon").css('background-image', - 'url(http://www.a-rms.net/313devgrp/reference/jquery-plugins/jstree-v.pre1.0/themes/ic_explorer.png)'); - }).jstree({ - // List of active plugins - "plugins": ["themes", "json_data", "ui", "crrm", "cookies", "dnd", "search", "types", "hotkeys", "contextmenu", "checkbox"], - "themes": { "theme": [ "lightblue4" ] }, - //contextmenu - "contextmenu": { - items: { // Could be a function that should return an object like this one - "create": { - "separator_before": true, - "separator_after": true, - "label": "Create", - "action": false, - "submenu": { - "create_file": { - "seperator_before": false, - "seperator_after": false, - "label": "File", - action: function(obj) { - this.create(obj, "last", { - "attr": { - "rel": "default" - } - }); - } - }, - "create_folder": { - "seperator_before": false, - "seperator_after": false, - "label": "Folder", - action: function(obj) { - this.create(obj, "last", { - "attr": { - "rel": "folder" - } - }); - } - } - - } - }, - "ccp": { - "separator_before": false, - "separator_after": true, - "label": "Edit", - "action": false, - "submenu": { - "cut": { - "seperator_before": false, - "seperator_after": false, - "label": "Cut", - action: function(obj) { - this.cut(obj, "last", { - "attr": { - "rel": "default" - } - }); - } - }, - "paste": { - "seperator_before": false, - "seperator_after": false, - "label": "Paste", - action: function(obj) { - this.paste(obj, "last", { - "attr": { - "rel": "folder" - } - }); - } - }, - - "changeType": { - "seperator_before": false, - "seperator_after": false, - "label": "Change Type", - "submenu": { - "toFile": { - "seperator_before": false, - "seperator_after": false, - "label": "toFile", - action: function(obj) { - this.set_type("default"); - } - }, - "toFolder": { - "seperator_before": false, - "seperator_after": false, - "label": "toFolder", - action: function(obj) { - this.set_type("folder"); - } - } - } - } - - } - } - - } - }, - - // I usually configure the plugin that handles the data first - // This example uses JSON as it is most common - "json_data": { - // This tree is ajax enabled - as this is most common, and maybe a bit more complex - // All the options are almost the same as jQuery's AJAX (read the docs) - "ajax": { - // the URL to fetch the data - "url": isDevelopingToRoute + "/api/arms/pdservice/getChildNode.do", - // the `data` function is executed in the instance's scope - // the parameter is the node being loaded - // (may be -1, 0, or undefined when loading the root nodes) - "data": function(n) { - // the result is fed to the AJAX request `data` option - console.log(n); - return { - "c_id": n.attr ? n.attr("id").replace("node_", "").replace("copy_", "") : 1 - }; - }, - "success": function(n) { - jSuccess('Product(service) Data Load Complete'); - } - } - }, - // Configuring the search plugin - "search": { - // As this has been a common question - async search - // Same as above - the `ajax` config option is actually jQuery's AJAX object - "ajax": { - "url": isDevelopingToRoute + "/api/arms/pdservice/searchNode.do", - // You get the search string as a parameter - "data": function(str) { - return { - "searchString": str - }; - }, - "success": function(n) { - jSuccess('search data complete'); - } - } - }, - // Using types - most of the time this is an overkill - // read the docs carefully to decide whether you need types - "types": { - // I set both options to -2, as I do not need depth and children count checking - // Those two checks may slow jstree a lot, so use only when needed - "max_depth": -2, - "max_children": -2, - // I want only `drive` nodes to be root nodes - // This will prevent moving or creating any other type as a root node - "valid_children": ["drive"], - "types": { - // The default type - "default": { - // I want this type to have no children (so only leaf nodes) - // In my case - those are files - "valid_children": "none", - // If we specify an icon for the default type it WILL OVERRIDE the theme icons - "icon": { - "image": "../dist/js/jstree-v.pre1.0/themes/attibutes.png" - } - }, - // The `folder` type - "folder": { - // can have files and other folders inside of it, but NOT `drive` nodes - "valid_children": ["default", "folder"], - "icon": { - "image": "../dist/js/jstree-v.pre1.0/themes/ic_explorer.png" - } - }, - // The `drive` nodes - "drive": { - // can have files and folders inside, but NOT other `drive` nodes - "valid_children": ["default", "folder"], - "icon": { - "image": "../dist/js/jstree-v.pre1.0/themes/home.png" - }, - // those prevent the functions with the same name to be used on `drive` nodes - // internally the `before` event is used - "start_drag": false, - "move_node": false, - "delete_node": false, - "remove": false - } - } - }, - // UI & core - the nodes to initially select and open will be overwritten by the cookie plugin - - // the UI plugin - it handles selecting/deselecting/hovering nodes - "ui": { - // this makes the node with ID node_4 selected onload - "initially_select": ["node_4"] - }, - // the core plugin - not many options here - "core": { - // just open those two nodes up - // as this is an AJAX enabled tree, both will be downloaded from the server - "initially_open": ["node_2", "node_3"] - } - }).bind("create.jstree", function(e, data) { - $.post(isDevelopingToRoute + "/api/arms/pdservice/addNode.do", { - "ref": data.rslt.parent.attr("id").replace("node_", "").replace("copy_", ""), - "c_position": data.rslt.position, - "c_title": data.rslt.name, - "c_type": data.rslt.obj.attr("rel") - }, function(r) { - if (r.status) { - $(data.rslt.obj).attr("id", "node_" + r.id); - jNotify('Notification : Add Node, Complete !'); - } else { - $.jstree.rollback(data.rlbk); - } - if (typeof Chat != "undefined"){ - Chat.sendMessage("노드를 추가했습니다. 추가된 노드의 아이디는 " + r.id , function(data) { - console.log(data); - }); - } - jsTreeBuild(); - }); - }).bind("remove.jstree", function(e, data) { - data.rslt.obj.each(function() { - $.ajax({ - async: false, - type: 'POST', - url: isDevelopingToRoute + "/api/arms/pdservice/removeNode.do", - data: { - "c_id": this.id.replace("node_", "").replace("copy_", "") - }, - success: function(r) { - jNotify('Notification : Remove Node, Complete !'); - if (typeof Chat != "undefined"){ - Chat.sendMessage("노드를 삭제했습니다. 삭제된 노드의 아이디는 " + r.c_id , function(data) { - console.log(data); - }); - } - jsTreeBuild(); - } - }); - }); - }).bind("rename.jstree", function(e, data) { - $.post(isDevelopingToRoute + "/api/arms/pdservice/alterNode.do", { - "c_id": data.rslt.obj.attr("id").replace("node_", "").replace("copy_", ""), - "c_title": data.rslt.new_name, - "c_type": data.rslt.obj.attr("rel") - }, function(r) { - if (!r.status) { - $.jstree.rollback(data.rlbk); - } - jSuccess('Rename Node Complete'); - if (typeof Chat != "undefined"){ - Chat.sendMessage("노드를 변경했습니다. 변경된 노드의 아이디는 " + r.c_id , function(data) { - console.log(data); - }); - } - jsTreeBuild(); - }); - }).bind("set_type.jstree", function(e, data) { - $.post(isDevelopingToRoute + "/api/arms/pdservice/alterNodeType.do", { - "c_id": data.rslt.obj.attr("id").replace("node_", "").replace("copy_", ""), - "c_title": data.rslt.new_name, - "c_type": data.rslt.obj.attr("rel") - }, function(r) { - jSuccess('Node Type Change'); - if (typeof Chat != "undefined"){ - Chat.sendMessage("노드를 변경했습니다. 변경된 노드의 아이디는 " + r.c_id , function(data) { - console.log(data); - }); - } - jsTreeBuild(); - }); - }).bind("move_node.jstree", function(e, data) { - data.rslt.o.each(function(i) { - $.ajax({ - async: false, - type: 'POST', - url: isDevelopingToRoute + "/api/arms/pdservice/moveNode.do", - data: { - "c_id": $(this).attr("id").replace("node_", "").replace("copy_", ""), - "ref": data.rslt.cr === -1 ? 1 : data.rslt.np.attr("id").replace("node_", "").replace("copy_", ""), - "c_position": data.rslt.cp + i, - "c_title": data.rslt.name, - "copy": data.rslt.cy ? 1 : 0, - "multiCounter": i - }, - success: function(r) { - if (r.status) { - $.jstree.rollback(data.rlbk); - } else { - $(data.rslt.oc).attr("id", "node_" + r.id); - if (data.rslt.cy && $(data.rslt.oc).children("UL").length) { - data.inst.refresh(data.inst._get_parent(data.rslt.oc)); - } - } - jNotify('Notification : Move Node Complete !'); - if (typeof Chat != "undefined"){ - Chat.sendMessage("노드가 이동되었습니다. 이동된 노드의 아이디는 " + r.c_id , function(data) { - console.log(data); - }); - } - jsTreeBuild(); - } - }); - }); - }).bind("select_node.jstree", function (event, data) { - // `data.rslt.obj` is the jquery extended node that was clicked - if ($.isFunction(jsTreeClick)) { - console.log(data.rslt.obj); - jsTreeClick(data.rslt.obj.attr("id")); - } - }); - - $("#mmenu input, #mmenu button").click(function() { - switch (this.id) { - case "add_default": - case "add_folder": - $("#pdServiceTree").jstree("create", null, "last", { - "attr": { - "rel": this.id.toString().replace("add_", "") - } - }); - break; - case "search": - $("#pdServiceTree").jstree("search", document.getElementById("text").value); - break; - case "text": - break; - default: - $("#pdServiceTree").jstree(this.id); - break; - } - }); -} - // --- 데이터 테이블 설정 --- // $(function () { jstreeDataTableReload(); $('.dataTables_length').find('select:eq(0)').addClass("darkBack"); $('.dataTables_length').find('select:eq(0)').css('min-height','30px'); //min-height: 30px; - $("body").find("[aria-controls='jstreeTable']").css('width', '100px'); + // $("body").find("[aria-controls='jstreeTable']").css('width', '100px'); }); function jstreeDataTableReload() { @@ -405,62 +44,147 @@ var isDevelopingToRoute = "/auth-user"; var data = [ - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Dev-Backend v.1.3.1', 'ISSUE-DEV-01', 'TEST-REQ-01', 'Resolved'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Dev-Backend v.11.9.15', 'ISSUE-DEV-16', 'TEST-REQ-01', 'Closed'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Design-Front v.12.93.1', 'ISSUE-DES-193','TEST-REQ-01', 'Open'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Oper-DB v.1.3.1', 'ISSUE-DB-163','TEST-REQ-01', 'Progress'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Oper-SYS v.0.3.0', 'ISSUE-SYS-213','TEST-REQ-01', 'Progress'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Oper-SYS v.3.9.11', 'ISSUE-SYS-863','TEST-REQ-01', 'Progress'], - ['aRMS Product', 'REQ-Auth-13', 'JIRA-Oper-SYS v.15.3.1', 'ISSUE-DO-10','TEST-REQ-01', 'Progress'], - - ['aRMS Product', 'REQ-Auth-19', 'JIRA-Dev-Backend v.1.3.9', 'ISSUE-DEV-101', 'TEST-REQ-13', 'Resolved'], - ['aRMS Product', 'REQ-Auth-19', 'JIRA-Dev-Backend v.1.2.91', 'ISSUE-DEV-136', 'TEST-REQ-13', 'Closed'], - ['aRMS Product', 'REQ-Auth-19', 'JIRA-Design-Front v.4.9.1', 'ISSUE-DES-143', 'TEST-REQ-13', 'Open'], - ['aRMS Product', 'REQ-Auth-19', 'JIRA-Oper-DB v.61.3.1', 'ISSUE-DB-763', 'TEST-REQ-13', 'Progress'], - ['aRMS Product', 'REQ-Auth-19', 'JIRA-Oper-SYS v.1.39.10', 'ISSUE-SYS-913', 'TEST-REQ-13', 'Progress'], - ['aRMS Product', 'REQ-Auth-21', 'JIRA-Oper-SYS v.14.3.1', 'ISSUE-SYS-263', 'TEST-REQ-313', 'Progress'], - ['aRMS Product', 'REQ-Auth-21', 'JIRA-Oper-SYS v.1.9.1', 'ISSUE-DO-40', 'TEST-REQ-313', 'Progress'] - + // ['aRMS Product', 'REQ-Auth-13', 'JIRA-Dev-Backend v.1.3.1', 'ISSUE-DEV-01', 'TEST-REQ-01', 'Resolved'], + { + review_type: 0, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + }, + { + review_type: 1, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + }, + { + review_type: 2, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + }, + { + review_type: 0, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + }, + { + review_type: 1, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + }, + { + review_type: 2, + product: "aRMS Product", + requirements: "REQ-Auth-13", + jira_project: "JIRA-Dev-Backend v.1.3.1", + issue: "ISSUE-DEV-01", + qa_test: "TEST-REQ-01", + status: "Resolved", + modified: "이반장", + worker: "함수원", + start_date: "2022-06-25", + modify_date: "2022-07-03", + } ]; var tempDataTable = $('#jstreeTable').DataTable({ "destroy": true, "processing": true, - "responsive": true, "select": true, + ordering: false, + scrollX: true, columns: [ { - name: 'first', + title: '', + data: 'review_type', + render: function (data, type) { + if (type === 'display') { + let icon = data ? data === 1 ? 'fa-pencil-square-o' : 'fa-exclamation-triangle' : 'fa-paper-plane-o'; + return ``; + } + return data; + } + }, + { title: '제품(서비스)', + data: 'product' }, { - name: 'second', title: '요구사항', + data: 'product' }, { title: 'JIRA Project', + data: 'jira_project' }, { title: 'Issue', + data: 'issue' }, { - name: 'third', title: 'QA', + data: 'qa_test' }, { title: 'Status - Test', + data: 'status' }, + { + title: '생성일', + data: 'start_date' + }, + { + title: '작업자', + data: 'worker' + }, + { + title: '수정자', + data: 'modified' + }, + { + title: '수정일', + data: 'modify_date' + }, ], data: data, - rowsGroup: [ - // Always the array (!) of the column-selectors in specified order to which rows groupping is applied - // (column-selector could be any of specified in https://datatables.net/reference/type/column-selector) - 'first:name', - 'second:name', - 'third:name', - 0, - 2 - ] }); $('#jstreeTable tbody').on('click', 'tr', function () { @@ -473,22 +197,5 @@ // 요구사항 상세 보기 클릭 이벤트 $( "#selectView" ).click(function() { - modal(rowData) + console.log("#### selectView click!!") }); - -function modal(data) { - console.log('#### modal data ::', data) - const th = ['제품(서비스)', '요구사항', 'JIRA Project', 'Issue', 'QA', 'Status-Test'] - if (!data) return - $('.modal-title').text(data[1]); - $('.modal-body').html(() => { - let text = ''; - th.forEach(function (name, index) { - text += `${name} : ${data[index]}
`; - }) - - return text; - }) - - $('.modal').modal('show'); -} \ No newline at end of file