Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Restored counting homes total from AdressdB in Preordercampaign/Index

Browse Source
This commit is contained in:
Frank Schubert
2023-04-24 19:55:05 +02:00
parent f89909014a
commit 732ee1c407
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Preordercampaign/Index.php
View File

@@ -113,8 +113,10 @@
<td>
<a href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preordercampaign_id" => $camp->id]])?>">
<?=$camp->active_preorder_count?>
<?php if($camp->homes_total): ?>
<?php if($camp->homes_total): // manual value ?>
/ <?=$camp->homes_total?> (<?=(round(($camp->active_preorder_count / $camp->homes_total) * 100, 2))?> %)
<?php elseif($camp->total_homes): // automatic value from AdressDB ?>
/ <?=$camp->total_homes?> (<?=(round(($camp->active_preorder_count / $camp->total_homes) * 100, 2))?> %)
<?php endif; ?>
</a>
</td>

2
application/ADBWohneinheit/ADBWohneinheitModel.php
View File

@@ -95,7 +95,7 @@ class ADBWohneinheitModel {
) as tbl
";
//mfLoghandler::singleton()->debug($sql);
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);

9
application/Preordercampaign/Preordercampaign.php
View File

@@ -82,10 +82,15 @@ class Preordercampaign extends mfBaseModel {
if($name == "total_homes") {
$total = 0;
$netzgebiet_ids = null;
foreach($this->getProperty("salesclusters") as $scluster) {
$netzgebiet_id = $scluster->salescluster_id;
$total += ADBWohneinheitModel::count(['netzgebiet_id' => $netzgebiet_id]);
$netzgebiet_ids[] = $scluster->id;
}
if(count($netzgebiet_ids)) {
$total = ADBWohneinheitModel::count(['netzgebiet_id' => $netzgebiet_ids]);
}
$this->total_homes = $total;
return $total;
}