@@ -126,8 +126,7 @@ |
||
126 | 126 | unset($this->included_set[$unit->getUnitId()]); |
127 | 127 | $this->addMiss($unit, $reason, $constraint); |
128 | 128 | return TRUE; |
129 | - } |
|
130 | - else { |
|
129 | + } else { |
|
131 | 130 | return FALSE; |
132 | 131 | } |
133 | 132 | } |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function getEventData(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
29 | 29 | |
30 | - $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
30 | + $queries = $this->buildQueries($start_date, $end_date, $unit_ids); |
|
31 | 31 | |
32 | 32 | $results = array(); |
33 | 33 | // Run each query and store results |
@@ -38,30 +38,30 @@ discard block |
||
38 | 38 | $db_events = array(); |
39 | 39 | |
40 | 40 | // Cycle through day results and setup an event array |
41 | - while( $data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
41 | + while ($data = $results[Event::BAT_DAY]->fetchAssoc()) { |
|
42 | 42 | // Figure out how many days the current month has |
43 | 43 | $temp_date = new \DateTime($data['year'] . "-" . $data['month']); |
44 | 44 | $days_in_month = (int)$temp_date->format('t'); |
45 | - for ($i = 1; $i<=$days_in_month; $i++) { |
|
46 | - $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d'.$i]; |
|
45 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
46 | + $db_events[$data['unit_id']][Event::BAT_DAY][$data['year']][$data['month']]['d' . $i] = $data['d' . $i]; |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
50 | 50 | // With the day events taken care off let's cycle through hours |
51 | - while( $data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
52 | - for ($i = 0; $i<=23; $i++) { |
|
53 | - $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h'. $i] = $data['h'.$i]; |
|
51 | + while ($data = $results[Event::BAT_HOUR]->fetchAssoc()) { |
|
52 | + for ($i = 0; $i <= 23; $i++) { |
|
53 | + $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | // With the hour events taken care off let's cycle through minutes |
58 | - while( $data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
59 | - for ($i = 0; $i<=59; $i++) { |
|
58 | + while ($data = $results[Event::BAT_MINUTE]->fetchAssoc()) { |
|
59 | + for ($i = 0; $i <= 59; $i++) { |
|
60 | 60 | if ($i <= 9) { |
61 | - $index = 'm0'.$i; |
|
61 | + $index = 'm0' . $i; |
|
62 | 62 | } |
63 | 63 | else { |
64 | - $index = 'm'.$i; |
|
64 | + $index = 'm' . $i; |
|
65 | 65 | } |
66 | 66 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']]['d' . $data['day']]['h' . $data['hour']][$index] = $data[$index]; |
67 | 67 | } |
@@ -70,8 +70,7 @@ discard block |
||
70 | 70 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
71 | 71 | |
72 | 72 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
73 | - } |
|
74 | - elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
73 | + } elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
75 | 74 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
76 | 75 | |
77 | 76 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
@@ -122,8 +121,7 @@ discard block |
||
122 | 121 | if ($day_of_the_week) { |
123 | 122 | if ($start_date && $end_date) { |
124 | 123 | $text = t('From @start_date to @end_date, if booking starts on @day_of_the_week', $args); |
125 | - } |
|
126 | - else { |
|
124 | + } else { |
|
127 | 125 | $text = t('If booking starts on @day_of_the_week', $args); |
128 | 126 | } |
129 | 127 | } |
@@ -132,8 +130,7 @@ discard block |
||
132 | 130 | if ($minimum_stay || $maximum_stay) { |
133 | 131 | if (empty($text)) { |
134 | 132 | $text = t('The stay') . ' '; |
135 | - } |
|
136 | - else { |
|
133 | + } else { |
|
137 | 134 | $text .= ' ' . t('the stay') . ' '; |
138 | 135 | } |
139 | 136 | } |
@@ -141,15 +138,12 @@ discard block |
||
141 | 138 | // Special case when min stay and max stay are the same. |
142 | 139 | if ($minimum_stay == $maximum_stay) { |
143 | 140 | $text .= t('must be for @minimum_stay', $args); |
144 | - } |
|
145 | - else { |
|
141 | + } else { |
|
146 | 142 | $text .= t('must be at least @minimum_stay and at most @maximum_stay', $args); |
147 | 143 | } |
148 | - } |
|
149 | - elseif ($minimum_stay) { |
|
144 | + } elseif ($minimum_stay) { |
|
150 | 145 | $text .= t('must be for at least @minimum_stay', $args); |
151 | - } |
|
152 | - elseif ($maximum_stay) { |
|
146 | + } elseif ($maximum_stay) { |
|
153 | 147 | $text .= t('cannot be more than @maximum_stay', $args); |
154 | 148 | } |
155 | 149 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -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 |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -49,14 +49,14 @@ 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++) { |
|
52 | + for ($i = 1; $i <= $days_in_month; $i++) { |
|
53 | 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++) { |
|
59 | + for ($i = 0; $i <= 23; $i++) { |
|
60 | 60 | $db_events[$data['unit_id']][Event::BAT_HOUR][$data['year']][$data['month']]['d' . $data['day']]['h' . $i] = $data['h' . $i]; |
61 | 61 | } |
62 | 62 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | // Because SQLite does not have a nice merge first we have to check if a row exists to determine whether to do an insert or an update |
103 | 103 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_DAY][$year][$month])) { |
104 | 104 | $command = "UPDATE $this->day_table SET "; |
105 | - foreach ($days as $day => $value){ |
|
105 | + foreach ($days as $day => $value) { |
|
106 | 106 | $command .= "$day = $value,"; |
107 | 107 | } |
108 | 108 | $command = rtrim($command, ','); |
@@ -125,11 +125,11 @@ discard block |
||
125 | 125 | $keys = array_keys($hours); |
126 | 126 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_HOUR][$year][$month][$day])) { |
127 | 127 | $command = "UPDATE $this->hour_table SET "; |
128 | - foreach ($hours as $hour => $value){ |
|
128 | + foreach ($hours as $hour => $value) { |
|
129 | 129 | $command .= "$hour = $value,"; |
130 | 130 | } |
131 | 131 | $command = rtrim($command, ','); |
132 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1); |
|
132 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1); |
|
133 | 133 | $this->pdo->exec($command); |
134 | 134 | } else { |
135 | 135 | $this->pdo->exec("INSERT INTO $this->hour_table (unit_id, year, month, day, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . implode(', ', $values) . ")"); |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | $keys = array_keys($minutes); |
149 | 149 | if (isset($existing_events[$event->getUnitId()][EVENT::BAT_MINUTE][$year][$month][$day][$hour])) { |
150 | 150 | $command = "UPDATE $this->minute_table SET "; |
151 | - foreach ($minutes as $minute => $value){ |
|
151 | + foreach ($minutes as $minute => $value) { |
|
152 | 152 | $command .= "$minute = $value,"; |
153 | 153 | } |
154 | 154 | $command = rtrim($command, ','); |
155 | - $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day,1) . " AND hour = " . substr($hour,1); |
|
155 | + $command .= " WHERE unit_id = " . $event->getUnitId() . " AND year = $year AND month = $month AND day = " . substr($day, 1) . " AND hour = " . substr($hour, 1); |
|
156 | 156 | $this->pdo->exec($command); |
157 | 157 | } else { |
158 | 158 | $this->pdo->exec("INSERT INTO $this->minute_table (unit_id, year, month, day, hour, " . implode(', ', $keys) . ") VALUES (" . $event->getUnitId() . ", $year, $month, " . substr($day, 1) . ", " . substr($hour, 1) . ", " . implode(', ', $values) . ")"); |
@@ -102,8 +102,7 @@ |
||
102 | 102 | if ($day_of_the_week) { |
103 | 103 | if ($start_date && $end_date) { |
104 | 104 | $text = 'From @start_date to @end_date, if booking starts on @day_of_the_week'; |
105 | - } |
|
106 | - else { |
|
105 | + } else { |
|
107 | 106 | $text = 'If booking starts on @day_of_the_week'; |
108 | 107 | } |
109 | 108 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | /** |
112 | 112 | * {@inheritdoc} |
113 | 113 | */ |
114 | - public function applyConstraint(CalendarResponse &$calendar_response) { |
|
114 | + public function applyConstraint(CalendarResponse & $calendar_response) { |
|
115 | 115 | $this->calendar_response = $calendar_response; |
116 | 116 | } |
117 | 117 |
@@ -107,10 +107,10 @@ |
||
107 | 107 | $query_parameters .= ' OR '; |
108 | 108 | } |
109 | 109 | $query_parameters .= 'year IN (' . $year . ') '; |
110 | - $query_parameters .= 'AND month IN (' . implode("," ,array_keys($months)) . ') '; |
|
110 | + $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
111 | 111 | if (count($unit_ids) > 0) { |
112 | 112 | // Unit ids are defined so add this as a filter |
113 | - $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) . ') '; |
|
113 | + $query_parameters .= 'AND unit_id in (' . implode(",", $unit_ids) . ') '; |
|
114 | 114 | } |
115 | 115 | $year_count++; |
116 | 116 | } |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | protected $duration_unit; |
34 | 34 | |
35 | - public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit){ |
|
35 | + public function __construct(\DateTime $start_date, \DateTime $end_date, Unit $unit, Store $store, \DateInterval $duration_unit) { |
|
36 | 36 | parent::__construct($start_date, $end_date, $unit, $store); |
37 | 37 | $this->duration_unit = $duration_unit; |
38 | 38 | } |
@@ -53,20 +53,20 @@ discard block |
||
53 | 53 | //var_dump($period); |
54 | 54 | //var_dump($unit); |
55 | 55 | //var_dump($unit_events); |
56 | - foreach ($unit_events as $event){ |
|
57 | - if ($unit == $this->unit->getUnitId()){ |
|
56 | + foreach ($unit_events as $event) { |
|
57 | + if ($unit == $this->unit->getUnitId()) { |
|
58 | 58 | foreach ($period as $dt) { |
59 | 59 | // If event in period involved add value of event |
60 | 60 | // If event is not completely in period involved then add just the percentage that is |
61 | 61 | print_r("Event is: "); |
62 | - print_r($event->getStartDate()->format('Y-m-d H:i:s') ." to "); |
|
63 | - print_r($event->getEndDate()->format('Y-m-d H:i:s') ."\n"); |
|
62 | + print_r($event->getStartDate()->format('Y-m-d H:i:s') . " to "); |
|
63 | + print_r($event->getEndDate()->format('Y-m-d H:i:s') . "\n"); |
|
64 | 64 | print_r("Period is: "); |
65 | - print_r($dt->format('Y-m-d H:i:s') ."\n"); |
|
66 | - if ($event->dateIsInRange($dt)){ |
|
65 | + print_r($dt->format('Y-m-d H:i:s') . "\n"); |
|
66 | + if ($event->dateIsInRange($dt)) { |
|
67 | 67 | print_r("In range adding: " . $event->getValue() . " to event.\n"); |
68 | 68 | $value = $value + $event->getValue(); |
69 | - print_r("Current Value " .$value . "\n"); |
|
69 | + print_r("Current Value " . $value . "\n"); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 | } |