Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

SE/budynki-STATYSTYKA_TABELE.php

@@ -1,5 +1,8 @@
 <?php
 
+die('funkcja wylaczona - pewnie zastapiona przez superedit-STATYSTYKA_TABELE.php');
+
+
 if($_GET[STATYSTYKA_TABELE]) {
 //by plabudda 2012-03-26: removed after ADD FOREIGN KEY (`T_TELBOX_BUILDING_IN`)
 // echo "<br> Wykonuje UPDATE USERS2_MARKETING SET T_TELBOX_BUILDING_IN=SUBSTRING_INDEX(S_ADDRESS_STREET,'/',1)<br> ";

SE/superedit-STATYSTYKA_TABELE.php

@@ -33,6 +33,105 @@ function STATYSTYKA_TABELE() {
 		return;
 	}
 	else {
+		
+		{ //@2016-07-11 bindera moved from old superedit-USERS_FIELDS_PROFILE_PRE_INIT.php $_SESSION['USERS2_MARKETING_COLUMN']['RELATIVEDB']['SQL_QUERY']
+
+
+			//TODO zastapic to czyms Piotrowym @2016-06-11
+			$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 )
+    and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , coalesce(SV.A_STATUS), 
+    if( ( unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_FROM) and  unix_timestamp(NOW()) < unix_timestamp(SV.HANGUP_TILL) 
+    and  ( SV.HANGUP_TILL<>'0000-00-00' and SV.HANGUP_TILL is not 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  unix_timestamp(NOW())< unix_timestamp(SV.HANGUP_TILL) 
+    and  ( SV.HANGUP_TILL<>'0000-00-00' and SV.HANGUP_TILL is not NULL )
+    and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , coalesce(SV.A_STATUS), 
+    if( (  
+      ( SV.HANGUP_TILL='0000-00-00' or SV.HANGUP_TILL is NULL )
+    and ( SV.HANGUP_FROM='0000-00-00' or SV.HANGUP_FROM is null )) , coalesce(SV.A_STATUS), 
+                if( unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_FROM) and  unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_TILL)  and (  
+      ( SV.HANGUP_TILL<>'0000-00-00' and SV.HANGUP_TILL is not NULL )
+           and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , coalesce(SV.A_STATUS), 
+                if( unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_FROM) and  unix_timestamp(NOW()) > unix_timestamp(SV.HANGUP_TILL)  and
+                SV.HANGUP_FROM<SV.HANGUP_TILL and (  
+         ( SV.HANGUP_TILL<>'0000-00-00' and SV.HANGUP_TILL is not NULL )
+           and ( SV.HANGUP_FROM<>'0000-00-00' and SV.HANGUP_FROM is not null )) , 'ERROR1', 
+     'ERROR2'
+      )
+      )      
+      )    
+      )
+      )
+     )    
+    )
+   )
+ "; 
+
+
+
+
+			$sqlList[]=" drop table if exists temp_USERS2_INTERNET_STATUS; ";
+			$sqlList[]="create table temp_USERS2_INTERNET_STATUS 
+			select SV.ID,
+			US2.S_ADDRESS_STREET, concat_ws('', ".$A_STATUS_L2_SQL." ,'.', coalesce(US2.A_STATUS_CURRENT), ' USLUGA:INTERNET(USERS2)' , ' GNIAZDO/USL:',US2.P_SERVICE,' CENA:',coalesce(SV.ABONAMENT_VALUE),
+			' SPEED:',coalesce(US2.P_SERVICE_QUOTA),' DEALD:(',coalesce(DT.ID),coalesce(DT.P_DEALPREFIX), '):', coalesce(DT.P_DEALDATE),'--',coalesce(DT.P_DEALDATE_TERM),
+			' KONTAKT_L2:',coalesce(BUA.P_PHONE),',', coalesce(BUA.user_mail_contact),',' , coalesce(BUA.P_FAX)) as USERS2_INTERNET_STATUS
+			, DT.P_DEALDATE_TERM as P_DEALEXPIRE , SV.NAME_LIST_SERVICES
+			, ".$A_STATUS_L2_SQL." as A_STATUS , SV.HANGUP_STATUS
+			from SERVICES as SV
+			inner JOIN  SES_USERS2_A as US2  on SV.ID=US2.ID_SERVICES
+			inner JOIN BILLING_USERS_ADD  as BUA on BUA.id_users=SV.ID_BILLING_USERS
+			left join DEALS_TABLE as DT on DT.ID=SV.ID_DEALS_TABLE
+			where SV.NAME_LIST_SERVICES='USERS2' and ( SV.P_ID_SERVICES is NULL   or SV.P_ID_SERVICES=0)                
+			;";
+			
+			$sqlList[]="insert ignore into temp_USERS2_INTERNET_STATUS 
+                select SV.ID,
+                US2.S_ADDRESS_STREET, 
+                concat_ws('',".$A_STATUS_L2_SQL.",'.', coalesce(US2.A_STATUS_CURRENT), ' USLUGA:',SV.NAME_LIST_SERVICES , ' GNIAZDO/USL:',US2.P_SERVICE,' CENA:',coalesce(SV.ABONAMENT_VALUE)
+                ,' DEALD:(',coalesce(DT.ID),coalesce(DT.P_DEALPREFIX), '):', coalesce(DT.P_DEALDATE),'--',coalesce(DT.P_DEALDATE_TERM),
+                    ' KONTAKT_L2:',coalesce(BUA.P_PHONE),',' ,coalesce(BUA.user_mail_contact),',' , coalesce(BUA.P_FAX)) as USERS2_INTERNET_STATUS
+                 , DT.P_DEALDATE_TERM as P_DEALEXPIRE , SV.NAME_LIST_SERVICES
+                 , ".$A_STATUS_L2_SQL." as A_STATUS, SV.HANGUP_STATUS 
+                 from SERVICES as SV
+                inner JOIN  SES_TV_A as US2  on SV.ID=US2.ID_SERVICES
+                                inner JOIN BILLING_USERS_ADD  as BUA on BUA.id_users=SV.ID_BILLING_USERS
+                left join DEALS_TABLE as DT on DT.ID=SV.ID_DEALS_TABLE                
+                where SV.NAME_LIST_SERVICES='TV' and ( SV.P_ID_SERVICES is NULL   or SV.P_ID_SERVICES=0) ; ";
+
+			$sqlList[]="insert ignore into temp_USERS2_INTERNET_STATUS 
+			select SV.ID,
+			US22.S_ADDRESS_STREET, 
+			concat_ws('',".$A_STATUS_L2_SQL.",'.', coalesce(US2.A_STATUS_CURRENT), ' USLUGA:',SV.NAME_LIST_SERVICES ,' KLIENT_ID/P_NAME:',concat_ws('',SV.ID_BILLING_USERS,'/',BUA.P_NAME,' ',BUA.P_NAME_SECOND,';'), ' GNIAZDO/USL:',US2.S_PHONE_NUMBER,' CENA:',coalesce(SV.ABONAMENT_VALUE),' DEALD:(',coalesce(DT.ID),coalesce(DT.P_DEALPREFIX), '):', coalesce(DT.P_DEALDATE),'--',coalesce(DT.P_DEALDATE_TERM) ,
+		    ' KONTAKT_L2:',coalesce(BUA.P_PHONE),',' ,coalesce(BUA.user_mail_contact),',' , coalesce(BUA.P_FAX)) as USERS2_INTERNET_STATUS
+			, DT.P_DEALDATE_TERM as P_DEALEXPIRE , SV.NAME_LIST_SERVICES
+			,  ".$A_STATUS_L2_SQL." as A_STATUS, SV.HANGUP_STATUS
+			from SERVICES as SV
+			inner JOIN  SES_VOIP_A as US2  on SV.ID=US2.ID_SERVICES
+			inner JOIN BILLING_USERS_ADD  as BUA on BUA.id_users=SV.ID_BILLING_USERS
+		   inner JOIN SERVICES as SV2 on SV2.P_ID_SERVICES=SV.ID
+  		   inner JOIN SES_USERS2_A as US22 on US22.ID_SERVICES=SV2.ID
+  		   left join DEALS_TABLE as DT on DT.ID=SV.ID_DEALS_TABLE
+  		   where SV.NAME_LIST_SERVICES='VOIP' and ( SV.P_ID_SERVICES is NULL   or SV.P_ID_SERVICES=0) 
+  		   and ".$A_STATUS_L2_SQL."!='OFF_HARD';";
+                
+            $sqlList[]="ALTER TABLE  temp_USERS2_INTERNET_STATUS CHANGE  USERS2_INTERNET_STATUS  USERS2_INTERNET_STATUS VARCHAR( 255 ) NOT NULL;";
+			//wyglada na dodanie rekordow z uslug do bazy marketingu
+            $sqlList[]="insert ignore into USERS2_MARKETING (A_RECORD_CREATE_DATE,A_RECORD_CREATE_AUTHOR,S_ADDRESS_STREET,T_NETWORK_SERVER, P_PHONE,P_OTHER_INFO,A_STATUS,A_STATUS_INFO,S_ALIAS)  SELECT A_RECORD_CREATE_DATE,A_RECORD_CREATE_AUTHOR,S_ADDRESS_STREET,T_NETWORK_SERVER,P_PHONE,P_OTHER_INFO,A_STATUS,A_STATUS_INFO,S_ALIAS FROM USERS2 ORDER BY A_RECORD_UPDATE_DATE DESC ;";
+			//wyglada na aktualizacje telefonu z innego miejsca -ale wyremowana
+            $sqlList[]="UPDATE USERS2_MARKETING AS USERS2_MARKETING , USERS2 AS USERS2 SET USERS2_MARKETING.S_ALIAS=USERS2.S_ALIAS , 
+						USERS2_MARKETING.P_PHONE=USERS2.P_PHONE WHERE USERS2_MARKETING.S_ADDRESS_STREET=USERS2.S_ADDRESS_STREET AND USERS2.A_RECORD_UPDATE_DATE>USERS2_MARKETING.A_RECORD_UPDATE_DATE and 1=0 ;";
+            $sqlList[]="alter table temp_USERS2_INTERNET_STATUS add index(S_ADDRESS_STREET) , add  index(USERS2_INTERNET_STATUS) ;";
+			////@2012-04-24 aktualizacja ADM_COMPANY z BUILDINGS
+
+            $sqlList[]="UPDATE USERS2_MARKETING AS USERS2_MARKETING , BUILDINGS AS BUILDINGS 
+            			SET USERS2_MARKETING.A_ADM_COMPANY=BUILDINGS.A_ADM_COMPANY 
+						WHERE USERS2_MARKETING.T_TELBOX_BUILDING_IN=BUILDINGS.S_ADDRESS_STREET;";
+                  
+		}
 
 		{// temp_USERS2_INTERNET_STATUS_INTERNET_NORMAL
 			$sqlList[] = "drop table if exists temp_USERS2_INTERNET_STATUS_INTERNET_NORMAL";
@@ -44,7 +143,7 @@ function STATYSTYKA_TABELE() {
 					and NAME_LIST_SERVICES like 'USERS2'
 				group by S_ADDRESS_STREET
 			";
-			$sqlList[] = "alter table temp_USERS2_INTERNET_STATUS_INTERNET_NORMAL add index(S_ADDRESS_STREET)";
+			$sqlList[] = "alter ignore table temp_USERS2_INTERNET_STATUS_INTERNET_NORMAL add index(S_ADDRESS_STREET)";
 		}
 
 		{// temp_USERS2_INTERNET_STATUS_VOIP_NORMAL
@@ -128,8 +227,47 @@ function STATYSTYKA_TABELE() {
 			";
 
 			$COLSFORSTATS = array('I','T','TV');
-			$COLSFORSTATS_OPERS = array('INNY','UPC','NSM','TP','EIA','BRAK','JARSAT');
+			$COLSFORSTATS_OPERS_default = array('INNY','UPC','NSM','TP','EIA','BRAK','JARSAT');
+			
+						
+			//@2016-07-01 automatyczne przetwarzanie roznych operatorow i ich skrotow na podstawie analizy obecnie dostepnych
+						$sql_OPERS="select distinct(I_OPER) as OPERS from USERS2_MARKETING 
+						union select distinct(T_OPER) as OPERS from USERS2_MARKETING
+						union select distinct(TV_OPER) as OPERS from USERS2_MARKETING
+						group by OPERS
+						";
+			 $res_OPERS=$db->query($sql_OPERS);
+			 while($row_OPERS=$db->fetch($res_OPERS)) {
+				if(strlen($row_OPERS->OPERS)>0) 
+					if(!in_array(strtolower(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS), $COLSFORSTATS_OPERS)))
+						 if(!in_array(strtoupper(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS), $COLSFORSTATS_OPERS)))
+						 	if(!in_array(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS, $COLSFORSTATS_OPERS))) {
+							 	//echo "dodaje ".strtoupper(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS));
+						 		$COLSFORSTATS_OPERS[]=strtoupper(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS));
+						 	}
+				if($row_OPERS->OPERS!=preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS)) {
+					//aktualizacja w bazie nazwy operatora aby byla bez dziwnych znakow
+					foreach($COLSFORSTATS as $FFS) {
+						$sql_upd="update USERS2_MARKETING set `{$FFS}_OPER`='".strtoupper(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS))."' where `{$FFS}_OPER`='".$row_OPERS->OPERS."'";
+						$res = $db->query($sql_upd);
+						if ($db->has_errors()) {
+							$errors = true;
+							echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;text-align:left;"> (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($db->get_errors());echo'</pre>';
+						}
+					}
+				}
+				
+			 }
+			
+			 //upewnienie sie, ze sa domyslne nazwy firm-operatorow
+			 foreach($COLSFORSTATS_OPERS_default as $OPER ) {
+				if(!in_array($OPER, $COLSFORSTATS_OPERS))	$COLSFORSTATS_OPERS[]=$OPER;
+			 }
+
+			 
+			 echo'<pre style="max-height:200px;overflow:auto;border:1px solid green;text-align:left;">Wykryci operatorzy do analizy: COLSFORSTATS_OPERS (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($COLSFORSTATS_OPERS);echo'</pre>';
 
