From 44c51225e6629905317f2bb7477203fde6ff237a Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Mon, 17 Sep 2018 19:27:32 +0200
Subject: [PATCH] Fix LTL bug, use column height, not chart height
---
components/chart/chart.js | 4 ++--
components/chart/day-column.js | 2 +-
components/chart/nfp-lines.js | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/chart/chart.js b/components/chart/chart.js
index ddd8d007..5fb03da2 100644
--- a/components/chart/chart.js
+++ b/components/chart/chart.js
@@ -33,7 +33,7 @@ export default class CycleChart extends Component {
const height = nativeEvent.layout.height
this.setState({ chartHeight: height })
this.reCalculateChartInfo = () => {
- this.setState({ columns: this.makeColumnInfo(nfpLines(height)) })
+ this.setState({ columns: this.makeColumnInfo(nfpLines()) })
}
this.cycleDaysSortedByDate.addListener(this.reCalculateChartInfo)
@@ -104,7 +104,7 @@ export default class CycleChart extends Component {
dateString,
y: temp ? normalizeToScale(temp, columnHeight) : null,
symptoms,
- ...getFhmAndLtlInfo(dateString, temp)
+ ...getFhmAndLtlInfo(dateString, temp, columnHeight)
}
})
diff --git a/components/chart/day-column.js b/components/chart/day-column.js
index 7f3fe5f1..47c41269 100644
--- a/components/chart/day-column.js
+++ b/components/chart/day-column.js
@@ -67,7 +67,7 @@ export default class DayColumn extends Component {
x2={x}
y2={columnHeight}
{...styles.nfpLine}
- key='ltl'
+ key='fhm'
/>)
columnElements.push(fhmLine)
}
diff --git a/components/chart/nfp-lines.js b/components/chart/nfp-lines.js
index ded95e81..51842d57 100644
--- a/components/chart/nfp-lines.js
+++ b/components/chart/nfp-lines.js
@@ -1,7 +1,7 @@
import { getCycleStatusForDay } from '../../lib/sympto-adapter'
import { normalizeToScale } from './y-axis'
-export default function (chartHeight) {
+export default function () {
const cycle = {
status: null
}
@@ -49,7 +49,7 @@ export default function (chartHeight) {
)
}
- return function(dateString, temperature) {
+ return function(dateString, temperature, columnHeight) {
const ret = {
drawLtlAt: null,
drawFhmLine: false
@@ -71,7 +71,7 @@ export default function (chartHeight) {
dateIsInPeriOrPostPhase(dateString) &&
isInTempMeasuringPhase(temperature, dateString)
) {
- ret.drawLtlAt = normalizeToScale(tempShift.ltl, chartHeight)
+ ret.drawLtlAt = normalizeToScale(tempShift.ltl, columnHeight)
}
}
--
GitLab