From 242029714df595a542bef4e0b112179642564647 Mon Sep 17 00:00:00 2001
From: imnavajas <imnavajas@coit.es>
Date: Wed, 21 May 2025 09:04:50 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adida=20descripcion=20en=20el=20select?=
 =?UTF-8?q?=20de=20las=20impresoras?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Logistica/EtiquetasTitulosController.php    | 6 +++---
 ci4/app/Controllers/Logistica/LogisticaController.php       | 6 +++---
 ci4/app/Controllers/Produccion/Ordentrabajo.php             | 2 +-
 .../Views/themes/vuexy/form/logistica/viewEnvioEditForm.php | 4 ++--
 .../vuexy/form/logistica/viewEtiquetasTitulosEdit.php       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ci4/app/Controllers/Logistica/EtiquetasTitulosController.php b/ci4/app/Controllers/Logistica/EtiquetasTitulosController.php
index d82805a0..dc0fa78a 100644
--- a/ci4/app/Controllers/Logistica/EtiquetasTitulosController.php
+++ b/ci4/app/Controllers/Logistica/EtiquetasTitulosController.php
@@ -163,10 +163,10 @@ class EtiquetasTitulosController extends BaseController
 
 
         $modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
-        $impresoras = $modelImpresora->select('id, name')
+        $impresoras = $modelImpresora->select('id, name, description')
             ->where('deleted_at', null)
             ->where('tipo', 1)
-            ->orderBy('name', 'desc')
+            ->orderBy('name', 'asc')
             ->findAll();
         $etiquetaEntity->impresoras = $impresoras;
 
@@ -440,7 +440,7 @@ class EtiquetasTitulosController extends BaseController
         $impresora_id = $this->request->getPost('impresora_id') ?? null;
 
         $modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
-        $impresora = $modelImpresora->select('id, name, ip, port, user, pass')
+        $impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
             ->where('deleted_at', null)
             ->where('id', $impresora_id)
             ->orderBy('name', 'asc')
diff --git a/ci4/app/Controllers/Logistica/LogisticaController.php b/ci4/app/Controllers/Logistica/LogisticaController.php
index 23c4d3de..82a1a6a5 100755
--- a/ci4/app/Controllers/Logistica/LogisticaController.php
+++ b/ci4/app/Controllers/Logistica/LogisticaController.php
@@ -225,7 +225,7 @@ class LogisticaController extends BaseController
             }
 
             $modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
-            $impresora = $modelImpresora->select('id, name, ip, port, user, pass')
+            $impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
                 ->where('deleted_at', null)
                 ->where('id', $printer_id)
                 ->orderBy('name', 'asc')
@@ -346,10 +346,10 @@ class LogisticaController extends BaseController
         }
 
         $modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
-        $impresoras = $modelImpresora->select('id, name')
+        $impresoras = $modelImpresora->select('id, name, description')
             ->where('deleted_at', null)
             ->where('tipo', 1)
-            ->orderBy('name', 'desc')
+            ->orderBy('name', 'asc')
             ->findAll();
         $envioEntity->impresoras = $impresoras;
 
diff --git a/ci4/app/Controllers/Produccion/Ordentrabajo.php b/ci4/app/Controllers/Produccion/Ordentrabajo.php
index 804fa8ec..e3098a42 100755
--- a/ci4/app/Controllers/Produccion/Ordentrabajo.php
+++ b/ci4/app/Controllers/Produccion/Ordentrabajo.php
@@ -951,7 +951,7 @@ class Ordentrabajo extends BaseController
         }
 
         $modelImpresora = model('App\Models\Configuracion\ImpresoraEtiquetaModel');
-        $impresora = $modelImpresora->select('id, name, ip, port, user, pass')
+        $impresora = $modelImpresora->select('id, name, description, ip, port, user, pass')
             ->where('deleted_at', null)
             ->where('id', $impresora_id)
             ->orderBy('name', 'asc')
diff --git a/ci4/app/Views/themes/vuexy/form/logistica/viewEnvioEditForm.php b/ci4/app/Views/themes/vuexy/form/logistica/viewEnvioEditForm.php
index c90fe1e5..489222a3 100644
--- a/ci4/app/Views/themes/vuexy/form/logistica/viewEnvioEditForm.php
+++ b/ci4/app/Views/themes/vuexy/form/logistica/viewEnvioEditForm.php
@@ -240,7 +240,7 @@
                                                 </button>
                                             </div>
 
-                                            <div class="col-sm-2 px-3 d-flex flex-column justify-content-end">
+                                            <div class="col-sm-3 px-3 d-flex flex-column justify-content-end">
                                                 <div class="d-flex flex-column justify-content-end h-100">
                                                     <label for="impresoraEtiquetas" class="form-label">
                                                         <?= lang("Logistica.impresoraEtiquetas") ?>
@@ -250,7 +250,7 @@
                                                         style="width: 100%;">
                                                         <?php foreach ($envioEntity->impresoras as $impresora): ?>
                                                             <option value="<?= $impresora->id ?>">
-                                                                <?= $impresora->name ?>
+                                                                <?= $impresora->description ? "$impresora->name [$impresora->description]" : $impresora->name ?>
                                                             </option>
                                                         <?php endforeach; ?>
                                                     </select>
diff --git a/ci4/app/Views/themes/vuexy/form/logistica/viewEtiquetasTitulosEdit.php b/ci4/app/Views/themes/vuexy/form/logistica/viewEtiquetasTitulosEdit.php
index b48cef9b..911e8578 100644
--- a/ci4/app/Views/themes/vuexy/form/logistica/viewEtiquetasTitulosEdit.php
+++ b/ci4/app/Views/themes/vuexy/form/logistica/viewEtiquetasTitulosEdit.php
@@ -158,7 +158,7 @@
                                         </button>
                                     </div>
 
-                                    <div class="col-sm-2 px-3 d-flex flex-column justify-content-end">
+                                    <div class="col-sm-3 px-3 d-flex flex-column justify-content-end">
                                         <div class="d-flex flex-column justify-content-end h-100">
                                             <label for="impresoraEtiquetas" class="form-label">
                                                 <?= lang("Logistica.impresoraEtiquetas") ?>
@@ -167,7 +167,7 @@
                                                 maxlength="50" class="form-control select2bs2" style="width: 100%;">
                                                 <?php foreach ($etiquetaEntity->impresoras as $impresora): ?>
                                                     <option value="<?= $impresora->id ?>">
-                                                        <?= $impresora->name ?>
+                                                        <?= $impresora->description ? "$impresora->name [$impresora->description]" : $impresora->name ?>
                                                     </option>
                                                 <?php endforeach; ?>
                                             </select>