Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ba294668fb | |||
| f11eb3d1a1 | |||
| 5f83464649 | |||
| 6e2e03f39e | |||
| cc62e24229 | |||
| cd24522b4d | |||
| 446638d6de | |||
| ae23ef2c58 | |||
| 38b9e8b31f | |||
| 84d657cabb | |||
| 4573b93921 | |||
| ab88a4c163 | |||
| baaf89c04e | |||
| d476f6c143 | |||
| b56e0818f3 | |||
| 1b5ffaf5d6 | |||
| f68cc2b49e | |||
| 27d430a465 | |||
| 28f52e2cea | |||
| 3f87f298fb | |||
| 585f32863d | |||
| 51e1c95e71 | |||
| 36c33c69b7 |
@@ -14,3 +14,4 @@ updates:
|
||||
- dependency-name: 'react'
|
||||
- dependency-name: 'react-native'
|
||||
- dependency-name: 'react-native-push-notifications'
|
||||
- dependency-name: '@babel/core'
|
||||
|
||||
@@ -201,7 +201,3 @@ More information about how the app calculates fertility status and bleeding pred
|
||||
react-native link
|
||||
|
||||
5. You should be able to use the icon now within drip, e.g. in Cycle Day Overview and on the chart.
|
||||
|
||||
## Translation
|
||||
|
||||
We are using [Weblate](https://weblate.org/) as translation software.
|
||||
|
||||
@@ -6,16 +6,17 @@ import AppText from '../common/app-text'
|
||||
import CloseIcon from '../common/close-icon'
|
||||
|
||||
import { Containers, Spacing } from '../../styles'
|
||||
import { chart } from '../../i18n/en/labels'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const image = require('../../assets/swipe.png')
|
||||
|
||||
const Tutorial = ({ onClose }) => {
|
||||
const { t } = useTranslation()
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
<Image resizeMode="contain" source={image} style={styles.image} />
|
||||
<View style={styles.textContainer}>
|
||||
<AppText>{chart.tutorial}</AppText>
|
||||
<AppText>{t('chart.tutorial')}</AppText>
|
||||
</View>
|
||||
<CloseIcon onClose={onClose} />
|
||||
</View>
|
||||
@@ -9,7 +9,7 @@ import HorizontalGrid from './horizontal-grid'
|
||||
import MainGrid from './main-grid'
|
||||
import NoData from './no-data'
|
||||
import NoTemperature from './no-temperature'
|
||||
import Tutorial from './tutorial'
|
||||
import Tutorial from './Tutorial'
|
||||
import YAxis from './y-axis'
|
||||
|
||||
import { getCycleDaysSortedByDate } from '../../db'
|
||||
|
||||
@@ -8,15 +8,13 @@ import { Sizes } from '../../styles'
|
||||
import { CHART_TICK_WIDTH } from '../../config'
|
||||
|
||||
const Tick = ({ yPosition, height, isBold, shouldShowLabel, label }) => {
|
||||
const top = yPosition - height / 2 - 4
|
||||
const top = yPosition - height / 2
|
||||
const containerStyle = [styles.container, { flexBasis: height, height, top }]
|
||||
const textStyle = isBold ? styles.textBold : styles.textNormal
|
||||
|
||||
if (!shouldShowLabel) return null
|
||||
|
||||
return (
|
||||
<View style={containerStyle}>
|
||||
<AppText style={textStyle}>{label}</AppText>
|
||||
<AppText style={textStyle}>{shouldShowLabel && label}</AppText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -38,7 +36,6 @@ const styles = StyleSheet.create({
|
||||
position: 'absolute',
|
||||
right: 0,
|
||||
width: CHART_TICK_WIDTH,
|
||||
minHeight: Sizes.base + 2,
|
||||
},
|
||||
textBold: {
|
||||
fontSize: Sizes.base,
|
||||
|
||||
@@ -3,7 +3,6 @@ import { LocalDate } from '@js-joda/core'
|
||||
import { scaleObservable, unitObservable } from '../../local-storage'
|
||||
import { getCycleStatusForDay } from '../../lib/sympto-adapter'
|
||||
import { getCycleDay, getAmountOfCycleDays } from '../../db'
|
||||
import { Sizes } from '../../styles'
|
||||
|
||||
//YAxis helpers
|
||||
|
||||
@@ -51,19 +50,15 @@ export function getTickList(columnHeight) {
|
||||
const label = tick.toFixed(1)
|
||||
let shouldShowLabel
|
||||
|
||||
// when units === 0.1 and tick height is big enough, we show temp values with step 0.2
|
||||
// when units === 0.5 and tick height is not big enough, we show temp values with step 1
|
||||
// otherwise we show temp values with step 0.5
|
||||
// when temp range <= 2, units === 0.1 we show temp values with step 0.2
|
||||
// when temp range > 2, units === 0.5 we show temp values with step 0.5
|
||||
|
||||
switch (true) {
|
||||
case unit === 0.1 && tickHeight > Sizes.base + 2:
|
||||
shouldShowLabel = !((label * 10) % 2)
|
||||
break
|
||||
case unit === 0.5 && tickHeight <= Sizes.base + 2:
|
||||
shouldShowLabel = !((label * 10) % 10)
|
||||
break
|
||||
default:
|
||||
shouldShowLabel = !((label * 10) % 5)
|
||||
if (unit === 0.1) {
|
||||
// show label with step 0.2
|
||||
shouldShowLabel = !((label * 10) % 2)
|
||||
} else {
|
||||
// show label with step 0.5
|
||||
shouldShowLabel = !((label * 10) % 5)
|
||||
}
|
||||
|
||||
// don't show label, if first or last tick
|
||||
|
||||
@@ -6,20 +6,23 @@ import MenuItem from './menu-item'
|
||||
|
||||
import { Containers } from '../../styles'
|
||||
import { pages } from '../pages'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const Menu = ({ currentPage, navigate }) => {
|
||||
const menuItems = pages.filter((page) => page.isInMenu)
|
||||
|
||||
const { t } = useTranslation(null, { keyPrefix: 'bottomMenu' })
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
{menuItems.map(({ icon, label, component }) => {
|
||||
{menuItems.map(({ icon, labelKey, component }) => {
|
||||
return (
|
||||
<MenuItem
|
||||
isActive={component === currentPage}
|
||||
onPress={() => navigate(component)}
|
||||
icon={icon}
|
||||
key={label}
|
||||
label={label}
|
||||
key={labelKey}
|
||||
label={t(labelKey)}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
|
||||
+3
-15
@@ -1,75 +1,63 @@
|
||||
import settingsViews from './settings'
|
||||
|
||||
import settingsLabels from '../i18n/en/settings'
|
||||
const labels = settingsLabels.menuItems
|
||||
|
||||
export const pages = [
|
||||
{
|
||||
component: 'Home',
|
||||
icon: 'home',
|
||||
label: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Calendar',
|
||||
icon: 'calendar',
|
||||
isInMenu: true,
|
||||
label: 'Calendar',
|
||||
labelKey: 'calendar',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Chart',
|
||||
icon: 'chart',
|
||||
isInMenu: true,
|
||||
label: 'Chart',
|
||||
labelKey: 'chart',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Stats',
|
||||
icon: 'statistics',
|
||||
isInMenu: true,
|
||||
label: 'Stats',
|
||||
labelKey: 'stats',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
children: Object.keys(settingsViews),
|
||||
component: 'SettingsMenu',
|
||||
icon: 'settings',
|
||||
label: 'Settings',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Reminders',
|
||||
label: labels.reminders.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'NfpSettings',
|
||||
label: labels.nfpSettings.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'DataManagement',
|
||||
label: labels.dataManagement.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'Password',
|
||||
label: labels.password.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'About',
|
||||
label: 'About',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'License',
|
||||
label: 'License',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'PrivacyPolicy',
|
||||
label: 'PrivacyPolicy',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
|
||||
+8
-27
@@ -6,40 +6,23 @@ import AppText from '../../common/app-text'
|
||||
import Button from '../../common/button'
|
||||
import Segment from '../../common/segment'
|
||||
|
||||
import { openImportDialog, getFileContent, importData } from './import-dialog'
|
||||
import openShareDialogAndExport from './export-dialog'
|
||||
import DeleteData from './delete-data'
|
||||
|
||||
import labels from '../../../i18n/en/settings'
|
||||
import { ACTION_DELETE, ACTION_EXPORT, ACTION_IMPORT } from '../../../config'
|
||||
import ImportData from './ImportData'
|
||||
|
||||
const DataManagement = () => {
|
||||
const [isLoading, setIsLoading] = useState(false)
|
||||
const [currentAction, setCurrentAction] = useState(null)
|
||||
|
||||
const startImportFlow = async (shouldDeleteExistingData) => {
|
||||
setIsLoading(true)
|
||||
const fileContent = await getFileContent()
|
||||
if (fileContent) {
|
||||
await importData(shouldDeleteExistingData, fileContent)
|
||||
}
|
||||
setIsLoading(false)
|
||||
}
|
||||
const [isDeletingData, setIsDeletingData] = useState(false)
|
||||
|
||||
const startExport = () => {
|
||||
setCurrentAction(ACTION_EXPORT)
|
||||
setIsDeletingData(false)
|
||||
openShareDialogAndExport()
|
||||
}
|
||||
|
||||
const startImport = () => {
|
||||
setCurrentAction(ACTION_IMPORT)
|
||||
openImportDialog(startImportFlow)
|
||||
}
|
||||
|
||||
if (isLoading) return <AppLoadingView />
|
||||
|
||||
const isDeletingData = currentAction === ACTION_DELETE
|
||||
|
||||
return (
|
||||
<AppPage>
|
||||
<Segment title={labels.export.button}>
|
||||
@@ -48,17 +31,15 @@ const DataManagement = () => {
|
||||
{labels.export.button}
|
||||
</Button>
|
||||
</Segment>
|
||||
<Segment title={labels.import.button}>
|
||||
<AppText>{labels.import.segmentExplainer}</AppText>
|
||||
<Button isCTA onPress={startImport}>
|
||||
{labels.import.button}
|
||||
</Button>
|
||||
</Segment>
|
||||
<ImportData
|
||||
resetIsDeletingData={() => setIsDeletingData(false)}
|
||||
setIsLoading={setIsLoading}
|
||||
/>
|
||||
<Segment title={labels.deleteSegment.title} last>
|
||||
<AppText>{labels.deleteSegment.explainer}</AppText>
|
||||
<DeleteData
|
||||
isDeletingData={isDeletingData}
|
||||
onStartDeletion={() => setCurrentAction(ACTION_DELETE)}
|
||||
onStartDeletion={() => setIsDeletingData(true)}
|
||||
/>
|
||||
</Segment>
|
||||
</AppPage>
|
||||
@@ -0,0 +1,97 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Alert } from 'react-native'
|
||||
import DocumentPicker from 'react-native-document-picker'
|
||||
import rnfs from 'react-native-fs'
|
||||
import importCsv from '../../../lib/import-export/import-from-csv'
|
||||
import alertError from '../common/alert-error'
|
||||
import Segment from '../../common/segment'
|
||||
import AppText from '../../common/app-text'
|
||||
import Button from '../../common/button'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
export default function ImportData({ resetIsDeletingData, setIsLoading }) {
|
||||
const { t } = useTranslation(null, {
|
||||
keyPrefix: 'hamburgerMenu.settings.data.import',
|
||||
})
|
||||
|
||||
async function startImport(shouldDeleteExistingData) {
|
||||
setIsLoading(true)
|
||||
await importData(shouldDeleteExistingData)
|
||||
setIsLoading(false)
|
||||
}
|
||||
|
||||
async function getFileInfo() {
|
||||
try {
|
||||
const fileInfo = await DocumentPicker.pickSingle({
|
||||
type: [DocumentPicker.types.csv, 'text/comma-separated-values'],
|
||||
})
|
||||
return fileInfo
|
||||
} catch (error) {
|
||||
if (DocumentPicker.isCancel(error)) return // User cancelled the picker, exit any dialogs or menus and move on
|
||||
showImportErrorAlert(error)
|
||||
}
|
||||
}
|
||||
|
||||
async function getFileContent() {
|
||||
const fileInfo = await getFileInfo()
|
||||
if (!fileInfo) return null
|
||||
|
||||
try {
|
||||
const fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
||||
return fileContent
|
||||
} catch (err) {
|
||||
return showImportErrorAlert(t('error.couldNotOpenFile'))
|
||||
}
|
||||
}
|
||||
|
||||
async function importData(shouldDeleteExistingData) {
|
||||
const fileContent = await getFileContent()
|
||||
if (!fileContent) return
|
||||
|
||||
try {
|
||||
await importCsv(fileContent, shouldDeleteExistingData)
|
||||
Alert.alert(t('success.title'), t('success.message'))
|
||||
} catch (err) {
|
||||
showImportErrorAlert(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
function openImportDialog() {
|
||||
resetIsDeletingData()
|
||||
Alert.alert(t('dialog.title'), t('dialog.message'), [
|
||||
{
|
||||
text: t('dialog.cancel'),
|
||||
style: 'cancel',
|
||||
onPress: () => {},
|
||||
},
|
||||
{
|
||||
text: t('dialog.replace'),
|
||||
onPress: () => startImport(false),
|
||||
},
|
||||
{
|
||||
text: t('dialog.delete'),
|
||||
onPress: () => startImport(true),
|
||||
},
|
||||
])
|
||||
}
|
||||
|
||||
function showImportErrorAlert(message) {
|
||||
const errorMessage = t('error.noDataImported', { message })
|
||||
alertError(errorMessage)
|
||||
}
|
||||
|
||||
return (
|
||||
<Segment title={t('button')}>
|
||||
<AppText>{t('segmentExplainer')}</AppText>
|
||||
<Button isCTA onPress={openImportDialog}>
|
||||
{t('button')}
|
||||
</Button>
|
||||
</Segment>
|
||||
)
|
||||
}
|
||||
|
||||
ImportData.propTypes = {
|
||||
resetIsDeletingData: PropTypes.func.isRequired,
|
||||
setIsLoading: PropTypes.func.isRequired,
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
import { Alert } from 'react-native'
|
||||
import DocumentPicker from 'react-native-document-picker'
|
||||
import rnfs from 'react-native-fs'
|
||||
import importCsv from '../../../lib/import-export/import-from-csv'
|
||||
import { shared as sharedLabels } from '../../../i18n/en/labels'
|
||||
import labels from '../../../i18n/en/settings'
|
||||
import alertError from '../common/alert-error'
|
||||
|
||||
export function openImportDialog(onImportData) {
|
||||
Alert.alert(labels.import.title, labels.import.message, [
|
||||
{
|
||||
text: sharedLabels.cancel,
|
||||
style: 'cancel',
|
||||
onPress: () => {},
|
||||
},
|
||||
{
|
||||
text: labels.import.replaceOption,
|
||||
onPress: () => onImportData(false),
|
||||
},
|
||||
{
|
||||
text: labels.import.deleteOption,
|
||||
onPress: () => onImportData(true),
|
||||
},
|
||||
])
|
||||
}
|
||||
|
||||
export async function getFileContent() {
|
||||
let fileInfo
|
||||
try {
|
||||
fileInfo = await DocumentPicker.pickSingle({
|
||||
type: [DocumentPicker.types.csv, 'text/comma-separated-values'],
|
||||
})
|
||||
} catch (error) {
|
||||
if (DocumentPicker.isCancel(error)) {
|
||||
// User cancelled the picker, exit any dialogs or menus and move on
|
||||
return
|
||||
} else {
|
||||
importError(error)
|
||||
}
|
||||
}
|
||||
|
||||
let fileContent
|
||||
try {
|
||||
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
||||
} catch (err) {
|
||||
return importError(labels.import.errors.couldNotOpenFile)
|
||||
}
|
||||
|
||||
return fileContent
|
||||
}
|
||||
|
||||
export async function importData(shouldDeleteExistingData, fileContent) {
|
||||
try {
|
||||
await importCsv(fileContent, shouldDeleteExistingData)
|
||||
Alert.alert(sharedLabels.successTitle, labels.import.success.message)
|
||||
} catch (err) {
|
||||
importError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
function importError(msg) {
|
||||
const postFixed = `${msg}\n\n${labels.import.errors.postFix}`
|
||||
alertError(postFixed)
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import Reminders from './reminders/reminders'
|
||||
import NfpSettings from './nfp-settings'
|
||||
import DataManagement from './data-management'
|
||||
import DataManagement from './data-management/DataManagement'
|
||||
import Password from './password'
|
||||
import About from './About'
|
||||
import License from './License'
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
import { PixelRatio, StatusBar } from 'react-native'
|
||||
import { scale, verticalScale } from 'react-native-size-matters'
|
||||
|
||||
export const ACTION_DELETE = 'delete'
|
||||
export const ACTION_EXPORT = 'export'
|
||||
export const ACTION_IMPORT = 'import'
|
||||
|
||||
export const SYMPTOMS = [
|
||||
'bleeding',
|
||||
'temperature',
|
||||
@@ -40,7 +36,7 @@ export const HIT_SLOP = {
|
||||
top: verticalScale(20),
|
||||
bottom: verticalScale(20),
|
||||
left: scale(20),
|
||||
right: scale(20)
|
||||
right: scale(20),
|
||||
}
|
||||
|
||||
export const STATUSBAR_HEIGHT = StatusBar.currentHeight
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
{
|
||||
"bottomMenu": {
|
||||
"calendar": "Calendar",
|
||||
"chart": "Chart",
|
||||
"stats": "Stats"
|
||||
},
|
||||
"chart": {
|
||||
"tutorial": "You can swipe the chart to view more dates."
|
||||
},
|
||||
"cycleDay": {
|
||||
"symptomBox": {
|
||||
"bleeding": "Bleeding",
|
||||
@@ -80,6 +88,29 @@
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"data": {
|
||||
"import": {
|
||||
"button": "Import data",
|
||||
"dialog": {
|
||||
"cancel": "Cancel",
|
||||
"delete": "Import and delete existing",
|
||||
"message": "There are two options for the import:\n\n1. Keep existing cycle days and replace only the ones in the import file.\n\n2. Delete all existing cycle days and import cycle days from file",
|
||||
"replace": "Import and replace",
|
||||
"title": "Keep existing data?"
|
||||
},
|
||||
"error": {
|
||||
"couldNotOpenFile": "Could not open file",
|
||||
"futureEdit": "Future dates may only contain a note, no other symptoms",
|
||||
"incorrectColumns": "Expected CSV column titles to be {{incorrectColumns}}",
|
||||
"noDataImported": "{{message}}\n\nNo data was imported or changed"
|
||||
},
|
||||
"segmentExplainer": "Import data in CSV format",
|
||||
"success": {
|
||||
"message": "Data successfully imported",
|
||||
"title": "Success"
|
||||
}
|
||||
}
|
||||
},
|
||||
"menuItem": {
|
||||
"dataManagement": {
|
||||
"name": "Data",
|
||||
|
||||
@@ -3,10 +3,6 @@ export const home = {
|
||||
phase: (n) => `${['1st', '2nd', '3rd'][n - 1]} cycle phase`,
|
||||
}
|
||||
|
||||
export const chart = {
|
||||
tutorial: 'You can swipe the chart to view more dates.',
|
||||
}
|
||||
|
||||
export const shared = {
|
||||
cancel: 'Cancel',
|
||||
save: 'Save',
|
||||
|
||||
@@ -1,24 +1,6 @@
|
||||
import links from './links'
|
||||
|
||||
export default {
|
||||
menuItems: {
|
||||
reminders: {
|
||||
name: 'Reminders',
|
||||
text: 'turn on/off reminders',
|
||||
},
|
||||
nfpSettings: {
|
||||
name: 'NFP settings',
|
||||
text: 'define how you want to use NFP',
|
||||
},
|
||||
dataManagement: {
|
||||
name: 'Data',
|
||||
text: 'import, export or delete your data',
|
||||
},
|
||||
password: {
|
||||
name: 'Password',
|
||||
text: '',
|
||||
},
|
||||
},
|
||||
export: {
|
||||
errors: {
|
||||
noData: 'There is no data to export',
|
||||
@@ -31,24 +13,6 @@ export default {
|
||||
segmentExplainer:
|
||||
'Export data in CSV format for backup or so you can use it elsewhere',
|
||||
},
|
||||
import: {
|
||||
button: 'Import data',
|
||||
title: 'Keep existing data?',
|
||||
message: `There are two options for the import:
|
||||
1. Keep existing cycle days and replace only the ones in the import file.
|
||||
2. Delete all existing cycle days and import cycle days from file.`,
|
||||
replaceOption: 'Import and replace',
|
||||
deleteOption: 'Import and delete existing',
|
||||
errors: {
|
||||
couldNotOpenFile: 'Could not open file',
|
||||
postFix: 'No data was imported or changed',
|
||||
futureEdit: 'Future dates may only contain a note, no other symptoms',
|
||||
},
|
||||
success: {
|
||||
message: 'Data successfully imported',
|
||||
},
|
||||
segmentExplainer: 'Import data in CSV format',
|
||||
},
|
||||
deleteSegment: {
|
||||
title: 'Delete app data',
|
||||
explainer: 'Delete app data from this phone',
|
||||
|
||||
@@ -17,7 +17,6 @@ i18n
|
||||
compatibilityJSON: 'v3', // TODO: migrate json to v4 and afterwards remove it
|
||||
resources,
|
||||
fallbackLng: 'en',
|
||||
debug: true,
|
||||
|
||||
interpolation: {
|
||||
escapeValue: false, // not needed for react as it escapes by default
|
||||
|
||||
@@ -5,4 +5,8 @@ module.exports = {
|
||||
transformIgnorePatterns: [
|
||||
'node_modules/(?!((jest-)?react-native(-.*)?|@react-native(-community)?)/)',
|
||||
],
|
||||
watchPlugins: [
|
||||
'jest-watch-typeahead/filename',
|
||||
'jest-watch-typeahead/testname',
|
||||
],
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
import getColumnNamesForCsv from './get-csv-column-names'
|
||||
import replaceWithNullIfAllPropertiesAreNull from './replace-with-null'
|
||||
import { LocalDate } from '@js-joda/core'
|
||||
import labels from '../../i18n/en/settings'
|
||||
import i18next from 'i18next'
|
||||
|
||||
export default async function importCsv(csv, deleteFirst) {
|
||||
const parseFuncs = {
|
||||
@@ -46,7 +46,10 @@ export default async function importCsv(csv, deleteFirst) {
|
||||
|
||||
const cycleDays = await csvParser(config)
|
||||
.fromString(csv)
|
||||
.on('header', validateHeaders)
|
||||
.on('header', (headers) => validateHeaders(headers))
|
||||
.on('error', (error) => {
|
||||
throw error
|
||||
})
|
||||
|
||||
//remove symptoms where all fields are null
|
||||
putNullForEmptySymptoms(cycleDays)
|
||||
@@ -67,8 +70,11 @@ function validateHeaders(headers) {
|
||||
return expectedHeaders.indexOf(header) > -1
|
||||
})
|
||||
) {
|
||||
const msg = `Expected CSV column titles to be ${expectedHeaders.join()}`
|
||||
throw new Error(msg)
|
||||
throw new Error(
|
||||
i18next.t('hamburgerMenu.settings.data.import.error.incorrectColumns', {
|
||||
incorrectColumns: expectedHeaders.join(),
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,7 +98,9 @@ function throwIfFutureData(cycleDays) {
|
||||
day.date > today &&
|
||||
Object.keys(day).some((symptom) => symptom != 'date' && symptom != 'note')
|
||||
) {
|
||||
throw new Error(labels.import.errors.futureEdit)
|
||||
throw new Error(
|
||||
i18next.t('hamburgerMenu.settings.data.import.error.futureEdit')
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-4
@@ -1,17 +1,16 @@
|
||||
export default function (feeling, texture) {
|
||||
|
||||
export default function getSensiplanMucus(feeling, texture) {
|
||||
if (typeof feeling != 'number' || typeof texture != 'number') return null
|
||||
|
||||
const feelingMapping = {
|
||||
0: 0,
|
||||
1: 1,
|
||||
2: 2,
|
||||
3: 4
|
||||
3: 4,
|
||||
}
|
||||
const textureMapping = {
|
||||
0: 0,
|
||||
1: 3,
|
||||
2: 4
|
||||
2: 4,
|
||||
}
|
||||
const nfpFeelingValue = feelingMapping[feeling]
|
||||
const nfpTextureValue = textureMapping[texture]
|
||||
|
||||
+4
-10
@@ -12,16 +12,10 @@ export const unitObservable = Observable()
|
||||
unitObservable.set(TEMP_SCALE_UNITS)
|
||||
scaleObservable((scale) => {
|
||||
const scaleRange = scale.max - scale.min
|
||||
|
||||
switch (true) {
|
||||
case scaleRange <= 1:
|
||||
unitObservable.set(0.1)
|
||||
break
|
||||
case scaleRange > 1 && scaleRange <= 2:
|
||||
unitObservable.set(0.2)
|
||||
break
|
||||
default:
|
||||
unitObservable.set(0.5)
|
||||
if (scaleRange <= 1.5) {
|
||||
unitObservable.set(0.1)
|
||||
} else {
|
||||
unitObservable.set(0.5)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
+9
-8
@@ -29,21 +29,21 @@
|
||||
"prepare": "husky install"
|
||||
},
|
||||
"dependencies": {
|
||||
"@js-joda/core": "^5.3.0",
|
||||
"@js-joda/core": "^5.5.3",
|
||||
"@ptomasroos/react-native-multi-slider": "^2.2.0",
|
||||
"@react-native-async-storage/async-storage": "^1.17.9",
|
||||
"@react-native-community/art": "^1.2.0",
|
||||
"@react-native-community/datetimepicker": "^6.3.1",
|
||||
"@react-native-community/push-notification-ios": "^1.8.0",
|
||||
"csvtojson": "^2.0.8",
|
||||
"i18next": "^21.9.0",
|
||||
"i18next": "^22.0.2",
|
||||
"jshashes": "^1.0.8",
|
||||
"moment": "^2.29.4",
|
||||
"object-path": "^0.11.4",
|
||||
"obv": "0.0.1",
|
||||
"prop-types": "^15.8.1",
|
||||
"react": "17.0.2",
|
||||
"react-i18next": "^11.18.3",
|
||||
"react-i18next": "^12.0.0",
|
||||
"react-native": "0.67.4",
|
||||
"react-native-calendars": "^1.1287.0",
|
||||
"react-native-document-picker": "^8.1.1",
|
||||
@@ -58,17 +58,18 @@
|
||||
"sympto": "3.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.12.9",
|
||||
"@babel/core": "^7.20.2",
|
||||
"@babel/eslint-parser": "^7.19.1",
|
||||
"@babel/preset-react": "^7.16.0",
|
||||
"@babel/preset-react": "^7.18.6",
|
||||
"@babel/runtime": "^7.12.5",
|
||||
"@testing-library/jest-native": "^4.0.12",
|
||||
"@testing-library/react-native": "^11.1.0",
|
||||
"basic-changelog": "gitlab:bloodyhealth/basic-changelog",
|
||||
"eslint": "7.14.0",
|
||||
"eslint-plugin-react": "^7.8.2",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-react": "^7.31.10",
|
||||
"husky": "^8.0.0",
|
||||
"jest": "^28.1.3",
|
||||
"jest": "^29.1.2",
|
||||
"jest-watch-typeahead": "^2.2.0",
|
||||
"jetifier": "^1.6.6",
|
||||
"metro-react-native-babel-preset": "^0.66.2",
|
||||
"prettier": "2.4.0",
|
||||
|
||||
@@ -1,27 +1,19 @@
|
||||
import React from 'react'
|
||||
import { render, screen, fireEvent } from '@testing-library/react-native'
|
||||
import AcceptLicense from '../components/AcceptLicense'
|
||||
|
||||
import { saveLicenseFlag } from '../local-storage'
|
||||
import { render, screen, fireEvent } from './test-utils'
|
||||
|
||||
jest.mock('../local-storage', () => ({
|
||||
saveLicenseFlag: jest.fn(() => Promise.resolve()),
|
||||
}))
|
||||
|
||||
jest.mock('react-i18next', () => ({
|
||||
useTranslation: () => ({
|
||||
t: (str, options) => {
|
||||
return str + (options ? JSON.stringify(options) : '')
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
describe('AcceptLicense', () => {
|
||||
test('On clicking OK button, the license is accepted', async () => {
|
||||
test('should accept license when clicking ok button', async () => {
|
||||
const mockedSetLicense = jest.fn()
|
||||
render(<AcceptLicense setLicense={mockedSetLicense} />)
|
||||
|
||||
const okButton = screen.getByText('ok', { exact: false })
|
||||
const okButton = screen.getByText('OK')
|
||||
|
||||
fireEvent(okButton, 'click')
|
||||
|
||||
@@ -29,9 +21,9 @@ describe('AcceptLicense', () => {
|
||||
expect(mockedSetLicense).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test('There is a Cancel button', async () => {
|
||||
test('should render cancel button', async () => {
|
||||
render(<AcceptLicense setLicense={jest.fn()} />)
|
||||
|
||||
screen.getByText('cancel', { exact: false })
|
||||
screen.getByText('Cancel')
|
||||
})
|
||||
})
|
||||
|
||||
+3
-11
@@ -1,24 +1,16 @@
|
||||
import React from 'react'
|
||||
import { render, screen } from '@testing-library/react-native'
|
||||
import License from '../components/settings/License'
|
||||
|
||||
jest.mock('react-i18next', () => ({
|
||||
useTranslation: () => ({
|
||||
t: (str, options) => {
|
||||
return str + (options ? JSON.stringify(options) : '')
|
||||
},
|
||||
}),
|
||||
}))
|
||||
import { render, screen } from './test-utils'
|
||||
|
||||
describe('License screen', () => {
|
||||
test('It should have a correct year', async () => {
|
||||
test('should display license text with correct year', async () => {
|
||||
render(<License />)
|
||||
const year = new Date().getFullYear().toString()
|
||||
|
||||
screen.getByText(year, { exact: false })
|
||||
})
|
||||
|
||||
test('It should match the snapshot', async () => {
|
||||
test('should match the snapshot', async () => {
|
||||
const licenseScreen = render(<License />)
|
||||
|
||||
expect(licenseScreen).toMatchSnapshot()
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`License screen It should match the snapshot 1`] = `
|
||||
exports[`License screen should match the snapshot 1`] = `
|
||||
<View
|
||||
style={
|
||||
Object {
|
||||
{
|
||||
"backgroundColor": "#E9F2ED",
|
||||
"flex": 1,
|
||||
}
|
||||
@@ -11,8 +11,8 @@ exports[`License screen It should match the snapshot 1`] = `
|
||||
>
|
||||
<RCTScrollView
|
||||
contentContainerStyle={
|
||||
Array [
|
||||
Object {
|
||||
[
|
||||
{
|
||||
"backgroundColor": "#E9F2ED",
|
||||
"flexGrow": 1,
|
||||
},
|
||||
@@ -23,13 +23,13 @@ exports[`License screen It should match the snapshot 1`] = `
|
||||
<View>
|
||||
<Text
|
||||
style={
|
||||
Array [
|
||||
Object {
|
||||
[
|
||||
{
|
||||
"color": "#555",
|
||||
"fontFamily": "Jost-Book",
|
||||
"fontSize": 34.285714285714285,
|
||||
},
|
||||
Object {
|
||||
{
|
||||
"alignSelf": "center",
|
||||
"color": "#3A2671",
|
||||
"fontFamily": "Jost-Bold",
|
||||
@@ -41,11 +41,11 @@ exports[`License screen It should match the snapshot 1`] = `
|
||||
]
|
||||
}
|
||||
>
|
||||
title
|
||||
drip. an open-source cycle tracking app
|
||||
</Text>
|
||||
<View
|
||||
style={
|
||||
Object {
|
||||
{
|
||||
"marginBottom": 34.285714285714285,
|
||||
"marginHorizontal": 34.285714285714285,
|
||||
}
|
||||
@@ -53,8 +53,8 @@ exports[`License screen It should match the snapshot 1`] = `
|
||||
>
|
||||
<Text
|
||||
style={
|
||||
Array [
|
||||
Object {
|
||||
[
|
||||
{
|
||||
"color": "#555",
|
||||
"fontFamily": "Jost-Book",
|
||||
"fontSize": 34.285714285714285,
|
||||
@@ -63,12 +63,14 @@ exports[`License screen It should match the snapshot 1`] = `
|
||||
]
|
||||
}
|
||||
>
|
||||
text{"currentYear":2022}
|
||||
Copyright (C) 2023 Heart of Code e.V.
|
||||
|
||||
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details:
|
||||
</Text>
|
||||
<Text
|
||||
onPress={[Function]}
|
||||
style={
|
||||
Object {
|
||||
{
|
||||
"color": "#3A2671",
|
||||
"fontFamily": "Jost-Book",
|
||||
"fontSize": 34.285714285714285,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
exports[`Footnote component when children are present, renders them 1`] = `
|
||||
<View
|
||||
style={
|
||||
Object {
|
||||
{
|
||||
"alignContent": "flex-start",
|
||||
"flexDirection": "row",
|
||||
"marginBottom": 8.571428571428571,
|
||||
@@ -13,13 +13,13 @@ exports[`Footnote component when children are present, renders them 1`] = `
|
||||
>
|
||||
<Text
|
||||
style={
|
||||
Array [
|
||||
Object {
|
||||
[
|
||||
{
|
||||
"color": "#555",
|
||||
"fontFamily": "Jost-Book",
|
||||
"fontSize": 34.285714285714285,
|
||||
},
|
||||
Object {
|
||||
{
|
||||
"color": "#F38337",
|
||||
},
|
||||
]
|
||||
@@ -29,18 +29,18 @@ exports[`Footnote component when children are present, renders them 1`] = `
|
||||
</Text>
|
||||
<Text
|
||||
linkStyle={
|
||||
Object {
|
||||
{
|
||||
"color": "white",
|
||||
}
|
||||
}
|
||||
style={
|
||||
Array [
|
||||
Object {
|
||||
[
|
||||
{
|
||||
"color": "#555",
|
||||
"fontFamily": "Jost-Book",
|
||||
"fontSize": 34.285714285714285,
|
||||
},
|
||||
Object {
|
||||
{
|
||||
"color": "#555",
|
||||
"paddingLeft": 21.428571428571427,
|
||||
},
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
import { render } from '@testing-library/react-native'
|
||||
import '../i18n/i18n'
|
||||
|
||||
const customRender = (ui, options) => render(ui, { ...options })
|
||||
|
||||
// re-export everything
|
||||
export * from '@testing-library/react-native'
|
||||
|
||||
// override render method
|
||||
export { customRender as render }
|
||||
Reference in New Issue
Block a user