From b27d1b33a5f8feb971b8ce6a157ded7b6146dfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Calder=C3=B3n?= Date: Sat, 25 May 2019 20:47:44 -0600 Subject: [PATCH 1/3] =?UTF-8?q?[Modificaciones]=20Ortograf=C3=ADa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/administrador/fontaneros.php | 2 +- view/administrador/info_asada.php | 20 ++++++++++---------- view/administrador/noticias.php | 5 +---- view/administrador/ordenes_trabajo.php | 2 +- view/administrador/productos.php | 5 +---- view/administrador/tramites.php | 11 +++-------- view/administrador/usuarios.php | 8 ++++---- view/administrador/ver_tramite.php | 10 +++++----- 8 files changed, 26 insertions(+), 37 deletions(-) diff --git a/view/administrador/fontaneros.php b/view/administrador/fontaneros.php index 5c72600..6256d63 100644 --- a/view/administrador/fontaneros.php +++ b/view/administrador/fontaneros.php @@ -159,7 +159,7 @@
- +
diff --git a/view/administrador/info_asada.php b/view/administrador/info_asada.php index cec04ae..82f0d53 100644 --- a/view/administrador/info_asada.php +++ b/view/administrador/info_asada.php @@ -65,7 +65,7 @@ function generarCodigo($longitud) {
- +
@@ -104,19 +104,19 @@ function generarCodigo($longitud) {
- +
- +
- +
@@ -128,37 +128,37 @@ function generarCodigo($longitud) {
- +
- +
- +
- +
- +
- +
diff --git a/view/administrador/noticias.php b/view/administrador/noticias.php index 124cf5d..5e805ca 100644 --- a/view/administrador/noticias.php +++ b/view/administrador/noticias.php @@ -131,10 +131,7 @@ function generarCodigo($longitud) { $total_paginas = ceil(mysqli_num_rows($sth) / $TAMANO_PAGINA); $consulta .= " LIMIT ".$inicio."," . $TAMANO_PAGINA; $sth = mysqli_query($link,$consulta); - - - - + while($r = mysqli_fetch_assoc($sth)) { echo ' diff --git a/view/administrador/ordenes_trabajo.php b/view/administrador/ordenes_trabajo.php index 8a8bd80..ecdb037 100644 --- a/view/administrador/ordenes_trabajo.php +++ b/view/administrador/ordenes_trabajo.php @@ -1,6 +1,6 @@
-

Ordenes de trabajo

+

Órdenes de trabajo

diff --git a/view/administrador/productos.php b/view/administrador/productos.php index 9bce9e4..9efdf98 100644 --- a/view/administrador/productos.php +++ b/view/administrador/productos.php @@ -46,7 +46,7 @@
-

Administracion de productos de inventario

+

Administración de productos de inventario

Nuevo Item

@@ -67,9 +67,6 @@ $consulta = "SELECT * FROM `producto` WHERE `id_asada` = '".$_SESSION["asada"]."'"; $sth = mysqli_query($link,$consulta); - - - if (!isset($_GET["pagina"])) { $inicio = 0; $pagina = 1; diff --git a/view/administrador/tramites.php b/view/administrador/tramites.php index a493c2a..413a047 100644 --- a/view/administrador/tramites.php +++ b/view/administrador/tramites.php @@ -1,6 +1,6 @@
-

Visualizacion de tramites

+

Visualización de trámites


@@ -15,9 +15,7 @@ mysqli_query($link,"UPDATE `tramite` SET `estado_tramite`='".$_GET['estado']."' WHERE `id_tramite`='".$_GET['tramite']."' "); echo ""; } - $consulta = "SELECT tramite.id_tramite, tramite.nombre, tramite.descripcion, tramite.plantilla,asada.nombre as asada,tramite.estado_tramite FROM tramite,asada WHERE (tramite.id_asada = '".$_SESSION["asada"]."' or tramite.id_asada = 0) and tramite.estado_tramite = 1 and tramite.id_asada = asada.id_asada ORDER BY tramite.id_asada, tramite.id_tramite ASC - - + $consulta = "SELECT tramite.id_tramite, tramite.nombre, tramite.descripcion, tramite.plantilla,asada.nombre as asada,tramite.estado_tramite FROM tramite,asada WHERE (tramite.id_asada = '".$_SESSION["asada"]."' or tramite.id_asada = 0) and tramite.estado_tramite = 1 and tramite.id_asada = asada.id_asada ORDER BY tramite.id_asada, tramite.id_tramite ASC "; $sth = mysqli_query($link,$consulta); @@ -34,10 +32,7 @@ $total_paginas = ceil(mysqli_num_rows($sth) / $TAMANO_PAGINA); $consulta .= " LIMIT ".$inicio."," . $TAMANO_PAGINA; $sth = mysqli_query($link,$consulta); - - - - + while($r = mysqli_fetch_assoc($sth)) { diff --git a/view/administrador/usuarios.php b/view/administrador/usuarios.php index 04bdf6c..bb7fbe3 100644 --- a/view/administrador/usuarios.php +++ b/view/administrador/usuarios.php @@ -122,7 +122,7 @@
- +
@@ -198,7 +198,7 @@
- +
@@ -250,10 +250,10 @@
- Busqueda + Búsqueda
- class="form-control input-md" /> + class="form-control input-md" />
diff --git a/view/administrador/ver_tramite.php b/view/administrador/ver_tramite.php index 099c5d0..4874ba1 100644 --- a/view/administrador/ver_tramite.php +++ b/view/administrador/ver_tramite.php @@ -74,7 +74,7 @@
@@ -205,7 +205,7 @@ echo ' '; } From ce8e82ac1a85991aa2751f1046213153729aa563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Calder=C3=B3n?= Date: Sat, 25 May 2019 20:56:13 -0600 Subject: [PATCH 2/3] =?UTF-8?q?[Modificaci=C3=B3n]=20Soluci=C3=B3n=20Redir?= =?UTF-8?q?eccionameinto=20Formularios=20generales?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/fontanero/cerrar_orden.php | 6 +++--- view/header.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/fontanero/cerrar_orden.php b/view/fontanero/cerrar_orden.php index a1a94cd..228412a 100644 --- a/view/fontanero/cerrar_orden.php +++ b/view/fontanero/cerrar_orden.php @@ -18,7 +18,7 @@ ?>
-

Imagenes anteriores

+

Imágenes anteriores

@@ -50,7 +50,7 @@ } ?>
-

Imagenes posteriores

+

Imágenes posteriores

@@ -61,7 +61,7 @@

-
Subir Imagen
+
Subir imagen




diff --git a/view/header.php b/view/header.php index e9a7c7d..ec962ba 100644 --- a/view/header.php +++ b/view/header.php @@ -58,7 +58,7 @@ $menu = "
  • Inicio
    • -
  • Formularios Generales +
  • Formularios Generales
    • Crear Formularios
    • Ver Formularios
    • From 3e160a3039196697cf0294a76fcb796268758344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Calder=C3=B3n?= Date: Sat, 25 May 2019 21:08:46 -0600 Subject: [PATCH 3/3] =?UTF-8?q?[Modificaci=C3=B3n]=20Soluci=C3=B3n=20Espac?= =?UTF-8?q?io=20de=20la=20direcci=C3=B3n=20inadecuado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/general/registro.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/general/registro.php b/view/general/registro.php index 9cd476b..7cb035a 100644 --- a/view/general/registro.php +++ b/view/general/registro.php @@ -118,7 +118,7 @@
      - +
    • - Autorizo + Autorizó
    		@@ -128,19 +128,19 @@
    - Pendiente + Pendiente
    - Abierta + Abierta
    - Cerrada + Cerrada
    '.$datos['nombre'].' + onclick="javascript: return confirm('."'".'¿Estás seguro?'."'".');" class="btn btn-'.$clase.'" href="#">'.$datos['nombre'].'