Skip to content
This repository has been archived by the owner on Mar 5, 2020. It is now read-only.

Updates to navbar + account + schedule + other #78

Merged
merged 26 commits into from
Jan 28, 2017
Merged

Conversation

getaclue00
Copy link
Owner

@getaclue00 getaclue00 commented Jan 22, 2017

  • lotsa updates here; you've seen most of the changes last time we met =)

- getting some ideas from setmore
- two views:
- a calendar
- and a week view
- want to add weekNumber attribute to an appointment
- the idea is to click on the big calendar (a specific date) and retrieve the appointments for that week based on the appointment's weekNumber
- for the nav bar --> added some icons and styled pretty much like setmore
- filtering by week and year
- currently there is a problem with fullcalendar in the listview (doesn't switch week if new data is fetched)
- need to probably modify appointment and add year, month, day attributes
- then we can add index based on week and year for faster queries (currently just quering by week number)
@getaclue00 getaclue00 added this to the January's Milestone milestone Jan 22, 2017
@getaclue00 getaclue00 self-assigned this Jan 22, 2017
@Leann88
Copy link
Collaborator

Leann88 commented Jan 27, 2017

Apparently there are some merger conflicts, might have been a result of My account being renamed Settings in another commit

Copy link
Collaborator

@Leann88 Leann88 left a comment

Choose a reason for hiding this comment

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

Questions:

Are we setting the my-calendar page to the default page visited when someone first logs in?

I am assuming the placeholder image is still there since the map functionality hasn't been added yet? If so, should we note it in the issues?

Other than that, looks good

@@ -28,7 +28,7 @@ install:

script:
- cd Rails
- bundle exec rake db:test:prepare
- bundle exec rake db:drop db:create db:migrate
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should db:setup be added to the list?

Copy link
Owner Author

Choose a reason for hiding this comment

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

nope; in my opinions we shouldn't load our database using the schema file. Rather, the database should be built using the migrations.

@getaclue00
Copy link
Owner Author

@Leann88 yeap and yeap. I am leaving the map image there as I will be adding location functionality. I can remove it if you want, but I will be adding it right back in. And sure... I'll look at the conflicts.

- also modified the nav-bar to remove the + Customer field until it is implemented
- fixed broken tests
- fixed merge conflicts
@Leann88
Copy link
Collaborator

Leann88 commented Jan 27, 2017

Just remember to take note of the login thing

@getaclue00 getaclue00 merged commit 9ba94f6 into master Jan 28, 2017
@getaclue00 getaclue00 deleted the ui_playground branch January 28, 2017 00:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants