Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 2201 → Rev 2202

/branches/v1.11-magnesium/src/org/tela_botanica/del/client/composants/moteurrecherche/MoteurRechercheVue.java
64,7 → 64,7
String codeRef = iterator.next();
referentiel.addItem(listeReferentiels.get(codeRef), codeRef);
}
referentiel.setItemSelected(1, true);
referentiel.setItemSelected(0, true);
}
@Override
380,4 → 380,4
public void cacherChampsTagsObs() {
conteneurMotCle.setVisible(false);
}
}
}
/branches/v1.11-magnesium/services/modules/0.1/plantnet/Changements.php
26,7 → 26,6
 
private $parametres = array();
private $ressources = array();
private $date_defaut = '1900-01-01';
private $ordre_defaut = 'asc';
private $idsObsImg = array();
private $infosObsImg = array();
54,10 → 53,14
$this->ressources = $ressources;
$this->parametres = $parametres;
 
if (!isset($parametres['date'])) {
$this->parametres['date'] = $this->date_defaut;
if (!isset($parametres['date.debut'])) {
$this->parametres['date.debut'] = '1900-01-01';
}
 
if (!isset($parametres['date.fin'])) {
$this->parametres['date.fin'] = date('Y-m-d');
}
 
if (! isset($parametres['ordre'])) {
$this->parametres['ordre'] = $this->ordre_defaut;
} else {
92,7 → 95,8
--------------------------------------------------------------------------------*/
 
private function getIdsObsImg() {
$date_debut = "'{$this->parametres['date']}'";
$date_debut = "'{$this->parametres['date.debut']}'";
$date_fin = "'{$this->parametres['date.fin']}'";
$limite = @min(intval($this->parametres['navigation.limite']), 1000);
$limite = $limite ? $limite : 100; // 0 => 10
$depart = intval(@$this->parametres['navigation.depart']);
107,7 → 111,8
'FROM del_plantnet AS p '.
' JOIN del_observation_modif_date '.
' ON (p.id_observation = del_observation_modif_date.id_observation '.
' AND modif_date >= '.$date_debut.') '.
' AND modif_date >= '.date('U', strtotime($date_debut)).') '.
' AND modif_date <= '.date('U', strtotime($date_fin)).') '.
' LEFT JOIN del_image_vote AS iv '.
' ON (id_image = iv.ce_image AND iv.ce_protocole = 3) '.
' LEFT JOIN del_image_tag AS it '.
/branches/v1.11-magnesium
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r2201