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

Merge branch 'fronkdev' into 'master'

Browse Source 
Changed Preordercampaign/Index table cols

See merge request fronk/thetool!716
This commit is contained in:
Frank Schubert
2024-11-12 12:41:13 +00:00
parent b7ebc3cd30 3a39731ffd
commit 4c5feb00b7
1 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,8 +212,8 @@
<th></th>
<th>Netzgebiete</th>
<th>Name</th>
<th>Gebiet</th>
<th>Vorbestellungen</th>
<td>Workorders</td>
<th>Start</th>
<th>Ende</th>
<th></th>
@@ -233,17 +233,60 @@
</td>
<td><?=$camp->network->name?></td>
<td><?=$camp->name?></td>
<td><?=$camp->area?></td>
<td>
<a href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preordercampaign_id" => $camp->id]])?>">
<?=$camp->active_preorder_count?>
<?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>
<div class="row">
<div class="col-1 text-right" style="font-size: 1.5em" title="Bestellungen anzeigen">
<a href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preordercampaign_id" => $camp->id]])?>"><i class="fas fa-list-alt"></i></a>
</div>
<div class="col">
<table class="table-sm table-borderless">
<tr class="bg-transparent" style="line-height: .6em;">
<?php if($camp->total_homes_sd): // automatic value from AdressDB ?>
<td class="text-right">EFH:</td>
<td class="text-right"><?=$camp->active_preorder_count_sd?> /</td>
<td class="text-right"><?=$camp->total_homes_sd?></td>
<td>(<?=(round(($camp->active_preorder_count_sd / $camp->total_homes_sd) * 100, 2))?> %)</td>
<?php endif; ?>
</tr>
<tr class="bg-transparent" style="line-height: .6em;">
<?php if($camp->total_homes_md): // automatic value from AdressdB ?>
<td class="text-right">MPH:</td>
<td class="text-right"><?=$camp->active_preorder_count_md?> /</td>
<td class="text-right"><?=$camp->total_homes_md?></td>
<td>(<?=(round(($camp->active_preorder_count_md / $camp->total_homes_md) * 100, 2))?> %)</td>
<?php endif; ?>
</tr>
<tr class="bg-transparent" style="line-height: .6em;">
<td class="text-right">Gesamt:</td>
<td class="text-right"><?=$camp->active_preorder_count?> /</td>
<td class="text-right">
<?php if($camp->homes_total): // manual value ?>
<?=$camp->homes_total?>
<?php elseif($camp->total_homes): // automatic value from AdressDB ?>
<?=$camp->total_homes?>
<?php endif; ?>
</td>
<td>
<?php if($camp->homes_total): // manual value ?>
(<?=(round(($camp->active_preorder_count / $camp->homes_total) * 100, 2))?> %)
<?php elseif($camp->total_homes): // automatic value from AdressDB ?>
(<?=(round(($camp->active_preorder_count / $camp->total_homes) * 100, 2))?> %)
<?php endif; ?>
</td>
</tr>
</table>
</div>
</div>
</td>
<td>
<?php if($camp->workorder_count): ?>
<?=$camp->workorder_count?>
<?php else: ?>
0
<?php endif; ?>
/ <?=$camp->active_preorder_count?>
</td>
<td><?=date('d.m.Y',$camp->from)?></td>
<td><?=date('d.m.Y',$camp->to)?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">