|
@@ -77,23 +77,23 @@ discard block |
|
|
block discarded – undo |
|
77
|
77
|
$this->event_type = $event_type; |
|
78
|
78
|
|
|
79
|
79
|
if ($event_data == SqlDBStore::BAT_STATE) { |
|
80
|
|
- $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_STATE; |
|
81
|
|
- $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_STATE; |
|
82
|
|
- $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_STATE; |
|
|
80
|
+ $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_STATE; |
|
|
81
|
+ $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_STATE; |
|
|
82
|
+ $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_STATE; |
|
83
|
83
|
|
|
84
|
|
- $this->day_table_no_prefix = 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_STATE; |
|
85
|
|
- $this->hour_table_no_prefix = 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_STATE; |
|
86
|
|
- $this->minute_table_no_prefix = 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_STATE; |
|
|
84
|
+ $this->day_table_no_prefix = 'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_STATE; |
|
|
85
|
+ $this->hour_table_no_prefix = 'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_STATE; |
|
|
86
|
+ $this->minute_table_no_prefix = 'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_STATE; |
|
87
|
87
|
} |
|
88
|
88
|
|
|
89
|
89
|
if ($event_data == SqlDBStore::BAT_EVENT) { |
|
90
|
|
- $this->day_table = $prefix . 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_EVENT; |
|
91
|
|
- $this->hour_table = $prefix . 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_EVENT; |
|
92
|
|
- $this->minute_table = $prefix . 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_EVENT; |
|
|
90
|
+ $this->day_table = $prefix.'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_EVENT; |
|
|
91
|
+ $this->hour_table = $prefix.'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_EVENT; |
|
|
92
|
+ $this->minute_table = $prefix.'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_EVENT; |
|
93
|
93
|
|
|
94
|
|
- $this->day_table_no_prefix = 'bat_event_' . $event_type . '_day_' . SqlDBStore::BAT_EVENT; |
|
95
|
|
- $this->hour_table_no_prefix = 'bat_event_' . $event_type . '_hour_' . SqlDBStore::BAT_EVENT; |
|
96
|
|
- $this->minute_table_no_prefix = 'bat_event_' . $event_type . '_minute_' . SqlDBStore::BAT_EVENT; |
|
|
94
|
+ $this->day_table_no_prefix = 'bat_event_'.$event_type.'_day_'.SqlDBStore::BAT_EVENT; |
|
|
95
|
+ $this->hour_table_no_prefix = 'bat_event_'.$event_type.'_hour_'.SqlDBStore::BAT_EVENT; |
|
|
96
|
+ $this->minute_table_no_prefix = 'bat_event_'.$event_type.'_minute_'.SqlDBStore::BAT_EVENT; |
|
97
|
97
|
} |
|
98
|
98
|
|
|
99
|
99
|
} |
|
@@ -108,9 +108,9 @@ discard block |
|
|
block discarded – undo |
|
108
|
108
|
public function buildQueries(\DateTime $start_date, \DateTime $end_date, $unit_ids) { |
|
109
|
109
|
$queries = array(); |
|
110
|
110
|
|
|
111
|
|
- $queries[Event::BAT_DAY] = 'SELECT * FROM ' . $this->day_table; |
|
112
|
|
- $queries[Event::BAT_HOUR] = 'SELECT * FROM ' . $this->hour_table; |
|
113
|
|
- $queries[Event::BAT_MINUTE] = 'SELECT * FROM ' . $this->minute_table; |
|
|
111
|
+ $queries[Event::BAT_DAY] = 'SELECT * FROM '.$this->day_table; |
|
|
112
|
+ $queries[Event::BAT_HOUR] = 'SELECT * FROM '.$this->hour_table; |
|
|
113
|
+ $queries[Event::BAT_MINUTE] = 'SELECT * FROM '.$this->minute_table; |
|
114
|
114
|
|
|
115
|
115
|
// Create a mock event which we will use to determine how to query the database |
|
116
|
116
|
$mock_event = new Event($start_date, $end_date, new Unit(0, 0, array()), -10); |
|
@@ -128,19 +128,19 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
// We are dealing with multiple years so add an OR |
|
129
|
129
|
$query_parameters .= ' OR '; |
|
130
|
130
|
} |
|
131
|
|
- $query_parameters .= 'year IN (' . $year . ') '; |
|
132
|
|
- $query_parameters .= 'AND month IN (' . implode(",", array_keys($months)) . ') '; |
|
|
131
|
+ $query_parameters .= 'year IN ('.$year.') '; |
|
|
132
|
+ $query_parameters .= 'AND month IN ('.implode(",", array_keys($months)).') '; |
|
133
|
133
|
if (count($unit_ids) > 0) { |
|
134
|
134
|
// Unit ids are defined so add this as a filter |
|
135
|
|
- $query_parameters .= 'AND unit_id in (' . implode("," , $unit_ids) . ') '; |
|
|
135
|
+ $query_parameters .= 'AND unit_id in ('.implode(",", $unit_ids).') '; |
|
136
|
136
|
} |
|
137
|
137
|
$year_count++; |
|
138
|
138
|
} |
|
139
|
139
|
|
|
140
|
140
|
// Add parameters to each query |
|
141
|
|
- $queries[Event::BAT_DAY] = !empty($query_parameters) ? $queries[Event::BAT_DAY] . ' WHERE ' . $query_parameters : $queries[Event::BAT_DAY]; |
|
142
|
|
- $queries[Event::BAT_HOUR] = !empty($query_parameters) ? $queries[Event::BAT_HOUR] . ' WHERE ' . $query_parameters : $queries[Event::BAT_HOUR]; |
|
143
|
|
- $queries[Event::BAT_MINUTE] = !empty($query_parameters) ? $queries[Event::BAT_MINUTE] . ' WHERE ' . $query_parameters : $queries[Event::BAT_MINUTE]; |
|
|
141
|
+ $queries[Event::BAT_DAY] = !empty($query_parameters) ? $queries[Event::BAT_DAY].' WHERE '.$query_parameters : $queries[Event::BAT_DAY]; |
|
|
142
|
+ $queries[Event::BAT_HOUR] = !empty($query_parameters) ? $queries[Event::BAT_HOUR].' WHERE '.$query_parameters : $queries[Event::BAT_HOUR]; |
|
|
143
|
+ $queries[Event::BAT_MINUTE] = !empty($query_parameters) ? $queries[Event::BAT_MINUTE].' WHERE '.$query_parameters : $queries[Event::BAT_MINUTE]; |
|
144
|
144
|
|
|
145
|
145
|
// Clean up and add ordering information |
|
146
|
146
|
$queries[Event::BAT_DAY] .= ' ORDER BY unit_id, year, month'; |
Roomify /
bat
