| Révision | e28753c23e2e7b46183209244625fb08da7ed23d (tree) |
|---|---|
| l'heure | 2020-03-07 18:16:47 |
| Auteur | Kazuhiro Fujieda <fujieda@user...> |
| Commiter | Kazuhiro Fujieda |
報告書の戦果のグラフが機能しないのを直す
LogViewer/tags.tag (diff)| @@ -1015,15 +1015,16 @@ this.calcChartData = function() { | ||
| 1015 | 1015 | data.push(["日付", "戦果", "EO", "月毎"]); |
| 1016 | 1016 | for (var i = 0; i < result.length; i++) { |
| 1017 | 1017 | var row = result[i]; |
| 1018 | + if (row[0].match(/予測/)) | |
| 1019 | + continue; | |
| 1018 | 1020 | if (row[0].match(/引継/)) { |
| 1019 | - eo = row[2] - 0; | |
| 1020 | - data.push([0, row[1], row[2], row[3]]); | |
| 1021 | + eo = row[3] - 0; | |
| 1022 | + data.push([0, row[1], row[3], row[4]]); | |
| 1021 | 1023 | continue; |
| 1022 | 1024 | } |
| 1023 | 1025 | d = moment(row[0], "YYYY-MM-DD").date(); |
| 1024 | - eo += row[2]; | |
| 1025 | - var ach = (row[3] - eo).toFixed(1); | |
| 1026 | - data.push([d, ach, eo, row[3]]); | |
| 1026 | + eo += row[3]; | |
| 1027 | + data.push([d, row[2], eo, row[4]]); | |
| 1027 | 1028 | } |
| 1028 | 1029 | var endOfMonth = moment(month, "YYYY-MM").endOf("month").date(); |
| 1029 | 1030 | while (d < endOfMonth) { |
Fork