+			
 			//BEGIN MIESZKANIA STATSY
 			$sql = "select 0 as ID
 				, USERS2_MARKETING.T_TELBOX_BUILDING_IN
@@ -152,54 +290,54 @@ function STATYSTYKA_TABELE() {
 				, BUILDINGS.A_ADM_COMPANY
 			";
 			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} ";
+				$sql .= " , round((sum(if( USERS2_MARKETING.`{$FFS}_OPER`='BN',1,0) ) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as `NAS_{$FFS}` ";
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
 					$sql .= " , round((
 							sum(
-								if( USERS2_MARKETING.{$FFS}_OPER='{$FFFS}', 1, 0)
+								if( USERS2_MARKETING.`{$FFS}_OPER`='{$FFFS}', 1, 0)
 							) / sum(
 									if(
-										(USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00')
-										and (USERS2_MARKETING.{$FFS}_OPER!='BN'), 1, 0
+										(USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00')
+										and (USERS2_MARKETING.`{$FFS}_OPER`!='BN'), 1, 0
 									)
 								) * (
 									count(USERS2_MARKETING.S_ADDRESS_STREET)
 									-
-									sum(if(USERS2_MARKETING.{$FFS}_OPER='BN', 1, 0))
+									sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN', 1, 0))
 								) / count(USERS2_MARKETING.S_ADDRESS_STREET)
-						) * 100, 2) as PR_{$FFS}_{$FFFS}
+						) * 100, 2) as `PR_{$FFS}_{$FFFS}`
 					";
 				}
 				$sql .= "
 					, round((
 						sum(
 							if(
-								(USERS2_MARKETING.{$FFS}_OPER!='BN'
-								and USERS2_MARKETING.{$FFS}_OPER_ZAINT > 2
-								and USERS2_MARKETING.{$FFS}_OPER_ZAINT != 'NIEWIADOMO'), 1, 0)
+								(USERS2_MARKETING.`{$FFS}_OPER`!='BN'
+								and USERS2_MARKETING.`{$FFS}_OPER_ZAINT` > 2
+								and USERS2_MARKETING.`{$FFS}_OPER_ZAINT` != 'NIEWIADOMO'), 1, 0)
 							) / sum(
-								if( (USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00') and (USERS2_MARKETING.{$FFS}_OPER!='BN'), 1, 0)
+								if( (USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00') and (USERS2_MARKETING.`{$FFS}_OPER`!='BN'), 1, 0)
 							) * (
 								count(USERS2_MARKETING.S_ADDRESS_STREET)
 								-
-								sum(if(USERS2_MARKETING.{$FFS}_OPER='BN',1,0))
+								sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN',1,0))
 							) / count(USERS2_MARKETING.S_ADDRESS_STREET)
-						) * 100, 2) as PR_{$FFS}_ZAINT
+						) * 100, 2) as `PR_{$FFS}_ZAINT`
 					, round ((
 							sum(
 								if(
-									(USERS2_MARKETING.{$FFS}_OPER!='BN'
-										and USERS2_MARKETING.{$FFS}_OPER!='BRAK'
-										and USERS2_MARKETING.{$FFS}_OPER!='NIEWIADOMO'), 1, 0)
+									(USERS2_MARKETING.`{$FFS}_OPER`!='BN'
+										and USERS2_MARKETING.`{$FFS}_OPER`!='BRAK'
+										and USERS2_MARKETING.`{$FFS}_OPER`!='NIEWIADOMO'), 1, 0)
 							) / sum(
 								if(
-									(USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00') and (USERS2_MARKETING.{$FFS}_OPER!='BN')  ,1,0 )
+									(USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00') and (USERS2_MARKETING.`{$FFS}_OPER`!='BN')  ,1,0 )
 							) * (
 								count(USERS2_MARKETING.S_ADDRESS_STREET)
 								-
-								sum(if(USERS2_MARKETING.{$FFS}_OPER='BN', 1, 0))
+								sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN', 1, 0))
 							) / count(USERS2_MARKETING.S_ADDRESS_STREET)
-						) * 100, 2) as PR_{$FFS}_KONKUR
+						) * 100, 2) as `PR_{$FFS}_KONKUR`
 					";
 			}
 			$sql .= "
