|
|
@@ -239,6 +239,19 @@ function STATYSTYKA_TABELE() {
|
|
|
if(strlen($row_OPERS->OPERS)>0)
|
|
|
if(!in_array(preg_replace('/[^a-zA-Z0-9\-_]/','_',$row_OPERS->OPERS), $COLSFORSTATS_OPERS))
|
|
|
$COLSFORSTATS_OPERS[]=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`='".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 ) {
|
|
|
@@ -270,54 +283,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 .= "
|