Merge branch 'fronkdev' into 'master'
OAIDs can be released now See merge request fronk/thetool!1348
This commit is contained in:
@@ -122,8 +122,8 @@
|
||||
<th>Herkunft</th>
|
||||
<th>Besitzer</th>
|
||||
<th colspan="2" title="Anzahl ADB Wohneinheiten">Zugewiesen</th>
|
||||
<th>Exportiert</th>
|
||||
<th></th>
|
||||
<th>Exportiert</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
<?php foreach($oaids as $oaid): ?>
|
||||
@@ -136,6 +136,7 @@
|
||||
<td><?=$oaid->owner->getCompanyOrName()?></td>
|
||||
<td class="text-right <?=($oaid->adb_wohneinheit_count > 1 || $oaid->adb_wohneinheit_id && $oaid->adb_wohneinheit_count < 1) ? "text-danger" : ""?>">
|
||||
<?=($oaid->adb_wohneinheit_id) ? $oaid->adb_wohneinheit_count."x" : ""?>
|
||||
<a class="ml-2" href="<?=self::getUrl("OpenAccessId", "release", ["id" => $oaid->id])?>" title="OAID freigeben" onclick="if(!confirm('Sind Sie sicher, dass die OAID von Wohneinheit, Preorder und Rimo-FTU entfernt werden soll?')) return false;"><i class="far fa-link-slash"></i></a>
|
||||
</td>
|
||||
<td>
|
||||
<?php if($oaid->termination_id): ?>
|
||||
@@ -151,7 +152,11 @@
|
||||
<?=((string)$oaid->adb_wohneinheit) ? " - ".(string)$oaid->adb_wohneinheit : ""?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td><?=($oaid->assigned) ? date("d.m.Y H:i",$oaid->assigned) : ""?></td>
|
||||
<td>
|
||||
<?php if($oaid->assigned): ?>
|
||||
<?=date("d.m.Y H:i",$oaid->assigned)?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if($oaid->exported_to): ?>
|
||||
[<?=$oaid->exported_to?>]
|
||||
|
||||
Reference in New Issue
Block a user