リビジョン | 68c2a1caeee2612b772525d404469e8a81298f52 (tree) |
---|---|
日時 | 2017-07-11 19:19:02 |
作者 | Kazuhiro Fujieda <fujieda@user...> |
コミッター | Kazuhiro Fujieda |
差分の資材グラフの期間指定で終了日を今日にしないと描画されないのを直す
@@ -610,19 +610,21 @@ this.pickChartData = function(data, range) { | ||
610 | 610 | for (var i = data.length - 1; i >= 0; i--) { |
611 | 611 | var row = data[i]; |
612 | 612 | var date = row[0]; |
613 | - if (date > first && date <= last) { | |
614 | - if (!prevRow) { | |
615 | - prevRow = row; | |
616 | - continue; | |
617 | - } | |
618 | - if (date <= lastDate) { | |
619 | - var newrow = [lastDate]; | |
620 | - for (var r = 1; r < 5; r++) { | |
621 | - newrow.push(prevRow[r] - row[r]); | |
613 | + if (date > first) { | |
614 | + if (date <= last) { | |
615 | + if (!prevRow) { | |
616 | + prevRow = row; | |
617 | + continue; | |
618 | + } | |
619 | + if (date <= lastDate) { | |
620 | + var newrow = [lastDate]; | |
621 | + for (var r = 1; r < 5; r++) { | |
622 | + newrow.push(prevRow[r] - row[r]); | |
623 | + } | |
624 | + newdata.unshift(newrow); | |
625 | + lastDate = lastDate - interval; | |
626 | + prevRow = row; | |
622 | 627 | } |
623 | - newdata.unshift(newrow); | |
624 | - lastDate = lastDate - interval; | |
625 | - prevRow = row; | |
626 | 628 | } |
627 | 629 | } else { |
628 | 630 | break; |