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 
PreorderstatusJournal & preorder flags -> ADBHausnummer flags sync

See merge request fronk/thetool!1739
This commit is contained in:
Frank Schubert
2025-09-10 15:41:55 +00:00
parent 01b79a8e27 aab08b5d65
commit 90e40567b1
11 changed files with 486 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Layout/default/Preorder/include/preorder-detail.php
View File

@@ -749,6 +749,29 @@
</div>
</div>
</div>
<div class="row mt-2" id="preorder-<?=$preorder->id?>-status-journal">
<div class="col">
<h3>Journal</h3>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text">Neuer Journaleintrag:</span>
</div>
<input type="text" class="form-control preorder-status-journal-input" id="preorder-<?=$preorder->id?>-status-journal-input" />
<div class="input-group-append">
<button type="button" class="btn btn-primary" onclick="submitStatusJournal(<?=$preorder->id?>)">Speichern</button>
</div>
</div>
<table class="table table-sm table-striped" id="preorder-<?=$preorder->id?>-status-journal-list">
<?php foreach(array_reverse($preorder->statusjournals) as $journal): ?>
<tr>
<td class="text-monospace"><small style="white-space: nowrap"><i class="fas fa-clock fa-fw"></i> <?=date("d.m.Y H:i", $journal->create)?></small> <span style="white-space: nowrap">(<?=htmlentities($journal->creator->name)?>)<span></span></td>
<td class="text-left"><?=htmlentities($journal->text)?></td>
</tr>
<?php endforeach; ?>
</table>
</div>
</div>
</div>
<div class="col-6">
<h3>Statusflags</h3>
@@ -757,9 +780,10 @@
<tr>
<th class="text-right">
<input type="checkbox" class="form-control preorder-statusflag"
id="preorder-<?=$preorder->id?>-statusflag-<?=$flag->id?>"
id="preorder-<?=$preorder->id?>-statusflag-<?=$flag->code?>"
data-preorder_id="<?=$preorder->id?>"
data-flag_id="<?=$flag->id?>"
data-flag_code="<?=$flag->code?>"
<?=(array_key_exists($flag->id, $preorder->statusflags) && $preorder->statusflags[$flag->id]->value && $preorder->statusflags[$flag->id]->value->value) ? "checked='checked'" : ""?>
/>
</th>