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

javascript et finalisation de la vue new fiche avant l'ajout de modification/ajout de fiche

Browse Source
This commit is contained in:
Pierr0 2023-12-30 19:18:25 +01:00
parent d279249503
commit 85c00fde0a
6 changed files with 129 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Class/class.newFiche.php
View File

@ -54,4 +54,18 @@ class Class_newFiche
return $result->fetchAll();
}
public function getMontantValide(string $idVisiteur, int $month): float
{
$req = 'SELECT "rMontantValide"
FROM remboursement
WHERE "rVisiteur" = :idVisiteur AND "rMois" = :mois ;';
$result = $this->pdo->prepare($req);
$result->bindParam(':idVisiteur', $idVisiteur);
$result->bindParam(':mois', $month);
$result->execute();
return $result->fetchAll()[0]['rMontantValide'];
}
}

42
controleurs/c_nouvelleFiche.php
View File

@ -4,11 +4,45 @@ require_once(__DIR__ . '/../Class/class.newFiche.php');
$newFiche = new Class_newFiche($pdo);
$_SESSION['userId'] = 'b34';
$_SESSION['typeU'] = 'visiteur';
$date = '202011';
/**
* Gestion de la date selon la vue à afficher
*/
if (isset($_GET['currentList'])) {
//Date des req SQL et function
$date = date('Ym');
//Date du header
try {
//sudo timedatectl set-local-rtc 1
$format = new IntlDateFormatter(
'fr_FR',
IntlDateFormatter::FULL,
IntlDateFormatter::FULL,
'Europe/Paris',
IntlDateFormatter::GREGORIAN,
'MMMM Y'
);
$dateHeader = $format->format(time());
} catch (\Throwable $th) {
$dateHeader = date('F Y');
}
//Date du formulaire HF
$dateFormHFMin = date('Y-m-\01');
$dateFormHFMax = date("Y-m-t", mktime(0, 0, 0, date('m'), 1, date('Y'))); // retourne le dernier jour du mois (30 ou 31)
} elseif (isset($_GET['dateListing'])) {
$date = $_GET['dateListing'];
}
/**
* Liste des frais forfaitaires du mois et de l'user :: sinon afficher les libelle
*/
$listeFraisForfaitaire = $newFiche->listFraisForfaitForU($_SESSION['userId'], '202011');
$listeFraisForfaitaire = $newFiche->listFraisForfaitForU($_SESSION['userId'], $date);
if (count($listeFraisForfaitaire) == 0) {
$listeFraisForfaitaire = $newFiche->listFraisForfaitaires();
}
@ -16,7 +50,11 @@ if (count($listeFraisForfaitaire) == 0) {
/**
* Listes des frais HF
*/
$listeFraisHf = $newFiche->listFraisHF($_SESSION['userId'], '202011');
$listeFraisHf = $newFiche->listFraisHF($_SESSION['userId'], $date);
/**
* TOTAL DE LA FICHE
*/
$totalFraisFiche = $newFiche->getMontantValide($_SESSION['userId'], $date);
include(__DIR__ . '/../vues/v_newFiche.php');

2
include/menu.php
View File

@ -25,7 +25,7 @@
</a>
</li>
<li>
<a href="index.php?direction=nouvelleFiche" class="nav-link px-0"> <span class="d-none d-sm-inline">Fiche du mois</span>
<a href="index.php?direction=nouvelleFiche&currentList" class="nav-link px-0"> <span class="d-none d-sm-inline">Fiche du mois</span>
</a>
</li>
</ul>

43
include/newFiche.js
View File

@ -1,6 +1,8 @@
$(document).ready(function () {
calcPrixTotalFrsF();
calcPrixTotalFrsHorsF();
updatePrixTotal();
/**
* Partie enregistrement frais F
*/
@ -19,6 +21,7 @@ $(document).ready(function () {
formTotal.html((val * mttFrs).toFixed(2) + ' €');
calcPrixTotalFrsF();
updatePrixTotal();
}
})
@ -56,16 +59,11 @@ $(document).ready(function () {
if (canAdd == true) {
var line = $('tr.fraisHF:first').clone();
lastId = $('tr.fraisHF').length
/*
line.find("#dateFrsHF").html(date.val());
line.find("#LibelleFrsHF").html(libelle.val());
line.find("#MttFrsHF").html(parseFloat(montant.val()).toFixed(2) + ' €');
*/
line.find('.btn').attr('id', 'frsSup-' + lastId)
var line = $('<tr id="fraisHf-' + lastId + '" class="fraisHF"></tr>');
var tdDate = $('<td scope="row" id="dateFrsHF"></td>');
var tdDate = $('<th scope="row" id="dateFrsHF"></th>');
tdDate.html(date.val());
var tdLibelle = $('<td id="LibelleFrsHF"></td>');
tdLibelle.html(libelle.val());
@ -81,7 +79,14 @@ $(document).ready(function () {
$(line).append(btn)
line.insertBefore('.newFraisForm')
date.val('')
libelle.val('')
montant.val('')
}
calcPrixTotalFrsHorsF();
updatePrixTotal();
})
@ -95,10 +100,12 @@ $(document).on('click', '.btnSuprFraisHf', function () {
console.log(id)
$('#fraisHf-' + id).remove()
calcPrixTotalFrsHorsF();
updatePrixTotal();
})
/**
* Calcul prix total
* Calcul prix total frais forfaitaires
*/
function calcPrixTotalFrsF() {
@ -107,4 +114,26 @@ function calcPrixTotalFrsF() {
prixTotal += parseFloat($(this).html().replace('€', ''))
})
$('.prixTotalFrsF').html('<strong>TOTAL :</strong> ' + prixTotal.toFixed(2) + ' €')
$('.prixTotalFrsF').attr('data-prix', prixTotal.toFixed(2))
}
/**
* Calcul prix total frais hors forfait
*/
function calcPrixTotalFrsHorsF() {
var prixTotal = 0;
$('td#MttFrsHF').each(function () {
prixTotal += parseFloat($(this).html().replace('€', ''))
})
$('#total-frais-HF').html('<strong>TOTAL :</strong> ' + prixTotal.toFixed(2) + ' €')
$('#total-frais-HF').attr('data-prix', prixTotal.toFixed(2))
}
/**
* Calcul prix total de la fiche
*/
function updatePrixTotal() {
var total = parseFloat($('#total-frais-HF').attr('data-prix'))
total += parseFloat($('.prixTotalFrsF').attr('data-prix'))
$('#total-fiche').html('<strong>TOTAL :</strong> ' + total.toFixed(2) + ' €')
}

22
vues/v_connexion.php
View File

@ -1,22 +0,0 @@
<!-- 03/05/2023 à 11H01 -->
<div id="contenu">
<h2>Identification utilisateur</h2>
<form method="POST" action="index.php?uc=connexion&action=valideConnexion">
<p>
<label for="nom">Login*</label>
<input id="login" type="text" name="login" size="30" maxlength="45">
</p>
<p>
<label for="mdp">Mot de passe*</label>
<input id="mdp" type="password" name="mdp" size="30" maxlength="45">
</p>
<input type="submit" value="Valider" name="valider">
<input type="reset" value="Annuler" name="annuler">
</p>
</form>
</div>

51
vues/v_newFiche.php
View File

@ -1,7 +1,9 @@
<center>
<h1>Nouvelle Fiche de frais</h1>
<h1>Fiche de frais</h1>
<br>
<p>Mois de Novembre 2023</p>
<p>Mois de
<?= $dateHeader ?>
</p>
</center>
<br>
<!--
@ -42,7 +44,7 @@
?>
<tr>
<td colspan="3" class="border-0"></td>
<td class="prixTotalFrsF"></td>
<td class="prixTotalFrsF table-primary"></td>
</tr>
</tbody>
</table>
@ -68,10 +70,10 @@
<?php
foreach ($listeFraisHf as $key => $value):
?>
<tr id="fraisHf-<?= $key ?>" class="fraisHF">
<td scope="row" id="dateFrsHF">
<tr id="fraisHf-<?= $key ?>" class="fraisHF <?= $value['lhRefus'] == 1 ? 'table-danger' : '' ?>">
<th scope="row" id="dateFrsHF">
<?= $value['lhDate'] ?>
</td>
</th>
<td id="LibelleFrsHF">
<?= $value['lhLibelle'] ?>
</td>
@ -82,9 +84,16 @@
<?= $value['lhJustificatif'] == 1 ? 'ok' : 'non fournis' ?>
</td>
<td>
<button type="button" class="btn btn-outline-primary btnSuprFraisHf" id="frsSup-<?= $key ?>">
Supprimer
</button>
<?php
if ($_SESSION['typeU'] === 'comptable') { ?>
<button type="button" class="btn btn-outline-primary btnRefuseFraisHf" id="frsSup-<?= $key ?>">
Refuser
</button>
<?php } elseif ($_SESSION['typeU'] === 'visiteur') { ?>
<button type="button" class="btn btn-outline-primary btnSuprFraisHf" id="frsSup-<?= $key ?>">
Supprimer
</button>
<?php } ?>
</td>
</tr>
<?php
@ -94,8 +103,10 @@
Formulaire d'ajout de frais HF
-->
<tr class="newFraisForm">
<td scope="row">
<input name="dateHf" class="form-control" id="dateHf" type="date" min="2020-11-01" max="2020-11-30">
<td>
<!-- Date form -->
<input name="dateHf" class="form-control" id="dateHf" type="date" min="<?= $dateFormHFMin ?>"
max="<?= $dateFormHFMax ?>">
</td>
<td><input type="text" name="libelleHf" id="libelleHf" class="form-control"
placeholder="saisir un titre"></td>
@ -104,17 +115,29 @@
<td><input type="file" class="form-control"></td>
<td><button type="button" class="btn btn-outline-primary validFraisHF">Valider</button></td>
</tr>
<tr>
<td colspan="2" class="border-0"></td>
<td class="table-primary" id="total-frais-HF">TOTAL: 0€</td> <!--COMPLETE HERE -->
</tr>
</tbody>
</table>
</div>
<span class="border-3 border-bottom border-black col-10 mx-auto my-5 d-flex"></span>
<!-- <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">
<strong>TOTAL : </strong>
<?= $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>
-->
<div class="col-3 d-flex mx-auto my-5 justify-content-center">
<button type="button" class="btn btn-outline-primary">Envoyer la Fiche</button>
<button type="button" class="btn btn-outline-primary btn-lg">Envoyer la Fiche</button>
</div>
<script src="../include/newFiche.js"></script>