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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Class/class.newFiche.php
View File

@ -175,12 +175,11 @@ class Class_newFiche
{
$req = 'UPDATE ligne_hors_forfait
SET "lhRefus" = :stateF
WHERE "rVisiteur" = :userId AND "rMois" = :monthF AND "lhId" = :idFrais;';
WHERE "lhId" = :idFrais;';
$result = $this->pdo->prepare($req);
$state = ($state) ? 'false' : 'true';
$result->bindParam(':stateF', $state);
$result->bindParam(':idFrais', $idFrais);
$result->bindParam(':userId', $this->userId);
$result->bindParam(':monthF', $this->month);
return $result->execute();
}

16
controleurs/c_actionFiche.php
View File

@ -14,8 +14,8 @@ switch ($_GET['action']) {
//FRAIS FORFAITAIRES
foreach ($_REQUEST['fraisF'] as $value) {
$pdoNewFiche->updateFraisF(
$value['quantité'],
intval($value['montant']),
$value['quantité'],
intval($value['montant']),
$value['id']
);
}
@ -23,8 +23,8 @@ switch ($_GET['action']) {
foreach ($_REQUEST['fraisHF'] as $value) {
if ($value['id'] == NULL) {
$pdoNewFiche->addFraisHF(
$value['libelle'],
$value['date'],
$value['libelle'],
$value['date'],
$value['montant']
);
}
@ -33,7 +33,13 @@ switch ($_GET['action']) {
case 'suprFraisHF':
$pdoNewFiche->suprLigneHF($_GET['idFrais']);
break;
case 'refusFraisHF':
$pdoNewFiche->accceptFrais(
$_GET['idFrais'],
boolval($_GET['state'])
);
break;
default:
# code...
break;

2
controleurs/c_nouvelleFiche.php
View File

@ -37,7 +37,7 @@ if (isset($_GET['currentList'])) {
$date = $_GET['dateListing'];
}
$date = '202312'; //TESTVAR
//$date = '202312'; //TESTVAR
//Instance de l'objet newFiche qui gère toute la partie bdd
$newFiche = new Class_newFiche($pdo, $userId, $date);

19
include/newFiche.js
View File

@ -88,9 +88,24 @@ $(document).ready(function () {
calcPrixTotalFrsHorsF();
updatePrixTotal();
})
})
/**
* Refus d'un frais HF pour un comptable
*/
$(document).on('click', '.btnRefuseFraisHf', function () {
idFrais = $(this).parent().parent().attr('data-id')
fiche = $('#idFiche').attr('data-id')
etatLigne = $(this).attr('data-status')
console.log(etatLigne)
//set on refus
$.ajax({
url: "../controleurs/c_actionFiche.php?action=refusFraisHF&fiche=" + fiche + "&idFrais=" + idFrais + "&state=" + etatLigne,
method: "POST",
}).done(function () {
location.reload();
})
})
/**
* Supprimer fraisHf
*/
@ -113,7 +128,7 @@ $(document).on('click', '.btnSuprFraisHf', function () {
* PARTIE ENVOIE DE LA FICHE
*/
$(document).on('click', '#sendFileBtn', function () {
//FRAIS FORFAITAIRES
var listeFraisF = []
$('tr.fraisForfaitaire').each(function () {

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 ?>