Index: arms/html/dashboard/content-container.html =================================================================== diff -u -rf3e1c0e4cfcff638a4e7065bef10ec06c0c76852 -r72e9f399da2f9d758900c499c8cacbbb354d9c70 --- arms/html/dashboard/content-container.html (.../content-container.html) (revision f3e1c0e4cfcff638a4e7065bef10ec06c0c76852) +++ arms/html/dashboard/content-container.html (.../content-container.html) (revision 72e9f399da2f9d758900c499c8cacbbb354d9c70) @@ -588,20 +588,20 @@
-

인력별 요구사항&연결이슈 (top 5)

+

인력별 요구사항 (top 5)

+ style="background-color: #82de32"> 요구사항
+ style="background-color: #dec732"> 연결이슈
@@ -803,4 +803,9 @@ margin-right: 8px; border: 1px solid white; } + + .c3-bars path { + stroke: white; + stroke-width: 0.5px; + } \ No newline at end of file Index: arms/js/dashboard.js =================================================================== diff -u -r0f0cceaba16790a1c7ba384945b642998e9bf391 -r72e9f399da2f9d758900c499c8cacbbb354d9c70 --- arms/js/dashboard.js (.../dashboard.js) (revision 0f0cceaba16790a1c7ba384945b642998e9bf391) +++ arms/js/dashboard.js (.../dashboard.js) (revision 72e9f399da2f9d758900c499c8cacbbb354d9c70) @@ -1126,6 +1126,7 @@ .style("fill", function (d) { return (d.color = color(d.type)); }) + .style("cursor", "default") .style("stroke", function (d) { return d3.rgb(d.color).darker(2); }) @@ -1144,6 +1145,7 @@ }) .attr("height", "16px") .attr("width", "16px") + .style("cursor", "default") .html((d) => nodeIcon(d.type)); node @@ -1194,6 +1196,19 @@ }) .attr("x", 6 + sankey.nodeWidth()) .attr("text-anchor", "start"); + + console.log("==== 장지윤 data"); + console.log(data); + + // data.nodes.forEach(function(node) { + // if (node.depth === 0) { + // node.x = 0; // X-position for product nodes + // } else if (node.depth === 1) { + // node.x = 1; // X-position for version nodes + // } else if (node.depth === 2) { + // node.x = 2; // X-position for worker nodes + // } + // }); }; return { loadChart, drawEmptyChart }; @@ -1369,8 +1384,13 @@ groups: [issueStatusTypes] }, color: { - pattern: dashboardColor.issueStatusColor + pattern: dashboardColor.accumulatedIssueStatusColor, }, + onrendered: function() { + d3.selectAll('.c3-line, .c3-bar, .c3-arc') + .style('stroke', 'white') + .style('stroke-width', '0.3px'); + }, axis: { x: { type: 'category', @@ -1783,7 +1803,7 @@ $("#issue-manpower-chart").html(""); var width = 270, - height = 380, + height = 430, margin = 10; var svg = d3 Index: arms/js/dashboard/chart/colorPalette.js =================================================================== diff -u -r1c47ce442540d84fd2f68b3e18045d8bb50417a7 -r72e9f399da2f9d758900c499c8cacbbb354d9c70 --- arms/js/dashboard/chart/colorPalette.js (.../colorPalette.js) (revision 1c47ce442540d84fd2f68b3e18045d8bb50417a7) +++ arms/js/dashboard/chart/colorPalette.js (.../colorPalette.js) (revision 72e9f399da2f9d758900c499c8cacbbb354d9c70) @@ -1,41 +1,58 @@ var dashboardPalette = { dashboardPalette01: { projectProgressColor: [ - "#E49400", - "#B09102", - "#7C8E04", - "#488B06", - "#138808", - "#488B06", - "#7C8E04", - "#B09102", - "#E49400" + '#32de77', + '#82de32', + '#b3e299', + '#e5b817', + '#e5db17', + '#e2e299', + '#bede32', + '#82de32' ], issueStatusColor: [ - '#1f77b4', - '#aec7e8', - '#ff7f0e', - '#ffbb78', - '#2ca02c', - '#98df8a', - '#d62728', - '#ff9896' + '#1774e5', //open + '#17abe5',//완료됨 + '#32de77',//In progress + '#82de32',//Backlog + '#bede32',//진행중 + '#e2e299',//Resolved + '#b3e299',//Closed + '#f8f4ff',//SlectedForDevelopment + 'rgba(144,142,147,0.58)',//테스트1 + 'rgba(78,77,80,0.58)'//테스트2 ], + accumulatedIssueStatusColor: [ + '#32de77',//InProgress + '#82de32',//Backlog + '#b3e299',//Closed + '#1774e5',//Open + '#17abe5',//완료됨 + '#e2e299',//Resolved + '#bede32',//진행중 + '#f8f4ff',//SelectedForDevelopment + 'rgba(144,142,147,0.58)',//테스트1 + 'rgba(78,77,80,0.58)',//테스트2 + '#6C567B'//요구사항 + ], manpowerReqColor: [ - "#155f92", "#1f841f" + "#82de32", "#b3e299" ], manpowerPerformance: [ - '#fff', - '#aec7e8', - '#ff7f0e', - '#ffbb78', - '#2ca02c', - '#98df8a', - '#d62728', - '#ff9896' + '#32de77', + '#82de32', + '#b3e299', + '#e5b817', + '#e5db17', + '#e2e299', + '#bede32', + '#82de32' ], productToMan: [ - "#1f77b4", "#2ca02c", "#d62728" + '#1774e5', + '#e3cc85', + '#17cde5', + '#e5db17' ] } }; Index: arms/js/dashboard/chart/timeline_custom.js =================================================================== diff -u -r99892abafa9a63153ea9ea8fbac5358f217b94d6 -r72e9f399da2f9d758900c499c8cacbbb354d9c70 --- arms/js/dashboard/chart/timeline_custom.js (.../timeline_custom.js) (revision 99892abafa9a63153ea9ea8fbac5358f217b94d6) +++ arms/js/dashboard/chart/timeline_custom.js (.../timeline_custom.js) (revision 72e9f399da2f9d758900c499c8cacbbb354d9c70) @@ -39,16 +39,10 @@ }; // 컬러 테스트 by 장지윤 colors = [ - "#4E79A7", - "#F18E2C", - "#E15759", - "#76B6B2", - "#58A14E", - "#EDC849", - "#AF7AA1", - "#FE9DA6", - "#9C755E", - "#BAAFAB" + '#f8f4ff', + '#B15EFF', + '#FFA33C', + '#FFFB73' ]; var t = []; Index: reference/c3/c3-custom.css =================================================================== diff -u -r1c47ce442540d84fd2f68b3e18045d8bb50417a7 -r72e9f399da2f9d758900c499c8cacbbb354d9c70 --- reference/c3/c3-custom.css (.../c3-custom.css) (revision 1c47ce442540d84fd2f68b3e18045d8bb50417a7) +++ reference/c3/c3-custom.css (.../c3-custom.css) (revision 72e9f399da2f9d758900c499c8cacbbb354d9c70) @@ -3,5 +3,5 @@ } .c3-chart-arc path { - stroke-width: 0.5px; + stroke-width: 0.4px; } \ No newline at end of file