Skip to content

left and right arrows added for date changing #32

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

Open
jancsi311 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

left and right arrows added for date changing #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 0 additions & 124 deletions .byebug_history
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion app/assets/javascripts/components/calendar/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ var Calendar = React.createClass({
this.loadDataFromServer(newSelectedDateUrl);
},

changeDay: function(newDate) {
var currentDate = this.state.events.currentDate,
newSelectedDateUrl = "/?date="+newDate.getFullYear()+'-'+(newDate.getMonth()+1)+'-'+newDate.getDate();
this.loadDataFromServer(newSelectedDateUrl);
},

render: function(){
if (this.state.events) {
var dataTable = this.generateDataTable(),
Expand Down Expand Up @@ -111,7 +117,8 @@ var Calendar = React.createClass({
<div className="col s12">
<Day
date={this.state.events.currentDate}
eventsUrl={this.props.eventsUrl}/>
eventsUrl={this.props.eventsUrl}
onChangeDay={self.changeDay}/>
</div>
</div>
)
Expand Down
18 changes: 16 additions & 2 deletions app/assets/javascripts/components/day/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
var Day = React.createClass({
propTypes: {
date: React.PropTypes.instanceOf(Date),
eventsUrl: React.PropTypes.string
eventsUrl: React.PropTypes.string,
onChangeDay: React.PropTypes.func
},

getInitialState: function(){
Expand Down Expand Up @@ -49,8 +50,13 @@ var Day = React.createClass({
$('#day-card').animate({"opacity": "0"}, 0).delay(100).animate({"opacity": "1"}, 700);
},

render: function() {
loadNewDay: function(value) {
var newDay = new Date(this.props.date);
newDay.setDate(newDay.getDate() + value);
this.props.onChangeDay(newDay);
},

render: function() {
if (this.state.activity) {
var projects = this.state.activity.projects,
dayNames = ['Sunday', 'Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
Expand All @@ -70,6 +76,14 @@ var Day = React.createClass({

return <div className="card z-depth-4" id="day-card">
<div className="card-content">
<div className="row">
<a className="btn-floating btn waves-effect waves-light blue" onClick={()=>this.loadNewDay(-1)}>
<i className="material-icons">fast_rewind</i>
</a>
<a className="btn-floating btn waves-effect waves-light blue right" onClick={()=>this.loadNewDay(+1)}>
<i className="material-icons">fast_forward</i>
</a>
</div>
<div className="row">
<h4 className="center">{this.state.activity.date}</h4>
<h4 className="center">{dayNames[currentDay]}</h4>
Expand Down