fixed range calculation and query in CalendarService #1295
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added start and end query parameters to get events resolves ChurchCRM#1289
DawoudIO
reviewed
Nov 8, 2016
| @@ -80,7 +80,10 @@ | |||
|
|
|||
| /// top of main form | |||
| // | |||
| $sSQL = "SELECT DISTINCT event_types.* FROM event_types RIGHT JOIN events_event ON event_types.type_id=events_event.event_type ORDER BY type_id "; | |||
There was a problem hiding this comment.
please ensure you idea uses the editor config settings
There was a problem hiding this comment.
oh I added line breaks manually cause it was hard to read all on one line, yes I have the editor config enabled 💯
|
this looks like it is related to #1298 ... is there common code that we should use between them... |
|
the changes in #1298 don't have any common code, because the birth day is stored in three fields in the database |
…1289 # Conflicts: # src/Service/CalendarService.php
DawoudIO
approved these changes
Nov 9, 2016
| @@ -5,7 +5,8 @@ | |||
| $app->group('/calendar', function () { | |||
|
|
|||
| $this->get('/events', function ($request, $response, $args) { | |||
| return $response->withJson($this->CalendarService->getEvents()); | |||
| $params = $request->getQueryParams(); | |||
| return $response->withJson($this->CalendarService->getEvents($params['start'], $params['end'])); | |||
There was a problem hiding this comment.
where are the start and end date come from
There was a problem hiding this comment.
they come from the fullcalendar plugin
| $start = $year . "-" . $person->getBirthMonth() . "-" . $person->getBirthDay(); | ||
| $event = $this->createCalendarItem("birthday", $person->getFullName(), $start, "", $person->getViewURI()); | ||
|
|
||
| $start = date_create($year . '-' . |
There was a problem hiding this comment.
let us try not to add extra breaks as it makes it hard to read
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added start and end query parameters to get events
resolves #1289