Closed manioul closed 10 years ago
diff --git a/tableauxEvenSpec.php b/tableauxEvenSpec.php
index 066c085..101ee21 100644
--- a/tableauxEvenSpec.php
+++ b/tableauxEvenSpec.php
@@ -128,13 +128,14 @@ $sql = sprintf("
AND type decompte
!= 'conges'
AND (centre
= 'all' OR centre
= '%s')
AND (team
= 'all' OR team
= '%s')
type decompte
", $affectation['centre']
, $affectation['team']
);
$results = $_SESSION['db']->db_interroge($sql);
-$index = 0;
while ($res = $_SESSION['db']->db_fetch_assoc($results)) {TBL_L_SHIFT_DISPO
AS l
, TBL_ANCIENNETE_EQUIPE
AS a
, TBL_USERS
AS u
did
= %ddid
IN (SELECT did
TBL_DISPO
type decompte
= '%s'centre
= '%s'team
= '%s'l
.uid
= u
.uid
AND a
.uid
= l
.uid
AND l
.date
>= a
.beginning
@@ -159,7 +165,9 @@ while ($res = $_SESSION['db']->db_fetch_assoc($results)) {
AND team
= '%s'
GROUP BY l
.uid
ORDER BY compte
ASC $onglets[$res['type decompte']]['quantity'] = $row[1] - $min;
}
}
} @@ -184,20 +192,27 @@ while ($res = $_SESSION['db']->db_fetch_assoc($results)) { // lorsque la différence (min, max) est importante mysqli_free_result($result);
uid
, did
, date
FROM TBL_L_SHIFT_DISPO
did
= %ddid
IN (SELECT did
TBL_DISPO
type decompte
= '%s'centre
= '%s'team
= '%s'uid
= %d
ORDER BY date
ASC
LIMIT %d, %d , $onglets[$res['type decompte']]['quantity']
);
$r = $_SESSION['db']->db_interroge($sql);
@@ -213,10 +228,14 @@ while ($res = $_SESSION['db']->db_fetch_assoc($results)) { $index++; } mysqli_free_result($results); +$ong = array(); +foreach ($onglets as $onglet) {
$ong[] = $onglet; +}
$smarty->assign('year', $year); $smarty->assign('titre', $titre); -$smarty->assign('onglets', $onglets); +$smarty->assign('onglets', $ong); $smarty->assign('users', $users); $smarty->assign('tab', $tab);
Les compteurs regroupant plusieurs activités sont affichés autant de fois que le nombre d'activités qu'ils rassemblent dans les tableaux de décompte d'événements. Mais les valeurs de date n'apparaissent pas pour ces compteurs...