Merge branch 'main' into 'dev/calculo_impresion_horas'

# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js

ci4/.env

@@ -22,8 +22,8 @@ CI_ENVIRONMENT = development
 # APP
 #--------------------------------------------------------------------
 
-app.baseURL = 'https://sk-jjo.imnavajas.es'
+# app.baseURL = 'https://sk-jjo.imnavajas.es'
-# app.baseURL = 'https://sk-imn.imnavajas.es'
+app.baseURL = 'https://sk-imn.imnavajas.es'
 # app.baseURL = "http://safekat.test/"
 # app.forceGlobalSecureRequests = false
 

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php

@@ -1403,9 +1403,11 @@ function fill_lp_bn(row, fromComparator=false){
         updateTotales()
     }
 
-
     $('#lp_bn').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 <?= $this->endSection() ?>
 
@@ -1645,6 +1647,9 @@ function fill_lp_color(row, fromComparator=false){
 
     $('#lp_color').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 <?= $this->endSection() ?>
 
@@ -1883,6 +1888,8 @@ function fill_lp_bnhq(row, fromComparator=false){
 
     $('#lp_bnhq').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
 }
 <?= $this->endSection() ?>
 
@@ -2123,6 +2130,9 @@ function fill_lp_colorhq(row, fromComparator=false){
 
     $('#lp_colorhq').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 <?= $this->endSection() ?>
 
@@ -2471,6 +2481,9 @@ function fill_lp_rot_bn(row, fromComparador=false){
 
     $('.lp_rot_bn').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 <?= $this->endSection() ?>
 
@@ -2829,6 +2842,9 @@ function fill_lp_rot_color(row, fromComparador=false){
 
     $('.lp_rot_color').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 <?= $this->endSection() ?>
 
@@ -3110,6 +3126,9 @@ function fill_lp_cubierta(row, fromComparador=false){
 
     $('.lp_cubierta').css('display', '')
     $("#tableLineasPresupuesto").DataTable().columns.adjust();
+
+    getVisibleTabs();   // Update preview UI
+
 }
 
 

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php

@@ -16,7 +16,7 @@
                         <li id="tab-pv-bn" class="nav-item" style="display: none">
                             <button
                                     type="button"
-                                    class="nav-link active"
+                                    class="nav-link"
                                     role="tab"
                                     data-bs-toggle="tab"
                                     data-bs-target="#pv_bn"
@@ -737,13 +737,10 @@
 <!------------------------------------------------------->
 <?= $this->section("additionalInlineJs") ?>
 
-var cubiertaObjeto = 0;
-
 getVisibleTabs();
 
 $('#tab-pv-bn').on( "click", function() {
 
-
     previewInteriorPlana('bn');
 
 } );
@@ -792,6 +789,13 @@ $('#tab-pv-esquema-cubierta').on( "click", function() {
 } );
 
 
+$('#confirmDelete').on( "click", function() {
+    setTimeout(function (){
+        getVisibleTabs();
+    }, 1000);
+} );
+
+
 
 
 <?= $this->endSection() ?>

ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js

@@ -1,18 +1,10 @@
 // Global parameters
 var _isCosido = true;
-var _offsetSolapas = 2;  // millimeters
-
 var pvObj;
 
-
-var styles = {
-    size: 13,
-    family: 'Public Sans',
-}
-
 var sangradoTexto = "Sangrado 5 mm";
 var sangradoValor = parseFloat(5);  // mm
-var offsetSolapaValor = parseFloat(3);  // mm
+var offsetSolapaValor = parseFloat(0);  // mm
 
 
 function previewInteriorPlana(lpTagName) {
@@ -99,7 +91,7 @@ function previewRotativa(lpTagName) {
     let styleText = {size: 12, family: 'Public Sans'};
     let margenTop = 3;
     let guardaV = 0;
-    guardaH = 0;
+    let guardaH = 0;
 
     // Get the preview Object parameters
     getObjetoLP(lpTagName);
@@ -195,8 +187,8 @@ function previewRotativa(lpTagName) {
 }
 
 function getDecimalPart(floatNumber) {
-    let int_part = Math.trunc(floatNumber); // returns 3
+    let int_part = Math.trunc(floatNumber);
-    let float_part = Number((floatNumber - int_part).toFixed(2)); // return 0.2
+    let float_part = Number((floatNumber - int_part).toFixed(2));
     return float_part;
 }
 
@@ -379,7 +371,7 @@ function getObjetoLP(lpName) {
 
     pvObj = {
         idIndex: lpName,
-        gramajeLibro: parseFloat($('#lp_' + lpName + '_gramaje').val()),
+        gramajeLibro: parseInt($('#lp_' + lpName + '_gramaje').text()),
         manoLP: parseFloat($('#lp_' + lpName + '_lomo').val()),
         lomoLibro: getLomoLibro(),
         anchoSolapa: parseFloat($('#solapas_ancho').val()),
@@ -399,13 +391,6 @@ function getObjetoLP(lpName) {
     pvObj.anchoForma = (_isCosido) ? 2 * pvObj.anchoLibro : pvObj.anchoLibro;
     pvObj.altoForma = pvObj.altoLibro;
 
-    // Conditional assignements depending on rotation of the printing shape
-    if (pvObj.orientacionFormas == 'v') {
-        let auxReg = pvObj.altoForma;
-        pvObj.altoForma = pvObj.anchoForma;
-        pvObj.anchoForma = auxReg;
-    }
-
     // Update preview info fields
     let pvName = '#pv_' + lpName;
     $(pvName + '_pg').attr("href", $(pvName + '_pg').attr('sk-url') + $('#lp_' + lpName + '_papel').val());
@@ -421,12 +406,19 @@ function getObjetoLP(lpName) {
     $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
     $(pvName + '_nFormas').text(pvObj.nFormas);
 
-    (pvObj.anchoSolapa != 0) ? $('.pv-solapas').show() : $('.pv-solapas').hide();
+    if(pvObj.anchoSolapa != 0){
+        $('.pv-solapas').show();
+        offsetSolapaValor = parseFloat(3); // 3mm
+
+    }else{
+        $('.pv-solapas').hide();
+        offsetSolapaValor = parseFloat(0);  // No offset
+    }
 
     // Custom overwrites
     switch (pvObj.idIndex) {
         case 'cubierta':
-            pvObj.anchoForma = ((2 * pvObj.anchoLibro) + (2 * (pvObj.anchoSolapa + _offsetSolapas)) + pvObj.lomoLibro);
+            pvObj.anchoForma = ((2 * pvObj.anchoLibro) + (2 * (pvObj.anchoSolapa + offsetSolapaValor)) + pvObj.lomoLibro);
             $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
             break;
         case 'ec':
@@ -438,13 +430,29 @@ function getObjetoLP(lpName) {
 
         case 'rot_bn':
         case 'rot_color':
-            pvObj.anchoMaquina = 520;
+            if((pvObj.anchoImpresion / pvObj.altoForma) > (pvObj.anchoImpresion / pvObj.anchoForma)){
-            pvObj.altoMaquina= 800;
+                let auxReg =  pvObj.anchoForma;
-            pvObj.anchoImpresion= 515;
+                pvObj.anchoForma = pvObj.altoForma;
-            pvObj.altoImpresion= 800;
+                pvObj.altoForma = auxReg;
-            pvObj.nFormasH = 1;
+            }
-            pvObj.nFormasV = 3;
+            $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
-            pvObj.altoClick = 305;
+            pvObj.altoClick = 305; //parseFloat($('#lp_' + lpName + '_alto_click').val());
+            pvObj.nFormasH = Math.trunc(pvObj.anchoImpresion / pvObj.anchoForma);
+            pvObj.nFormasV = Math.trunc((pvObj.altoImpresion - 3) / (pvObj.altoForma + 4));
+            console.log( )
+            break;
+
+        case 'bn':
+        case 'bnhq':
+        case 'color':
+        case 'colorhq':
+            // Conditional assignements depending on rotation of the printing shape
+            if (pvObj.orientacionFormas == 'v') {
+                let auxReg = pvObj.altoForma;
+                pvObj.altoForma = pvObj.anchoForma;
+                pvObj.anchoForma = auxReg;
+            }
+            $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
             break;
 
         default:
@@ -455,21 +463,80 @@ function getObjetoLP(lpName) {
 
 function getVisibleTabs() {
 
-    $("#tableLineasPresupuesto tbody tr:visible").each(function () {
+    $("#tableLineasPresupuesto tbody tr").each(function () {
+        let isVisible = $(this).is(":visible");
+        let lpName = $(this).attr('id').replace('lp_', '');
+        let tabName = lpName.replace('_', '-');
 
-        //console.log($(this).attr('id'));
+        switch (lpName){
+            case 'bn':
+            case 'bnhq':
+            case 'color':
+            case 'colorhq':
+            case 'rot_bn':
+            case 'rot_color':
+                if(isVisible) {
+                    $("#tab-pv-" + tabName).show();
+                }else{
+                    $("#tab-pv-" + tabName).hide();
+                    $("#tab-pv-" + tabName).children('.active').each(function () {
+                        $(this).removeClass('active');
+                    });
+                    $("#pv_" + lpName).removeClass("active show");
+                }
+                break;
+
+
+            case 'cubierta':
+                if(isVisible) {
+                    $("#tab-pv-" + tabName).show();
+                    $("#tab-pv-esquema-" + tabName).show();
+                }else{
+                    $("#tab-pv-" + tabName).hide();
+                    $("#tab-pv-esquema-" + tabName).hide();
+                    $("#tab-pv-" + tabName).children('.active').each(function () {
+                        $(this).removeClass('active');
+                    });
+                    $("#tab-pv-esquema-" + tabName).children('.active').each(function () {
+                        $(this).removeClass('active');
+                    });
+                    $("#pv_" + lpName).removeClass("active show");
+                    $("#pv_esquema_" + lpName).removeClass("active show");
+                }
+                break;
+
+            default:
+                //console.log(tabType + " visible? " +isVisible );
+                break;
+        }
+
+        //console.log(tabType + " visible? " +isVisible );
+
+    });
+
+
+    /*
+
+    $("#tableLineasPresupuesto tbody tr:hidden").each(function () {
+
+        //console.log("Hidden: " + $(this).attr('id'));
         if ($(this).attr('id').indexOf('cubierta') > -1) {
-            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).show();
+            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).hide();
-            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-esquema-')).show();
+            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-esquema-')).hide();
+            $("#pv_cubierta").removeClass("active show");
+            $("#pv_esquema_cubierta").removeClass("active show");
         } else if ($(this).attr('id').indexOf('_data') > -1) {
             // Do nothing here
         } else if ($(this).attr('id').indexOf('_rot') > -1) {
-            $("#" + $(this).attr('id').replace('lp_rot_', 'tab-pv-rot-')).show();
+            $("#" + $(this).attr('id').replace('lp_rot_', 'tab-pv-rot-')).hide();
+            $("#" + $(this).attr('id').replace('lp_', 'pv_')).removeClass("active show");
         } else {
-            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).show();
+            $("#" + $(this).attr('id').replace('lp_', 'tab-pv-')).hide();
+            $("#" + $(this).attr('id').replace('lp_', 'pv_')).removeClass("active show");
         }
-
     });
+    */
+
 
 }