Skip to content

Feature/support categories #113

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
Closed
wants to merge 131 commits into from
Closed

Feature/support categories #113

wants to merge 131 commits into from

Conversation

ivarshav
Copy link
Contributor

Support Categories for events (issue #29):

  • Add table
  • Add routers
  • Add tests

Frontend will be supported in issue #39 .

IdanPelled and others added 30 commits January 12, 2021 15:40
@IdanPelled
update ORM and added export for an event
8928b17
@IdanPelled
update ORM and added export for an event
79874a7
@IdanPelled
Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…
bc53da7 
…nto feature/shareable-event
@IdanPelled
Added in app shareable events
8f4e690
@IdanPelled
upstream merge
25d1b80
@IdanPelled
docs: add type annotation and fix folder structure
8fb1035
@IdanPelled
docs: add type annotation and fix folder structure
149b571
@IdanPelled
docs: fix documentation
be96e5d
@hadaskedar2020
feat: get weather forecast for date and location
41ed0c2
@hadaskedar2020
feat: get weather forecast for date and location
0bb1c48
@IdanPelled
add: tests
9b2a861
@sagizaidor
set up commit
ee88405
@IdanPelled
add: timezone support
aa654ac
@IdanPelled
add: session management
5227c11
@IdanPelled
fix bug
56877c6
@IdanPelled
split conftest file
eda3c31
@IdanPelled
split conftest file
c24830a
@IdanPelled
move "utils" folder into "internal" folder
69f81e1
@sagizaidor
working day view with jinja2 template
1e3b912
@sagizaidor
Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…
8de8f90 
…nto style-daily_view
@sagizaidor
with tests for pytest
43c57ce
@hadaskedar2020
feat: get weather forecast - fixes according to requested changes.
4cc2447
@IdanPelled
change file structure
0dc1ae6
@hadaskedar2020
feat: get weather forecast - fixes according to requested changes.
249523f
@sagizaidor
first functioning day-view html, css and router
b0a8cc4
@sagizaidor
feat: Basic responsive calender day view page
f61c9e4 
Added dayview template with css and router.
An tempreroy event class with,
 processing function for the day view to work.
@IdanPelled
Merge branch 'develop' into feature/shareable-event
868ba44
@IdanPelled
Merge branch 'develop' feature/shareable-event
7c2edd0
@sagizaidor
feat: Basic responsive calender day view page
3c32513 
Added dayview template with css and router.
An tempreroy event class with,
 processing function for the day view to work.
fixed after taking notes.
@sagizaidor
Merge branch 'develop' into style/dayview
41abd94
@ivarshav
Copy link
Contributor Author

ivarshav commented Jan 24, 2021 •
edited
Loading

It seems that merged code breaks tests. Could it be possible?
sqlalchemy.exc.InvalidRequestError: One or more mappers failed to initialize - can't proceed with initialization of other mappers. Triggering mapper: 'mapped class UserEvent->user_event'. Original exception was: Mapper 'mapped class Event->events' has no property 'participants'

@IdanPelled

@IdanPelled
Copy link
Contributor

It seems that merged code breaks tests. Could it be possible?

Probably not. The tests works well locally and on git. Maybe you changed a file while you where resolving conflicts?

@yammesicka
Copy link
Member

This merge seems to include lot of code which belongs to other students.

Why have you included it in your commit?

@ivarshav
Copy link
Contributor Author

This merge seems to include lot of code which belongs to other students.

Why have you included it in your commit?

@yammesicka , this is the merge effect.
I thought that it would not show a code that similar to the code in develop branch, only the difference between branches.
Do you have any recommendation on how to show just the difference?
Thanks

yammesicka
yammesicka reviewed Jan 27, 2021
View reviewed changes
Copy link
Member

@yammesicka yammesicka left a comment

Choose a reason for hiding this comment

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

I actually don't have a clue, but it causes a rollback of some contributions, and therefore I can't merge it.

Care to open a new PR with your last commits, before you resolved the conflicts?

@ivarshav
Copy link
Contributor Author

Thanks @yammesicka,
A link to the new PR for the same feature - #137.

@yammesicka yammesicka closed this Jan 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yammesicka yammesicka yammesicka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ivarshav @codecov-io @yammesicka @IdanPelled @hadaskedar2020 @sagizaidor