Nextrek

URLs

Explore

Commits

Diff Revisions 697 vs 698 for /Android/SmartCharging/endPoints/nightly/repositories/LocalRepository.php

		@@ -343,12 +343,20 @@
343	343		$whereClause = ($tipologia>=0) ? "WHERE tipologia='".$tipologia."' AND hidden=0" : "WHERE hidden=0";
344	344
345	345		if ($lat==="" \|\| $lon==="") {
346		-	$harvesinFormulaSQL = "SELECT * FROM locale WHERE hidden=0";
	346	+	$harvesinFormulaSQL = "SELECT l.id as id, id_utente_owner, lat, lon, indirizzo, tipologia, nomelocale, telefono, email, sito, l.descrizione as descrizione, n_punti_ricarica,
	347	+	avg(c.voto) as stelle
	348	+	FROM locale l, commenti c
	349	+	".$whereClause."
	350	+	AND c.id_locale=l.id
	351	+	GROUP BY c.id_locale";
347	352		} else {
348		-	$harvesinFormulaSQL = "SELECT id, id_utente_owner, lat, lon, indirizzo, tipologia, nomelocale, telefono, email, sito, n_punti_ricarica,
	353	+	$harvesinFormulaSQL = "SELECT l.id as id, id_utente_owner, lat, lon, indirizzo, tipologia, nomelocale, telefono, email, sito, l.descrizione as descrizione, n_punti_ricarica,
	354	+	avg(c.voto) as stelle,
349	355		( 6371 * acos( cos( radians(".$lat.") ) * cos( radians( lat ) ) * cos( radians( lon ) - radians(".$lon.") ) + sin( radians(".$lat.") ) * sin( radians( lat ) ) ) ) AS distance
350		-	FROM locale
	356	+	FROM locale l, commenti c
351	357		".$whereClause."
	358	+	AND c.id_locale=l.id
	359	+	GROUP BY c.id_locale
352	360		HAVING distance < ".$distance/1000.0."
353	361		ORDER BY distance";
354	362		//ORDER BY distance LIMIT 0 , 20"; //nel caso in cui si voglia introdurre il limite di locali vicini
		@@ -374,8 +382,10 @@
374	382		$local["nomelocale"] = $row["nomelocale"];
375	383		$local["telefono"] = $row["telefono"];
376	384		$local["email"] = $row["email"];
	385	+	$local["descrizione"] = $row["descrizione"];
377	386		$local["sito"] = $row["sito"];
378	387		$local["n_punti_ricarica"] = $row["n_punti_ricarica"];
	388	+	$local["stelle"] = $row["stelle"];
379	389
380	390		array_push($local_list, $local);
381	391		}

View View this file contents

History View the full history

Feeds

Commits for /Android/SmartCharging/endPoints/nightly/repositories/LocalRepository.php