| 27,6 → 27,7 |
|---|
| private $parametres = array(); |
| private $ressources = array(); |
| private $date_defaut = '1900-01-01'; |
| private $ordre_defaut = 'asc'; |
| private $idsObsImg = array(); |
| private $infosObsImg = array(); |
| |
| 57,6 → 58,15 |
|---|
| $this->parametres['date'] = $this->date_defaut; |
| } |
| |
| if (! isset($parametres['ordre'])) { |
| $this->parametres['ordre'] = $this->ordre_defaut; |
| } else { |
| $parametres['ordre'] = strtolower($parametres['ordre']); |
| if (! in_array($parametres['ordre'], array('asc', 'desc'))) { |
| $this->parametres['ordre'] = $this->ordre_defaut; |
| } |
| } |
| |
| // Lancement du service |
| $this->idsObsImg = $this->getIdsObsImg(); |
| $infos = array(); |
| 86,6 → 96,7 |
|---|
| $limite = @min(intval($this->parametres['navigation.limite']), 1000); |
| $limite = $limite ? $limite : 10; // 0 => 10 |
| $depart = intval(@$this->parametres['navigation.depart']); |
| $ordre = $this->parametres['ordre']; |
| |
| $requete = |
| 'SELECT SQL_CALC_FOUND_ROWS p.id_observation, p.id_image, '. |
| 117,7 → 128,7 |
|---|
| ' OR MAX(iv.date) >= '.$date_debut.' '. |
| ' OR MAX(c.date) >= '.$date_debut.' '. |
| ' OR MAX(cv.date) >= '.$date_debut.' '. |
| 'ORDER BY modif_date DESC '. |
| 'ORDER BY modif_date ' . $ordre . ' '. |
| 'LIMIT '.$depart.', '.$limite. |
| ' -- '.__FILE__.':'.__LINE__; |
| //echo $requete; exit; |
| 276,11 → 287,18 |
|---|
| $ret[] = $o; |
| } |
| |
| function cmp($a, $b) { |
| function cmpDesc($a, $b) { |
| return ($a['date_changement'] < $b['date_changement']) ? 1 : -1; |
| } |
| function cmpAsc($a, $b) { |
| return cmpDesc($b, $a); |
| } |
| |
| usort($ret, 'cmp'); |
| if ($this->parametres['ordre'] == 'desc') { |
| usort($ret, 'cmpDesc'); |
| } else { |
| usort($ret, 'cmpAsc'); |
| } |
| return $ret; |
| } |
| |