lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9521 from frederic34/patch-16

Browse Source 
reduce complexity of showWeather
This commit is contained in:
Laurent Destailleur 2018-09-16 08:55:04 +02:00 committed by GitHub
commit 62d4955db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/index.php
View File

@ -703,15 +703,27 @@ function showWeather($totallate,$text,$options)
$used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
$level0=$offset; if (! empty($conf->global->{$used_conf.'0'})) $level0=$conf->global->{$used_conf.'0'};
$level1=$offset+1*$factor; if (! empty($conf->global->{$used_conf.'1'})) $level1=$conf->global->{$used_conf.'1'};
$level2=$offset+2*$factor; if (! empty($conf->global->{$used_conf.'2'})) $level2=$conf->global->{$used_conf.'2'};
$level3=$offset+3*$factor; if (! empty($conf->global->{$used_conf.'3'})) $level3=$conf->global->{$used_conf.'3'};
$level0=$offset;
if (! empty($conf->global->{$used_conf.'0'})) {
$level0=$conf->global->{$used_conf.'0'};
}
$level1=$offset+1*$factor;
if (! empty($conf->global->{$used_conf.'1'})) {
$level1=$conf->global->{$used_conf.'1'};
}
$level2=$offset+2*$factor;
if (! empty($conf->global->{$used_conf.'2'})) {
$level2=$conf->global->{$used_conf.'2'};
}
$level3=$offset+3*$factor;
if (! empty($conf->global->{$used_conf.'3'})) {
$level3=$conf->global->{$used_conf.'3'};
}
if ($totallate <= $level0) $out.=img_weather($text,'weather-clear.png',$options);
if ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
if ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
if ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
if ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
elseif ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text,'weather-few-clouds.png',$options);
elseif ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text,'weather-clouds.png',$options);
elseif ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text,'weather-many-clouds.png',$options);
elseif ($totallate > $level3) $out.=img_weather($text,'weather-storm.png',$options);
return $out;
}