jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

quitado el error del alto en el calculo de formas de cubierta y sobrecubierta

Browse Source
This commit is contained in:
Jaime Jiménez
2024-02-22 18:16:18 +01:00
parent fe65a7ad1c
commit 2d6d5e3d9f
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ci4/app/Services/PresupuestoService.php
View File

@ -458,51 +458,47 @@ class PresupuestoService extends BaseService
$num_formas = $isCosido ? $num_formas * 2 : $num_formas; $num_formas = $isCosido ? $num_formas * 2 : $num_formas;
} }
else if ($forzar_a_favor_fibra){ else if ($forzar_a_favor_fibra){
$num_formas = $formas_h; $num_formas = $formas_h;
$num_formas = $isCosido ? $num_formas * 2 : $num_formas; $num_formas = $isCosido ? $num_formas * 2 : $num_formas;
} }
else{ else{
$num_formas = $h1*$h2;
$num_formas = $h1*$v1;
} }
/*
if($uso=='interior'){
$info = [
'h1' => $h2_temp,
'v1' => $alto,
'h2' => $h2,
'v2' => $v2,
'num_formas' => $num_formas
];
log_message('error', 'h1:{h1}, v1:{v1}, h2:{h2}, v2:{v2}, numFormas:{num_formas}', $info);
}*/
// si no hay formas se devuelve n/a // si no hay formas se devuelve n/a
if ($num_formas == 0) { if ($num_formas == 0) {
$response['num_formas']['posicion_formas'] = 'n/a'; // not available $response['num_formas']['posicion_formas'] = 'n/a'; // not available
} else if ($formas_h > $formas_v || $forzar_a_favor_fibra) { }
$response['num_formas']['posicion_formas'] = 'h'; else{
$response['num_formas']['num_formas_horizontales'] = $h1; if ($formas_h > $formas_v || $forzar_a_favor_fibra && $formas_h != 0) {
$response['num_formas']['num_formas_verticales'] = $v1; $response['num_formas']['posicion_formas'] = 'h';
$response['num_formas']['value'] = $num_formas; $response['num_formas']['num_formas_horizontales'] = $h1;
} else { $response['num_formas']['num_formas_verticales'] = $v1;
$response['num_formas']['posicion_formas'] = 'v'; $response['num_formas']['value'] = $num_formas;
$response['num_formas']['num_formas_horizontales'] = $h2; }
$response['num_formas']['num_formas_verticales'] = $v2; else {
$response['num_formas']['value'] = $num_formas; if($formas_v != 0){
$response['num_formas']['posicion_formas'] = 'v';
$response['num_formas']['num_formas_horizontales'] = $h2;
$response['num_formas']['num_formas_verticales'] = $v2;
$response['num_formas']['value'] = $num_formas;
}
}
if(($uso == 'cubierta' || $uso == 'sobrecubierta') && $num_formas>0) {
if(property_exists($maquina, 'forzar_num_formas_horizontales_cubierta') &&
property_exists($maquina, 'forzar_num_formas_horizontales_cubierta')){
$response['num_formas']['num_formas_verticales'] = $h2_temp;
}
}
} }
if($uso == 'cubierta' || $uso == 'sobrecubierta') {
if(property_exists($maquina, 'forzar_num_formas_horizontales_cubierta') &&
property_exists($maquina, 'forzar_num_formas_horizontales_cubierta')){
$response['num_formas']['num_formas_verticales'] = $h2;
}
}
return $response; return $response;
} }