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

modificacion hecha

Browse Source
This commit is contained in:
Jaime Jiménez
2024-01-07 20:19:54 +01:00
parent 2f5c205902
commit 55f26c85b8
21 changed files with 537 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php
View File

@ -164,9 +164,9 @@
<div class="form-check form-check-inline">
<input type="checkbox"
id="isTinta"
name="is_tinta"
name="is_inkjet"
value="1"
class="form-check-input"<?= $maquina->is_tinta == true ? 'checked' : ''; ?>
class="form-check-input"<?= $maquina->is_inkjet == true ? 'checked' : ''; ?>
>
<label for="isPadre" class="form-check-label">
<?= lang('Maquinas.isTinta') ?>
@ -174,7 +174,7 @@
</div>
</div>
<?php if ($maquina->is_rotativa == false): ?>
<?php if ($maquina->is_rotativa == false && $maquina->is_inkjet == false): ?>
<div class="row" id="datosRotativa" style="display:none">
<?php else: ?>
<div class="row" id="datosRotativa">
@ -196,7 +196,8 @@
maxLength="8" step="0.01" class="form-control"
value="<?= old('precio_tinta_color', $maquina->precio_tinta_color) ?>">
</div>
<div class="col-md-2">
<div class="col-md-2" <?= ($maquina->is_rotativa == false)?' style="display:none"':""; ?>>
<label for="velocidadCorte" class="form-label">
<?= lang('Maquinas.velocidadCorte') ?>
</label>
@ -204,7 +205,7 @@
step="0.01" class="form-control"
value="<?= old('velocidad_corte', $maquina->velocidad_corte) ?>">
</div>
<div class="col-md-2">
<div class="col-md-2" <?= ($maquina->is_rotativa == false)?' style="display:none"':""; ?>>
<label for="precioHoraCorte" class="form-label">
<?= lang('Maquinas.precioHoraCorte') ?>
</label>
@ -212,7 +213,7 @@
maxLength="8" step="0.01" class="form-control"
value="<?= old('precio_hora_corte', $maquina->precio_hora_corte) ?>">
</div>
<div class="col-md-2">
<div class="col-md-2" <?= ($maquina->is_rotativa == false)?' style="display:none"':""; ?>>
<label for="metrosxminuto" class="form-label">
<?= lang('Maquinas.metrosxminuto') ?>
</label>
@ -220,4 +221,5 @@
step="0.01" class="form-control"
value="<?= old('metrosxminuto', $maquina->metrosxminuto) ?>">
</div>
</div>

59
ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php
View File

