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
5460d574
Commit
5460d574
authored
6 years ago
by
Julia Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Use border style to draw fhm line
parent
f6607b98
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
components/chart/day-column.js
+16
-16
16 additions, 16 deletions
components/chart/day-column.js
components/chart/styles.js
+0
-1
0 additions, 1 deletion
components/chart/styles.js
with
16 additions
and
17 deletions
components/chart/day-column.js
+
16
−
16
View file @
5460d574
...
@@ -38,19 +38,11 @@ export default class DayColumn extends Component {
...
@@ -38,19 +38,11 @@ export default class DayColumn extends Component {
chartHeight
chartHeight
}
=
this
.
props
}
=
this
.
props
const
columnElements
=
[]
const
columnHeight
=
chartHeight
*
config
.
columnHeightPercentage
const
xAxisHeight
=
chartHeight
*
config
.
xAxisHeightPercentage
const
symptomHeight
=
chartHeight
*
config
.
symptomRowHeightPercentage
if
(
drawFhmLine
)
{
const
columnElements
=
[]
const
fhmLine
=
(
<
View
position
=
'
absolute
'
top
=
{
100
}
width
=
{
styles
.
nfpLine
.
strokeWidth
}
height
=
{
200
}
{...
styles
.
nfpLine
}
key
=
'
fhm
'
/>
)
columnElements
.
push
(
fhmLine
)
}
if
(
drawLtlAt
)
{
if
(
drawLtlAt
)
{
const
ltlLine
=
(
<
View
const
ltlLine
=
(
<
View
...
@@ -89,14 +81,22 @@ export default class DayColumn extends Component {
...
@@ -89,14 +81,22 @@ export default class DayColumn extends Component {
<
/Text
>
<
/Text
>
)
)
const
columnHeight
=
chartHeight
*
config
.
columnHeightPercentage
// we merge the colors here instead of from the stylesheet because of a RN
const
xAxisHeight
=
chartHeight
*
config
.
xAxisHeightPercentage
// bug that doesn't apply borderLeftColor otherwise
const
symptomHeight
=
chartHeight
*
config
.
symptomRowHeightPercentage
const
customStyle
=
{
height
:
columnHeight
,
borderLeftColor
:
'
grey
'
,
borderRightColor
:
'
grey
'
}
if
(
drawFhmLine
)
{
customStyle
.
borderLeftColor
=
styles
.
nfpLine
.
borderColor
customStyle
.
borderLeftWidth
=
3
}
const
column
=
React
.
createElement
(
const
column
=
React
.
createElement
(
TouchableOpacity
,
TouchableOpacity
,
{
{
style
:
[
styles
.
column
.
rect
,
{
height
:
columnHeight
}
],
style
:
[
styles
.
column
.
rect
,
customStyle
],
key
:
this
.
props
.
index
.
toString
(),
key
:
this
.
props
.
index
.
toString
(),
onPress
:
()
=>
{
onPress
:
()
=>
{
this
.
passDateToDayView
(
dateString
)
this
.
passDateToDayView
(
dateString
)
...
...
This diff is collapsed.
Click to expand it.
components/chart/styles.js
+
0
−
1
View file @
5460d574
...
@@ -39,7 +39,6 @@ const styles = {
...
@@ -39,7 +39,6 @@ const styles = {
rect
:
{
rect
:
{
width
:
config
.
columnWidth
,
width
:
config
.
columnWidth
,
borderStyle
:
'
solid
'
,
borderStyle
:
'
solid
'
,
borderColor
:
'
grey
'
,
borderLeftWidth
:
0.5
,
borderLeftWidth
:
0.5
,
borderRightWidth
:
0.5
,
borderRightWidth
:
0.5
,
}
}
...
...
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