From 1e4d8ed90c8f90056407ac04f18707770b76a229 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Fri, 21 Oct 2022 11:36:28 +0200 Subject: [PATCH] calculating preoder count with connection_count --- Layout/default/Preordercampaign/Index.php | 2 +- .../Preordercampaign/Preordercampaign.php | 16 ++++++++++ .../addressdb_import_bev_adressregister.php | 30 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Layout/default/Preordercampaign/Index.php b/Layout/default/Preordercampaign/Index.php index a052f8191..addcbf490 100644 --- a/Layout/default/Preordercampaign/Index.php +++ b/Layout/default/Preordercampaign/Index.php @@ -100,7 +100,7 @@ area?> ["preordercampaign_id" => $camp->id]])?>"> - active_preorders)?> + active_preorder_count?> homes_total): ?> / homes_total?> (active_preorders) / $camp->homes_total) * 100, 2))?> %) diff --git a/application/Preordercampaign/Preordercampaign.php b/application/Preordercampaign/Preordercampaign.php index 97c93c1c1..0dba43ab3 100644 --- a/application/Preordercampaign/Preordercampaign.php +++ b/application/Preordercampaign/Preordercampaign.php @@ -4,6 +4,7 @@ class Preordercampaign extends mfBaseModel { private $network; private $preorders; private $active_preorders; + private $active_preorder_count = 0; private $types; private $setup_products = []; private $salesclusters; @@ -106,6 +107,21 @@ class Preordercampaign extends mfBaseModel { return $this->active_preorders; } + if($name == "active_preorder_count") { + $count = 0; + foreach($this->getProperty("active_preorders") as $preorder) { + //echo "/c:".$preorder->connection_count."/"; + if($preorder->connection_count) { + $count += (int)$preorder->connection_count; + } else { + $count++; + } + //echo "/s:$count/"; + } + $this->active_preorder_count = $count; + return $this->active_preorder_count; + } + if($name == "types") { $types = PreordercampaignTypeModel::search(['preordercampaign_id' => $this->id]); foreach($types as $type) { diff --git a/scripts/addressdb/addressdb_import_bev_adressregister.php b/scripts/addressdb/addressdb_import_bev_adressregister.php index 99441f26d..5f1c1090e 100755 --- a/scripts/addressdb/addressdb_import_bev_adressregister.php +++ b/scripts/addressdb/addressdb_import_bev_adressregister.php @@ -225,6 +225,36 @@ while($csv = fgetcsv($input, 0, ";")) { echo "\n".($i-1)." Straßen importiert\n"; +$filename = "$folder/STRASSE.csv"; +$input = fopen($filename, "r"); + +$i = 0; +while($csv = fgetcsv($input, 0, ";")) { + $i++; + if($i == 1) continue; + + if($i % 1000 == 0) { + echo "."; + } + + if(!trim($csv[0])) { + continue; + } + + $skz = trim($csv[0]); + $strasse_name = trim($csv[1]); + $gkz = trim($csv[4]); + + if(!$skz) continue; + + $gemeinde = getGemeinde($gkz); + if(!$gemeinde) { + die("Kann Strasse nicht importieren: Gemeinde nicht gefunden ($gkz)\n"); + } + + +} + function getGemeinde($kz) { global $gemeinden_cache;