This commit is contained in:
Damien LASSERRE 2011-12-16 16:50:07 +00:00
parent 024950d275
commit 90cda842ec
6 changed files with 23 additions and 13 deletions

View File

@ -51,12 +51,12 @@ class CriteresController extends Zend_Controller_Action
array('name' => 'NaceEntrep', 'libelle' => 'Liste Code NACE de l\'entreprise', 'type' => 'textarea'),
array('name' => 'age_etab', 'libelle' => 'Code AGE Etablissement', 'type' => 'text'),
array('name' => 'age_entrep', 'libelle' => 'Code AGE Entreprise', 'type' => 'text'),
array('name' => 'teff_entrep', 'libelle' => 'Tranche d\'effectif de l\'entreprise', 'type' => 'interval'),
array('name' => 'teff_etab', 'libelle' => 'Tranche d\'effectif de l\'etablissement', 'type' => 'interval'),
array('name' => 'teff_entrep', 'libelle' => 'Tranche d\'effectif de l\'entreprise', 'type' => 'interval:regle'),
array('name' => 'teff_etab', 'libelle' => 'Tranche d\'effectif de l\'etablissement', 'type' => 'interval:regle'),
array('name' => 'nbEtab', 'libelle' => 'Nombre d\'établissements', 'type' => 'interval'),
array('name' => 'eff_entrep', 'libelle' => 'Effectif réel de l\'entreprise', 'type' => 'interval'),
array('name' => 'eff_etab', 'libelle' => 'Effectif réel de l\'établissement', 'type' => 'interval'),
array('name' => 'capital', 'libelle' => 'Capital de l\'entreprise', 'type' => 'interval'),
array('name' => 'capital', 'libelle' => 'Capital de l\'entreprise', 'type' => 'interval:regle'),
);
$this->view->champs = $champs;
}
@ -123,7 +123,7 @@ class CriteresController extends Zend_Controller_Action
array('name' => 'actifEco', 'libelle' => 'Établissement économiquement actif', 'type' => 'select', 'parametres' => array('Oui' => '1', 'Non' => '0')),
array('name' => 'procolHisto', 'libelle' => 'Présence d\'une procédure collective dans l\'histo.', 'type' => 'select', 'parametres' => array('Oui' => '1', 'Non' => '0')),
array('name' => 'tvaIntraValide', 'libelle' => 'Numéro de TVA Valide', 'type' => 'select', 'parametres' => array('Oui' => '1', 'Non' => '0')),
array('name' => 'dateImmat', 'libelle' => 'Date d\'immatriculation de l\'entreprise', 'type' => 'interval')
array('name' => 'dateImmat', 'libelle' => 'Date d\'immatriculation de l\'entreprise', 'type' => 'interval:date')
);
$this->view->champs = $champs;

View File

@ -1,11 +1,12 @@
<div>
<?php foreach($this->champs as $champ){
switch ($champ['type']) {
$valeur = explode(':', $champ['type']);
switch ($valeur[0]) {
case 'select':
echo $this->Select($champ['name'], $champ['libelle'], $champ['parametres']);
break;
case 'interval':
echo $this->Interval($champ['name'], $champ['libelle']);
echo $this->Interval($champ['name'], $champ['libelle'], (isset($valeur[1])?$valeur[1]:false));
break;
case 'text':
echo $this->Text($champ['name'], $champ['libelle']);

View File

@ -1,11 +1,12 @@
<div>
<?php foreach($this->champs as $champ){
switch ($champ['type']) {
$valeur = explode(':', $champ['type']);
switch ($valeur[0]) {
case 'select':
echo $this->Select($champ['name'], $champ['libelle'], $champ['parametres']);
break;
case 'interval':
echo $this->Interval($champ['name'], $champ['libelle']);
echo $this->Interval($champ['name'], $champ['libelle'], (isset($valeur[1])?$valeur[1]:false));
break;
case 'text':
echo $this->Text($champ['name'], $champ['libelle']);

View File

@ -1,11 +1,12 @@
<div>
<?php foreach($this->champs as $champ){
switch ($champ['type']) {
$valeur = explode(':', $champ['type']);
switch ($valeur[0]) {
case 'select':
echo $this->Select($champ['name'], $champ['libelle'], $champ['parametres']);
break;
case 'interval':
echo $this->Interval($champ['name'], $champ['libelle']);
echo $this->Interval($champ['name'], $champ['libelle'], (isset($valeur[1])?$valeur[1]:false));
break;
case 'text':
echo $this->Text($champ['name'], $champ['libelle']);

View File

@ -1,11 +1,12 @@
<div>
<?php foreach($this->champs as $champ){
switch ($champ['type']) {
$valeur = explode(':', $champ['type']);
switch ($valeur[0]) {
case 'select':
echo $this->Select($champ['name'], $champ['libelle'], $champ['parametres']);
break;
case 'interval':
echo $this->Interval($champ['name'], $champ['libelle']);
echo $this->Interval($champ['name'], $champ['libelle'], (isset($valeur[1])?$valeur[1]:false));
break;
case 'text':
echo $this->Text($champ['name'], $champ['libelle']);
@ -13,6 +14,8 @@
case 'textarea':
echo $this->Textarea($champ['name'], $champ['libelle']);
break;
default:
echo $champ['name'].'<br />';
}
} ?>
</div>

View File

@ -26,7 +26,11 @@ $(document).ready(function(){
});
$(function() {
$( ".datepicker" ).datepicker();
$( ".datepicker" ).datepicker({
showOn: "button",
buttonImage: "/themes/default/images/calendar.png",
buttonImageOnly: true
});
$( ".datepicker" ).datepicker( "option", "dateFormat", "yymmdd" );
});