Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filtering #59

Merged
merged 23 commits into from
Apr 21, 2017
Merged

Filtering #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
027af99
Added filter by headings
Apr 2, 2017
08b2578
Fixed Lint Issues
Apr 2, 2017
ddf7db0
Fixed Lint Issues
Apr 2, 2017
975a5d4
adding radio buttons and filter options
PrashanthKumarM Apr 3, 2017
ecb78c6
Merge remote-tracking branch 'origin/filtering' into filtering
PrashanthKumarM Apr 3, 2017
ddc91db
renderContent changes
Apr 4, 2017
3f73d56
Sidemenu change
Apr 4, 2017
cf833d6
Added the Route status and action requested options
Apr 4, 2017
dd3b243
Added function call and options for action requested and route status
Apr 4, 2017
ea0658e
Removed hard coded values for filter types
Apr 4, 2017
dc53f99
filtering payload added
Apr 4, 2017
b4316d2
filtering
Apr 4, 2017
fa85976
Merge branch 'develop' into filtering
Apr 6, 2017
5488d07
merge issues fixed
Apr 6, 2017
8596c5e
fixed build error
Apr 12, 2017
b38b362
Merge branch 'develop' into filtering
Apr 12, 2017
2228674
Merge branch 'develop' into filtering
PrashanthKumarM Apr 17, 2017
9d16cdf
Added 3 filters completely
PrashanthKumarM Apr 20, 2017
eccd781
lint fixes
PrashanthKumarM Apr 20, 2017
e48252d
lint fix-2
PrashanthKumarM Apr 20, 2017
9157003
content header added to reduce redundancy
PrashanthKumarM Apr 20, 2017
33f7830
changing content header title to children
PrashanthKumarM Apr 21, 2017
abd1cf9
Merge branch 'develop' into filtering
PrashanthKumarM Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions actionlist/app/components/SideMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ import {
} from 'react-native';

import Button from 'react-native-button';
import { Actions } from 'react-native-router-flux';
import Actions from 'react-native-router-flux';
import { connect } from 'react-redux';
import { sortActionList, resetFilters } from '../actions/action_items';
import { Colors, sortTypes, filterTypes } from '../lib/commons';
import FilterPicker from './filterPicker';
import ContentHeader from './contentHeader';

const style = StyleSheet.create({
view: {
Expand Down Expand Up @@ -49,12 +50,6 @@ const style = StyleSheet.create({
color: Colors.IUGray,
fontFamily: 'BentonSansBold, Arial, sans-serif',
},
headerText: {
fontSize: 10,
color: '#7B1500',
fontFamily: 'BentonSansBold, Arial, sans-serif',
margin: 10,
},
container: {
backgroundColor: '#f4f7f9',
paddingTop: 0,
Expand Down Expand Up @@ -132,12 +127,8 @@ const SideMenu = ({ optionSelected,
value={filters.actionRequested}
filterKey={'actionRequested'}
/>
<View style={style.header}>
<Text style={style.headerText}>{filterTypes.DocumentCreatedDate.title}</Text>
</View>
<View style={style.header}>
<Text style={style.headerText}>{filterTypes.DocumentAssignedDate.title}</Text>
</View>
<ContentHeader title={filterTypes.DocumentCreatedDate.title} />
<ContentHeader title={filterTypes.DocumentAssignedDate.title} />
</View>
<Button
containerStyle={style.resetContainer}
Expand Down
1 change: 0 additions & 1 deletion actionlist/app/components/action_item_header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,3 @@ ActionItemHeader.propTypes = {
};

export default ActionItemHeader;

28 changes: 28 additions & 0 deletions actionlist/app/components/contentHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from 'react';
import {
StyleSheet,
View,
Text,
} from 'react-native';
import { Colors } from '../lib/commons';

const style = StyleSheet.create({
headerText: {
fontSize: 10,
color: Colors.IUCrimson,
fontFamily: 'BentonSansBold, Arial, sans-serif',
margin: 10,
},
});

const ContentHeader = ({ title }) => (
<View>
<Text style={style.headerText}>{title}</Text>
Copy link
Contributor

@burnumd burnumd Apr 20, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend not using a title prop and just use the children prop. It looks like it's allowed for Text components to have node children, so if you just use children you can pass off prop validation to the react-native component and allow yourself more flexibility.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to use children and lint threw an error saying I need to have a prop validation for it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the type of children should be documented as React.PropTypes.node: jsx-eslint/eslint-plugin-react#7

</View>
);

ContentHeader.propTypes = {
title: React.PropTypes.string.isRequired,
};

export default ContentHeader;
17 changes: 2 additions & 15 deletions actionlist/app/components/filterPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
import React from 'react';
import {
StyleSheet,
View,
Text,
Picker,
} from 'react-native';

/* eslint-disable no-unused-vars */
import { connect } from 'react-redux';
import { filterActionList } from '../actions/action_items';
import { Colors } from '../lib/commons';

const style = StyleSheet.create({
headerText: {
fontSize: 10,
color: Colors.IUCrimson,
fontFamily: 'BentonSansBold, Arial, sans-serif',
margin: 10,
},
});
import ContentHeader from './contentHeader';

const FilterPicker = ({ filter, value, filterKey, onActionListFiltering }) => (
<View>
<View>
<Text style={style.headerText}>{filter.title}</Text>
</View>
<ContentHeader title={filter.title} />
<Picker
selectedValue={value}
onValueChange={selectedOption => onActionListFiltering(filterKey, selectedOption)}
Expand Down