Show medical condition in toolbar

Once a medical condition is selected in the first screen, show the selected condition's name in subsequent screens
vikynandha · Feb 7, 2016 · 2f7be23 · 2f7be23
1 parent 3a314be
commit 2f7be23
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/app/components/common/ToolBar.js b/app/components/common/ToolBar.js
@@ -12,7 +12,7 @@ export default class ToolBar extends Component {
     render() {
         return (
             <ToolbarAndroid
-            	title='Chiron'
+            	title={this.props.title || 'Chiron'}
             	titleColor='rgba(255,255,255,0.87)'
             	style={style}
             />

diff --git a/app/components/scheduleVisit.js b/app/components/scheduleVisit.js
@@ -65,9 +65,12 @@ export default class ScheduleVisit extends Component {
     }
 
     render() {
+        const conditionId = this.props.store.selected_condition;
+        const selectedCondition = this.props.store.conditions.entities[conditionId];
+
         return (
             <ScrollView>
-                <ToolBar />
+                <ToolBar title={selectedCondition.title} />
                 <AppBody>
                     <Heading1>
                         When is your next visit?

diff --git a/app/components/scheduleVisitSuccess.js b/app/components/scheduleVisitSuccess.js
@@ -19,11 +19,15 @@ export default class ScheduleVisitSuccess extends Component {
     }
 
 	render() {
-		const headingStyle = {color: '#43A047', fontWeight: 'bold'};
+		const conditionId = this.props.store.selected_condition;
+        const selectedCondition = this.props.store.conditions.entities[conditionId];
+
+        const headingStyle = {color: '#43A047', fontWeight: 'bold'};
 		const nextVisit = this.props.store.nextVisit;
-		return (
+
+        return (
 			<ScrollView>
-                <ToolBar />
+                <ToolBar title={selectedCondition.title} />
                 <AppBody>
                     <Heading1 style={headingStyle}>
                         Success!

diff --git a/app/components/setupCondition.js b/app/components/setupCondition.js
@@ -19,9 +19,11 @@ export default class SetupCondition extends Component {
     }
 
     render() {
+        const conditionId = this.props.store.selected_condition;
+        const selectedCondition = this.props.store.conditions.entities[conditionId];
         return (
             <ScrollView>
-                <ToolBar />
+                <ToolBar title={selectedCondition.title} />
                 <AppBody>
                     <Heading1>
                         Your current reading & dosage

diff --git a/app/reducers/index.js b/app/reducers/index.js
@@ -3,7 +3,7 @@ import ActionTypes from '../actions/actionTypes';
 const conditions = {
     1: {
         id: 1,
-        title: 'DVT (Deep Vein Thrombosis)'
+        title: 'Deep Vein Thrombosis'
     },
     2: {
         id: 2,