Finalisation des interval avec jQuery.
+ Implementation de qtip 2.0
This commit is contained in:
parent
4bf8336ace
commit
b265300d7a
@ -7,7 +7,7 @@ class ComptageController extends Zend_Controller_Action
|
||||
$this->_helper->viewRenderer->setNoRender(true);
|
||||
$explode = array('dateCrea_etab', 'dateCrea_ent', 'dateImmat', 'nbEtab', 'teff_entrep', 'teff_etab',
|
||||
'teff_entrep', 'teff_etab', 'eff_etab', 'eff_entrep', 'adr_dep', 'adr_cp', 'nbMPubli',
|
||||
'nbPart', 'nbAction', 'capital', 'bilAnnee', 'bilCloture', 'bilEE', 'bilFL', 'bilFK',
|
||||
'nbPart', 'nbActio', 'capital', 'bilAnnee', 'bilCloture', 'bilEE', 'bilFL', 'bilFK',
|
||||
'bilFR', 'bilGF', 'bilGP', 'bilGU', 'bilGW', 'bilHD', 'bilHH', 'bilHL', 'bilHM', 'bilHN', 'bilYP', 'adr_com'
|
||||
);
|
||||
$request = $this->getRequest();
|
||||
|
@ -2,7 +2,7 @@
|
||||
class CriteresController extends Zend_Controller_Action
|
||||
{
|
||||
public function indexAction(){}
|
||||
protected $entreprise = array('siege', 'sirenGrp', 'tel', 'fax', 'web', 'mail', 'presentRcs', 'adrDom', 'dirNom', 'lieuAct', 'nbMPubli', 'dateCrea_ent', 'dateCrea_etab', 'nbAction', 'nbPart');
|
||||
protected $entreprise = array('siege', 'sirenGrp', 'tel', 'fax', 'web', 'mail', 'presentRcs', 'adrDom', 'dirNom', 'lieuAct', 'nbMPubli', 'dateCrea_ent', 'dateCrea_etab', 'nbActio', 'nbPart');
|
||||
protected $economique = array('ape_etab', 'ape_entrep', 'NaceEtab', 'NaceEntrep', 'age_etab', 'age_entrep', 'teff_entrep', 'teff_etab', 'nbEtab', 'eff_entrep', 'eff_etab', 'capital');
|
||||
protected $geographique = array('adr_cp', 'adr_dep', 'adr_com');
|
||||
protected $juridique = array('cj', 'actifEco', 'procolHisto', 'tvaIntraValide', 'dateImmat');
|
||||
@ -32,7 +32,7 @@ class CriteresController extends Zend_Controller_Action
|
||||
array('name' => 'nbMPubli', 'libelle' => 'Nombre de marchés publiques remportés', 'type' => 'interval:regle'),
|
||||
array('name' => 'dateCrea_ent', 'libelle' => 'Date de création de l\'entreprose', 'type' => 'interval:date'),
|
||||
array('name' => 'dateCrea_etab', 'libelle' => 'Date de création de l\'etablissement', 'type' => 'interval:date'),
|
||||
array('name' => 'nbAction', 'libelle' => 'Nombre d\'actionnaires connus', 'type' => 'interval:regle'),
|
||||
array('name' => 'nbActio', 'libelle' => 'Nombre d\'actionnaires connus', 'type' => 'interval:regle'),
|
||||
array('name' => 'nbPart', 'libelle' => 'Nombre de participations connues', 'type' => 'interval:regle')
|
||||
);
|
||||
$select['entreprise'] = $this->entreprise;
|
||||
|
@ -18,8 +18,10 @@ Class Zend_View_Helper_Interval extends Zend_View_Helper_Abstract
|
||||
$min = ((!empty($session->ciblage['nbMPubli'][0]))?$session->ciblage['nbMPubli'][0]:'0');
|
||||
$max = ((!empty($session->ciblage['nbMPubli'][0]))?$session->ciblage['nbMPubli'][1]:'1000');
|
||||
return (array($min, $max));
|
||||
case 'nbAction':
|
||||
return array('0', '100');
|
||||
case 'nbActio':
|
||||
$min = ((!empty($session->ciblage['nbActio'][0]))?$session->ciblage['nbMPubli'][0]:'0');
|
||||
$max = ((!empty($session->ciblage['nbActio'][0]))?$session->ciblage['nbMPubli'][1]:'100');
|
||||
return (array($min, $max));
|
||||
case 'nbPart':
|
||||
return array('0', '100');
|
||||
}
|
||||
|
@ -116,6 +116,10 @@ Class Ciblage
|
||||
return ($copy);
|
||||
}
|
||||
|
||||
protected function dirNom($valeur) {
|
||||
$this->setFilter('dirNom', $valeur);
|
||||
}
|
||||
|
||||
protected function siege($valeur) {
|
||||
$this->setFilter('siege', $valeur);
|
||||
}
|
||||
@ -320,6 +324,10 @@ Class Ciblage
|
||||
$this->setFilterRange('bilFS', $valeur);
|
||||
}
|
||||
|
||||
protected function lieuAct($valeur) {
|
||||
$this->setFilter('lieuAct', $valeur);
|
||||
}
|
||||
|
||||
protected function bilGG($valeur) {
|
||||
$this->setFilterRange('bilGG', $valeur);
|
||||
}
|
||||
@ -332,7 +340,7 @@ Class Ciblage
|
||||
$this->setFilterRange('bilHI', $valeur);
|
||||
}
|
||||
|
||||
protected function adrdom($valeur) {
|
||||
protected function adrDom($valeur) {
|
||||
$this->setFilter('adrDom', $valeur);
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
require_once('commons/dates.php');
|
||||
class SessionCiblage
|
||||
{
|
||||
protected $criteres = array('nbMPubli' ,'total', 'insee', 'siege', 'adr_cp', 'adr_dep', 'adr_com', 'tel', 'fax', 'cj', 'capital', 'ape_etab', 'ape_entrep', 'age_entrep',
|
||||
protected $criteres = array('nbMPubli' , 'dirNom', 'lieuAct', 'adrDom','total', 'insee', 'siege', 'adr_cp', 'adr_dep', 'adr_com', 'tel', 'fax', 'cj', 'capital', 'ape_etab', 'ape_entrep', 'age_entrep',
|
||||
'age_etab', 'tcaexp', 'teff_entrep', 'teff_etab', 'rang', 'actifEco', 'presentRcs', 'procolHisto', 'tvaIntraValide',
|
||||
'NaceEtab', 'NaceEntrep', 'dateCrea_etab', 'dateCrea_ent', 'dateImmat', 'eff_entrep', 'eff_etab', 'rivoli', 'nbEtab',
|
||||
'sirenGrp', 'nbActio', 'nbPart', 'bilType', 'bilAnnee', 'avisCs', 'bilTca', 'bilEE', 'bilFL', 'bilFK', 'bilFR', 'bilGF', 'bilGP',
|
||||
|
File diff suppressed because one or more lines are too long
13
public/themes/default/scripts/jquery.qtip.min.js
vendored
Normal file
13
public/themes/default/scripts/jquery.qtip.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -25,8 +25,11 @@ $(document).ready(function(){
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
$(function() {
|
||||
$( ".slider-range" ).slider({
|
||||
|
||||
slider = $( ".slider-range" ).slider({
|
||||
range: true,
|
||||
create: function(event, ui) {
|
||||
var max = $("#"+$(this).attr('input')).attr('max');
|
||||
@ -38,14 +41,31 @@ $(document).ready(function(){
|
||||
values : [0, 100000000000000],
|
||||
slide: function( event, ui ) {
|
||||
var name = $(this).attr('input');
|
||||
|
||||
$( "#"+name ).val( ui.values[ 0 ] + " , " + ui.values[ 1 ] );
|
||||
},
|
||||
|
||||
step: 10,
|
||||
stop: function( event, ui ) {
|
||||
var name = $(this).attr('input');
|
||||
set(name, ui.values[ 0 ] + "," + ui.values[ 1 ]);
|
||||
},
|
||||
})
|
||||
});
|
||||
|
||||
$(function() {
|
||||
var dates = $( ".from, .to" ).datepicker({
|
||||
defaultDate: "+1w",
|
||||
changeMonth: true,
|
||||
numberOfMonths: 3,
|
||||
onSelect: function( selectedDate ) {
|
||||
var option = this.id == "from" ? "minDate" : "maxDate",
|
||||
instance = $( this ).data( "datepicker" ),
|
||||
date = $.datepicker.parseDate(
|
||||
instance.settings.dateFormat ||
|
||||
$.datepicker._defaults.dateFormat,
|
||||
selectedDate, instance.settings );
|
||||
dates.not( this ).datepicker( "option", option, date );
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
* http://en.wikipedia.org/wiki/MIT_License
|
||||
* http://en.wikipedia.org/wiki/GNU_General_Public_License
|
||||
*
|
||||
* Date: Sat Aug 27 09:34:17.0000000000 2011
|
||||
* Date: Mon Dec 19 15:43:28.0000000000 2011
|
||||
*/
|
||||
|
||||
/* Core qTip styles */
|
||||
@ -19,13 +19,11 @@
|
||||
top: -28000px;
|
||||
display: none;
|
||||
|
||||
max-width: 800px;
|
||||
max-width: 280px;
|
||||
min-width: 50px;
|
||||
|
||||
font-size: 10.5px;
|
||||
line-height: 12px;
|
||||
|
||||
z-index: 15000;
|
||||
}
|
||||
|
||||
/* Fluid class for determining actual width in IE */
|
||||
@ -41,8 +39,7 @@
|
||||
padding: 5px 9px;
|
||||
overflow: hidden;
|
||||
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border: 1px solid #000001;
|
||||
|
||||
text-align: left;
|
||||
word-wrap: break-word;
|
||||
@ -55,8 +52,8 @@
|
||||
padding: 5px 35px 5px 10px;
|
||||
overflow: hidden;
|
||||
|
||||
border: 1px solid #000001;
|
||||
border-width: 1px 1px 0;
|
||||
border-style: solid;
|
||||
|
||||
font-weight: bold;
|
||||
}
|
||||
@ -142,9 +139,6 @@
|
||||
.ui-tooltip .ui-tooltip-tip{
|
||||
margin: 0 auto;
|
||||
overflow: hidden;
|
||||
|
||||
background: transparent !important;
|
||||
border: 0px dashed transparent !important;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user