@@ -249,34 +387,34 @@ function STATYSTYKA_TABELE() {
 			foreach ($COLSFORSTATS as $FFS) {
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
 					$sql .= ", round(( sum(
-							if(USERS2_MARKETING.{$FFS}_OPER='{$FFFS}', 1, 0)
+							if(USERS2_MARKETING.`{$FFS}_OPER`='{$FFFS}', 1, 0)
 						) / sum(
-							if( (USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00') and (USERS2_MARKETING.{$FFS}_OPER!='BN'), 1, 0)
+							if( (USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00') and (USERS2_MARKETING.`{$FFS}_OPER`!='BN'), 1, 0)
 						) * (
 							count(USERS2_MARKETING.S_ADDRESS_STREET)
-							- sum(if(USERS2_MARKETING.{$FFS}_OPER='BN', 1, 0))
-						) / count(USERS2_MARKETING.S_ADDRESS_STREET)) * 100, 2) as PR_{$FFS}_{$FFFS}
+							- sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN', 1, 0))
+						) / count(USERS2_MARKETING.S_ADDRESS_STREET)) * 100, 2) as `PR_{$FFS}_{$FFFS}`
 					";
 				}
 				$sql .= ", round(( sum(
 						if(
-							(USERS2_MARKETING.{$FFS}_OPER!='BN'
-							and USERS2_MARKETING.{$FFS}_OPER_ZAINT > 2
-							and USERS2_MARKETING.{$FFS}_OPER_ZAINT!='NIEWIADOMO'), 1, 0)
+							(USERS2_MARKETING.`{$FFS}_OPER`!='BN'
+							and USERS2_MARKETING.`{$FFS}_OPER_ZAINT` > 2
+							and USERS2_MARKETING.`{$FFS}_OPER_ZAINT`!='NIEWIADOMO'), 1, 0)
 					) /	sum(
-						if( (USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00') and (USERS2_MARKETING.{$FFS}_OPER!='BN'), 1, 0)
+						if( (USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00') and (USERS2_MARKETING.`{$FFS}_OPER`!='BN'), 1, 0)
 					) * (
 						count(USERS2_MARKETING.S_ADDRESS_STREET)
-						- sum(if(USERS2_MARKETING.{$FFS}_OPER='BN', 1, 0))
-					) / count(USERS2_MARKETING.S_ADDRESS_STREET)) * 100, 2) as PR_{$FFS}_ZAINT
+						- sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN', 1, 0))
+					) / count(USERS2_MARKETING.S_ADDRESS_STREET)) * 100, 2) as `PR_{$FFS}_ZAINT`
 				, round((
 					sum(
-						if( (USERS2_MARKETING.{$FFS}_OPER!='BN'  and USERS2_MARKETING.{$FFS}_OPER!='BRAK' and USERS2_MARKETING.{$FFS}_OPER!='NIEWIADOMO'), 1, 0)
+						if( (USERS2_MARKETING.`{$FFS}_OPER`!='BN'  and USERS2_MARKETING.`{$FFS}_OPER`!='BRAK' and USERS2_MARKETING.`{$FFS}_OPER`!='NIEWIADOMO'), 1, 0)
 					) / sum(
-						if( (USERS2_MARKETING.{$FFS}_BAD_DATE!='0000-00-00') and (USERS2_MARKETING.{$FFS}_OPER!='BN'), 1, 0)
+						if( (USERS2_MARKETING.`{$FFS}_BAD_DATE`!='0000-00-00') and (USERS2_MARKETING.`{$FFS}_OPER`!='BN'), 1, 0)
 					) * (
 							count(USERS2_MARKETING.S_ADDRESS_STREET)
-							- sum(if(USERS2_MARKETING.{$FFS}_OPER='BN',1,0))
+							- sum(if(USERS2_MARKETING.`{$FFS}_OPER`='BN',1,0))
 						) / count(USERS2_MARKETING.S_ADDRESS_STREET)
 				) * 100, 2) as PR_{$FFS}_KONKUR
 				";