diff --git a/.eslintrc b/.eslintrc
index 6ec6205a75c3c3f5668108ae62979aa3fafedbd7..fb7b9841bb670442504403efe5a08fea2c28bd5b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -8,6 +8,7 @@
"eslint:recommended",
"plugin:react/recommended"
],
+ "parser": "babel-eslint",
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
diff --git a/components/labels.js b/components/labels.js
index 1d3258a99bdc6f85b6618d54da4d774debfa2dcb..4e69a95241cc23da57dc203df51cbd4757cd3c29 100644
--- a/components/labels.js
+++ b/components/labels.js
@@ -45,4 +45,15 @@ export const headerTitles = {
NoteEditView: 'Note',
DesireEditView: 'Desire',
SexEditView: 'Sex'
+}
+
+export const stats = {
+ emptyStats: 'At least one completed cycle is needed to present you with stats here.',
+ oneCycleStats: (number) => `You have documented one cycle of ${number} days.`,
+ getBasisOfStats: (numberOfCycles) => `Stats are based on ${numberOfCycles} completed cycles.`,
+ daysLabel: 'days',
+ averageLabel: 'Average cycle length',
+ minLabel: 'Shortest cycle',
+ maxLabel: 'Longest cycle',
+ stdLabel: 'Standard deviation'
}
\ No newline at end of file
diff --git a/components/stats.js b/components/stats.js
index 4021fdee0af44ab2fb229e565988014ba4a4d99f..f3f136c78b2cbf5da4238590a7f76dad7b979526 100644
--- a/components/stats.js
+++ b/components/stats.js
@@ -8,15 +8,50 @@ import { LocalDate, ChronoUnit } from 'js-joda'
import styles from '../styles/index'
import cycleModule from '../lib/cycle'
import getCycleInfo from '../lib/cycle-length'
+import {stats as labels} from './labels'
export default class Stats extends Component {
render() {
const allMensesStarts = cycleModule().getAllMensesStarts()
- const statsText = determineStatsText(allMensesStarts)
+ const atLeastOneCycle = allMensesStarts.length > 1
+ let cycleLengths
+ let numberOfCycles
+ let cycleInfo
+ if (atLeastOneCycle) {
+ cycleLengths = getCycleLength(allMensesStarts)
+ numberOfCycles = cycleLengths.length
+ if (numberOfCycles > 1) {
+ cycleInfo = getCycleInfo(cycleLengths)
+ }
+ }
return (
<ScrollView>
<View>
- <Text style={styles.stats}>{statsText}</Text>
+ {!atLeastOneCycle &&
+ <Text style={styles.statsIntro}>{labels.emptyStats}</Text>
+ }
+ {atLeastOneCycle && numberOfCycles === 1 &&
+ <Text style={styles.statsIntro}>{labels.oneCycleStats(cycleLengths[0])}</Text>
+ }
+ {atLeastOneCycle && numberOfCycles > 1 && <View>
+ <Text style={styles.statsIntro}>{labels.getBasisOfStats(numberOfCycles)}</Text>
+ <View style={styles.statsRow}>
+ <Text style={styles.statsLabelLeft}>{labels.averageLabel}</Text>
+ <Text style={styles.statsLabelRight}>{cycleInfo.mean + ' ' + labels.daysLabel}</Text>
+ </View>
+ <View style={styles.statsRow}>
+ <Text style={styles.statsLabelLeft}>{labels.minLabel}</Text>
+ <Text style={styles.statsLabelRight}>{cycleInfo.minimum + ' ' + labels.daysLabel}</Text>
+ </View>
+ <View style={styles.statsRow}>
+ <Text style={styles.statsLabelLeft}>{labels.maxLabel}</Text>
+ <Text style={styles.statsLabelRight}>{cycleInfo.maximum + ' ' + labels.daysLabel}</Text>
+ </View>
+ <View style={styles.statsRow}>
+ <Text style={styles.statsLabelLeft}>{labels.stdLabel}</Text>
+ <Text style={styles.statsLabelRight}>{cycleInfo.stdDeviation + ' ' + labels.daysLabel}</Text>
+ </View>
+ </View>}
</View>
</ScrollView>
)
@@ -31,21 +66,4 @@ function getCycleLength(cycleStartDates) {
cycleLengths.push(cycleStart.until(nextCycleStart, ChronoUnit.DAYS))
}
return cycleLengths
-}
-
-function determineStatsText(allMensesStarts) {
- const emptyStats = 'At least one completed cycle is needed to present you with stats here.'
- if (allMensesStarts.length < 2) {
- return emptyStats
- } else {
- const cycleLengths = getCycleLength(allMensesStarts)
- const numberOfCycles = cycleLengths.length
- if (numberOfCycles === 1) {
- return `You have documented one cycle of ${cycleLengths[0]} days.`
- }
- const cycleInfo = getCycleInfo(cycleLengths)
- const statsText = `Stats are based on ${numberOfCycles} completed cycles.\n\n\
- Average cycle length: ${cycleInfo.mean} days\n\nShortest cycle: ${cycleInfo.minimum} days\nLongest cycle: ${cycleInfo.maximum} days\nMedian length (meaning 50% of cycles are of this length or shorter): ${cycleInfo.median} days\nStandard deviation: ${cycleInfo.stdDeviation}`
- return statsText
- }
}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9823a713e6ae35c8dbfa4b2a799e41bcfce4de33..2e57413b2f834ab6ee65569d48a1b73ce472fef4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1339,6 +1339,203 @@
"source-map": "^0.5.7"
}
},
+ "babel-eslint": {
+ "version": "8.2.6",
+ "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.6.tgz",
+ "integrity": "sha512-aCdHjhzcILdP8c9lej7hvXKvQieyRt20SF102SIGyY4cUIiw6UaAtK4j2o3dXX74jEmy0TJ0CEhv4fTIM3SzcA==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.0.0-beta.44",
+ "@babel/traverse": "7.0.0-beta.44",
+ "@babel/types": "7.0.0-beta.44",
+ "babylon": "7.0.0-beta.44",
+ "eslint-scope": "3.7.1",
+ "eslint-visitor-keys": "^1.0.0"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz",
+ "integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "7.0.0-beta.44"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz",
+ "integrity": "sha512-5xVb7hlhjGcdkKpMXgicAVgx8syK5VJz193k0i/0sLP6DzE6lRrU1K3B/rFefgdo9LPGMAOOOAWW4jycj07ShQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.0.0-beta.44",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.2.0",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz",
+ "integrity": "sha512-MHRG2qZMKMFaBavX0LWpfZ2e+hLloT++N7rfM3DYOMUOGCD8cVjqZpwiL8a0bOX3IYcQev1ruciT0gdFFRTxzg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "7.0.0-beta.44",
+ "@babel/template": "7.0.0-beta.44",
+ "@babel/types": "7.0.0-beta.44"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz",
+ "integrity": "sha512-w0YjWVwrM2HwP6/H3sEgrSQdkCaxppqFeJtAnB23pRiJB5E/O9Yp7JAAeWBl+gGEgmBFinnTyOv2RN7rcSmMiw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.0.0-beta.44"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz",
+ "integrity": "sha512-aQ7QowtkgKKzPGf0j6u77kBMdUFVBKNHw2p/3HX/POt5/oz8ec5cs0GwlgM8Hz7ui5EwJnzyfRmkNF1Nx1N7aA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.0.0-beta.44"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
+ "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "^2.0.0",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.0"
+ }
+ },
+ "@babel/template": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
+ "integrity": "sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.0.0-beta.44",
+ "@babel/types": "7.0.0-beta.44",
+ "babylon": "7.0.0-beta.44",
+ "lodash": "^4.2.0"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz",
+ "integrity": "sha512-UHuDz8ukQkJCDASKHf+oDt3FVUzFd+QYfuBIsiNu/4+/ix6pP/C+uQZJ6K1oEfbCMv/IKWbgDEh7fcsnIE5AtA==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.0.0-beta.44",
+ "@babel/generator": "7.0.0-beta.44",
+ "@babel/helper-function-name": "7.0.0-beta.44",
+ "@babel/helper-split-export-declaration": "7.0.0-beta.44",
+ "@babel/types": "7.0.0-beta.44",
+ "babylon": "7.0.0-beta.44",
+ "debug": "^3.1.0",
+ "globals": "^11.1.0",
+ "invariant": "^2.2.0",
+ "lodash": "^4.2.0"
+ }
+ },
+ "@babel/types": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz",
+ "integrity": "sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.2.0",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "babylon": {
+ "version": "7.0.0-beta.44",
+ "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+ "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "eslint-scope": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+ "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+ "dev": true,
+ "requires": {
+ "esrecurse": "^4.1.0",
+ "estraverse": "^4.1.1"
+ }
+ },
+ "globals": {
+ "version": "11.7.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+ "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
+ "dev": true
+ },
+ "js-tokens": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+ "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+ "dev": true
+ },
+ "jsesc": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+ "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "dev": true
+ }
+ }
+ },
"babel-generator": {
"version": "6.26.1",
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
diff --git a/package.json b/package.json
index 4a07999ff691225c6f4e3a13a3519d973a56e896..6ff1901c2e599b1eec0fbdc9b28fc376f3425dc5 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
},
"devDependencies": {
"@babel/register": "^7.0.0-beta.55",
+ "babel-eslint": "^8.2.6",
"babel-preset-react-native": "^5.0.0",
"chai": "^4.1.2",
"dirty-chai": "^2.0.1",
diff --git a/styles/index.js b/styles/index.js
index 4b90e8dbee9d6df9cb55fb96b1c56f9f895ec4b6..6e14c9fc1fa692fc69de5832aff75037eccc4f80 100644
--- a/styles/index.js
+++ b/styles/index.js
@@ -146,9 +146,25 @@ export default StyleSheet.create({
marginLeft: 'auto',
marginRight: 'auto'
},
- stats: {
+ statsIntro: {
+ fontSize: 18,
+ margin: 10,
+ textAlign: 'left',
+ textAlignVertical: 'center'
+ },
+ statsRow: {
+ flexDirection: 'row',
+ width: '100%'
+ },
+ statsLabelLeft: {
+ fontSize: 18,
+ width: '60%',
+ textAlign: 'left',
+ textAlignVertical: 'center',
+ marginLeft: 10
+ },
+ statsLabelRight: {
fontSize: 18,
- margin: 30,
textAlign: 'left',
textAlignVertical: 'center'
},