diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php index c4585428b..56b7b56e4 100644 --- a/application/Admin/functions/RtrReporting.php +++ b/application/Admin/functions/RtrReporting.php @@ -62,7 +62,7 @@ class Admin_RtrReporting { "Fladnitz a. d. Teichalm" => "Fladnitz an der Teichalm", //"Stübing" => "Deutschfeistritz", "Stübing" => "Gratkorn", - "Deutsch Feistritz"=> "Deutschfeistritz", + "Deutsch Feistritz" => "Deutschfeistritz", "Minihof Liebau" => "Minihof-Liebau", "Windisch-Minihof" => "Minihof-Liebau", "Windisch Minihof" => "Minihof-Liebau", @@ -106,6 +106,7 @@ class Admin_RtrReporting { "Heiligenkreuz a/W" => "Heiligenkreuz am Waasen", "Rettenbach in der Oststeiermark" => "Pirching am Traubenberg", "Rettenbach" => "Pirching am Traubenberg", + "Pirching" => "Pirching am Traubenberg", "St. Ulrich im Greith" => "Sankt Martin im Sulmtal", "St. Martin i. S." => "Sankt Martin im Sulmtal", "St. Georgen/Stiefing" => "Sankt Georgen an der Stiefing", @@ -153,6 +154,7 @@ class Admin_RtrReporting { "Breitenfeld" => "Riegersburg", "Mortanstch" => "Mortantsch", "Eggersdorf" => "Eggersdorf bei Graz", + "Dobl - Zwaring" => "Dobl-Zwaring" //"" => "Sankt Ruprecht an der Raab", //"" => "Sankt Ruprecht an der Raab", @@ -420,7 +422,9 @@ class Admin_RtrReporting { $res = $adb->query($sql); if(!$adb->num_rows($res)) { - echo "Geminde nicht gefunden Plz.plz='$plz' AND Ortschaft.name='$ort'\n"; + echo "Geminde nicht gefunden Plz.plz='$plz' AND Ortschaft.name='$ort' Contract ".$contract->id."\n"; + print_r($contract); + print_r($contract->owner); exit; } } @@ -588,7 +592,11 @@ class Admin_RtrReporting { $data[$prov_id] = []; } - if($prov_id == $this->systemowner_rtr_id && $netowner_id == $this->systemowner_id && ($prod_code_start == 1042 || $prod_code_start == 1431)) { + if($prod_code_start == 1222) { + $this->log->debug(__METHOD__.": $prod_code - prov_id $prov_id - netowner_id $netowner_id"); + } + + if($prov_id == $this->systemowner_rtr_id && (($netowner_id == $this->systemowner_id && ($prod_code_start == 1042 || $prod_code_start == 1431)) || $prod_code_start == 1222)) { if(!in_array($prod_code_a, $data[$prov_id])) { $data[$prov_id][] = $prod_code_a; } @@ -597,7 +605,7 @@ class Admin_RtrReporting { if(!in_array($prod_code_p, $data[$prov_id])) { $data[$prov_id][] = $prod_code_p; } - if(!in_array($prod_code_b, $data[$prov_id])) { + if(!in_array($prod_code_b, $data[$prov_id]) && !$prod_code_start == 12221) { $data[$prov_id][] = $prod_code_b; } }