Skip to content

Commit 8311bff

Browse files
committed
fixed 7-day trend bug
1 parent 5d139c6 commit 8311bff

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/App.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
var data1 = json1.epidata;
6464
var data2 = json2.epidata;
6565
for (var i = 0; i < data1.length; i++) {
66-
var ratio = data1[i].value;
67-
var count = data2[i].value;
66+
var ratio = Math.max(0, data1[i].value);
67+
var count = Math.max(0, data2[i].value);
6868
data1[i].ratio = ratio;
6969
delete data1[i].value;
7070
data1[i].count = count;

src/Graph.svelte

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,13 @@
100100
});
101101
102102
let currDate = parseTime(date);
103-
let currDateSeven = new Date().setDate(currDate.getDate() - 7);
103+
let currDateSeven = d3.timeDay.offset(currDate, -7);
104104
105105
// peg values to max and min if out of range
106106
let minMax = calculateSD(sensor);
107107
let chartMax = minMax[1];
108108
let chartMin = minMax[0];
109+
109110
for (var i = 0; i < data.length; i++) {
110111
let directionDate = parseTime(data[i].time_value);
111112
if (directionDate >= currDateSeven && directionDate <= currDate) {
@@ -221,6 +222,7 @@
221222
.style('stroke-width', d => (d.time_value == date ? 1 : 1))
222223
.style('fill', d => {
223224
let color = '#767676';
225+
console.log(d.inDirection);
224226
if (d.inDirection && signal === 'direction') {
225227
switch (d.direction) {
226228
case 1:

0 commit comments

Comments
 (0)