Merge branch 'fronkdev' into 'master'

creation of Sbidi Preorders / AddressDB unit deletion

See merge request fronk/thetool!1100
This commit is contained in:
Frank Schubert
2025-03-11 13:06:04 +00:00
9 changed files with 541 additions and 26 deletions
+2
View File
@@ -154,6 +154,7 @@
<th>Beschreibung</th>
<th>Extref</th>
<th title="Anzahl Bestellungen">Best.</th>
<th></th>
</tr>
<?php foreach($address->wohneinheiten as $unit): ?>
<tr>
@@ -191,6 +192,7 @@
0
<?php endif; ?>
</td>
<td><a href="<?=self::getUrl("ADBWohneinheit", "delete", ["id" => $unit->id])?>" onclick="if(!confirm('Wohneinheit wirklich löschen?')) return false"><i class="fas fa-trash-alt text-danger"></i></a></td>
</tr>
<?php endforeach; ?>
</table>
-4
View File
@@ -124,7 +124,6 @@
<th colspan="2" title="Anzahl ADB Wohneinheiten">Zugewiesen</th>
<th>Exportiert</th>
<th></th>
<th></th>
</tr>
<?php foreach($oaids as $oaid): ?>
@@ -162,9 +161,6 @@
<?php endif; ?>
</td>
<td><?=($oaid->exported) ? date("d.m.Y H:i", $oaid->exported) : ""?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<!--a href="<?=self::getUrl("OpenAccessId", "edit", ["id" => $oaid->id])?>"><i class="far fa-edit" title="OAID Bearbeiten"></i></a-->
</td>
</tr>
<?php endforeach; ?>
</table>