diff --git a/ci4/app/Services/PresupuestoService.php b/ci4/app/Services/PresupuestoService.php index b8ef70be..fd4ade80 100755 --- a/ci4/app/Services/PresupuestoService.php +++ b/ci4/app/Services/PresupuestoService.php @@ -458,51 +458,47 @@ class PresupuestoService extends BaseService $num_formas = $isCosido ? $num_formas * 2 : $num_formas; } else if ($forzar_a_favor_fibra){ + $num_formas = $formas_h; $num_formas = $isCosido ? $num_formas * 2 : $num_formas; } - else{ - $num_formas = $h1*$h2; + else{ + + $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 if ($num_formas == 0) { $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'; - $response['num_formas']['num_formas_horizontales'] = $h1; - $response['num_formas']['num_formas_verticales'] = $v1; - $response['num_formas']['value'] = $num_formas; - } else { - $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; + } + else{ + if ($formas_h > $formas_v || $forzar_a_favor_fibra && $formas_h != 0) { + $response['num_formas']['posicion_formas'] = 'h'; + $response['num_formas']['num_formas_horizontales'] = $h1; + $response['num_formas']['num_formas_verticales'] = $v1; + $response['num_formas']['value'] = $num_formas; + } + else { + 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; }