Make saving incomplete value possible
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import React, { Component } from 'react'
|
||||
import {
|
||||
View, TouchableOpacity, Text, Alert, ToastAndroid
|
||||
} from 'react-native'
|
||||
View, TouchableOpacity, Text, Alert} from 'react-native'
|
||||
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
|
||||
import { saveSymptom } from '../../../db'
|
||||
import styles, {iconStyles} from '../../../styles'
|
||||
@@ -15,7 +14,6 @@ export default class ActionButtonFooter extends Component {
|
||||
currentSymptomValue,
|
||||
date,
|
||||
saveAction,
|
||||
saveDisabled,
|
||||
navigate,
|
||||
autoShowDayView = true}
|
||||
= this.props
|
||||
@@ -47,40 +45,24 @@ export default class ActionButtonFooter extends Component {
|
||||
}, {
|
||||
title: labels.save,
|
||||
action: () => {
|
||||
if(saveDisabled) {
|
||||
ToastAndroid.show(labels.disabledInfo, ToastAndroid.LONG)
|
||||
} else {
|
||||
saveAction()
|
||||
if (autoShowDayView) navigateToOverView()
|
||||
}
|
||||
saveAction()
|
||||
if (autoShowDayView) navigateToOverView()
|
||||
|
||||
},
|
||||
disabledCondition: saveDisabled,
|
||||
icon: 'content-save-outline'
|
||||
}
|
||||
]
|
||||
return (
|
||||
<View style={styles.actionButtonFooter}>
|
||||
{buttons.map(({ title, action, disabledCondition, icon }, i) => {
|
||||
<View style={styles.menu}>
|
||||
{buttons.map(({ title, action, icon }, i) => {
|
||||
const textStyle = [styles.menuText]
|
||||
if (disabledCondition) {
|
||||
textStyle.push(styles.menuTextInActive)
|
||||
}
|
||||
const iconStyle = disabledCondition ?
|
||||
Object.assign(
|
||||
{},
|
||||
iconStyles.menuIcon,
|
||||
iconStyles.menuIconInactive
|
||||
)
|
||||
:
|
||||
iconStyles.menuIcon
|
||||
return (
|
||||
<TouchableOpacity
|
||||
onPress={action}
|
||||
style={styles.actionButtonItem}
|
||||
key={i.toString()}
|
||||
>
|
||||
<Icon name={icon} {...iconStyle} />
|
||||
<Icon name={icon} {...iconStyles.menuIcon} />
|
||||
<Text style={textStyle}>
|
||||
{title.toLowerCase()}
|
||||
</Text>
|
||||
|
||||
@@ -10,7 +10,6 @@ import { cervix as labels } from '../../../i18n/en/cycle-day'
|
||||
import ActionButtonFooter from './action-button-footer'
|
||||
import SelectTabGroup from '../select-tab-group'
|
||||
import SymptomSection from './symptom-section'
|
||||
import { ActionHint } from '../../app-text'
|
||||
|
||||
export default class Cervix extends Component {
|
||||
constructor(props) {
|
||||
@@ -36,7 +35,7 @@ export default class Cervix extends Component {
|
||||
{ label: labels.position.categories[1], value: 1 },
|
||||
{ label: labels.position.categories[2], value: 2 }
|
||||
]
|
||||
const mandatoryNotCompletedYet = typeof this.state.opening != 'number' || typeof this.state.firmness != 'number'
|
||||
const mandatoryNotCompleted = typeof this.state.opening != 'number' || typeof this.state.firmness != 'number'
|
||||
return (
|
||||
<View style={{ flex: 1 }}>
|
||||
<ScrollView style={styles.page}>
|
||||
@@ -83,7 +82,6 @@ export default class Cervix extends Component {
|
||||
/>
|
||||
</SymptomSection>
|
||||
</ScrollView>
|
||||
<ActionHint isVisible={mandatoryNotCompletedYet}>{labels.actionHint}</ActionHint>
|
||||
<ActionButtonFooter
|
||||
symptom='cervix'
|
||||
date={this.props.date}
|
||||
@@ -96,7 +94,6 @@ export default class Cervix extends Component {
|
||||
exclude: Boolean(this.state.exclude)
|
||||
})
|
||||
}}
|
||||
saveDisabled={mandatoryNotCompletedYet}
|
||||
navigate={this.props.navigate}
|
||||
/>
|
||||
</View>
|
||||
|
||||
@@ -11,7 +11,6 @@ import computeNfpValue from '../../../lib/nfp-mucus'
|
||||
import ActionButtonFooter from './action-button-footer'
|
||||
import SelectTabGroup from '../select-tab-group'
|
||||
import SymptomSection from './symptom-section'
|
||||
import { ActionHint } from '../../app-text'
|
||||
|
||||
export default class Mucus extends Component {
|
||||
constructor(props) {
|
||||
@@ -71,7 +70,6 @@ export default class Mucus extends Component {
|
||||
/>
|
||||
</SymptomSection>
|
||||
</ScrollView>
|
||||
<ActionHint isVisible={mandatoryNotCompletedYet}>{labels.actionHint}</ActionHint>
|
||||
<ActionButtonFooter
|
||||
symptom='mucus'
|
||||
date={this.props.date}
|
||||
@@ -86,7 +84,6 @@ export default class Mucus extends Component {
|
||||
exclude: Boolean(this.state.exclude)
|
||||
})
|
||||
}}
|
||||
saveDisabled={mandatoryNotCompletedYet}
|
||||
navigate={this.props.navigate}
|
||||
/>
|
||||
</View>
|
||||
|
||||
Reference in New Issue
Block a user