Merge for correction

This commit is contained in:
Michael RICOIS 2012-10-05 15:27:32 +00:00
commit 1cfc57905b

View File

@ -251,8 +251,8 @@ class Ciblage
$valMax = $minmax->max;
}
$min = !is_int($min) ? $valMin : $min;
$max = !is_int($max) ? $valMax : $max;
$min = ($min=='' || $min===null) ? $valMin : $min;
$max = ($max=='' || $min===null) ? $valMax : $max;
return array(
'min' => $min,
@ -372,7 +372,7 @@ class Ciblage
$result = $this->minmax('nbActio', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -387,7 +387,7 @@ class Ciblage
$result = $this->minmax('nbPart', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -402,7 +402,7 @@ class Ciblage
$result = $this->minmax('nbMPubli', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -417,7 +417,7 @@ class Ciblage
$result = $this->minmax('capital', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -432,7 +432,7 @@ class Ciblage
$result = $this->minmax('age_entrep', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -447,7 +447,7 @@ class Ciblage
$result = $this->minmax('age_etab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -483,7 +483,7 @@ class Ciblage
$result = $this->minmax('eff_etab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -499,7 +499,7 @@ class Ciblage
$result = $this->minmax('eff_entrep', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -514,7 +514,7 @@ class Ciblage
$result = $this->minmax('nbEtab', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -668,7 +668,7 @@ class Ciblage
$result = $this->minmax('bilEE', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -683,7 +683,7 @@ class Ciblage
$result = $this->minmax('bilFL', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -698,7 +698,7 @@ class Ciblage
$result = $this->minmax('bilFK', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -713,7 +713,7 @@ class Ciblage
$result = $this->minmax('bilFR', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -728,7 +728,7 @@ class Ciblage
$result = $this->minmax('bilGF', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -743,7 +743,7 @@ class Ciblage
$result = $this->minmax('bilGP', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -758,7 +758,7 @@ class Ciblage
$result = $this->minmax('bilGW', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -773,7 +773,7 @@ class Ciblage
$result = $this->minmax('bilHD', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -788,7 +788,7 @@ class Ciblage
$result = $this->minmax('bilHH', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -803,7 +803,7 @@ class Ciblage
$result = $this->minmax('bilHL', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -818,7 +818,7 @@ class Ciblage
$result = $this->minmax('bilHM', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -833,7 +833,7 @@ class Ciblage
$result = $this->minmax('bilHN', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;
@ -848,7 +848,7 @@ class Ciblage
$result = $this->minmax('bilYP', $value['in'][0], $value['in'][1]);
$min = $result['min'];
$max = $resumt['max'];
$max = $result['max'];
if ($min===null || $max===null)
return;