Skip to content
Snippets Groups Projects
Commit 7c39b070 authored by clement's avatar clement
Browse files

Merge branch 'master' of gitlab.utc.fr:nf17-camp-p14/clivi

parents 1cb34ca1 a8eb03fc
No related branches found
No related tags found
No related merge requests found
......@@ -14,7 +14,7 @@ class DureeField extends Field
public function validate()
{
$this->value = $_POST[$this->name];
if (this->value > -1) {
if ($this->value > -1) {
return true;
}
return false;
......@@ -23,8 +23,10 @@ class DureeField extends Field
public function show() {
$heures = (int)$this->value / 60;
$heure = intval($heures);
$minutes = (int)$this->value % 60;
$html = $heures.'h '.$minutes.'min';
$minute = intval($minutes);
$html = $heure.'h '.$minute.'min';
return $html;
}
}
......@@ -6,10 +6,10 @@ class ListView
protected $objArray;
public $class;
public function __construct($class, $title, $id=null)
public function __construct($class, $title, $arr=Array())
{
$this->title = $title;
$this->objArray = $class::getAll($id);
$this->objArray = $class::getAll($arr);
$this->class = $class;
}
......
......@@ -23,18 +23,22 @@ class Objet
return $dbName;
}
public static function getAll($id = null)
public static function getAll($arr = array())
{
$className = get_called_class();
$dbName = self::dbName();
$bdd = new Db();
$result = Array();
if($id == null) {
if(count($arr) == 0) {
$requete_prepare = $bdd->db->prepare("SELECT * FROM ".$dbName); // on prépare notre requête
$requete_prepare->execute();
} else {
$requete_prepare = $bdd->db->prepare("SELECT * FROM ".$dbName." WHERE id = :id");
$requete_prepare->execute(array("id" => $id));
$req = "SELECT * FROM ".$dbName." WHERE 1=1";
foreach($arr as $k => $a) {
$req .= " AND $k = :$k";
}
$requete_prepare = $bdd->db->prepare($req);
$requete_prepare->execute($arr);
}
while($ligne = $requete_prepare->fetch(PDO::FETCH_ASSOC)) {
......@@ -160,7 +164,7 @@ class Objet
return self::dbName()." #".$this->{$this->_primaryAttr};
}
public function getList($title, $id=null) {
return new ListView(get_called_class(), $title, $id);
public function getList($title, $arr=array()) {
return new ListView(get_called_class(), $title, $arr);
}
}
......@@ -170,14 +170,15 @@ class Stats
{
$bdd = new Db();
$requete_prepare = $bdd->db->prepare(" SELECT r.nom, count(*)
$requete_prepare = $bdd->db->prepare(" SELECT r.nom, count(*) AS count
FROM animal a, race r
WHERE a.race = r.id
GROUP BY r.nom, r.id
ORDER BY count DESC
LIMIT 10" ); // on prépare notre requête
$requete_prepare->execute();
$ligne = $requete_prepare->fetch(PDO::FETCH_ASSOC);
$ligne = $requete_prepare->fetchAll(PDO::FETCH_ASSOC);
return $ligne;
}
......@@ -187,15 +188,16 @@ class Stats
$bdd = new Db();
$requete_prepare = $bdd->db->prepare(" SELECT e.nom, count(*)
$requete_prepare = $bdd->db->prepare(" SELECT e.nom, count(*) AS count
FROM animal a, race r, espece e
WHERE a.race = r.id
AND e.id = r.espece
GROUP BY e.nom, e.id
ORDER BY count DESC
LIMIT 10" ); // on prépare notre requête
$requete_prepare->execute();
$ligne = $requete_prepare->fetch(PDO::FETCH_ASSOC);
$ligne = $requete_prepare->fetchAll(PDO::FETCH_ASSOC);
return $ligne;
}
......
......@@ -47,7 +47,7 @@ switch($action) {
echo ' <a href="'.$base_url.$page.'/addProduit'.'?factId='.$_GET["id"].'" type="button" class="btn btn-success">Ajouter un Produit</a>';
echo ' <a href="'.$base_url.$page.'/addOrd'.'?factId='.$_GET["id"].'" type="button" class="btn btn-success">Ajouter une Ordonnance</a>';
echo '</div>';
$list = LigneFacture::getList("Détails de la facture", $_GET["id"]);
$list = LigneFacture::getList("Détails de la facture", array("facture" => $_GET["id"]));
include 'view/list.php';
break;
default:
......
......@@ -116,4 +116,40 @@
</tbody>
</table>
<br/>
<hr/>
<h4>Top 10 des espèces clientes</h4>
<table class="table">
<thead>
<th>Nom </th>
<th>Nombre d'individu </th>
</thead>
<tbody>
<?php foreach ($stats->top10Espece() as $ligne): ?>
<tr>
<td><?php echo $ligne["nom"]; ?> </td>
<td><?php echo $ligne["count"]; ?> </td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<br/>
<hr/>
<h4>Top 10 des races clientes</h4>
<table class="table">
<thead>
<th>Nom </th>
<th>Nombre d'individu </th>
</thead>
<tbody>
<?php foreach ($stats->top10Race() as $ligne): ?>
<tr>
<td><?php echo $ligne["nom"]; ?> </td>
<td><?php echo $ligne["count"]; ?> </td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment