Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
backup
Drip
Commits
44c51225
Commit
44c51225
authored
6 years ago
by
Julia Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Fix LTL bug, use column height, not chart height
parent
738a00c1
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
components/chart/chart.js
+2
-2
2 additions, 2 deletions
components/chart/chart.js
components/chart/day-column.js
+1
-1
1 addition, 1 deletion
components/chart/day-column.js
components/chart/nfp-lines.js
+3
-3
3 additions, 3 deletions
components/chart/nfp-lines.js
with
6 additions
and
6 deletions
components/chart/chart.js
+
2
−
2
View file @
44c51225
...
...
@@ -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
)
}
})
...
...
This diff is collapsed.
Click to expand it.
components/chart/day-column.js
+
1
−
1
View file @
44c51225
...
...
@@ -67,7 +67,7 @@ export default class DayColumn extends Component {
x2
=
{
x
}
y2
=
{
columnHeight
}
{...
styles
.
nfpLine
}
key
=
'
ltl
'
key
=
'
fhm
'
/>
)
columnElements
.
push
(
fhmLine
)
}
...
...
This diff is collapsed.
Click to expand it.
components/chart/nfp-lines.js
+
3
−
3
View file @
44c51225
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
,
c
hart
Height
)
ret
.
drawLtlAt
=
normalizeToScale
(
tempShift
.
ltl
,
c
olumn
Height
)
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment