scores/odea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modification de l'affichage des champs

Browse Source
This commit is contained in:
Michael RICOIS 2012-05-11 20:25:55 +00:00
parent daabfd826a
commit 2697e8933d
14 changed files with 476 additions and 1162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
application/controllers/ComptageController.php
View File

@ -16,8 +16,34 @@ class ComptageController extends Zend_Controller_Action
$cle = $request->getParam('cle');
$valeur = $request->getParam('valeur');
$object = new Object_Comptage();
echo $object->count($cle, $valeur);
//Set the flag for exclusion
$exclude = $request->getParam('exclude');
$ex = false;
if ( !empty($exclude) ) {
$ex = true;
}
$fields = new Scores_Fields();
$fields->setCritere($cle, $valeur, $ex);
//Comptage
require_once 'Scores/Ciblage.php';
$ciblage = new Ciblage($fields->getValues());
$total = $ciblage->execute();
$insee = $ciblage->calculRedevanceInsee();
$fields->setNb('total', $total);
$fields->setNb('insee', $insee);
//@todo : Ajouter les critères sous forme json_encode
//Retour comptage, unité Insee
$result = array(
'count' => number_format($total, 0, '', ' '),
'insee' => number_format($insee, 0, '', ' ')
);
echo json_encode($result);
}
public function resetAction()

10
application/controllers/IndexController.php
View File

@ -32,10 +32,14 @@ Class IndexController extends Zend_Controller_Action
public function removeAction()
{
require_once('Scores/SessionCiblage.php');
$this->_helper->layout()->disableLayout();
$session = new SessionCiblage();
$session->unsetCritere($this->getRequest()->getParam('critere'));
$fields = new Scores_Fields();
$fields->unsetCritere($this->getRequest()->getParam('critere'));
$objet = new Object_Comptage();
$objet->count(null, null);
$this->_redirect('/');

55
application/views/default/helpers/Field.php
View File

@ -36,7 +36,9 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$html.= '</a>';
break;
case 'text':
$html.= '<img style="cursor:pointer" class="manuel" ref="'.$name.'" src="/themes/default/images/Textarea.gif" title="'.$options['title'].'"/>';
$html.= '<a class="text" href="#" id="'.$name.'" >';
$html.= '<img style="cursor:pointer" src="/themes/default/images/Textarea.gif" title="'.$options['title'].'"/>';
$html.= '</a>';
break;
}
$html.= '&nbsp;';
@ -75,6 +77,12 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$this->intervalSelectHTML($name, $options)
);
break;
case 'checkbox':
$html.= $this->structureHTML(
$label,
$this->checkboxHTML($name, $options)
);
break;
case 'interval':
$html.= $this->structureHTML(
$label,
@ -135,9 +143,8 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$class = ' class="fieldgrp"';
if ( $this->display===false ) {
$style = ' style="display:none;"';
$class = ' class="fieldgrp '.$this->name.'"';
}
$out.= '<div '.$class.''.$style.'>';
$out.= '<div id="'.$this->name.'" '.$class.''.$style.'>';
$out.= $this->structureLabel($label);
$out.= '<div class="field">'.$html.'</div>';
$out.= '</div>';
@ -157,7 +164,8 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
protected function getMinMax($name, $valeur)
{
if(!empty($name)) {
$default = Scores_Fields::getMinMax($name);
//$fields = new Scores_Fields();
//$default = $fields->getMinMax($name);
if(empty($valeur[0])){$valeur[0] = $default[0]['min'];}
if(empty($valeur[1])){$valeur[1] = $default[0]['max'];}
}
@ -193,8 +201,24 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
return ($return);
}
/* Select */
private function selectMultipleHTML($name, $options)
protected function checkboxHTML($name, $options)
{
$session = new Scores_Fields();
$sessionValeur = $session->getCritere($name);
$select = '';
if ($sessionValeur==1) $select = ' checked';
$return = '<input type="checkbox" class="criteres" name="'.$name.'" value="'.$options['value'].'"'.$select.'>';
return $return;
}
/**
*
* @param unknown_type $name
* @param unknown_type $options
* @return string
*/
protected function selectMultipleHTML($name, $options)
{
$session = new Scores_Fields();
$sessionValeur = $session->getCritere($name);
@ -202,33 +226,40 @@ class Zend_View_Helper_Field extends Zend_View_Helper_Abstract
$return = '<select size="'.count($options['value']).'" class="criteres " name="'.$name.'" multiple>';
foreach($options['value'] as $value => $label) {
$selected = "";
Zend_Registry::get('firebug')->info('sessionValeur : '.$sessionValeur);
if( !empty($sessionValeur) ) {
if (is_array($sessionValeur) && in_array($value, $sessionValeur) ) {
if ( is_array($sessionValeur) && in_array($value, $sessionValeur) ) {
$selected = " selected";
}
}
$return .= '<option'.$selected.' value="'.$value.'">'.$label.'</option>';
}
$return .= '</select>';
$return .= '<a href="#" class="selectMultiple">Sélectionner</a>';
$return .= '&nbsp;<a href="#" class="selectMultipleEx">Exclure</a>';
return $return;
}
/* Select Multiple */
private function selectHTML($name, $options)
/**
*
* @param unknown_type $name
* @param unknown_type $options
* @return string
*/
protected function selectHTML($name, $options)
{
$session = new Scores_Fields();
$sessionValeur = $session->getCritere($name);
if(is_array($sessionValeur))
if( is_array($sessionValeur) ) {
$sessionValeur = implode(',', $sessionValeur);
}
$return = '<select class="criteres" name="'.$name.'">';
$return .= '<option '.(($sessionValeur == '-')?'selected':'').' value="-">-</option>';
foreach($options['value'] as $value => $label) {
$selected = "";
if( $sessionValeur!==null && $sessionValeur==$value && $sessionValeur != "-")
if( $sessionValeur!==null && $sessionValeur != "-" && $sessionValeur==$value )
$selected = " selected";
$return .= '<option'.$selected.' value="'.$value.'">'.$label.'</option>';
}

2
application/views/default/scripts/economique/index.phtml
View File

@ -5,12 +5,10 @@
<li><?=$this->Field('ape_etab')?></li>
<li><?=$this->Field('age_etab')?></li>
<li><?=$this->Field('teff_etab')?></li>
<li><?=$this->Field('teff_etabM')?></li>
<li><?=$this->Field('eff_etab')?></li>
<div id="a_economique" style="display:none;">
<li><?=$this->Field('age_entrep')?></li>
<li><?=$this->Field('teff_entrep')?></li>
<li><?=$this->Field('teff_entrepM')?></li>
<li><?=$this->Field('eff_entrep')?></li>
<li><?=$this->Field('nbEtab')?></li>
</div>

32
application/views/default/scripts/entreprise/index.phtml
View File

@ -4,26 +4,26 @@
<div id="entreprise">
<div id="s_entreprise">
<ul id="fieldsblock">
<li id="siege"><?=$this->Field('siege');?></li>
<li id="sirenGrp"><?=$this->Field('sirenGrp');?></li>
<li id="tel"><?=$this->Field('tel');?></li>
<li id="fax"><?=$this->Field('fax');?></li>
<li id="web"><?=$this->Field('web');?></li>
<li id="mail"><?=$this->Field('mail');?></li>
<li id="presentRcs"><?=$this->Field('presentRcs');?></li>
<li id="adrDom"><?=$this->Field('adrDom');?></li>
<li id="dirNom"><?=$this->Field('dirNom');?></li>
<li id="li_dateCrea_etab"><?=$this->Field('dateCrea_etab');?></li>
<li id="part"><?=$this->Field('part');?></li>
<li><?=$this->Field('siege')?></li>
<li><?=$this->Field('groupe')?></li>
<li><?=$this->Field('tel')?></li>
<li><?=$this->Field('fax')?></li>
<li><?=$this->Field('web')?></li>
<li><?=$this->Field('mail')?></li>
<li><?=$this->Field('presentRcs')?></li>
<li><?=$this->Field('adrDom')?></li>
<li><?=$this->Field('dirNom')?></li>
<li><?=$this->Field('dateCrea_etab')?></li>
<li><?=$this->Field('participation')?></li>
</ul>
</div>
<div id="a_entreprise" style="display:none">
<ul id="fieldsblock">
<li id="nbMPublic"><?=$this->Field('nbMPubli');?></li>
<li id="li_dateCrea_ent" ><?=$this->Field('dateCrea_ent');?></li>
<li id="action"><?=$this->Field('action');?></li>
<li id="nbActio"><?=$this->Field('nbActio');?></li>
<li id="nbPart"><?=$this->Field('nbPart');?></li>
<li><?=$this->Field('nbMPubli')?></li>
<li><?=$this->Field('dateCrea_ent')?></li>
<li><?=$this->Field('action')?></li>
<li><?=$this->Field('nbActio')?></li>
<li><?=$this->Field('nbPart')?></li>
</ul>
</div>
<p>

6
application/views/default/scripts/geographique/index.phtml
View File

@ -2,9 +2,9 @@
<ul id="fieldsblock">
<li>
<?=$this->Field('adr_com')?>
Exclure DOM-TOM <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_domtom" /><br />
Exclure Etranger <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_entr" /><br />
Exclure Corse <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_corse" /><br />
<?=$this->Field('geo_domtom')?>
<?=$this->Field('geo_etranger')?>
<?=$this->Field('geo_corse')?>
</li>
<li><?=$this->Field('zus')?></li>
<li><?=$this->Field('zru')?></li>

6
application/views/default/scripts/index/criteres.phtml
View File

@ -63,12 +63,12 @@
</div>
<div style="text-align:center; border:1px solid; background-color:#182838; padding:5px;">
<div style="text-align:center; border:1px solid #ffffff; background-color:#182838; padding:5px;">
<a style="color:white; text-decoration:none;" href="/comptage/reset">Initialiser les critères</a>
</div>
<div style="text-align:center; border:1px solid; background-color:#182838; padding:5px;">
<div style="text-align:center; border:1px solid #ffffff; background-color:#182838; padding:5px;">
<a style="color:white; text-decoration:none;" class="saveciblage" href="/comptage/savedialog">Sauvegarder</a>
</div>
<div style="text-align:center; border:1px solid; background-color:#182838; padding:5px;">
<div style="text-align:center; border:1px solid #ffffff; background-color:#182838; padding:5px;">
<a style="color:white; text-decoration:none;" class="previsualisation" href="/comptage/previsualisation">Prévisualisation</a>
</div>

10
application/views/default/scripts/juridique/index.phtml
View File

@ -1,15 +1,15 @@
<div id="juridique">
<div id="s_juridique">
<ul id="fieldsblock">
<li><?=$this->Field('cj');?></li>
<li><?=$this->Field('actifEco', $this->fields->get('actifEco'));?></li>
<li><?=$this->Field('procolHisto', $this->fields->get('procolHisto'));?></li>
<li><?=$this->Field('dateImmat', $this->fields->get('dateImmat'));?></li>
<li><?=$this->Field('cj')?></li>
<li><?=$this->Field('actifEco')?></li>
<li><?=$this->Field('procolHisto')?></li>
<li><?=$this->Field('dateImmat')?></li>
</ul>
</div>
<div id="a_juridique" style="display:none">
<ul id="fieldsblock">
<li><?=$this->Field('tvaIntraValide', $this->fields->get('tvaIntraValide'));?></li>
<li><?=$this->Field('tvaIntraValide')?></li>
</ul>
</div>
<p>

80
library/Object/Comptage.php
View File

@ -60,91 +60,19 @@ class Object_Comptage
public function count($key, $valeur, $need = false)
{
require_once 'Scores/SessionCiblage.php';
$session = new SessionCiblage();
if(in_array($key, array('adr_dept', 'adr_com', 'adr_reg', 'adr_com_ex', 'adr_dept_ex')))
{
$valeurs = explode(',', $valeur);
if($key == 'adr_dept') {
$reg_ = $session->getCritere('adr_reg');
if(!empty($reg_)) {
$reg_ = explode(',', $reg_);
$table = new Application_Model_Departements();
$result = array();
foreach($reg_ as $item) {
$sql = $table->select()->where('codeRegionInsee = ?', $item);
$donner = $table->fetchAll($sql)->toArray();
foreach ($donner as $don) {
$result[] = $don['numdep'];
}
foreach($result as $dep) {
if(in_array($dep, $valeurs)) {
$diff[] = $dep;
}
}
$session->unsetCritereValue('adr_reg', $item);
}
}
}
foreach($valeurs as $valeur)
{
$type = explode(':', $valeur);
if(count($type) == 2) {
$key = $type[0];
$valeur = $type[1];
}
switch($key) {
case 'adr_dept':
case 'adr_reg':
$dept .= trim($valeur).',';
break;
case 'adr_com':
case 'vil':
default:
$vil .= trim($valeur).',';
break;
case 'adr_com_ex':
$adr_com_ex .= trim($valeur).',';
break;
case 'adr_dept_ex':
$adr_dept_ex .= trim($valeur).',';
break;
}
}
if(strlen($dept)>0) {
$dept = substr($dept, 0, strlen($dept)-1);
$session->setCritere('adr_dept', $dept);
}
if(strlen($vil)>0) {
$vil = substr($vil, 0, strlen($vil)-1);
$session->setCritere('adr_com', $vil);
}
if(strlen($adr_com_ex)>0) {
$adr_com_ex = substr($adr_com_ex, 0, strlen($adr_com_ex)-1);
$session->setCritere('adr_com_ex', $adr_com_ex);
}
if(strlen($adr_dept_ex)>0) {
$adr_dept_ex = substr($adr_dept_ex, 0, strlen($adr_dept_ex)-1);
$session->setCritere('adr_dept_ex', $adr_dept_ex);
}
} else
$session->setCritere($key, $valeur);
require_once 'Scores/Field.php';
$field = new Fields();
$fields = new Scores_Fields();
//Comptage
require_once 'Scores/Ciblage.php';
$ciblage = new Ciblage($field->getValues());
$ciblage = new Ciblage($fields->getValues());
if($need) {
return $ciblage->execute(true, 10);
}
$total = $ciblage->execute();
$insee = $ciblage->calculRedevanceInsee();
$session->setNb('total', $total);
$session->setNb('insee', $insee);
$fields->setNb('total', $total);
$fields->setNb('insee', $insee);
//@todo : Ajouter les critères sous forme json_encode

619
library/Scores/Ciblage.php
View File

@ -16,15 +16,11 @@ class Ciblage
*/
protected $sphinx;
public $sphinx_match = SPH_MATCH_EXTENDED2;
public $sphinx_sort = SPH_SORT_EXTENDED;
/**
* Construct request
* @var string
*/
protected $alpha = '';
protected $presentRcs = 0;
/**
*
@ -33,6 +29,8 @@ class Ciblage
*/
public function __construct($structure, $need = false)
{
Zend_Registry::get('firebug')->info($structure);
/*
* First of all we need to load the Sphinx API
* @todo : Make a test and load the right version of API
@ -46,41 +44,52 @@ class Ciblage
//Sphinx init
$this->sphinx = new SphinxClient();
$this->sphinx->SetServer($configuration->sphinx->host, intval($configuration->sphinx->port));
$this->sphinx->SetServer(
$configuration->sphinx->host,
intval($configuration->sphinx->port)
);
$this->sphinx->SetMatchMode(SPH_MATCH_EXTENDED2);
$this->sphinx->ResetFilters();
//
foreach($structure as $key => $valeur) {
if (method_exists($this, $key)) {
if(is_array($valeur)) {
if(isset($valeur[0])) {
if($valeur[0] != "" and $valeur[0] != '-')
$this->$key($valeur);
}
} else {
if($valeur != '-' and $valeur != "")
$this->$key($valeur);
if ( count($structure)>0 ) {
foreach($structure as $key => $valeur) {
if ($key!= 'NB' && method_exists($this, $key)) {
$this->{$key}($valeur);
}
}
}
}
protected function setMinMax($name, $valeur)
protected function setFilter($name, $valeur, $ex = false)
{
if(!empty($name)) {
$default = Fields::getMinMax($name);
if(empty($valeur[0])){
$valeur[0] = $default[0]['min'];
}
if(empty($valeur[1])){
$valeur[1] = $default[0]['max'];
}
//All values must be integer
if ( is_array($valeur) ) {
$valeur = array_map('intval', $valeur);
} else {
$valeur = array(intval($valeur));
}
return ($valeur);
$this->sphinx->SetFilter($name, $valeur, $ex);
}
protected function setFilterRange($name, $min, $max)
{
$this->sphinx->SetFilterRange($name, intval($min), intval($max));
}
protected function setAlpha($name, $valeur)
{
if ( $this->alpha!='' ) $this->alpha.= ' ';
$this->alpha.= '@'.$name.' '.$valeur;
}
public function extract()
{
$resultats = $this->execute(true);
@ -103,9 +112,6 @@ class Ciblage
return ($resSphinx['total_found']);
}
protected function getSiret($structure)
{
$siret = array();
@ -119,8 +125,6 @@ class Ciblage
}
public function execute($need = false, $limitD = false)
{
Zend_Registry::get('firebug')->info("Sphinx : ");
Zend_Registry::get('firebug')->info($this->alpha);
if($need) {
$return = array();
$limit = 0;
@ -136,436 +140,189 @@ class Ciblage
$this->sphinx->SetLimits(0, 1);
$resSphinx = $this->sphinx->Query($this->alpha, $this->index);
}
Zend_Registry::get('firebug')->info("Sphinx : ".$this->alpha);
Zend_Registry::get('firebug')->info($resSphinx);
return $resSphinx['total_found'];
}
protected function setFilter($name, $valeur, $ex = false)
protected function siege($value)
{
if(!is_array($valeur)) {
$this->sphinx->SetFilter($name, array(intval($valeur)), $ex);
}else {
$this->sphinx->SetFilter($name, $this->transformIntval($valeur), $ex);
if ( array_key_exists('in', $value) ) {
$this->setFilter('siege', $value);
}
}
protected function setFilterRange($name, $valeur) {
$this->sphinx->SetFilterRange($name, intval($valeur[0]), intval($valeur[1]));
//Valeur NULL dans BDD
protected function groupe($value)
{
if ( array_key_exists('in', $value) ) {
//$this->setFilter('sirenGrp', $value);
}
}
private function getListeDepartement()
protected function tel($value)
{
$table = new Application_Model_Departements();
$sql = $table->select();
$result = $table->fetchAll($sql)->toArray();
foreach ($result as $dept) {
$depts .= $dept['numdep'].' | ';
if ( array_key_exists('in', $value) ) {
$this->setFilter('tel', $value);
}
$depts = substr($depts, 0, strlen($depts)-2);
return ($depts);
}
protected function writeRequest($name, $valeur, $ex, $or = false) {
if(in_array($name, array('bilType_ex', 'ape_etab_ex', 'ape_entrep_ex'))) {
if(!strstr($this->alpha, 'ape_etab') or
!strstr($this->alpha, 'bilType') or
!strstr($this->alpha, 'ape_entrep')) {
$this->alpha .= ' @exclu (ex) ';
}
switch($name) {
case 'ape_entrep_ex':
$name = 'ape_entrep';
break;
case 'ape_etab_ex':
$name = 'ape_etab';
break;
case 'bilType_ex':
$name = 'bilType';
break;
}
protected function fax($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('fax', $value);
}
$this->alpha .= ((!empty($this->alpha))?' ':'').'@'.$name . (($ex)?" -":" ").'(';
if(!is_array($valeur)) {
$this->alpha .= $valeur.')';
} else {
$i = 0;
foreach($valeur as $item) {
if($i != 0)
$this->alpha .= ' | ';
$this->alpha .= $item;
$i++;
}
$this->alpha .= ')';
}
protected function web($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('web', $value);
}
}
protected function mail($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('mail', $value);
}
}
protected function presentRcs($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('presentRcs', $value);
}
}
protected function adrDom($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('adrDom', $value);
}
}
protected function dirNom($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('dirNom', $value);
}
}
protected function participation($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('part', $value);
}
}
protected function action($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('actio', $value);
}
}
//Don't work
protected function dateCrea_etab($value)
{
}
protected function setAlpha($name, $valeur, $ex = false)
//Don't work
protected function dateCrea_ent($value)
{
$or = array('adr_com', 'adr_dep', 'adr_com_ex', 'adr_dep_ex');
$and = array('bilType', 'ape_etab_ex', 'ape_etab','ape_entrep', 'ape_entrep_ex', 'NaceEntrep', 'NaceEtab', 'bilType_ex');
if(!empty($this->alpha))
$this->alpha .= ' ';
if(in_array($name, $or)) {
if(!empty($valeur)) {
$this->writeRequest($name, $valeur, $ex);
}
} else if(in_array($name, $and)) {
if(!empty($valeur))
$this->writeRequest($name, $valeur, $ex);
}
protected function nbActio($value)
{
if ( array_key_exists('in', $value) ) {
$min = $value['in'][0];
$max = $value['in'][1];
$this->setFilterRange('nbActio', $min, $max);
}
}
protected function transformIntval($array) {
$copy = array();
foreach($array as $item => $valeur) {
$copy[$item] = intval($valeur);
}
return ($copy);
}
protected function dirNom($valeur) {
$this->setFilter('dirNom', $valeur);
}
protected function siege($valeur) {
$this->setFilter('siege', $valeur);
}
protected function adr_com($valeur) {
$this->setAlpha('adr_com', $valeur);
}
protected function ex_domtom($valeur)
protected function nbPart($value)
{
if($valeur == 1) {
if ( array_key_exists('in', $value) ) {
$min = $value['in'][0];
$max = $value['in'][1];
$this->setFilterRange('nbPart', $min, $max);
}
}
protected function nbMPubli($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('nbMPubli', $value);
}
}
protected function capital($value)
{
if ( array_key_exists('in', $value) ) {
$min = $value['in'][0];
$max = $value['in'][1];
$this->setFilterRange('capital', $min, $max);
}
}
protected function age_entrep($value)
{
if ( array_key_exists('in', $value) ) {
$min = $value['in'][0];
$max = $value['in'][1];
$this->setFilterRange('age_entrep', $min, $max);
}
}
protected function age_etab($value)
{
if ( array_key_exists('in', $value) ) {
$min = $value['in'][0];
$max = $value['in'][1];
$this->setFilterRange('age_etab', $min, $max);
}
}
protected function teff_entrep($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('teff_entrep', $value);
}
if ( array_key_exists('ex', $value) ) {
$this->setFilter('teff_entrep', $value, true);
}
}
protected function teff_etab($value)
{
if ( array_key_exists('in', $value) ) {
$this->setFilter('teff_etab', $value);
}
if ( array_key_exists('ex', $value) ) {
$this->setFilter('teff_etab', $value, true);
}
}
protected function geo_domtom($value)
{
if( $value['in']==1 ) {
$this->setFilter('adr_dep', array(971, 972, 973, 974, 976), true);
}
}
protected function ex_entr($valeur)
protected function geo_etranger($value)
{
if($valeur == 1) {
if( $value['in']==1 ) {
$this->setFilter('adr_dep', array(986, 987, 988), true);
}
}
protected function ex_corse($valeur)
protected function geo_corse($value)
{
if($valeur == 1) {
if( $value['in']==1 ) {
$this->setFilter('adr_dep', array(201, 202), true);
}
}
protected function adr_com_ex($valeur) {
$this->setAlpha('adr_com_ex', $valeur, true);
}
protected function adr_dep($valeur) {
$this->setAlpha('adr_dep', $valeur);
}
protected function adr_dep_ex($valeur) {
$this->setAlpha('adr_dep_ex', $valeur, true);
}
protected function action($valeur) {
$this->setFilter('action', $valeur);
}
protected function part($valeur) {
$this->setFilter('part', $valeur);
}
protected function tel($valeur) {
$this->setFilter('tel', $valeur);
}
protected function fax($valeur) {
$this->setFilter('fax', $valeur);
}
protected function cj($valeur) {
$this->setFilter('cj', $valeur);
}
protected function cj_ex($valeur) {
$this->setFilter('cj', $valeur, true);
}
protected function capital($valeur) {
$valeur = $this->setMinMax($name, $valeur);
$this->setFilterRange('capital', $valeur);
}
protected function ape_etab($valeur) {
$this->setAlpha('ape_etab', $valeur);
}
protected function ape_etab_ex($valeur) {
$this->setAlpha('ape_etab_ex', $valeur, true);
}
protected function ape_entrep($valeur) {
$this->setAlpha('ape_entrep', $valeur);
}
protected function ape_entrep_ex($valeur) {
$this->setAlpha('ape_entrep_ex', $valeur, true);
}
protected function age_entrep($valeur) {
$this->setFilter('age_entrep', $valeur);
}
protected function age_etab($valeur) {
$this->setFilter('age_etab', $valeur);
}
protected function tcaexp($valeur) {
$this->setFilterRange('tcaexp', $valeur);
}
protected function teff_entrep($valeur) {
if($valeur[0] != 0 or $valeur[1] != 0)
$this->setFilterRange('teff_entrep', $valeur);
}
protected function teff_entrepM($valeur) {
$this->setFilter('teff_entrepM', $valeur);
}
protected function teff_etabM($valeur) {
$this->setFilter('teff_etabM', $valeur);
}
protected function teff_etab($valeur) {
//$valeur = $this->setMinMax($name, $valeur);
$this->setFilterRange('teff_etab', $valeur);
}
protected function rang($valeur) {
$this->setFilterRange('rang', $valeur);
}
protected function actifEco($valeur) {
$this->setFilter('actifEco', $valeur);
}
protected function presentRcs($valeur) {
$this->setFilter('presentRcs', $valeur);
}
protected function procolHisto($valeur) {
$this->setFilter('procolHisto', $valeur);
}
protected function tvaIntraValide($valeur) {
$this->setFilter('tvaIntraValide', $valeur);
}
protected function NaceEtab($valeur) {
$this->setAlpha('NaceEtab', $valeur);
}
protected function NaceEntrep($valeur) {
$this->setAlpha('NaceEntrep', $valeur);
}
protected function dateCrea_etab($valeur) {
if(empty($valeur[1])) {$valeur[1] = date('Ymd');}
$valeur = $this->setMinMax('dateCrea_etab', $valeur);
if(!is_array($valeur)) {
$format = explode('/', $valeur);
$valeur = $format[2].$format[1].$format[0];
} else {
$format1 = explode('/', $valeur[0]);
$format2 = explode('/', $valeur[1]);
$valeur[0] = $format1[2].$format1[1].$format1[0];
$valeur[1] = $format2[2].$format2[1].$format2[0];
}
$this->setFilterRange('dateCrea_etab', $valeur);
}
protected function dateCrea_ent($valeur) {
if(empty($valeur[1])) {$valeur[1] = date('Ymd');}
$valeur = $this->setMinMax('dateCrea_ent', $valeur);
if(!is_array($valeur)) {
$format = explode('/', $valeur);
$valeur = $format[2].$format[1].$format[0];
} else {
$format1 = explode('/', $valeur[0]);
$format2 = explode('/', $valeur[1]);
$valeur[0] = $format1[2].$format1[1].$format1[0];
$valeur[1] = $format2[2].$format2[1].$format2[0];
}
$this->setFilterRange('dateCrea_ent', $valeur);
}
protected function dateImmat($valeur) {
if(empty($valeur[1])) {$valeur[1] = date('Ymd');}
$valeur = $this->setMinMax('dateImmat', $valeur);
if(!is_array($valeur)) {
$format = explode('/', $valeur);
$valeur = $format[2].$format[1].$format[0];
} else {
$format1 = explode('/', $valeur[0]);
$format2 = explode('/', $valeur[0]);
$valeur[0] = $format1[2].$format1[1].$format1[0];
$valeur[1] = $format2[2].$format2[1].$format2[0];
}
$this->setFilterRange('dateImmat', $valeur);
}
protected function eff_entrep($valeur) {
$valeur = $this->setMinMax($name, $valeur);
$this->setFilter('eff_entrep', $valeur);
}
protected function eff_etab($valeur) {
$valeur = $this->setMinMax($name, $valeur);
$this->setFilter('eff_etab', $valeur);
}
protected function rivoli($valeur) {
$this->setFilter('rivoli', $valeur);
}
protected function nbEtab($valeur) {
$valeur = $this->setMinMax($name, $valeur);
$this->setFilterRange('nbEtab', $valeur);
}
protected function sirenGrp($valeur) {
$this->setFilter('sirenGrp', $valeur);
}
protected function nbActio($valeur) {
$valeur = $this->setMinMax('nbActio', $valeur);
$this->setFilterRange('nbActio', $valeur);
}
protected function nbMPubli($valeur) {
$this->setFilter('nbMPubli', $valeur);
}
protected function nbPart($valeur) {
$valeur = $this->setMinMax('nbPart', $valeur);
$this->setFilterRange('nbPart', $valeur);
}
protected function bilDuree($valeur) {
$this->setFilterRange('bilDuree', $valeur);
}
protected function bilType($valeur) {
foreach ($valeur as $val) {
$string .= '-'.$val;
}
$string = substr($string, 1);
$valeur = explode('-', $string);
$this->setAlpha('bilType', $valeur);
}
protected function bilType_ex($valeur) {
foreach ($valeur as $val) {
$string .= '-'.$val;
}
$string = substr($string, 1);
$valeur = explode('-', $string);
$this->setAlpha('bilType_ex', $valeur, true);
}
protected function bilAnnee($valeur) {
$this->setFilter('bilAnnee', $valeur);
}
protected function bilTca($valeur) {
$this->setFilter('bilTca', $valeur);
}
protected function bilTca_ex($valeur) {
$this->setFilter('bilTca', $valeur, true);
}
protected function bilEE($valeur) {
$valeur = $this->setMinMax('bilEE', $valeur);
$this->setFilterRange('bilEE', $valeur);
}
protected function bilFL($valeur) {
$valeur = $this->setMinMax('bilFL', $valeur);
$this->setFilterRange('bilFL', $valeur);
}
protected function bilFK($valeur) {
$valeur = $this->setMinMax('bilFK', $valeur);
$this->setFilterRange('bilFK', $valeur);
}
protected function bilFR($valeur) {
$valeur = $this->setMinMax('bilFR', $valeur);
$this->setFilterRange('bilFR', $valeur);
}
protected function bilGF($valeur) {
$valeur = $this->setMinMax('bilGF', $valeur);
$this->setFilterRange('bilGF', $valeur);
}
protected function bilGP($valeur) {
$valeur = $this->setMinMax('bilGP', $valeur);
$this->setFilterRange('bilGP', $valeur);
}
protected function bilGU($valeur) {
$valeur = $this->setMinMax('bilGU', $valeur);
$this->setFilterRange('bilGU', $valeur);
}
protected function bilGW($valeur) {
$valeur = $this->setMinMax('bilGW', $valeur);
$this->setFilterRange('bilGW', $valeur);
}
protected function bilHD($valeur) {
$valeur = $this->setMinMax('bilHD', $valeur);
$this->setFilterRange('bilHD', $valeur);
}
protected function bilHL($valeur) {
$valeur = $this->setMinMax('bilHL', $valeur);
$this->setFilterRange('bilHL', $valeur);
}
protected function bilHM($valeur) {
$valeur = $this->setMinMax('bilHM', $valeur);
$this->setFilterRange('bilHM', $valeur);
}
protected function bilHN($valeur) {
$valeur = $this->setMinMax('bilHN', $valeur);
$this->setFilterRange('bilHN', $valeur);
}
protected function bilYP($valeur) {
$valeur = $this->setMinMax('bilYP', $valeur);
$this->setFilterRange('bilYP', $valeur);
}
protected function avisCs($valeur) {
foreach ($valeur as $val) {
$string .= '-'.$val;
}
$string = substr($string, 1);
$valeur = explode('-', $string);
$this->setFilter('avisCs', $valeur);
}
protected function avisCs_ex($valeur) {
foreach ($valeur as $val) {
$string .= '-'.$val;
}
$string = substr($string, 1);
$valeur = explode('-', $string);
$this->setFilter('avisCs', $valeur, true);
}
protected function bilFS($valeur) {
$this->setFilterRange('bilFS', $valeur);
}
protected function lieuAct($valeur) {
$this->setFilter('lieuAct', $valeur);
}
protected function bilGG($valeur) {
$this->setFilterRange('bilGG', $valeur);
}
protected function bilGV($valeur) {
$this->setFilterRange('bilGV', $valeur);
}
protected function bilHI($valeur) {
$this->setFilterRange('bilHI', $valeur);
}
protected function adrDom($valeur) {
$this->setFilter('adrDom', $valeur);
}
protected function web($valeur) {
$this->setFilter('web', $valeur);
}
protected function mail($valeur) {
$this->setFilter('mail', $valeur);
}
protected function bilCloture($valeur) {
if(!is_array($valeur)) {
$format = explode('/', $valeur);
$valeur = $format[2].$format[1].$format[0];
} else {
$format1 = explode('/', $valeur[0]);
$format2 = explode('/', $valeur[0]);
$valeur[0] = $format1[2].$format1[1].$format1[0];
$valeur[1] = $format2[2].$format2[1].$format2[0];
}
$this->setFilterRange('bilCloture', $valeur);
}
protected function zru($valeur) {
$this->setFilter('zru', $valeur);
}
protected function zus($valeur){
$this->setFilter('zus', $valeur);
}
protected function zfu($valeur){
$this->setFilter('zfu', $valeur);
}
protected function cucs($valeur){
$this->setFilter('cucs', $valeur);
}
protected function zrr($valeur){
$this->setFilter('zrr', $valeur);
}
protected function zafr($valeur){
$this->setFilter('zafr', $valeur);
}
}

215
library/Scores/Fields.php
View File

@ -18,21 +18,21 @@ class Scores_Fields
* )
* )
*
* name : the key to retrieve parameters of field
* name : the key to retrieve field parameters
* label : the string to display as title
* famille : the key to identify what familly the field belongs to
* famille : the key to identify where familly the field belongs to
* activated : true or false
*
* fields : define all different fields for the same element
* => type : which type of element (select, text, tree, ...), it's the key for array
* => values :
* => value :
* => label (optional) :
* => class :
* @var array
*/
protected $fields = array
(
'siege' => array(
'siege' => array (
'label' => "Type d'établissement",
'fields' => array(
'select' => array('value' => array('1' => 'Sièges', '0' => 'Secondaires')),
@ -40,8 +40,8 @@ class Scores_Fields
'famille' => 'entreprise',
'activated' => true,
),
'sirenGrp' => array(
'label' => "Présence d'un groupe",
'groupe' => array(
'label' => "Appartient à un groupe",
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non')),
),
@ -115,7 +115,6 @@ class Scores_Fields
'famille' => 'entreprise',
'activated' => true,
),
'nbMPubli' => array(
'label' => 'Marchés publiques remportés',
'fields' => array(
@ -125,14 +124,13 @@ class Scores_Fields
'activated' => true,
),
'dateCrea_ent' => array(
'label' => 'Date de création de l\'entreprise',
'label' => "Date de création de l'entreprise",
'fields' => array(
'interval' => array('value' => array('0', '1000'))
),
'famille' => 'entreprise',
'activated' => true,
),
'dateCrea_etab' => array(
'label' => "Date de création de l'établissement",
'fields' => array(
@ -141,7 +139,6 @@ class Scores_Fields
'famille' => 'entreprise',
'activated' => true,
),
'action' => array(
'label' => 'Présence d\'actionnaires',
'fields' => array(
@ -153,12 +150,13 @@ class Scores_Fields
'nbActio' => array(
'label' => 'Nombre d\'actionnaires connus',
'fields' => array(
'interval' => array('value' => array('0', '1000'))
//@todo : getMinMax
'interval' => array('value' => null)
),
'famille' => 'entreprise',
'activated' => true,
),
'part' => array(
'participation' => array(
'label' => "Présence de participations",
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non'))
@ -227,25 +225,28 @@ class Scores_Fields
'activated' => true,
),
'teff_entrep' => array(
'label' => 'Tranche d\'effectif de l\'Entreprise',
'label' => "Tranche d'effectif de l'Entreprise",
'fields' => array(
'intervalSelect' => array('value' => array(
array('0', '1 ou 2'),
array('1', '3 ou 5'),
array('2', '3'),
array('3', '11'),
array('11', '12'),
array('12', '21'),
array('21', '22'),
array('22', '31'),
array('31', '32'),
array('32', '41'),
array('41', '42'),
array('42', '51'),
array('51', '52'),
array('52', '53'),
array('53', '0')
))
'selectMultiple' => array(
'value' => array(
'NN' => "Unités non employeuses",
'0' => "0 salarié",
'1' => "1 ou 2 salariés",
'2' => "3 à 5 salariés",
'3' => "6 à 9 salariés",
'11' => "10 à 19 salariés",
'12' => "20 à 49 salariés",
'21' => "50 à 99 salariés",
'22' => "100 à 199 salariés",
'31' => "200 à 249 salariés",
'32' => "250 à 499 salariés",
'41' => "500 à 999 salariés",
'42' => "1 000 à 1 999 salariés",
'51' => "2 000 à 4 999 salariés",
'52' => "5 000 à 9 999 salariés",
'53' => "10 000 salariés et plus",
),
),
),
'famille' => 'economique',
'activated' => true,
@ -253,41 +254,26 @@ class Scores_Fields
'teff_etab' => array(
'label' => 'Tranche d\'effectif de l\'établissement',
'fields' => array(
'intervalSelect' => array(
'selectMultiple' => array(
'value' => array(
array('0', '1'),
array('1', '2'),
array('2', '3'),
array('3', '11'),
array('11', '12'),
array('12', '21'),
array('21', '22'),
array('22', '31'),
array('31', '32'),
array('32', '41'),
array('41', '42'),
array('42', '51'),
array('51', '52'),
array('52', '53'),
array('53', '0')
'NN' => "Unités non employeuses",
'0' => "0 salarié",
'1' => "1 ou 2 salariés",
'2' => "3 à 5 salariés",
'3' => "6 à 9 salariés",
'11' => "10 à 19 salariés",
'12' => "20 à 49 salariés",
'21' => "50 à 99 salariés",
'22' => "100 à 199 salariés",
'31' => "200 à 249 salariés",
'32' => "250 à 499 salariés",
'41' => "500 à 999 salariés",
'42' => "1 000 à 1 999 salariés",
'51' => "2 000 à 4 999 salariés",
'52' => "5 000 à 9 999 salariés",
'53' => "10 000 salariés et plus",
)
)
),
'famille' => 'economique',
'activated' => true,
),
'teff_etabM' => array(
'label' => 'Tranche d\'effectif de l\'établissement M',
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non'))
),
'famille' => 'economique',
'activated' => true,
),
'teff_entrepM' => array(
'label' => 'Tranche d\'effectif de l\'entreprise M',
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non'))
),
),
'famille' => 'economique',
'activated' => true,
@ -343,26 +329,27 @@ class Scores_Fields
'famille' => 'geographique',
'activated' => true,
),
'ex_domtom' => array(
'label' => 'Exclusion des Dom-Tom',
'geo_domtom' => array(
'label' => 'Exlcure les DOM-TOM',
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non')),
'checkbox' => array('value' => '1'),
),
'famille' => 'geographique',
'activated' => true,
),
'ex_entr' => array(
'label' => 'Exclusion départements étrangés',
'geo_etranger' => array(
'label' => 'Exclure les départements étrangers',
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non')),
'checkbox' => array('value' => '1'),
),
'famille' => 'geographique',
'activated' => true,
),
'ex_corse' => array(
'label' => 'Exclusion corse',
'geo_corse' => array(
'label' => 'Exclure la corse',
'fields' => array(
'select' => array('value' => array('1' => 'Oui', '0' => 'Non')),
'checkbox' => array('value' => '1'),
),
'famille' => 'geographique',
'activated' => true,
@ -687,6 +674,9 @@ class Scores_Fields
* The key NB is mandatory as this
* ['NB']['total'] => store the number of elements matches
* ['NB']['insee'] => store the number of elements matches which type is INSEE
* Other keys
* [key][in] => inclusion
* [key][ex] => exclusion
* @var array
*/
protected $ciblage;
@ -721,10 +711,39 @@ class Scores_Fields
* Enregistre un critère et sa valeur
* @param string $key
* @param mixed $value
* @param boolean $ex
*/
public function setCritere($key, $value)
public function setCritere($key, $value, $ex = false)
{
$this->ciblage[$key] = $value;
//Remove critere for these values on all type of fields
if ( in_array($value, array('', '-', null)) ) {
unset($this->ciblage[$key]);
return;
}
//Before to save the value
$types = array_keys($this->fields[$key]['fields']);
switch ( $types[0] ) {
case 'interval':
$value = explode(',', $value);
//@todo : Check Min Max
break;
case 'checkbox':
if ( $value==0 ) {
unset($this->ciblage[$key]);
return;
}
break;
}
//Save the value
if ($ex) {
$this->ciblage[$key]['ex'] = $value;
} else {
$this->ciblage[$key]['in'] = $value;
}
$this->setSession();
}
@ -744,7 +763,7 @@ class Scores_Fields
*/
public function unsetCritere($key)
{
if(key_exists($key, $this->valeur)) {
if( key_exists($key, $this->ciblage) ) {
unset($this->ciblage[$key]);
$this->setSession();
}
@ -845,40 +864,9 @@ class Scores_Fields
public function getValues($val = null)
{
if ( $val === null ) {
require_once 'Scores/SessionCiblage.php';
$session = new SessionCiblage();
$val = $session->getCriteres();
$val = $this->getCriteres();
}
$values = array();
foreach($val as $key => $item)
{
if($item != '') {
if( $this->fields[$key]['type'] == 'interval' or
$this->fields[$key]['type'] == 'intervalSelect' or
$this->fields[$key]['type'] == 'textarea' and
empty($this->fields[$key]['action']))
{
$values[$key] = explode(',', $item);
} else if (!empty($this->fields[$key]['action'])) {
if(!empty($values[$key])) {
$values[$key] = array_merge($this->selectArbo($key, $item), $values[$key]);
}
else {
if($key == 'adr_reg') {
if(!empty($values['adr_dept']))
$values['adr_dept'] = array_merge($this->selectArbo($key, $item), $values['adr_dept']);
else
$values['adr_dept'] = $this->selectArbo($key, $item);
}else {
$values[$key] = $this->selectArbo($key, $item);
}
}
} else {
$values[$key] = $item;
}
}
}
return ($values);
return $val;
}
public function selectArbo($name, $valeur)
@ -1002,14 +990,11 @@ class Scores_Fields
return ($value);
}
static public function getMinMax($name)
protected function getMinMax($name)
{
$tab = array('dateCrea_ent','dateCrea_etab');
if(!in_array($name, $tab)) {
$table = new Application_Model_MinMax();
return ($table->fetchAll($table->select()->where('cle = ?', $name))->toArray());
}
return (array());
$MinMaxM = new Application_Model_MinMax();
$minmax = $table->fetchAll($table->select()->where('cle = ?', $name))->toArray();
return $minmax;
}
public function getFields() {

221
public/themes/default/scripts/fields.js
View File

@ -21,72 +21,22 @@ $(document).ready(function()
});
});
$("div.slider-range").slider({
range: true,
create: function(event, ui) {
var max = $("#"+$(this).attr('input')).attr('max');
var min = $("#"+$(this).attr('input')).attr('min');
$(this).slider( "option", "min", min );
$(this).slider( "option", "max", max );
},
values : [0, 10000000000],
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 ]);
}
});
$("input.datepicker").datepicker({ dateFormat: 'dd/mm/yy' } );
$( "#accordion" ).accordion({
autoHeight: false,
navigation: true,
icons: {
header: "ui-icon-circle-arrow-e",
headerSelected: "ui-icon-circle-arrow-s"
}
});
$( "#toggle" ).button().toggle(function() {
$( "#accordion" ).accordion( "option", "icons", false );
}, function() {
$( "#accordion" ).accordion( "option", "icons", icons );
});
$( ".column" ).sortable({
connectWith: ".column"
});
$( ".portlet" ).addClass( "ui-widget ui-widget-content ui-helper-clearfix ui-corner-all" )
.find( ".portlet-header" )
.addClass( "ui-widget-header ui-corner-all" )
.prepend( "<span class='ui-icon ui-icon-minusthick'></span>")
.end()
.find( ".portlet-content" );
$( ".portlet-header .ui-icon" ).click(function() {
$( this ).toggleClass( "ui-icon-minusthick" ).toggleClass( "ui-icon-plusthick" );
$( this ).parents( ".portlet:first" ).find( ".portlet-content" ).toggle();
});
$( ".column" ).disableSelection();
$('#tabs').delegate('select.criteres', 'change', function(e){
var valeur = $(this, ':selected').val();
e.stopPropagation();
set($(this).attr('name'), valeur);
});
$('#tabs').delegate('input[type=checkbox].criteres', 'click', function(e){
e.stopPropagation();
set($(this).attr('name'), $(this).val());
if($(this).is(':checked')) {
set($(this).attr('name'), 1);
} else {
set($(this).attr('name'), 0);
}
});
$('#tabs').delegate('input[type=radio].criteres', 'click', function(e){
@ -172,159 +122,16 @@ $(document).ready(function()
return false;
});
$('.resetFamille').click(function(){
var famille = $(this).attr('id');
$.ajax({
type : "GET",
cache : false,
url : famille+'/reset',
data : $(this).serializeArray(),
success: function(data) {
set(null, null);
}
});
window.location.replace('/');
});
$('.checkbox_ex').click(function(){
if($(this).is(':checked')) {
$('#'+$(this).attr('name')+'_in').css('display', 'none');
$('#'+$(this).attr('name')+'_ex').css('display', 'block');
$('#tabs').delegate('a.text', 'click', function(e) {
e.preventDefault();
var id = $(this).attr('id');
if ($('div#'+id).css('display') == 'none') {
$('div#'+id).show('blind');
} else {
$('#'+$(this).attr('name')+'_in').css('display', 'block');
$('#'+$(this).attr('name')+'_ex').css('display', 'none');
$('div#'+id).hide('blind');
}
});
$('.ex_prede').click(function(){
if($(this).is(':checked')) {
set($(this).attr('name'), 1);
} else {
set($(this).attr('name'), 0);
}
});
$('textarea.complitedCj').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/juridique/completed', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
$('textarea.complitedCj_ex').autocomplete({
delay:300,
source: function(request, response) {
$.getJSON('/juridique/completed', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
/*
$('textarea.complitedNaf').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/economique/completed', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
*/
$('#textarea_adr_dept').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/dep/1', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
$('#textarea_adr_reg').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/reg/1', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
$('#textarea_adr_dept').val(terms.join( "," )+$('#textarea_adr_dept').val());
$(this).val('');
return false;
}
});
$('textarea.complitedadr_com').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/adr_com/1', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
$('textarea.complitedadr_com_ex').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/adr_com_ex/1', { q: extractLast( request.term ) },
function(data) { response(data); }
);
},
select: function(event, ui){
var terms = split( this.value );
terms.pop();
terms.push( ui.item.value );
terms.push( "" );
this.value = terms.join( ", " );
return false;
}
});
});
@ -334,7 +141,7 @@ function set(key, value)
$('#attente').css('display', 'block');
$('#panel').html('<img src="/themes/default/images/ajax.gif" />');
$.post('/comptage', { cle:key, valeur:value }, function(data, status) {
$.post('/comptage/index', { cle:key, valeur:value }, function(data, status) {
var html = 'Nombre sélectionnées : <span class="valeur">' +
data.count + '</span> (dont <span class="valeur">' +
data.insee +'</span> unité(s) insee)';
@ -342,8 +149,6 @@ function set(key, value)
$('#attente').css('display', 'none');
$('#comptage').html(html).css('display','block');
$.ajax({
type : "GET",
cache : false,
@ -354,8 +159,6 @@ function set(key, value)
}
});
}, 'json')
.error(function(){ alert('error'); });
}

8
public/themes/default/scripts/scripts.js
View File

@ -68,14 +68,6 @@ $(document).ready(function(){
return false;
});
$('.manuel').click( function(){
var id = $(this).attr('ref');
if($('.'+id).css('display') == 'none')
$('.'+id).show('blind');
else
$('.'+id).hide('blind');
});
$('.mode').click(function(){
var id = $(this).attr('id');
if($('#'+id).css('display') == 'none') {

330
public/themes/default/styles/main.css
View File

@ -144,49 +144,6 @@ body {
min-width: 0px;
}
.range
{
margin-left:10px;
margin-top:3px;
float:left;
border:0;
color:black;
font-weight:bold;
}
.mySlider
{
margin:0px;
padding:10px;
}
.critereSelection li
{
list-style: none;
}
label {
font-weight:800;
}
li.liHover {
border:1px solid silver;
padding:5px;
margin:1px;
background-repeat: no-repeat;
background-position:2px;
cursor:move;
font-size: 0.9em;
}
li.liHover a {
text-decoration:none;
}
li.liHover:hover {
cursor:pointer;
}
table#client { width:100%; }
table#client td {
border:1px solid #000;
@ -198,7 +155,6 @@ table#client tr:hover {
background-color: #88ccff;
}
.paragraph {
margin:5px;
padding:5px;
@ -235,14 +191,6 @@ h3 {
padding:2px;
}
#accordion {
}
#rappel {
}
.ui-accordion .ui-accordion-content {
padding:0;
}
@ -264,9 +212,6 @@ h3 {
height:200px;
}
ul#fieldsblock li { list-style-type: none; }
table.ciblage {
width:100%;
}
@ -281,34 +226,54 @@ table.ciblage td {
padding:2px;
}
.fieldgrp {
clear: both;
width: 100%;
overflow: hidden;
ul#fieldsblock li {
list-style-type: none;
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
border:1px solid silver;
margin:1px;
font-size: 0.9em;
}
.fieldgrp:after {
content: ".";
display: block;
clear: both;
visibility: hidden;
line-height: 0;
height: 0;
ul#fieldsblock li a {
text-decoration:none;
}
.fieldgrp label {
ul#fieldsblock li:hover {
background-color:#9EC5FF;
}
ul#fieldsblock li div.fieldgrp {
clear: both;
width: 100%;
overflow: hidden;
}
ul#fieldsblock li div.fieldgrp:after {
content: ".";
display: block;
clear: both;
visibility: hidden;
line-height: 0;
height: 0;
}
ul#fieldsblock li div.fieldgrp:first-child label {
font-weight: bold;
/*width: 320px;*/
}
ul#fieldsblock li div.fieldgrp label {
clear: both;
line-height: 22px;
_padding-top: 3px;
float: right;
display: block;
font-size:0.9em;
float:left;
}
.field {
ul#fieldsblock li div.fieldgrp div.field {
width: 350px;
float: right;
padding: 0 10px 0 0;
@ -317,109 +282,77 @@ table.ciblage td {
text-align: right;
}
.field a
{
ul#fieldsblock li div.fieldgrp div.field a {
font-size:10px;
color:blue;
}
.field .longfield {
ul#fieldsblock li div.fieldgrp div.field .longfield {
width: 215px;
}
.field .longfield-select {
ul#fieldsblock li div.fieldgrp div.field .longfield-select {
width: 220px;
}
.field .smallfield {
ul#fieldsblock li div.fieldgrp div.field .smallfield {
width: 95px;
}
.field .medfield {
ul#fieldsblock li div.fieldgrp div.field .medfield {
width: 110px;
}
.field input, .field textarea {
ul#fieldsblock li div.fieldgrp div.field input, .field textarea {
font-size: 0.9em;
margin: 2px 0;
border:1px solid #000000;
width:100%;
}
.field input[type="radio"] {
ul#fieldsblock li div.fieldgrp div.field input[type="radio"] {
margin: 0 5px 0 5px;
}
.slider-range
{
width:100%;
ul#fieldsblock li div.fieldgrp div.field input[type="checkbox"] {
width:auto;
}
.range {background-color:transparent;}
ul#fieldsblock li div.fieldgrp div.field select {
width:265px;
}
#helper
{
ul#fieldsblock li div.fieldgrp div.field select.intervalSelect {
width:102px;
}
ul#fieldsblock li div.fieldgrp div.field .interval input[type=text] {
width:100px;
}
#helper {
border:2px solid silver;
background-color: #CBD3D2;
padding:10px;
}
.Valide
{
.Valide {
padding:5px;
border:1px solid black;
background-color:#182838;
}
.Valide a
{
.Valide a {
color:white;
text-decoration: none;
}
#economique
{
font-size:13px;
}
#economique select {
width:80px;
}
#economique li {
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
}
#economique li:hover {
background-color:#9EC5FF;
}
#link
{
#link {
text-align:right;
margin-top:20px;
font-size:13px;
}
#economique .interval input[type=text]
{
width:100px;
}
#economique select.intervalSelect
{
width:102px;
}
#economique select
{
width:265px;
}
.error {
display:block;
border:1px solid red;
@ -434,150 +367,7 @@ table.ciblage td {
color:red;
}
#entreprise
{
font-size:13px;
}
#entreprise select {
width:70%;
}
#entreprise li {
height:20px;
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
}
#entreprise li:hover {
background-color:#9EC5FF;
}
#entreprise li input {
width:125px;
}
#entreprise .interval input[type=text]
{
width:100px;
}
#entreprise select.intervalSelect
{
width:102px;
}
#entreprise select
{
width:265px;
border:1px solid silver;
}
.resetFamille
{
.resetFamille {
cursor:pointer;
text-decoration: underline;
}
#financiere
{
font-size:13px;
}
#financiere select {
width:80px;
}
#financiere li {
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
}
#financiere li:hover {
background-color:#9EC5FF;
}
#financiere select
{
width:100%;
}
#financiere .interval input[type=text]
{
width:100px;
}
#financiere select.intervalSelect
{
width:102px;
}
#financiere select
{
width:265px;
}
#geographique
{
font-size:13px;
}
#geographique select {
width:70%;
}
#geographique li {
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
}
#geographique li:hover {
background-color:#9EC5FF;
}
#geographique .interval input[type=text]
{
width:100px;
}
#juridique
{
font-size:13px;
text-shadow: 1px 1px 1px white;
}
#juridique select {
width:80px;
}
#juridique li {
padding:5px;
border:1px solid silver;
margin-top:2px;
background-color:#D4D4D4;
}
#juridique li:hover {
background-color:#9EC5FF;
}
#juridique .interval input[type=text]
{
width:100px;
}
#juridique select.intervalSelect
{
width:102px;
}
#juridique select
{
width:265px;
}