Subversion Repository Public Repository

Nextrek

Diff Revisions 415 vs 417 for /Android/SmartCharging/endPoints/nightly/repositories/LocalRepository.php

Diff revisions: vs.
  @@ -12,13 +12,17 @@
12 12 public function registerLocal($local) {
13 13 $status = array();
14 14
15 - $queryLocal = "INSERT INTO locale(id_utente_owner, nomelocale, descrizione, tipologia, lat, lon)
15 + $queryLocal = "INSERT INTO locale(id_utente_owner, nomelocale, descrizione, tipologia, lat, lon, indirizzo, email, telefono, sito)
16 16 VALUES ('".$local->id_utente_owner."',
17 17 '".$local->nomelocale."',
18 18 '".$local->descrizione."',
19 19 '".$local->tipologia."',
20 20 '".$local->lat."',
21 - '".$local->lon."')";
21 + '".$local->lon."',
22 + '".$local->indirizzo."',
23 + '".$local->email."',
24 + '".$local->telefono."',
25 + '".$local->sito."')";
22 26
23 27 //echo "<br/>".$query."<br/>";
24 28
  @@ -209,7 +213,7 @@
209 213
210 214 $whereClause = ($tipologia>=0) ? "WHERE tipologia='".$tipologia."'" : "";
211 215
212 - $harvesinFormulaSQL = "SELECT id, lat, lon, tipologia, nomelocale,
216 + $harvesinFormulaSQL = "SELECT id, lat, lon, indirizzo, tipologia, nomelocale, telefono, email, sito,
213 217 ( 6371 * acos( cos( radians(".$lat.") ) * cos( radians( lat ) ) * cos( radians( lon ) - radians(".$lon.") ) + sin( radians(".$lat.") ) * sin( radians( lat ) ) ) ) AS distance
214 218 FROM locale
215 219 ".$whereClause."
  @@ -231,8 +235,51 @@
231 235 $local["id"] = $row["id"];
232 236 $local["lat"] = $row["lat"];
233 237 $local["lon"] = $row["lon"];
238 + $local["indirizzo"] = $row["indirizzo"];
234 239 $local["tipologia"] = $row["tipologia"];
235 240 $local["nomelocale"] = $row["nomelocale"];
241 + $local["telefono"] = $row["telefono"];
242 + $local["email"] = $row["email"];
243 + $local["sito"] = $row["sito"];
244 +
245 + array_push($local_list, $local);
246 + }
247 +
248 + return $local_list;
249 +
250 + } catch (PDOException $e) {
251 + echo $e->getMessage();
252 + return null;
253 + }
254 + }
255 +
256 + public function getLocalsByUser($user_id) {
257 + $local_list = array();
258 +
259 + $sql = "SELECT id, lat, lon, indirizzo, tipologia, nomelocale, telefono, email, sito
260 + FROM locale
261 + WHERE id_utente_owner=".$user_id;
262 +
263 + //echo "<br/>".$sql."<br/>";
264 +
265 + try {
266 + $query = $this->db->query($sql);
267 +
268 + if (!$query) return null;
269 +
270 + $rows = $query->fetchAll(PDO::FETCH_ASSOC);
271 +
272 + foreach ($rows as $row) {
273 + $local = array();
274 + $local["id"] = $row["id"];
275 + $local["lat"] = $row["lat"];
276 + $local["lon"] = $row["lon"];
277 + $local["indirizzo"] = $row["indirizzo"];
278 + $local["tipologia"] = $row["tipologia"];
279 + $local["nomelocale"] = $row["nomelocale"];
280 + $local["telefono"] = $row["telefono"];
281 + $local["email"] = $row["email"];
282 + $local["sito"] = $row["sito"];
236 283
237 284 array_push($local_list, $local);
238 285 }