Skip to content

Commit 9b9eca1

Browse files
committed
Correction bug si aucun membres dispo(génération planning) et probleme affichage des heures (page memebres)
1 parent 39b5684 commit 9b9eca1

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

includes/fonctions.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Modification mineure/correction bug: =.=.+1
1010
On change tout: +1.0.0
1111
*/
12-
$version = "1.0.2";
12+
$version = "1.0.3";
1313
$jours = array("Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche");
1414

1515

@@ -62,10 +62,12 @@ function genere_planning($bdd)
6262
for($i=0;$i<$c['affectations'];$i++)
6363
{
6464
$liste_membres = array_diff($liste_membres, $affecte);
65-
$member = min_perm($liste_membres, $obj_membres);
66-
$affecte[] = $member;
67-
$bdd->query("INSERT INTO planning_temp VALUES (".$c['c_id'].", ".$member.")");
68-
$obj_membres[$member]->setTmpAffectation($obj_membres[$member]->tempsPerm() + $c['c_poids']);
65+
if(count($liste_membres)){
66+
$member = min_perm($liste_membres, $obj_membres);
67+
$affecte[] = $member;
68+
$bdd->query("INSERT INTO planning_temp VALUES (".$c['c_id'].", ".$member.")");
69+
$obj_membres[$member]->setTmpAffectation($obj_membres[$member]->tempsPerm() + $c['c_poids']);
70+
}
6971
}
7072
}
7173

@@ -112,4 +114,4 @@ function affichePlanning($p, $moi)
112114
}
113115
echo '</table>';
114116
}
115-
}
117+
}

pages/membres.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
$last = strtotime($mb->getLastModif());
99
if(date("d-m-y") == date("d-m-y", $last)) $affLast = "Aujourd'hui à ".date("h:i", $last);
10-
else $affLast = date("d-m-Y à h:i");
10+
else $affLast = date("d-m-Y à H:i",$last);
1111

1212
echo "
1313
<table>
@@ -44,4 +44,4 @@
4444
</tr>
4545
</table>
4646
";
47-
47+

phpfiles/last_genere

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1500034223
1+
1505251380

0 commit comments

Comments
 (0)