@@ -444,14 +444,14 @@ discard block |
||
| 444 | 444 | |
| 445 | 445 | $counter = (int)$period_start->format('i'); |
| 446 | 446 | $start_minute = $counter; |
| 447 | - foreach($period as $minute) { |
|
| 447 | + foreach ($period as $minute) { |
|
| 448 | 448 | // Doing minutes so set the values in the minute array |
| 449 | - $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]['m' .$minute->format('i')] = $this->getValue(); |
|
| 449 | + $itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]['m' . $minute->format('i')] = $this->getValue(); |
|
| 450 | 450 | // Let the hours know that it cannot determine availability |
| 451 | - $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')] = -1; |
|
| 451 | + $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = -1; |
|
| 452 | 452 | $counter++; |
| 453 | 453 | |
| 454 | - if ($counter == 60 && $start_minute!==0) { |
|
| 454 | + if ($counter == 60 && $start_minute !== 0) { |
|
| 455 | 455 | // Not a real hour - leave as is and move on |
| 456 | 456 | $counter = 0; |
| 457 | 457 | $start_minute = 0; |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | // Did a real whole hour so initialize the hour |
| 461 | 461 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
| 462 | 462 | // We have a whole hour so get rid of the minute info |
| 463 | - unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d'. $minute->format('j')]['h'. $minute->format('G')]); |
|
| 463 | + unset($itemized[AbstractEvent::BAT_MINUTE][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')]); |
|
| 464 | 464 | $counter = 0; |
| 465 | 465 | $start_minute = 0; |
| 466 | 466 | } |
@@ -481,12 +481,12 @@ discard block |
||
| 481 | 481 | // Set the end date to the last day of the month so that we are sure to get that last month |
| 482 | 482 | $adjusted_end_day = new \DateTime($this->end_date->format('Y-n-t')); |
| 483 | 483 | |
| 484 | - $daterange = new \DatePeriod($this->start_date, $interval ,$adjusted_end_day); |
|
| 484 | + $daterange = new \DatePeriod($this->start_date, $interval, $adjusted_end_day); |
|
| 485 | 485 | |
| 486 | 486 | $itemized = array(); |
| 487 | 487 | |
| 488 | 488 | // Cycle through each month |
| 489 | - foreach($daterange as $date) { |
|
| 489 | + foreach ($daterange as $date) { |
|
| 490 | 490 | |
| 491 | 491 | $year = $date->format("Y"); |
| 492 | 492 | $dayinterval = new \DateInterval('P1D'); |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | $text = t('The stay') . ' '; |
| 135 | 135 | } |
| 136 | 136 | else { |
| 137 | - $text .= ' ' . t('the stay') . ' '; |
|
| 137 | + $text .= ' ' . t('the stay') . ' '; |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | if ($minimum_stay && $maximum_stay) { |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * |
| 20 | 20 | * @param $calendar_response |
| 21 | 21 | */ |
| 22 | - public function applyConstraint(CalendarResponse &$calendar_response); |
|
| 22 | + public function applyConstraint(CalendarResponse & $calendar_response); |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @param $start_date |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $current_states = array_keys($unit_states); |
| 124 | 124 | // Compare the current states with the set of valid states |
| 125 | 125 | $remaining_states = array_diff($current_states, $valid_states); |
| 126 | - if (count($remaining_states) == 0 ) { |
|
| 126 | + if (count($remaining_states) == 0) { |
|
| 127 | 127 | // Unit is in a state that is within the set of valid states so add to result set |
| 128 | 128 | $units[$unit] = $unit; |
| 129 | 129 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | foreach ($months as $month => $days) { |
| 213 | 213 | foreach ($days as $day => $hours) { |
| 214 | 214 | foreach ($hours as $hour => $value) { |
| 215 | - $events[$unit][Event::BAT_HOUR][$year][$month]['d'.$day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 215 | + $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | 218 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | foreach ($hours as $hour => $minutes) { |
| 227 | 227 | foreach ($minutes as $minute => $value) { |
| 228 | 228 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
| 229 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); |
|
| 229 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); |
|
| 230 | 230 | } |
| 231 | 231 | else { |
| 232 | 232 | // If nothing from db - then revert to the defaults |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | foreach ($days as $day => $hours) { |
| 245 | 245 | foreach ($hours as $hour => $minutes) { |
| 246 | 246 | foreach ($minutes as $minute => $value) { |
| 247 | - $events[$unit][Event::BAT_MINUTE][$year][$month]['d'.$day]['h'.$hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 247 | + $events[$unit][Event::BAT_MINUTE][$year][$month]['d' . $day]['h' . $hour][$minute] = ((int)$value == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$value); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -316,12 +316,12 @@ discard block |
||
| 316 | 316 | // Value just switched - let us wrap up with current event and start a new one |
| 317 | 317 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); |
| 318 | 318 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
| 319 | - $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 319 | + $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
| 320 | 320 | $current_value = $minute_value; |
| 321 | 321 | } |
| 322 | 322 | if ($current_value === NULL) { |
| 323 | 323 | // We are down to minutes and haven't created and event yet - do one now |
| 324 | - $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute,1)); |
|
| 324 | + $start_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . substr($hour, 1) . ':' . substr($minute, 1)); |
|
| 325 | 325 | $end_event = clone($start_event); |
| 326 | 326 | } |
| 327 | 327 | $current_value = $minute_value; |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
| 36 | 36 | |
| 37 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 37 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 38 | 38 | |
| 39 | 39 | $results = array(); |
| 40 | 40 | // Run each query and store results |
@@ -49,26 +49,26 @@ discard block |
||
| 49 | 49 | // Figure out how many days the current month has |
| 50 | 50 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
| 51 | 51 | $days_in_month = (int)$temp_date->format('t'); |
| 52 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 53 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
| 52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 53 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // With the day events taken care off let's cycle through hours |
| 58 | 58 | foreach ($results[Event::BAT_HOUR]->fetchAll() as $data) { |
| 59 | - for ($i = 0; $i<=23; $i++) { |
|
| 60 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
| 59 | + for ($i = 0; $i <= 23; $i++) { |
|
| 60 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // With the hour events taken care off let's cycle through minutes |
| 65 | 65 | foreach ($results[Event::BAT_MINUTE]->fetchAll() as $data) { |
| 66 | - for ($i = 0; $i<=59; $i++) { |
|
| 66 | + for ($i = 0; $i <= 59; $i++) { |
|
| 67 | 67 | if ($i <= 9) { |
| 68 | - $index = 'm0'.$i; |
|
| 68 | + $index = 'm0' . $i; |
|
| 69 | 69 | } |
| 70 | 70 | else { |
| 71 | - $index = 'm'.$i; |
|
| 71 | + $index = 'm' . $i; |
|
| 72 | 72 | } |
| 73 | 73 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
| 74 | 74 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
| 28 | 28 | |
| 29 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 29 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
| 30 | 30 | |
| 31 | 31 | $results = array(); |
| 32 | 32 | // Run each query and store results |
@@ -37,30 +37,30 @@ discard block |
||
| 37 | 37 | $db_events = array(); |
| 38 | 38 | |
| 39 | 39 | // Cycle through day results and setup an event array |
| 40 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 40 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
| 41 | 41 | // Figure out how many days the current month has |
| 42 | 42 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
| 43 | 43 | $days_in_month = (int)$temp_date->format('t'); |
| 44 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
| 45 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
| 44 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
| 45 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | // With the day events taken care off let's cycle through hours |
| 50 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 51 | - for ($i = 0; $i<=23; $i++) { |
|
| 52 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h'. $i] = $data['h'.$i]; |
|
| 50 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
| 51 | + for ($i = 0; $i <= 23; $i++) { |
|
| 52 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']][$data['day']]['h' . $i] = $data['h' . $i]; |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // With the hour events taken care off let's cycle through minutes |
| 57 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 58 | - for ($i = 0; $i<=59; $i++) { |
|
| 57 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
| 58 | + for ($i = 0; $i <= 59; $i++) { |
|
| 59 | 59 | if ($i <= 9) { |
| 60 | - $index = 'm0'.$i; |
|
| 60 | + $index = 'm0' . $i; |
|
| 61 | 61 | } |
| 62 | 62 | else { |
| 63 | - $index = 'm'.$i; |
|
| 63 | + $index = 'm' . $i; |
|
| 64 | 64 | } |
| 65 | 65 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
| 66 | 66 | } |
@@ -100,16 +100,16 @@ |
||
| 100 | 100 | |
| 101 | 101 | $query_parameters = ''; |
| 102 | 102 | |
| 103 | - foreach($itemized[Event::BAT_DAY] as $year => $months) { |
|
| 103 | + foreach ($itemized[Event::BAT_DAY] as $year => $months) { |
|
| 104 | 104 | if ($year_count > 0) { |
| 105 | 105 | // We are dealing with multiple years so add an OR |
| 106 | 106 | $query_parameters .= ' OR '; |
| 107 | 107 | } |
| 108 | 108 | $query_parameters .= 'year IN (' . $year . ') '; |
| 109 | - $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) .') '; |
|
| 109 | + $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
| 110 | 110 | if (count($unit_ids) > 0) { |
| 111 | 111 | // Unit ids are defined so add this as a filter |
| 112 | - $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) .') '; |
|
| 112 | + $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') '; |
|
| 113 | 113 | } |
| 114 | 114 | $year_count++; |
| 115 | 115 | } |