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

trabajando en dropzone

Browse Source
This commit is contained in:
Jaime Jiménez
2024-06-03 12:01:40 +02:00
parent 3119005688
commit 234006783c
6 changed files with 8511 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,7 +788,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
return $this->respond([
'status' => $id,
'url' => site_url('presupuestocliente/list'),
'url' => site_url('presupuestos/presupuestocliente/edit'),
'message' => lang('Basic.global.saveSuccess', [lang('Basic.global.record')]),
$csrfTokenName => $newTokenHash
]);
@ -1479,6 +1479,9 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
}
}
public function uploadFiles(){
}
protected function calcular_coste_linea($linea, &$totalPapel, &$margenPapel, &$sumForFactor, &$totalImpresion, &$margenImpresion)
{
@ -1676,14 +1679,18 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
protected function obtenerPaginasColor($presupuestoEntity)
{
$comparador_data = json_decode($presupuestoEntity->comparador_json_data);
if (property_exists($comparador_data, 'color')) {
$presupuestoEntity->paginasColor = $comparador_data->color->paginas;
if(!is_null($comparador_data)){
if (property_exists($comparador_data, 'color')) {
$presupuestoEntity->paginasColor = $comparador_data->color->paginas;
}
if (property_exists($comparador_data, 'colorhq')) {
$presupuestoEntity->paginasColor = $comparador_data->colorhq->paginas;
} else {
$presupuestoEntity->paginasColor = 0;
}
}
if (property_exists($comparador_data, 'colorhq')) {
$presupuestoEntity->paginasColor = $comparador_data->colorhq->paginas;
} else {
else
$presupuestoEntity->paginasColor = 0;
}
}
protected function obtenerTiradas($presupuestoEntity)

44
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/_resumenItems.php
View File

@ -145,10 +145,25 @@
echo '</div>';
endforeach;
endif;
echo '</div>';
echo '</div>';
endif; ?>
<?php if($presupuestoEntity->estado_id==2): ?>
<div class="row mb-3">
<h3>Ficheros</h3>
<div class="col-sm-3">
<form action="<?= site_url('presupuestocliente/uploadFiles') ?>" class="dropzone needsclick" id="dropzone-multi" >
<div class="dz-message needsclick">
Arrastre aquí los ficheros o haga click
</div>
<div class="fallback">
<input name="file" type="file" />
</div>
</form>
</div>
</div>
<?php endif; ?>
</div>
<!-- Modal -->
@ -181,7 +196,32 @@ window.routes_resumen = {
duplicarPresupuesto: "<?= route_to('duplicarPresupuesto') ?>",
}
if(<?php echo $presupuestoEntity->estado_id?>==2)
if(<?php echo $presupuestoEntity->estado_id?>==2){
previewEsquemaCubierta(true);
const previewTemplate = `<div class="dz-preview dz-file-preview">
<div class="dz-details">
<div class="dz-thumbnail">
<img data-dz-thumbnail>
<span class="dz-nopreview">No preview</span>
<div class="dz-success-mark"></div>
<div class="dz-error-mark"></div>
<div class="dz-error-message"><span data-dz-errormessage></span></div>
<div class="progress">
<div class="progress-bar progress-bar-primary" role="progressbar" aria-valuemin="0" aria-valuemax="100" data-dz-uploadprogress></div>
</div>
</div>
<div class="dz-filename" data-dz-name></div>
<div class="dz-size" data-dz-size></div>
</div>
</div>`;
let dropzoneMulti = new Dropzone('#dropzone-multi', {
previewTemplate: previewTemplate,
parallelUploads: 1,
maxFilesize: 5,
addRemoveLinks: true
});
}
<?= $this->endSection() ?>

5
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/disenioLibro.js
View File

@ -735,7 +735,10 @@ async function calcularPresupuesto() {
}
catch(error){
}
console.log(response);
//For debug only
//console.log(response);
$('#loader').hide();
$('#divTiradasPrecio').empty();

10
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/resumen.js
View File

@ -279,11 +279,13 @@ function finalizarPresupuesto(confirmar){
data: datos,
success: function(response) {
if(Object.keys(response).length > 0) {
if(response.status > 0){
window.location.href = response.url;
if(confirmar){
if(Object.keys(response).length > 0) {
if(response.status > 0){
window.location.href = response.url + '/' + response.status;
}
}
}
$('#loader').hide();

2
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php
View File

@ -239,10 +239,12 @@ if(<?= $presupuestoEntity->estado_id ?>==1){
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/bs-stepper/bs-stepper.css') ?>" />
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/formvalidation/dist/css/formValidation.min.css') ?>" />
<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/dropzone/dropzone.css') ?>" />
<?= $this->endSection() ?>
<?= $this->section('additionalExternalJs') ?>
<script src="<?= site_url("themes/vuexy/vendor/libs/dropzone/dropzone.js") ?>"></script>
<script src="<?= site_url("themes/vuexy/vendor/libs/bs-stepper/bs-stepper.js") ?>"></script>
<script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/FormValidation.min.js") ?>"></script>
<script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/Bootstrap5.min.js") ?>"></script>

8443
xdebug.log
View File

File diff suppressed because one or more lines are too long