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
0afaf8e2
Commit
0afaf8e2
authored
6 years ago
by
Julia Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Re-add mucus icon
parent
d6cc8a7c
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
+17
-13
17 additions, 13 deletions
components/chart/day-column.js
components/chart/styles.js
+3
-3
3 additions, 3 deletions
components/chart/styles.js
with
20 additions
and
16 deletions
components/chart/day-column.js
+
17
−
13
View file @
0afaf8e2
...
@@ -9,7 +9,6 @@ import { getOrCreateCycleDay } from '../../db'
...
@@ -9,7 +9,6 @@ import { getOrCreateCycleDay } from '../../db'
import
cycleModule
from
'
../../lib/cycle
'
import
cycleModule
from
'
../../lib/cycle
'
import
setUpFertilityStatusFunc
from
'
./nfp-lines
'
import
setUpFertilityStatusFunc
from
'
./nfp-lines
'
import
{
horizontalGrid
}
from
'
./y-axis
'
import
{
horizontalGrid
}
from
'
./y-axis
'
// import slowlog from 'react-native-slowlog'
const
getCycleDayNumber
=
cycleModule
().
getCycleDayNumber
const
getCycleDayNumber
=
cycleModule
().
getCycleDayNumber
const
label
=
styles
.
column
.
label
const
label
=
styles
.
column
.
label
...
@@ -18,7 +17,6 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc()
...
@@ -18,7 +17,6 @@ const getFhmAndLtlInfo = setUpFertilityStatusFunc()
export
default
class
DayColumn
extends
Component
{
export
default
class
DayColumn
extends
Component
{
constructor
(
props
)
{
constructor
(
props
)
{
super
(
props
)
super
(
props
)
// slowlog(this, /.*/, {threshold: 30})
}
}
makeDayColumn
(
data
,
index
)
{
makeDayColumn
(
data
,
index
)
{
const
{
const
{
...
@@ -44,7 +42,7 @@ export default class DayColumn extends Component {
...
@@ -44,7 +42,7 @@ export default class DayColumn extends Component {
<
/Text
>
<
/Text
>
)
)
const
columnElements
=
[]
const
columnElements
=
[]
if
(
bleeding
)
{
if
(
typeof
bleeding
===
'
number
'
)
{
columnElements
.
push
(
columnElements
.
push
(
<
Icon
<
Icon
name
=
'
drop
'
name
=
'
drop
'
...
@@ -57,6 +55,21 @@ export default class DayColumn extends Component {
...
@@ -57,6 +55,21 @@ export default class DayColumn extends Component {
/
>
/
>
)
)
}
}
if
(
typeof
mucus
===
'
number
'
)
{
console
.
log
(
'
ever
'
)
const
mucusIcon
=
(
<
View
position
=
'
absolute
'
top
=
{
40
}
left
=
{
config
.
columnMiddle
-
styles
.
mucusIcon
.
width
/
2
}
{...
styles
.
mucusIcon
}
backgroundColor
=
{
styles
.
mucusIconShades
[
mucus
]}
/
>
)
columnElements
.
push
(
mucusIcon
)
}
columnElements
.
push
(
cycleDayLabel
,
dateLabel
,
horizontalGrid
)
columnElements
.
push
(
cycleDayLabel
,
dateLabel
,
horizontalGrid
)
if
(
nfpLineInfo
.
drawFhmLine
)
{
if
(
nfpLineInfo
.
drawFhmLine
)
{
...
@@ -71,7 +84,6 @@ export default class DayColumn extends Component {
...
@@ -71,7 +84,6 @@ export default class DayColumn extends Component {
}
}
if
(
nfpLineInfo
.
drawLtlAt
)
{
if
(
nfpLineInfo
.
drawLtlAt
)
{
console
.
log
(
'
yep
'
)
const
ltlLine
=
(
<
View
const
ltlLine
=
(
<
View
position
=
'
absolute
'
position
=
'
absolute
'
width
=
{
'
100%
'
}
width
=
{
'
100%
'
}
...
@@ -84,15 +96,7 @@ export default class DayColumn extends Component {
...
@@ -84,15 +96,7 @@ export default class DayColumn extends Component {
if
(
y
)
{
if
(
y
)
{
columnElements
.
push
(...
this
.
drawDotAndLine
(
y
,
temperatureExclude
,
index
))
columnElements
.
push
(...
this
.
drawDotAndLine
(
y
,
temperatureExclude
,
index
))
}
}
// {cycleDay && cycleDay.mucus ?
// <Circle
// {...styles.mucusIcon}
// fill={styles.mucusIconShades[cycleDay.mucus.value]}
// /> : null}
// {y ?
// this.drawDotAndLines(y, cycleDay.temperature.exclude, index)
// : null} */}
return
React
.
createElement
(
return
React
.
createElement
(
TouchableOpacity
,
TouchableOpacity
,
...
...
This diff is collapsed.
Click to expand it.
components/chart/styles.js
+
3
−
3
View file @
0afaf8e2
...
@@ -53,9 +53,9 @@ const styles = {
...
@@ -53,9 +53,9 @@ const styles = {
y
:
3
y
:
3
},
},
mucusIcon
:
{
mucusIcon
:
{
cx
:
config
.
columnW
idth
/
2
,
w
idth
:
1
2
,
cy
:
50
,
height
:
12
,
r
:
10
borderRadius
:
50
,
},
},
mucusIconShades
:
[
mucusIconShades
:
[
'
#cc99cc
'
,
'
#cc99cc
'
,
...
...
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