dodanie the_geom do widokow do lepszej analizy przestrzennej

SE/superedit-STATYSTYKA_TABELE.php

@@ -14,7 +14,7 @@
  * 
  */
 function STATYSTYKA_TABELE() {
-
+	global $$A_STATUS_L2_SQL;
 	$db = DB::getDB();
 	if (!$db) {
 		echo '<div class="alert alert-danger">' . "Database Error" . '</div>';
@@ -38,7 +38,11 @@ function STATYSTYKA_TABELE() {
 
 
 			//TODO zastapic to czyms Piotrowym @2016-06-11
-			$A_STATUS_L2_SQL="if(SV.HANGUP_STATUS=SV.A_STATUS,coalesce(SV.A_STATUS),
+			if(!isset($A_STATUS_L2_SQL)) {
+				
+				echo "<br> WARNING variable A_STATUS_L2_SQL is not set globally to emulate correct active client status.";
+				
+				$A_STATUS_L2_SQL="if(SV.HANGUP_STATUS=SV.A_STATUS,coalesce(SV.A_STATUS),
     if( ( unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_FROM) and  ( SV.HANGUP_TILL='0000-00-00' or SV.HANGUP_TILL is NULL )
     and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , coalesce(SV.HANGUP_STATUS), 
     if( ( unix_timestamp(NOW()) < unix_timestamp(SV.HANGUP_FROM) and  ( SV.HANGUP_TILL='0000-00-00' or SV.HANGUP_TILL is NULL )
@@ -69,6 +73,7 @@ function STATYSTYKA_TABELE() {
     )
    )
  "; 
+ }
 
 
 
@@ -334,6 +339,7 @@ function STATYSTYKA_TABELE() {
 						or USERS2_MARKETING.TV_OPER='BN'
 					), 1, 0) ) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
+				, BUILDINGS.the_geom
 			";
 			foreach ($COLSFORSTATS as $FFS) {
 				$sql .= " , round((sum(if( USERS2_MARKETING.`{$FFS}_OPER`='BN',1,0) ) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as `NAS_{$FFS}` ";
@@ -429,6 +435,7 @@ function STATYSTYKA_TABELE() {
 						or USERS2_MARKETING.TV_OPER='BN'), 1, 0)
 					) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
+				, MK_Rewiry.the_geom
 			";
 			foreach ($COLSFORSTATS as $FFS) {
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
@@ -468,6 +475,7 @@ function STATYSTYKA_TABELE() {
 			$sql .= "
 				from USERS2_MARKETING as USERS2_MARKETING
 					left join BUILDINGS on BUILDINGS.S_ADDRESS_STREET=USERS2_MARKETING.T_TELBOX_BUILDING_IN
+					left join MK_Rewiry on MK_Rewiry.NAZWA_REWI=BUILDINGS.M_REWIR
 				where USERS2_MARKETING.A_STATUS!='DELETED' and BUILDINGS.A_STATUS!='DELETED'
 				group by USERS2_MARKETING.M_REWIR
 				order by USERS2_MARKETING.M_REWIR DESC ,USERS2_MARKETING.T_TELBOX_BUILDING_IN