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

Merge branch 'main' into feat/tipo_papel_presup_cliente

Browse Source
This commit is contained in:
Jaime Jiménez
2025-07-18 17:57:19 +02:00
parent ad8e0ac75b df21b5ba05
commit 7bb6329783
11 changed files with 140 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -3686,21 +3686,30 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
public function download_zip()
{
$presupuesto_id = $this->request->getPost('presupuesto_id');
$ot_id = $this->request->getPost('ot_id');
if (!$presupuesto_id) {
return $this->response->setStatusCode(400)->setBody('Presupuesto ID requerido');
}
// Definir prefijo si se recibió un ot_id válido
$prefijo = (!empty($ot_id) && is_numeric($ot_id)) ? "OT_{$ot_id}" : null;
$ftpClient = new \App\Libraries\SafekatFtpClient();
try {
$zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id);
$zipPath = $ftpClient->downloadZipPresupuesto((int) $presupuesto_id, $prefijo);
if ($zipPath === null || !file_exists($zipPath)) {
return $this->response->setStatusCode(404)->setBody('No se encontraron archivos');
}
$nombreArchivo = $prefijo
? "{$prefijo}_PRESUPUESTO_{$presupuesto_id}.zip"
: "archivos_presupuesto_{$presupuesto_id}.zip";
return $this->response
->download($zipPath, null) // null = usar nombre original del archivo
->setFileName('archivos_presupuesto_' . $presupuesto_id . '.zip');
->download($zipPath, null)
->setFileName($nombreArchivo);
} catch (\Throwable $e) {
log_message('error', $e->getMessage());
return $this->response->setStatusCode(500)->setBody('Error interno');
@ -3708,4 +3717,5 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
}
}

35
ci4/app/Controllers/Produccion/Ordenmaquina.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Produccion;
use App\Controllers\BaseController;
class Ordenmaquina extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Orden maquina';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

35
ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Produccion;
use App\Controllers\BaseController;
class Ordentrabajomaquetacion extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Orden maquetación';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

35
ci4/app/Controllers/Produccion/Pedidoproduccion.php
View File

@ -1,35 +0,0 @@
<?php
namespace App\Controllers\Produccion;
use App\Controllers\BaseController;
class Pedidoproduccion extends BaseController
{
function __construct()
{
}
public function index()
{
echo 'Pedido produccion';
}
public function delete()
{
}
public function add()
{
}
public function edit()
{
}
}

8
ci4/app/Libraries/SafekatFtpClient.php
View File

@ -115,7 +115,7 @@ class SafekatFtpClient
return implode('/', [$this->base_dir, 'pedidos_files', $rootIdExtern]);
}
public function downloadZipPresupuesto(int $presupuesto_id): ?string
public function downloadZipPresupuesto(int $presupuesto_id, ?string $prefijo = null): ?string
{
$modelPedidoLinea = model(PedidoLineaModel::class);
$model = model(PresupuestoFicheroModel::class);
@ -143,8 +143,11 @@ class SafekatFtpClient
foreach ($files as $file) {
$originalName = $file->nombre ?? basename($file->file_path);
$localFile = $localTempDir . '/' . $originalName;
$prefixedName = $prefijo ? $prefijo . '_' . $originalName : $originalName;
$localFile = $localTempDir . '/' . $prefixedName;
$remoteFile = $remotePath . '/' . basename($file->file_path);
$this->ftp->get($remoteFile, $localFile);
}
@ -167,4 +170,5 @@ class SafekatFtpClient
}
}

2
ci4/app/Views/themes/vuexy/components/dropzone.php
View File

@ -12,7 +12,7 @@
data-bs-parent="#accordionPresupuestoFiles">
<div class="accordion-body">
<div class="col-12">
<div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>">
<div class="dropzone needsclick" id="<?= $id ?>" data-id="<?= $modelId ?>" data-ot-id="<?= $otId ?? '' ?>">
<div class="dz-message needsclick">
Arrastre aquí los ficheros o haga click

29
ci4/app/Views/themes/vuexy/form/presupuestos/admin/_resumenPresupuestoItems.php
View File

