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.

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

Add Resource view #373

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ let Calendar = React.createClass({
*/
events: PropTypes.arrayOf(PropTypes.object),

/**
* An array of resource objects that map events to a specific resource
*/
resources: PropTypes.arrayOf(PropTypes.object),

/**
* Callback fired when the `date` value changes.
*
Expand Down Expand Up @@ -439,7 +444,7 @@ let Calendar = React.createClass({
popup: false,
toolbar: true,
view: views.MONTH,
views: [views.MONTH, views.WEEK, views.DAY, views.AGENDA],
views: [views.MONTH, views.WEEK, views.DAY, views.AGENDA, views.RESOURCE],
date: now,
step: 30,

Expand Down
2 changes: 2 additions & 0 deletions src/DayColumn.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ let DaySlot = React.createClass({
dayWrapperComponent: elementType,
eventComponent: elementType,
eventWrapperComponent: elementType.isRequired,
resource: React.PropTypes.string,
},

getDefaultProps() {
Expand Down Expand Up @@ -304,6 +305,7 @@ let DaySlot = React.createClass({
slots,
start: startDate,
end: endDate,
resourceId: this.props.resource,
action
})
},
Expand Down
42 changes: 42 additions & 0 deletions src/Resource.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import React from 'react';
import dates from './utils/dates';
import ResourceGrid from './ResourceGrid';
import { navigate } from './utils/constants';

const Resource = React.createClass({
propTypes: {
date: React.PropTypes.instanceOf(Date).isRequired
},

render() {
let { date, ...props } = this.props;
let { start, end } = Resource.range(date);

return (
<ResourceGrid {...props} start={start} end={end} eventOffset={10} />
);
}
});

Resource.navigate = (date, action) => {
switch (action){
case navigate.PREVIOUS:
return dates.add(date, -1, 'day');

case navigate.NEXT:
return dates.add(date, 1, 'day');

default:
return date;
}
};


Resource.range = (date) => {
date = dates.startOf(date, 'day');
return { start: date, end: date };
};


export default Resource;

Loading