@ -208,6 +208,41 @@
$('#isRotativa').prop("checked", !$('#isRotativa').prop("checked"));
}
$('#isRotativa').on('change', function(){
updatePapeles()
})
$('#isTinta').on('change', function(){
updatePapeles()
})
function updatePapeles(){
yeniden(json.<?= csrf_token() ?>);
$.ajax({
url: '<?= route_to('updateMaquinaPapelOnTarifasChange') ?>',
data: {
maquina_id: id,
isRotativa: isRotativa.watch,
isInkjet: $('#isTinta').prop('checked'),
<?= csrf_token() ?? "token" ?>: <?= csrf_token() ?>v,
},
method: 'POST',
headers: {'X-Requested-With': 'XMLHttpRequest'},
success:function(response){
token=JSON.parse(response).<?= csrf_token() ?>;
yeniden(token);
theTable.clearPipeline();
theTable.draw();
theTable2.clearPipeline();
theTable2.draw();
}
});
}
$('#isPadre').on("click",function(el){
if($(this).is(':checked')){
$("#selectVariante").show();
@ -329,29 +364,7 @@
editor.on( 'postSubmit', function ( e, json, data, action ) {
yeniden(json.<?= csrf_token() ?>);
$.ajax({
url: '<?= route_to('updateMaquinaPapelOnTarifasChange') ?>',
data: {
maquina_id: id,
isRotativa: isRotativa.watch,
<?= csrf_token() ?? "token" ?>: <?= csrf_token() ?>v,
},
method: 'POST',
headers: {'X-Requested-With': 'XMLHttpRequest'},
success:function(response){
token=JSON.parse(response).<?= csrf_token() ?>;
yeniden(token);
theTable.clearPipeline();
theTable.draw();
theTable2.clearPipeline();
theTable2.draw();
}
});
updatePapeles()
});

58
ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php
View File

@ -8,7 +8,7 @@
<input type="text" id="nombre" name="nombre" required maxLength="255" class="form-control" value="<?= old('nombre', $papelImpresion->nombre) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<label for="referencia" class="form-label">
<?= lang('PapelImpresion.referencia') ?>
</label>
@ -22,13 +22,13 @@
<input type="number" id="mano" name="mano" required maxLength="8" step="0.01" class="form-control" value="<?= old('mano', $papelImpresion->mano) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<label for="precioTonelada" class="form-label">
<?= lang('PapelImpresion.precioTonelada') ?>*
</label>
<input type="number" id="precioTonelada" name="precio_tonelada" required maxLength="31" step="0.01" class="form-control" value="<?= old('precio_tonelada', $papelImpresion->precio_tonelada) ?>">
</div><!--//.mb-3 -->
</div><!--//.mb-3 -->
</div><!--//.col -->
@ -49,14 +49,14 @@
</select>
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<label for="gramaje" class="form-label">
<?= lang('PapelImpresion.gramaje') ?>*
</label>
<input type="number" id="gramaje" name="gramaje" required maxLength="31" step="0.01" class="form-control" value="<?= old('gramaje', $papelImpresion->gramaje) ?>">
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<label for="espesor" class="form-label">
<?= lang('PapelImpresion.espesor') ?>*
</label>
@ -68,19 +68,19 @@
</div><!-- //.row -->
<div class="row">
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<div class="form-check">
<div class="row">
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<div class="form-check">
<label for="bn" class="form-check-label">
<input type="checkbox" id="bn" name="bn" value="1" class="form-check-input" <?= $papelImpresion->bn == true ? 'checked' : ''; ?>>
<?= lang('PapelImpresion.bn') ?>
</label>
<label for="bn" class="form-check-label">
<input type="checkbox" id="bn" name="bn" value="1" class="form-check-input" <?= $papelImpresion->bn == true ? 'checked' : ''; ?>>
<?= lang('PapelImpresion.bn') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<div class="form-check">
<label for="cubierta" class="form-check-label">
@ -89,8 +89,8 @@
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<div class="form-check">
<label for="rotativa" class="form-check-label">
@ -100,7 +100,7 @@
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="mb-3">
<div class="form-check">
<label for="isActivo" class="form-check-label">
@ -109,10 +109,10 @@
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
</div><!--//.col -->
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
</div><!--//.col -->
<div class="col-md-12 col-lg-6 px-4">
<div class="mb-3">
<div class="form-check">
<label for="color" class="form-check-label">
@ -132,6 +132,16 @@
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="form-check">
<label for="inkjet" class="form-check-label">
<input type="checkbox" id="inkjet" name="inkjet" value="1" class="form-check-input" <?= $papelImpresion->inkjet == true ? 'checked' : ''; ?>>
<?= lang('PapelImpresion.inkjet') ?>
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
<div class="mb-3">
<div class="form-check">
@ -141,5 +151,5 @@
</label>
</div><!--//.form-check -->
</div><!--//.mb-3 -->
</div><!--//.col -->
</div><!-- //.row -->
</div><!--//.col -->
</div><!-- //.row -->

14
ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
View File

@ -58,7 +58,7 @@
</div> <!-- //.accordion -->
<?php endif; ?>
<?php if(str_contains($formAction,'edit') && $papelImpresion->rotativa == true): ?>
<?php if(str_contains($formAction,'edit') && ($papelImpresion->rotativa == true || $papelImpresion->inkjet == true)): ?>
<div class="accordion mt-3" id="accordionTipologias">
<div class="card accordion-item active">
@ -729,7 +729,17 @@
.submit();
} );
$('#rotativa').on('change', function() {
if($('#inkjet').prop('checked')){
$('#inkjet').prop('checked', false)
}
})
$('#inkjet').on('change', function() {
if($('#rotativa').prop('checked')){
$('#rotativa').prop('checked', false)
}
})
<?= $this->endSection() ?>

6
ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php
View File

@ -25,7 +25,8 @@
<th><?= lang('PapelImpresion.color') ?></th>
<th><?= lang('PapelImpresion.cubierta') ?></th>
<th><?= lang('PapelImpresion.sobrecubierta') ?></th>
<th><?= lang('PapelImpresion.rotativa') ?></th>
<th><?= lang('PapelImpresion.inkjet') ?></th>
<th><?= lang('PapelImpresion.rotativa') ?></th>
<th><?= lang('PapelImpresion.activo') ?></th>
<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
</tr>
@ -100,6 +101,7 @@
{ 'data': 'color' },
{ 'data': 'cubierta' },
{ 'data': 'sobrecubierta' },
{ 'data': 'inkjet' },
{ 'data': 'rotativa' },
{ 'data': 'isActivo' },
{ 'data': actionBtns }
@ -108,7 +110,7 @@
theTable.on( 'draw.dt', function () {
const boolCols = [3, 4, 5, 6, 7, 8];
const boolCols = [3, 4, 5, 6, 7, 8, 9];
for (let coln of boolCols) {
theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) {
cell.innerHTML = cell.innerHTML == '1' ? '<i class="ti ti-check"></i>' : '';

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

@ -1134,7 +1134,7 @@ function change_lp_bn_paginas(){
}
}
function calcularPresupuesto_bn(input_data={}){
function calcularPresupuesto_bn(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1166,6 +1166,15 @@ function calcularPresupuesto_bn(input_data={}){
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
if(updatedTipologias){
datos.gota_negro= $('#lp_bn_gotaNegro').val()
datos.gota_color= $('#lp_bn_gotaColor').val()
datos.negro= $('#lp_bn_cobNegro').val()
datos.cyan= $('#lp_bn_cobCyan').val()
datos.magenta= $('#lp_bn_cobMagenta').val()
datos.amarillo= $('#lp_bn_cobAmarillo').val()
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1203,8 +1212,35 @@ function calcularPresupuesto_bn(input_data={}){
})
}
function change_lp_bn_tipologia(){
if( parseInt($('#lp_bn_paginas').val())>0 &&
parseInt($('#lp_bn_papel option:selected').val())>0 &&
$('#lp_bn_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bn_papelImpresion option:selected').val())>0
){
calcularPresupuesto_bn({},true);
}
}
function por_defecto_lp_bn(){
if( parseInt($('#lp_bn_paginas').val())>0 &&
parseInt($('#lp_bn_papel option:selected').val())>0 &&
$('#lp_bn_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bn_papelImpresion option:selected').val())>0
){
calcularPresupuesto_bn();
}
}
function fill_lp_bn(row, fromComparator=false){
console.log(row)
if(fromComparator){
var input_data = {
@ -1229,7 +1265,7 @@ function fill_lp_bn(row, fromComparator=false){
}
row.child(format(row.data())).show();
eventos_lp_bn()
eventos_lp_bn(data.maquinaTipo=='inkjet'?true:false)
calcular_mermas()
updateTotales()
@ -1241,13 +1277,19 @@ function fill_lp_bn(row, fromComparator=false){
}
function eventos_lp_bn(){
function eventos_lp_bn(isInkjet = false){
$('#lp_bn_papel').bind("focus", {clear_selectors: true}, clear_lp_bn);
$('#lp_bn_gramaje').bind("focus", set_lp_bn_gramaje);
$('#lp_bn_papelImpresion').focus("focus", set_lp_bn_papelImpresion);
$('#lp_bn_maquina').bind("focus", set_lp_bn_maquina);
$('#lp_bn_maquina').bind("change", change_lp_bn_maquina);
$('#lp_bn_vercalculos').bind("click", {rowId: 'lp_bn'}, verCalculosInkjet);
if(isInkjet){
$('.lp-bn-tipologia').bind("change", change_lp_bn_tipologia);
$('#lp_bn_defecto').bind("click", por_defecto_lp_bn);
}
$('#lp_bn_checkPapel').bind("change", {id_linea: 'lp_bn'}, update_total_linea);
$('#lp_bn_checkClicks').bind("change", {id_linea: 'lp_bn'}, update_total_linea);
}
@ -1378,7 +1420,32 @@ function change_lp_color_paginas(){
}
}
function calcularPresupuesto_color(input_data={}){
function change_lp_color_tipologia(){
if( parseInt($('#lp_color_paginas').val())>0 &&
parseInt($('#lp_color_papel option:selected').val())>0 &&
$('#lp_color_gramaje option:selected').text().length>0 &&
parseInt($('#lp_color_papelImpresion option:selected').val())>0
){
calcularPresupuesto_color({},true);
}
}
function por_defecto_lp_bn(){
if( parseInt($('#lp_color_paginas').val())>0 &&
parseInt($('#lp_color_papel option:selected').val())>0 &&
$('#lp_color_gramaje option:selected').text().length>0 &&
parseInt($('#lp_color_papelImpresion option:selected').val())>0
){
calcularPresupuesto_color();
}
}
function calcularPresupuesto_color(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1410,6 +1477,15 @@ function calcularPresupuesto_color(input_data={}){
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
if(updatedTipologias){
datos.gota_negro= $('#lp_color_gotaNegro').val()
datos.gota_color= $('#lp_color_gotaColor').val()
datos.negro= $('#lp_color_cobNegro').val()
datos.cyan= $('#lp_color_cobCyan').val()
datos.magenta= $('#lp_color_cobMagenta').val()
datos.amarillo= $('#lp_color_cobAmarillo').val()
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1471,7 +1547,7 @@ function fill_lp_color(row, fromComparator=false){
}
row.child(format(row.data())).show();
eventos_lp_color()
eventos_lp_color(data.maquinaTipo=='inkjet'?true:false)
calcular_mermas()
updateTotales()
@ -1483,15 +1559,21 @@ function fill_lp_color(row, fromComparator=false){
}
function eventos_lp_color(){
function eventos_lp_color(isInkjet = false){
$('#lp_color_papel').bind("focus", {clear_selectors: true}, clear_lp_color);
$('#lp_color_gramaje').bind("focus", set_lp_color_gramaje);
$('#lp_color_papelImpresion').focus("focus", set_lp_color_papelImpresion);
$('#lp_color_maquina').bind("focus", set_lp_color_maquina);
$('#lp_color_maquina').bind("change", change_color_maquina);
$('#lp_color_maquina').bind("change", change_lp_color_maquina);
$('#lp_color_paginas').bind("change", change_lp_color_paginas);
$('#lp_color_vercalculos').bind("click", {rowId: 'lp_color'}, verCalculosInkjet);
if(isInkjet){
$('.lp-color-tipologia').bind("change", change_lp_color_tipologia);
$('#lp_color_defecto').bind("click", por_defecto_lp_color);
}
$('#lp_color_checkPapel').bind("change", {id_linea: 'lp_color'}, update_total_linea);
$('#lp_color_checkClicks').bind("change", {id_linea: 'lp_color'}, update_total_linea);
}
@ -1620,7 +1702,34 @@ function change_lp_bnhq_paginas(){
}
}
function calcularPresupuesto_bnhq(input_data={}){
function change_lp_bnhq_tipologia(){
if( parseInt($('#lp_bnhq_paginas').val())>0 &&
parseInt($('#lp_bnhq_papel option:selected').val())>0 &&
$('#lp_bnhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bnhq_papelImpresion option:selected').val())>0
){
calcularPresupuesto_bnhq({},true);
}
}
function por_defecto_lp_bnhq(){
if( parseInt($('#lp_bnhq_paginas').val())>0 &&
parseInt($('#lp_bnhq_papel option:selected').val())>0 &&
$('#lp_bnhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bnhq_papelImpresion option:selected').val())>0
){
calcularPresupuesto_bnhq();
}
}
function calcularPresupuesto_bnhq(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1652,6 +1761,15 @@ function calcularPresupuesto_bnhq(input_data={}){
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
if(updatedTipologias){
datos.gota_negro= $('#lp_bnhq_gotaNegro').val()
datos.gota_color= $('#lp_bnhq_gotaColor').val()
datos.negro= $('#lp_bnhq_cobNegro').val()
datos.cyan= $('#lp_bnhq_cobCyan').val()
datos.magenta= $('#lp_bnhq_cobMagenta').val()
datos.amarillo= $('#lp_bnhq_cobAmarillo').val()
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1714,7 +1832,7 @@ function fill_lp_bnhq(row, fromComparator=false){
}
row.child(format(row.data())).show();
eventos_lp_bnhq()
eventos_lp_bnhq(data.maquinaTipo=='inkjet'?true:false)
calcular_mermas()
updateTotales()
@ -1725,7 +1843,7 @@ function fill_lp_bnhq(row, fromComparator=false){
// getVisibleTabs(); // Update preview UI
}
function eventos_lp_bnhq(){
function eventos_lp_bnhq(isInkjet = false){
$('#lp_bnhq_papel').bind("focus", {clear_selectors: true}, clear_lp_bnhq);
$('#lp_bnhq_gramaje').bind("focus", set_lp_bnhq_gramaje);
$('#lp_bnhq_papelImpresion').focus("focus", set_lp_bnhq_papelImpresion);
@ -1733,6 +1851,12 @@ function eventos_lp_bnhq(){
$('#lp_bnhq_maquina').bind("change", change_lp_bnhq_maquina);
$('#lp_bnhq_paginas').bind("change", change_lp_bnhq_paginas);
$('#lp_bnhq_vercalculos').bind("click", {rowId: 'lp_bnhq'}, verCalculosInkjet);
if(isInkjet){
$('.lp-bnhq-tipologia').bind("change", change_lp_bnhq_tipologia);
$('#lp_bnhq_defecto').bind("click", por_defecto_lp_bnhq);
}
$('#lp_bnhq_checkPapel').bind("change", {id_linea: 'lp_bnhq'}, update_total_linea);
$('#lp_bnhq_checkClicks').bind("change", {id_linea: 'lp_bnhq'}, update_total_linea);
}
@ -1865,7 +1989,34 @@ function change_lp_colorhq_paginas(){
}
function calcularPresupuesto_colorhq(input_data={}){
function change_lp_colorhq_tipologia(){
if( parseInt($('#lp_colorhq_paginas').val())>0 &&
parseInt($('#lp_colorhq_papel option:selected').val())>0 &&
$('#lp_colorhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_colorhq_papelImpresion option:selected').val())>0
){
calcularPresupuesto_colorhq({},true);
}
}
function por_defecto_lp_colorhq(){
if( parseInt($('#lp_colorhq_paginas').val())>0 &&
parseInt($('#lp_colorhq_papel option:selected').val())>0 &&
$('#lp_colorhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_colorhq_papelImpresion option:selected').val())>0
){
calcularPresupuesto_colorhq();
}
}
function calcularPresupuesto_colorhq(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1897,6 +2048,15 @@ function calcularPresupuesto_colorhq(input_data={}){
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
if(updatedTipologias){
datos.gota_negro= $('#lp_colorhq_gotaNegro').val()
datos.gota_color= $('#lp_colorhq_gotaColor').val()
datos.negro= $('#lp_colorhq_cobNegro').val()
datos.cyan= $('#lp_colorhq_cobCyan').val()
datos.magenta= $('#lp_colorhq_cobMagenta').val()
datos.amarillo= $('#lp_colorhq_cobAmarillo').val()
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1957,7 +2117,7 @@ function fill_lp_colorhq(row, fromComparator=false){
}
row.child(format(row.data())).show();
eventos_lp_colorhq()
eventos_lp_colorhq(data.maquinaTipo=='inkjet'?true:false)
calcular_mermas()
updateTotales()
@ -1969,7 +2129,7 @@ function fill_lp_colorhq(row, fromComparator=false){
}
function eventos_lp_colorhq(){
function eventos_lp_colorhq(isInkjet = false){
$('#lp_colorhq_papel').bind("focus", {clear_selectors: true}, clear_lp_colorhq);
$('#lp_colorhq_gramaje').bind("focus", set_lp_colorhq_gramaje);
@ -1978,6 +2138,12 @@ function eventos_lp_colorhq(){
$('#lp_colorhq_maquina').bind("change", change_lp_colorhq_maquina);
$('#lp_colorhq_paginas').bind("change", change_lp_colorhq_paginas);
$('#lp_colorhq_vercalculos').bind("click", {rowId: 'lp_colorhq'}, verCalculosInkjet);
if(isInkjet){
$('.lp-colorhq-tipologia').bind("change", change_lp_colorhq_tipologia);
$('#lp_colorhq_defecto').bind("click", por_defecto_lp_colorhq);
}
$('#lp_colorhq_checkPapel').bind("change", {id_linea: 'lp_colorhq'}, update_total_linea);
$('#lp_colorhq_checkClicks').bind("change", {id_linea: 'lp_colorhq'}, update_total_linea);
}