Skip to content

Commit 8a8eef2

Browse files
authored
Merge pull request #91 from openimis/feature/picker-title
Allow setting title on location pickers
2 parents b1dc948 + aae5757 commit 8a8eef2

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

src/components/CoarseLocation.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ class CoarseLocation extends Component {
6060
};
6161

6262
render() {
63-
const { classes, readOnly, required = false, filterLabels = true, allRegions } = this.props;
63+
const {
64+
classes,
65+
readOnly,
66+
required = false,
67+
filterLabels = true,
68+
allRegions,
69+
title,
70+
} = this.props;
6471
const { region, district } = this.state;
6572
return (
6673
<Grid container className={classes.form}>
@@ -78,6 +85,7 @@ class CoarseLocation extends Component {
7885
filterLabels={filterLabels}
7986
onChange={this.onChangeRegion}
8087
allRegions={allRegions}
88+
title={title}
8189
/>
8290
</Grid>
8391
}
@@ -96,6 +104,7 @@ class CoarseLocation extends Component {
96104
withNull={false}
97105
filterLabels={filterLabels}
98106
onChange={this.onChangeDistrict}
107+
title={title}
99108
/>
100109
</Grid>
101110
}

src/components/DetailedLocation.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ class DetailedLocation extends Component {
9494
};
9595

9696
render() {
97-
const { classes, split = false, readOnly, required = false, filterLabels = true } = this.props;
97+
const {
98+
classes,
99+
split = false,
100+
readOnly,
101+
required = false,
102+
filterLabels = true,
103+
title = '',
104+
} = this.props;
98105
let grid = split ? 12 : 6;
99106
return (
100107
<Grid container className={classes.form}>
@@ -106,6 +113,7 @@ class DetailedLocation extends Component {
106113
required={required}
107114
onChange={this.onDistrictChange}
108115
filterLabels={filterLabels}
116+
title={title}
109117
/>
110118
</Grid>
111119
{_.times(this.locationTypes.length - 2, (i) => (
@@ -125,6 +133,7 @@ class DetailedLocation extends Component {
125133
filterLabels={filterLabels}
126134
locationLevel={this.locationTypes.length - 2 + i}
127135
onChange={(v) => this.onLocationChange(i, v)}
136+
title={title}
128137
/>
129138
</Grid>
130139
}

src/pickers/DistrictPicker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class DistrictPicker extends Component {
4444
districts,
4545
readOnly = false,
4646
required = false,
47+
title,
4748
} = this.props;
4849

4950
let items = userHealthFacilityFullPath && [userHealthFacilityFullPath.location] || districts || [];
@@ -75,6 +76,7 @@ class DistrictPicker extends Component {
7576
? formatMessage(intl, "location", "location.DistrictPicker.null")
7677
: formatMessage(intl, "location", "location.DistrictPicker.none")
7778
}
79+
title={title}
7880
/>
7981
);
8082
}

src/pickers/LocationPicker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const LocationPicker = (props) => {
3333
filterSelectedOptions = true,
3434
withPlaceholder,
3535
restrictedOptions,
36+
title = '',
3637
} = props;
3738
const [open, setOpen] = useState(false);
3839
const [resetKey, setResetKey] = useState();
@@ -132,6 +133,7 @@ const LocationPicker = (props) => {
132133
placeholder={
133134
withPlaceholder ? placeholder || formatMessage(`Location${locationLevel}Picker.placehoder`) : null
134135
}
136+
title={title}
135137
/>
136138
)}
137139
/>

src/pickers/RegionPicker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class RegionPicker extends Component {
5555
readOnly = false,
5656
required = false,
5757
allRegions,
58+
title,
5859
} = this.props;
5960

6061
allRegionsFlag = allRegions;
@@ -86,6 +87,7 @@ class RegionPicker extends Component {
8687
? formatMessage(intl, "location", "location.RegionPicker.null")
8788
: formatMessage(intl, "location", "location.RegionPicker.none")
8889
}
90+
title={title}
8991
/>
9092
);
9193
}

0 commit comments

Comments
 (0)