@ -13,6 +13,16 @@
<div class="col-xl-12">
<div class="border rounded p-4 mb-3 pb-3">
<div class="d-flex justify-content-between align-items-center mb-4">
<h5 class="mb-0">Costes detallados</h5>
<button class="btn btn-sm btn-link p-0" type="button" data-bs-toggle="collapse"
data-bs-target="#detallesCostes" aria-expanded="true"
aria-controls="detallesCostes" title="Mostrar/ocultar detalle de precios">
<i class="ti ti-chevron-down"></i>
</button>
</div>
<div id="detallesCostes" class="collapse">
<!-- Price Details -->
<dl class="row mb-0">
<dt class="col-5 py-1 fw-normal text-end">Coste papel</dt>
@ -25,7 +35,9 @@
class="autonumeric-resumen-currency"></span></dd>
<dt class="col-5 fw-normal text-end">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".costes-impresion" aria-expanded="false" aria-controls="costes-impresion">
<a href="javascript:void(0);" data-bs-toggle="collapse"
data-bs-target=".costes-impresion" aria-expanded="false"
aria-controls="costes-impresion">
<i class="ti ti-list ti-sm mx-2"></i>
</a>
Coste impresión
@ -45,7 +57,7 @@
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste tinta</dt>
<dd class="col-6 text-end py-1 collapse costes-impresion">
<span id="totalCosteTinta" class="autonumeric-resumen-currency" ></span>
<span id="totalCosteTinta" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse costes-impresion">Coste corte</dt>
@ -53,7 +65,9 @@
<span id="totalCosteCorte" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 py-1 fw-normal text-end">
<a href="javascript:void(0);" data-bs-toggle="collapse" data-bs-target=".margen-impresion" aria-expanded="false" aria-controls="margen-impresion">
<a href="javascript:void(0);" data-bs-toggle="collapse"
data-bs-target=".margen-impresion" aria-expanded="false"
aria-controls="margen-impresion">
<i class="ti ti-list ti-sm mx-2"></i>
</a>
Margen impresión
@ -75,7 +89,7 @@
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen tinta</dt>
<dd class="col-6 text-end py-1 collapse margen-impresion">
<span id="totalMargenTinta" class="autonumeric-resumen-currency" ></span>
<span id="totalMargenTinta" class="autonumeric-resumen-currency"></span>
</dd>
<dt class="col-5 fw-normal text-end collapse margen-impresion">Margen corte</dt>
@ -100,6 +114,10 @@
class="autonumeric-resumen-currency"></span></dd>
</dl>
</div>
<hr class="mx-n4">
<dl class="row mb-0">
@ -168,7 +186,8 @@
<div class="col-xl-12 mt-3">
<div class="card border border-secondary-subtle rounded-3">
<div class="card-body">
<div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none" role="alert">
<div id="div_ajustar_error" class="alert alert-danger d-flex align-items-baseline d-none"
role="alert">
<span class="alert-icon alert-icon-lg text-primary me-2">
<i class="ti ti-ban ti-sm"></i>
</span>

6
ci4/app/Views/themes/vuexy/form/produccion/ot/otFiles.php
View File

@ -1,5 +1,9 @@
<div class="row">
<div class="col-md-12">
<?= view("themes/vuexy/components/dropzone",data: ['id' => 'dropzone-ot-files','modelId' => $presupuesto->id]) ?>
<?= view("themes/vuexy/components/dropzone", data: [
'id' => 'dropzone-ot-files',
'modelId' => $presupuesto->id,
'otId' => $ot->id
]) ?>
</div><!--//.col -->
</div><!--//.row -->

10
httpdocs/assets/js/safekat/components/forms/fileUploadDropzone.js
View File

@ -1,6 +1,6 @@
import Ajax from '../ajax.js';
import { alertSuccessMessage } from '../alerts/sweetAlert.js'
import { alertSuccessMessage, alertWarningMessage } from '../alerts/sweetAlert.js'
const PREVIEW_TEMPLATE = `
<div class="dz-preview dz-file-preview">
@ -25,7 +25,7 @@ const PREVIEW_TEMPLATE = `
class FileUploadDropzone {
constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos" }) {
constructor({ domElement, nameId = "presupuesto_id", getUri = null, postUri = null, resourcePath = "presupuestos", otId = null }) {
Dropzone.autoDiscover = false;
this.domElement = domElement
this.jqElement = $(domElement)
@ -35,6 +35,7 @@ class FileUploadDropzone {
this.btnDownloadFiles = $(`#${domElement.replace('#', '')}_btnDownloadFiles`);
this.dataPost = {}
this.nameId = nameId;
this.otId = otId;
this.getUri = getUri
this.postUri = postUri
this.dataPost[nameId] = this.modelId;
@ -160,7 +161,8 @@ class FileUploadDropzone {
url: `/presupuestoadmin/download_zip`,
type: 'POST',
data: {
[this.nameId]: this.modelId
[this.nameId]: this.modelId,
'ot_id': this.otId
},
xhrFields: {
responseType: 'blob'
@ -185,7 +187,7 @@ class FileUploadDropzone {
window.URL.revokeObjectURL(url);
},
error: () => {
alertWarningMessage("Error al descargar el archivo ZIP.");
alertWarningMessage("Error", "Error al descargar el archivo ZIP.");
},
complete: () => {
$("#loader").modal('hide');

2
httpdocs/assets/js/safekat/pages/produccion/ot.js
View File

@ -10,6 +10,7 @@ class OrdenTrabajo {
this.otForm = this.item.find("#ot-edit-form")
this.block = document.querySelector('.section-block');
this.modelId = this.item.data("id");
this.otId = parseInt($("#dropzone-ot-files").data("ot-id")) || null;
this.tareasTableItem = this.item.find("#ot-task-table");
this.tareasId = []
this.summaryData = {}
@ -70,6 +71,7 @@ class OrdenTrabajo {
this.configUploadDropzone = {
domElement: '#dropzone-ot-files',
nameId: "presupuesto_id",
otId: this.otId,
getUri: '/presupuestos/presupuestocliente/get_files',
postUri: '/presupuestos/presupuestocliente/upload_files'
}

BIN
log.json Normal file
View File

Binary file not shown.