pierre.renaudot/AP44
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correction bugs page newFiche

Browse Source
This commit is contained in:
Pierr0
2024-01-07 16:26:43 +01:00
parent df7599ab9b
commit fcf292e823
5 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vues/v_newFiche.php
View File

@@ -5,7 +5,8 @@
<?= $dateHeader ?>
</p>
<p class="color-grey" id='idFiche' data-id="<?= $userId . '-' . $date ?>">
ID: <?= $userId . '-' . $date ?>
ID:
<?= $userId . '-' . $date ?>
</p>
</center>
<br>
@@ -32,8 +33,8 @@
<?= $value['fLibelle'] ?>
</th>
<td>
<input type="text" name="fraisForfait" class="form-control frsFrt"
id="<?= $key ?>" value="<?= $value['lfQuantite'] ?>" <?= $disabled ?>>
<input type="text" name="fraisForfait" class="form-control frsFrt" id="<?= $key ?>"
value="<?= $value['lfQuantite'] ?>" <?= $disabled ?>>
</td>
<td id="mttFrs-<?= $key ?>" data-price="<?= $value['fMontant'] ?>">
<?= $value['fMontant'] ?> €
@@ -73,8 +74,8 @@
<?php
foreach ($listeFraisHf as $key => $value):
?>
<tr id="fraisHf-<?= $key ?>" data-id="<?= $value['lhId'] ?>" class="fraisHF <?= $value['lhRefus'] == 1 ? 'table-danger' : '' ?>"
data-id="<?= $value['lhId'] ?>">
<tr id="fraisHf-<?= $key ?>" data-id="<?= $value['lhId'] ?>"
class="fraisHF <?= $value['lhRefus'] == 1 ? 'table-danger' : '' ?>" data-id="<?= $value['lhId'] ?>">
<th scope="row" id="dateFrsHF">
<?= $value['lhDate'] ?>
</th>
@@ -90,9 +91,9 @@
<td>
<?php
if ($typeUser === 'comptable') { ?>
<button type="button" class="btn btn-outline-primary btnRefuseFraisHf" id="frsSup-<?= $key ?>"
<?= $disabled ?>>
Refuser
<button type="button" class="btn btn-outline-primary btnRefuseFraisHf"
data-status="<?= $value['lhRefus'] | 0 ?>" id="frsSup-<?= $key ?>" <?= $disabled ?>>
<?= ($value['lhRefus']) ? 'Accepter' : 'Refuser' ?>
</button>
<?php } elseif ($typeUser === 'visiteur') { ?>
<button type="button" class="btn btn-outline-primary btnSuprFraisHf" id="frsSup-<?= $key ?>"
@@ -127,12 +128,11 @@
<?php endif ?>
<tr>
<td colspan="2" class="border-0"></td>
<td class="table-primary" id="total-frais-HF">TOTAL: 0€</td> <!--COMPLETE HERE -->
<td class="table-primary" id="total-frais-HF">TOTAL: 0€</td>
</tr>
</tbody>
</table>
</div>
<!-- <span class="border-3 border-bottom border-black col-10 mx-auto my-5 d-flex"></span> -->
<!-- TOTAL -->
<div style="position:fixed; bottom:5px; right:5px; margin:0; padding:5px 3px;">
<button type="button" class="btn btn-primary" id="total-fiche">
@@ -140,13 +140,6 @@
<?= $totalFraisFiche ?>
</button>
</div>
<!--
<h3 class="fw-bold offset-1">Commentaire (facultatif)</h3>
<div class="col-8 d-flex mx-auto">
<textarea name="commentaireFiche" id="commentaireFiche" class="form-control border-black"></textarea>
</div>
-->
<?php
/**
* Affiche le bouton si fiche non cloturé
@@ -154,7 +147,8 @@
if ($status === 'CR'):
?>
<div class="col-3 d-flex mx-auto my-5 justify-content-center">
<button type="button" class="btn btn-outline-primary btn-lg" id="sendFileBtn" data-uType="<?= $typeUser ?>">Envoyer la Fiche
<button type="button" class="btn btn-outline-primary btn-lg" id="sendFileBtn" data-uType="<?= $typeUser ?>">Envoyer
la Fiche
</button>
</div>
<?php endif ?>