| リビジョン | 63cb2e7432c3530d0ee6e582d2a42039304a024a (tree) |
|---|---|
| 日時 | 2017-07-11 19:36:30 |
| 作者 | Kazuhiro Fujieda <fujieda@user...> |
| コミッター | Kazuhiro Fujieda |
資材グラフの差分の全期間でデータがひと月未満でもバーを表示する
LogViewer/tags.html (diff)| @@ -645,8 +645,10 @@ this.pickMonthlyChartData = function(data) { | ||
| 645 | 645 | var grid = []; |
| 646 | 646 | var prevRow; |
| 647 | 647 | var prevMonth; |
| 648 | + var row; | |
| 649 | + var date; | |
| 648 | 650 | for (var i = data.length - 1; i >= 0; i--) { |
| 649 | - var row = data[i]; | |
| 651 | + row = data[i]; | |
| 650 | 652 | if (!prevRow) { |
| 651 | 653 | prevRow = row; |
| 652 | 654 | var eom = moment(row[0]).endOf('month'); |
| @@ -654,7 +656,7 @@ this.pickMonthlyChartData = function(data) { | ||
| 654 | 656 | prevMonth = eom.month(); |
| 655 | 657 | continue; |
| 656 | 658 | } |
| 657 | - var date = new Date(row[0]); | |
| 659 | + date = new Date(row[0]); | |
| 658 | 660 | if (prevMonth !== date.getMonth()) { |
| 659 | 661 | var newrow = [prevRow[0]]; |
| 660 | 662 | for (var r = 1; r < 5; r++) |
| @@ -666,6 +668,14 @@ this.pickMonthlyChartData = function(data) { | ||
| 666 | 668 | prevMonth = date.getMonth(); |
| 667 | 669 | } |
| 668 | 670 | } |
| 671 | + if (prevRow && date !== prevRow[0]) { | |
| 672 | + newrow = [prevRow[0]]; | |
| 673 | + for (r = 1; r < 5; r++) | |
| 674 | + newrow.push(prevRow[r] - row[r]); | |
| 675 | + newdata.unshift(newrow); | |
| 676 | + ticks.unshift(prevRow[0]); | |
| 677 | + grid.unshift({ value: prevRow[0] }); | |
| 678 | + } | |
| 669 | 679 | return { monthly: true, data: newdata, tick: ticks, grid: grid, width: 0.5 }; |
| 670 | 680 | }; |
| 671 | 681 | </script> |
KancolleSniffer
Fork