Merge branch 'hotfix/Ajaxminuscula'

* hotfix/Ajaxminuscula:
  Versión 1.091
  -Cambiado el enlace de ajax a Ajax

.gitignore

@@ -1,4 +1,2 @@
 nbproject
-tmp/*
 .DS_Store
-/img.data/

Ajax.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * @package Inventario
+ * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+ * This file is part of Inventario.
+ * Inventario is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Inventario is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+//Clase encargada de procesar las peticiones ajax
+require_once 'inc/configuracion.inc';
+require_once 'Sql.php';
+
+$ajax = new Ajax();
+echo $ajax->procesa();
+
+class Ajax {
+    private $sql;
+    private $tabla;
+    
+    public function __construct()
+    {
+        $this->sql = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
+        if ($this->sql->error()) {
+            return $this->respuesta($this->mensaje(false, 'Error conectando con la Base de Datos'));
+        };
+        $this->tabla = $_GET['tabla'];
+    }
+    private function respuesta($mensaje)
+    {
+        header('Content-Type: application/json', true, 200);
+        return $mensaje;
+    }
+    public function procesa()
+    {
+        $opc = $_GET['opc'];
+        switch ($opc) {
+            case "get": return $this->obtiene();
+            case "put": return $this->actualiza();
+        }
+    }
+    private function mensaje($exito, $texto)
+    {
+        return json_encode(array("success" => $exito, "msj" => $texto));
+    }
+    private function actualiza()
+    {
+        if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
+            $comando = "update " . mysql_escape_string($this->tabla) . " set " . mysql_escape_string($_POST['name']) . " = '" . mysql_escape_string($_POST['value']) . "' where id = '" . mysql_escape_string($_POST['pk']). "';";
+            $this->sql->ejecuta($comando);
+            $exito = !$this->sql->error();
+            $mensaje = $this->sql->mensajeError();
+            $resp = $this->mensaje($exito, $mensaje);  
+            return $this->respuesta($resp);
+        }
+    }
+    private function obtiene()
+    {
+        if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
+            $comando = "select id, descripcion from " . $this->tabla . " order by descripcion asc;";
+            $this->sql->ejecuta($comando);
+            $exito = !$this->sql->error();
+            $mensaje = $this->sql->mensajeError();
+            if (!$exito) {
+                return $this->respuesta($this->mensaje($exito, $mensaje));
+            }
+            $filas = array();
+            while($r = $this->sql->procesaResultado()) {
+                $filas[] = array($r['id'] => $r['descripcion']);
+            }
+            $resp = json_encode($filas);
+            return $this->respuesta($resp);
+        }
+    }
+}  
+
+?>

AportaContenido.php

@@ -39,9 +39,25 @@ define('CREDITOS', '<div class="modal fade" tabindex="-1" id="creditos" role="di
                                 <div class="jumbotron">
                                     <img src="img/logo.png" class="img-responsive img-rounded" style="float:left"> 
                                     <h1>Inventario2</h1>
-                                    <p> Aplicación para controlar el inventario de un centro educativo.</p><br><br><br><br><br><br>
-                                    <p><small>Copyright (C) 2008-2014 Ricardo Montañana Gómez<br>
-                                    Esta aplicación se distribuye con licencia <a target="_blank" href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3 </a></small></p>
+                                    <p> Aplicación para controlar el inventario de un centro educativo.</p>
+                                    <p>En la aplicación se hace uso de los siguientes módulos y/o bibliotecas</p>
+                                    <table class="table table-condensed">
+                                     <thead><tr><th>Biblioteca/Módulo</th><th>Licencia</th></tr></thead>
+                                     <tbody>
+                                      <tr><td><a href="http://getbootstrap.com/" target="_blank">Twitter Bootstrap</a></td><td><a target="_blank" href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT</a></td>
+                                      <tr><td><a href="http://www.fpdf.org/" target="_blank">FPDF</a></td><td>Libre</td>
+                                      <tr><td><a href="http://phpqrcode.sourceforge.net/" target="_blank">PHP QR Code Enconder</a></td><td><a target="_blank" href="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</a></td>
+                                      <tr><td><a href="http://stefangabos.ro/php-libraries/zebra-image/" target="_blank">Zebra_Image</a></td><td><a target="_blank" href="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</a></td>
+                                      <tr><td><a href="http://jasny.github.io/bootstrap/" target="_blank">Jasny Bootstrap</a></td><td><a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a></td>
+                                      <tr><td><a href="http://1000hz.github.io/bootstrap-validator/" target="_blank">Bootstrap Validator</a></td><td><a target="_blank" href="https://github.com/1000hz/bootstrap-validator/blob/master/LICENSE">MIT</a></td>
+                                      <tr><td><a href="https://github.com/tkrotoff/jquery-simplecolorpicker" target="_blank">jquery-simplecolorpicker</a></td><td><a target="_blank" href="https://github.com/tkrotoff/jquery-simplecolorpicker/blob/master/LICENSE.txt">MIT</a></td>
+                                      <tr><td><a href="http://eonasdan.github.io/bootstrap-datetimepicker/" target="_blank">Bootstrap datetimepicker</a></td><td><a target="_blank" href="https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/src/js/bootstrap-datetimepicker.js">MIT</a></td>
+                                      <tr><td><a href="http://silviomoreto.github.io/bootstrap-select/" target="_blank">Bootstrap-select</a></td><td><a target="_blank" href="https://github.com/silviomoreto/bootstrap-select">MIT</a></td>
+                                      <tr><td><a href="https://github.com/vitalets/x-editable" target="_blank">X-editable</a></td><td><a target="_blank" href="https://github.com/vitalets/x-editable/blob/master/LICENSE-MIT">MIT</a></td>
+                                     </tbody>
+                                    </table>
+                                    <p><h5>Copyright &copy; 2008-2014 Ricardo Montañana Gómez</h4>
+                                    <h5><small>Esta aplicación se distribuye con licencia <a target="_blank" href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3 </a></small></h5></p>
                                 </div>
                             </div>
                         </div>

CHANGELOG

@@ -1,3 +1,16 @@
+Versión 1.09 16-04-2014
+-Añadida la biblioteca X-Edit
+-Añadida actualización Ajax en Mantenimiento
+
+Versión 1.082 09-04-2014
+-Ahora git tiene en cuenta los directorios tmp e img.data y no tiene en cuenta su contenido
+-Fix #30. Arreglado el botón de buscar que no enviaba los datos. Cambiado el texto por la lupa.
+
+Versión 1.081 08-04-2014
+-Fix #29. Añade el programa instalar.php en el proceso de instalación en README.md
+-Fix #29. Añadida la tabla de módulos/bibliotecas utilizados en los créditos.
+-Fix #28. Corrige que el informe pedido desde matenimiento salga en una ventana nueva.
+
 Versión 1.08 07-04-2014
 -Los informes aparecen ahora en la pantalla de la aplicación embebidos.
 -Añadido un calendario al pulsar sobre la fecha en la cabecera de la aplicación.

Instalar.php

@@ -334,9 +334,9 @@ class Instalar {
             $articulos = "CREATE TABLE `Articulos` (
                               `id` smallint(6) NOT NULL auto_increment COMMENT 'ordenable',
                               `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
-                              `marca` varchar(20) default NULL COMMENT 'ordenable',
-                              `modelo` varchar(20) default NULL COMMENT 'ordenable',
-                              `cantidad` int(11) default NULL COMMENT 'ordenable',
+                              `marca` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+                              `modelo` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+                              `cantidad` int(11) default NULL COMMENT 'ordenable,ajax/number',
                               `imagen` varchar(45) default NULL COMMENT 'imagen',
                               PRIMARY KEY  (`id`)
                             ) ENGINE=InnoDB AUTO_INCREMENT=769 DEFAULT CHARSET=utf8;
@@ -352,9 +352,9 @@ class Instalar {
                               `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
                               `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
                               `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-                              `numserie` varchar(30) default NULL COMMENT 'ordenable',
-                              `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
-                              `fechaCompra` date NOT NULL COMMENT 'ordenable',
+                              `numserie` varchar(30) default NULL COMMENT 'ordenable,ajax/text',
+                              `cantidad` int(10) unsigned default NULL COMMENT 'ordenable,ajax/number',
+                              `fechaCompra` date NOT NULL COMMENT 'ordenable,ajax/combodate',
                               `imagen` varchar(45) default NULL COMMENT 'imagen',
                               PRIMARY KEY  (`id`),
                               KEY `id` (`id`),
@@ -366,9 +366,9 @@ class Instalar {
                             ";
             $usuarios = "CREATE TABLE `Usuarios` (
                               `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-                              `nombre` varchar(16) NOT NULL default '',
-                              `clave` varchar(32) NOT NULL default '',
-                              `idSesion` varchar(20) NOT NULL default '',
+                              `nombre` varchar(16) NOT NULL default '' COMMENT 'ajax/text',
+                              `clave` varchar(32) NOT NULL default '' COMMENT 'ajax/text',
+                              `idSesion` varchar(20) NOT NULL default '' COMMENT 'ajax/text',
                               `alta` tinyint(1) NOT NULL default '0',
                               `modificacion` tinyint(1) NOT NULL default '0',
                               `borrado` tinyint(1) NOT NULL default '0',

Mantenimiento.php

@@ -158,8 +158,9 @@ class Mantenimiento {
         } else {
             $comando = str_replace('{orden}', ' ', $comando);
         }
+        $salida = $this->cargaComplementos();
         //Introduce un botón para hacer búsquedas y el número de la página
-        $salida = $this->enlaceBusqueda($pagSigte);
+        $salida.= $this->enlaceBusqueda($pagSigte);
         $salida.= $cabecera;
         //Consulta paginada de todas las tuplas
         $comando = str_replace('{inferior}', $pagina * NUMFILAS, $comando);
@@ -194,6 +195,9 @@ class Mantenimiento {
                 if ($clave == "id") {
                     $id = $valor;
                 }
+                if ($this->campos[$clave]['Visible'] == "no") {
+                    continue;
+                }
                 // Comprueba si tiene que añadir el enlace de inventario
                 if (strstr($this->campos[$clave]['Comment'], "link")) {
                     $comen = explode(",", $this->campos[$clave]['Comment']);
@@ -215,6 +219,17 @@ class Mantenimiento {
                     $checked = $valor == '1' ? 'checked' : '';
                     $valor = '<input type="checkbox" disabled ' . $checked . '>';
                 }
+                if (strstr($this->campos[$clave]['Comment'], "ajax") && $this->perfil['Modificacion']) {
+                    $comen = explode(",", $this->campos[$clave]['Comment']);
+                    foreach ($comen as $co) {
+                        if (strstr($co, "ajax")) {
+                            $tmpco = explode("/", $co);
+                            $tipo = $tmpco[1];
+                        }
+                    }
+                    $cant++;
+                    $valor = $this->campoAjax($id, $clave, $tipo, $valor, $cant, $fila);
+                }
                 $salida.="<td>$valor</td>\n";
             }
             //Añade el icono de editar
@@ -262,7 +277,7 @@ class Mantenimiento {
             if ($this->perfil['Informe']) {
                 $this->datosURL['opc'] = "informe";
                 $inf = $this->montaURL();
-                $informe = '<a href="' . $inf . '" target="_blank"><img src="img/' . ESTILO . '/informe.png" alt="informe" title="Informe pdf"></a>';
+                $informe = '<a href="' . $inf . '"><img src="img/' . ESTILO . '/informe.png" alt="informe" title="Informe pdf"></a>';
             } else {
                 $informe = "";
             }
@@ -285,7 +300,7 @@ class Mantenimiento {
         $valor = isset($this->cadenaBusqueda) ? 'value="' . $this->cadenaBusqueda . '"' : '';
         $salida = '<form name="busqueda" method="POST"><div class="col-xs-6 col-sm-4 col-md-6 col-lg-6"><div class="input-group">
                 <input type="text" name="buscar" placeholder="Descripci&oacute;n" class="form-control" ' . $valor . '>
-                <span class="input-group-btn"><button class="btn btn-primary" type="button">Buscar</button>
+                <span class="input-group-btn"><button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-search"></span></button>
                 </span></div></div></form>';
         $salida .= '<button class="btn btn-info pull-right" type="button">P&aacute;gina <span class="badge">'
                 . $pagina . '</span></button>';
@@ -520,7 +535,7 @@ class Mantenimiento {
             $def = simplexml_load_file($nombre);
             foreach ($def->Campos->Col as $columna) {
                 $this->campos[(string) $columna['Nombre']] = array("Field" => (string) $columna['Titulo'], "Comment" => (string) $columna['Varios'],
-                    "Type" => (string) $columna['Tipo'] . "(" . $columna['Ancho'] . ")", "Editable" => (string) $columna['Editable'], "Campo" => (string) $columna['Campo']);
+                    "Type" => (string) $columna['Tipo'] . "(" . $columna['Ancho'] . ")", "Editable" => (string) $columna['Editable'], "Campo" => (string) $columna['Campo'], "Visible" => (string) $columna['Visible']);
             }
             $this->comandoConsulta = $def->Consulta;
         } else {
@@ -547,6 +562,9 @@ class Mantenimiento {
         }
         $flecha = '<span class="glyphicon glyphicon-chevron-'.$sentidoFlecha.'"></span>';
         foreach ($this->campos as $clave => $datos) {
+            if ($this->campos[$clave]['Visible'] == "no") {
+                continue;
+            }
             $comen = explode(",", $datos["Comment"]);
             $ordenable = false;
             foreach ($comen as $co) {
@@ -765,6 +783,54 @@ class Mantenimiento {
         return $mensaje;
     }
     
+    private function cargaComplementos()
+    {
+        $mensaje  = '<link href="css/bootstrap3-editable/css/bootstrap-editable.css" rel="stylesheet"/>';
+        //$mensaje .= '<script src="css/bootstrap3-editable/js/bootstrap-editable.min.js"></script>';
+        return $mensaje;
+    }
+    
+    private function campoAjax($id, $clave, $tipo, $valor, $num, $datosFila)
+    {
+        //url: 'ajax.php?tabla=". $this->tabla  . "',
+        //url: '" . $this->montaURL() . "&tabla=" . $this->tabla "',
+        $formato = $tipo == "combodate" ? 'data-format="YYYY-MM-DD" data-viewformat="DD/MM/YYYY"' : '';
+        $remoto = ""; $select2 = "";
+        $titulo = $clave;
+        if (strstr($tipo, "select")) {
+            $datos = explode("-", $tipo);
+            $tipo = $datos[0];
+            $tabla2 = $datos[1];
+            $clave = "id_".$clave;
+            $indice = "id".$tabla2;
+            $valorDato = $datosFila[$indice];
+            $valorSelect = 'data-value="'.$valorDato.'" ';
+            $remoto = $valorSelect . ' data-sourceCache="true" data-sourceError="Error cargando datos" data-source="Ajax.php?opc=get&tabla='.$tabla2.'"';
+        }
+ 
+        $mensaje = '<a href="#" title="Modifica '.$titulo.'" id="'.$clave.'" name="'.$clave.$num.'" data-type="'.$tipo.'" data-min="1" data-placement="right" '.$formato.' data-pk="'.$id.'" '.$remoto.' >' . $valor . '</a>
+                                <script>
+                                    $(function(){' . "
+                                        $('[name=\"".$clave.$num."\"]').editable({
+                                            url: 'Ajax.php?opc=put&tabla=". $this->tabla  . "',
+
+                                            emptytext: 'Vacío',
+                                            success: function(respuesta, newValue) {
+                                                        if (respuesta.success === false) {
+                                                            return respuesta.msj; //msj will be shown in editable form
+                                                        }
+                                                     },
+                                            validate: function(value) {
+                                                if($.trim(value) == '') {
+                                                    return 'No se puede dejar vacío';
+                                                }
+                                            }
+                                        });
+                                    });
+                                </script>";
+        return $mensaje;
+    }
+    
 }
 
 ?>

README.md

@@ -38,14 +38,12 @@ Para instalar la aplicación basta con seguir estos pasos:
 
     grant all on Inventario.* to usuario identified by "contraseña";
 
-###5. Crear la estructura de la base de datos para poder comenzar a trabajar:
+###5. Conectarse a la aplicación en la url donde se ha instalado:
 
-    mysql -u usuario --password=contraseña <sql/setup.sql
+    http://<url>
 
-Con esto queda instalado el programa. Se crean en este proceso dos usuarios:
+Al hacer esto se arrancará automáticamente el programa de instalación con el que terminaremos de configurar la aplicación.
 
-    Usuario: admin              Usuario: demo
-    Contraseña: pruebas         Contraseña: pruebas
 
 ##Modelo de datos
 El modelo de datos que se ha utilizado ha sido:

css/bootstrap3-editable/css/bootstrap-editable.css

@@ -0,0 +1,663 @@
+/*! X-editable - v1.5.1 
+* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
+* http://github.com/vitalets/x-editable
+* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
+.editableform {
+    margin-bottom: 0; /* overwrites bootstrap margin */
+}
+
+.editableform .control-group {
+    margin-bottom: 0; /* overwrites bootstrap margin */
+    white-space: nowrap; /* prevent wrapping buttons on new line */
+    line-height: 20px; /* overwriting bootstrap line-height. See #133 */
+}
+
+/* 
+  BS3 width:1005 for inputs breaks editable form in popup 
+  See: https://github.com/vitalets/x-editable/issues/393
+*/
+.editableform .form-control {
+    width: auto;
+}
+
+.editable-buttons {
+   display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
+   vertical-align: top;
+   margin-left: 7px;
+   /* inline-block emulation for IE7*/
+   zoom: 1; 
+   *display: inline;
+}
+
+.editable-buttons.editable-buttons-bottom {
+   display: block; 
+   margin-top: 7px;
+   margin-left: 0;
+}
+
+.editable-input {
+    vertical-align: top; 
+    display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
+    width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
+    white-space: normal; /* reset white-space decalred in parent*/
+   /* display-inline emulation for IE7*/
+   zoom: 1; 
+   *display: inline;   
+}
+
+.editable-buttons .editable-cancel {
+   margin-left: 7px; 
+}
+
+/*for jquery-ui buttons need set height to look more pretty*/
+.editable-buttons button.ui-button-icon-only {
+   height: 24px; 
+   width: 30px;
+}
+
+.editableform-loading {
+    background: url('../img/loading.gif') center center no-repeat;  
+    height: 25px;
+    width: auto; 
+    min-width: 25px; 
+}
+
+.editable-inline .editableform-loading {
+    background-position: left 5px;      
+}
+
+ .editable-error-block {
+    max-width: 300px;
+    margin: 5px 0 0 0;
+    width: auto;
+    white-space: normal;
+}
+
+/*add padding for jquery ui*/
+.editable-error-block.ui-state-error {
+    padding: 3px;  
+}  
+
+.editable-error {
+   color: red;  
+}
+
+/* ---- For specific types ---- */
+
+.editableform .editable-date {
+    padding: 0; 
+    margin: 0;
+    float: left;
+}
+
+/* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
+.editable-inline .add-on .icon-th {
+   margin-top: 3px;
+   margin-left: 1px; 
+}
+
+
+/* checklist vertical alignment */
+.editable-checklist label input[type="checkbox"], 
+.editable-checklist label span {
+    vertical-align: middle;
+    margin: 0;
+}
+
+.editable-checklist label {
+    white-space: nowrap; 
+}
+
+/* set exact width of textarea to fit buttons toolbar */
+.editable-wysihtml5 {
+    width: 566px; 
+    height: 250px; 
+}
+
+/* clear button shown as link in date inputs */
+.editable-clear {
+   clear: both;
+   font-size: 0.9em;
+   text-decoration: none;
+   text-align: right;
+}
+
+/* IOS-style clear button for text inputs */
+.editable-clear-x {
+   background: url('../img/clear.png') center center no-repeat;
+   display: block;
+   width: 13px;    
+   height: 13px;
+   position: absolute;
+   opacity: 0.6;
+   z-index: 100;
+   
+   top: 50%;
+   right: 6px;
+   margin-top: -6px;
+   
+}
+
+.editable-clear-x:hover {
+   opacity: 1;
+}
+
+.editable-pre-wrapped {
+   white-space: pre-wrap;
+}
+.editable-container.editable-popup {
+    max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
+}  
+
+.editable-container.popover {
+    width: auto; /* without this rule popover does not stretch */
+}
+
+.editable-container.editable-inline {
+    display: inline-block; 
+    vertical-align: middle;
+    width: auto;
+    /* inline-block emulation for IE7*/
+    zoom: 1; 
+    *display: inline;    
+}
+
+.editable-container.ui-widget {
+   font-size: inherit;  /* jqueryui widget font 1.1em too big, overwrite it */
+   z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
+}
+.editable-click, 
+a.editable-click, 
+a.editable-click:hover {
+    text-decoration: none;
+    border-bottom: dashed 1px #0088cc;
+}
+
+.editable-click.editable-disabled, 
+a.editable-click.editable-disabled, 
+a.editable-click.editable-disabled:hover {
+   color: #585858;  
+   cursor: default;
+   border-bottom: none;
+}
+
+.editable-empty, .editable-empty:hover, .editable-empty:focus{
+  font-style: italic; 
+  color: #DD1144;  
+  /* border-bottom: none; */
+  text-decoration: none;
+}
+
+.editable-unsaved {
+  font-weight: bold; 
+}
+
+.editable-unsaved:after {
+/*    content: '*'*/
+}
+
+.editable-bg-transition {
+  -webkit-transition: background-color 1400ms ease-out;
+  -moz-transition: background-color 1400ms ease-out;
+  -o-transition: background-color 1400ms ease-out;
+  -ms-transition: background-color 1400ms ease-out;
+  transition: background-color 1400ms ease-out;  
+}
+
+/*see https://github.com/vitalets/x-editable/issues/139 */
+.form-horizontal .editable
+{ 
+    padding-top: 5px;
+    display:inline-block;
+}
+
+
+/*!
+ * Datepicker for Bootstrap
+ *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+.datepicker {
+  padding: 4px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  direction: ltr;
+  /*.dow {
+		border-top: 1px solid #ddd !important;
+	}*/
+
+}
+.datepicker-inline {
+  width: 220px;
+}
+.datepicker.datepicker-rtl {
+  direction: rtl;
+}
+.datepicker.datepicker-rtl table tr td span {
+  float: right;
+}
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker.days div.datepicker-days {
+  display: block;
+}
+.datepicker.months div.datepicker-months {
+  display: block;
+}
+.datepicker.years div.datepicker-years {
+  display: block;
+}
+.datepicker table {
+  margin: 0;
+}
+.datepicker td,
+.datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  border: none;
+}
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}
+.datepicker table tr td.day:hover {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker table tr td.old,
+.datepicker table tr td.new {
+  color: #999999;
+}
+.datepicker table tr td.disabled,
+.datepicker table tr td.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td.today,
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today.disabled:hover {
+  background-color: #fde19a;
+  background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
+  background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
+  background-image: linear-gradient(top, #fdd49a, #fdf59a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
+  border-color: #fdf59a #fdf59a #fbed50;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #000;
+}
+.datepicker table tr td.today:hover,
+.datepicker table tr td.today:hover:hover,
+.datepicker table tr td.today.disabled:hover,
+.datepicker table tr td.today.disabled:hover:hover,
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active,
+.datepicker table tr td.today.disabled,
+.datepicker table tr td.today:hover.disabled,
+.datepicker table tr td.today.disabled.disabled,
+.datepicker table tr td.today.disabled:hover.disabled,
+.datepicker table tr td.today[disabled],
+.datepicker table tr td.today:hover[disabled],
+.datepicker table tr td.today.disabled[disabled],
+.datepicker table tr td.today.disabled:hover[disabled] {
+  background-color: #fdf59a;
+}
+.datepicker table tr td.today:active,
+.datepicker table tr td.today:hover:active,
+.datepicker table tr td.today.disabled:active,
+.datepicker table tr td.today.disabled:hover:active,
+.datepicker table tr td.today.active,
+.datepicker table tr td.today:hover.active,
+.datepicker table tr td.today.disabled.active,
+.datepicker table tr td.today.disabled:hover.active {
+  background-color: #fbf069 \9;
+}
+.datepicker table tr td.today:hover:hover {
+  color: #000;
+}
+.datepicker table tr td.today.active:hover {
+  color: #fff;
+}
+.datepicker table tr td.range,
+.datepicker table tr td.range:hover,
+.datepicker table tr td.range.disabled,
+.datepicker table tr td.range.disabled:hover {
+  background: #eeeeee;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today,
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today.disabled:hover {
+  background-color: #f3d17a;
+  background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
+  background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
+  background-image: linear-gradient(top, #f3c17a, #f3e97a);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
+  border-color: #f3e97a #f3e97a #edde34;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.datepicker table tr td.range.today:hover,
+.datepicker table tr td.range.today:hover:hover,
+.datepicker table tr td.range.today.disabled:hover,
+.datepicker table tr td.range.today.disabled:hover:hover,
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active,
+.datepicker table tr td.range.today.disabled,
+.datepicker table tr td.range.today:hover.disabled,
+.datepicker table tr td.range.today.disabled.disabled,
+.datepicker table tr td.range.today.disabled:hover.disabled,
+.datepicker table tr td.range.today[disabled],
+.datepicker table tr td.range.today:hover[disabled],
+.datepicker table tr td.range.today.disabled[disabled],
+.datepicker table tr td.range.today.disabled:hover[disabled] {
+  background-color: #f3e97a;
+}
+.datepicker table tr td.range.today:active,
+.datepicker table tr td.range.today:hover:active,
+.datepicker table tr td.range.today.disabled:active,
+.datepicker table tr td.range.today.disabled:hover:active,
+.datepicker table tr td.range.today.active,
+.datepicker table tr td.range.today:hover.active,
+.datepicker table tr td.range.today.disabled.active,
+.datepicker table tr td.range.today.disabled:hover.active {
+  background-color: #efe24b \9;
+}
+.datepicker table tr td.selected,
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected.disabled:hover {
+  background-color: #9e9e9e;
+  background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
+  background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
+  background-image: -o-linear-gradient(top, #b3b3b3, #808080);
+  background-image: linear-gradient(top, #b3b3b3, #808080);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
+  border-color: #808080 #808080 #595959;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.selected:hover,
+.datepicker table tr td.selected:hover:hover,
+.datepicker table tr td.selected.disabled:hover,
+.datepicker table tr td.selected.disabled:hover:hover,
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active,
+.datepicker table tr td.selected.disabled,
+.datepicker table tr td.selected:hover.disabled,
+.datepicker table tr td.selected.disabled.disabled,
+.datepicker table tr td.selected.disabled:hover.disabled,
+.datepicker table tr td.selected[disabled],
+.datepicker table tr td.selected:hover[disabled],
+.datepicker table tr td.selected.disabled[disabled],
+.datepicker table tr td.selected.disabled:hover[disabled] {
+  background-color: #808080;
+}
+.datepicker table tr td.selected:active,
+.datepicker table tr td.selected:hover:active,
+.datepicker table tr td.selected.disabled:active,
+.datepicker table tr td.selected.disabled:hover:active,
+.datepicker table tr td.selected.active,
+.datepicker table tr td.selected:hover.active,
+.datepicker table tr td.selected.disabled.active,
+.datepicker table tr td.selected.disabled:hover.active {
+  background-color: #666666 \9;
+}
+.datepicker table tr td.active,
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td.active:hover,
+.datepicker table tr td.active:hover:hover,
+.datepicker table tr td.active.disabled:hover,
+.datepicker table tr td.active.disabled:hover:hover,
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active,
+.datepicker table tr td.active.disabled,
+.datepicker table tr td.active:hover.disabled,
+.datepicker table tr td.active.disabled.disabled,
+.datepicker table tr td.active.disabled:hover.disabled,
+.datepicker table tr td.active[disabled],
+.datepicker table tr td.active:hover[disabled],
+.datepicker table tr td.active.disabled[disabled],
+.datepicker table tr td.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td.active:active,
+.datepicker table tr td.active:hover:active,
+.datepicker table tr td.active.disabled:active,
+.datepicker table tr td.active.disabled:hover:active,
+.datepicker table tr td.active.active,
+.datepicker table tr td.active:hover.active,
+.datepicker table tr td.active.disabled.active,
+.datepicker table tr td.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker table tr td span:hover {
+  background: #eeeeee;
+}
+.datepicker table tr td span.disabled,
+.datepicker table tr td span.disabled:hover {
+  background: none;
+  color: #999999;
+  cursor: default;
+}
+.datepicker table tr td span.active,
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active.disabled:hover {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.datepicker table tr td span.active:hover,
+.datepicker table tr td span.active:hover:hover,
+.datepicker table tr td span.active.disabled:hover,
+.datepicker table tr td span.active.disabled:hover:hover,
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active,
+.datepicker table tr td span.active.disabled,
+.datepicker table tr td span.active:hover.disabled,
+.datepicker table tr td span.active.disabled.disabled,
+.datepicker table tr td span.active.disabled:hover.disabled,
+.datepicker table tr td span.active[disabled],
+.datepicker table tr td span.active:hover[disabled],
+.datepicker table tr td span.active.disabled[disabled],
+.datepicker table tr td span.active.disabled:hover[disabled] {
+  background-color: #0044cc;
+}
+.datepicker table tr td span.active:active,
+.datepicker table tr td span.active:hover:active,
+.datepicker table tr td span.active.disabled:active,
+.datepicker table tr td span.active.disabled:hover:active,
+.datepicker table tr td span.active.active,
+.datepicker table tr td span.active:hover.active,
+.datepicker table tr td span.active.disabled.active,
+.datepicker table tr td span.active.disabled:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker table tr td span.old,
+.datepicker table tr td span.new {
+  color: #999999;
+}
+.datepicker th.datepicker-switch {
+  width: 145px;
+}
+.datepicker thead tr:first-child th,
+.datepicker tfoot tr th {
+  cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover,
+.datepicker tfoot tr th:hover {
+  background: #eeeeee;
+}
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+.datepicker thead tr:first-child th.cw {
+  cursor: default;
+  background-color: transparent;
+}
+.input-append.date .add-on i,
+.input-prepend.date .add-on i {
+  display: block;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+}
+.input-daterange input {
+  text-align: center;
+}
+.input-daterange input:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-daterange input:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-daterange .add-on {
+  display: inline-block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+  margin-left: -5px;
+  margin-right: -5px;
+}

img.data/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+

inc/version.inc

@@ -23,5 +23,5 @@
  */
 
 define('AUTOR', 'Ricardo Montañana Gómez');
-define('VERSION', '1.08');
+define('VERSION', '1.091');
 ?>

plant/bootstrap.html

@@ -81,5 +81,6 @@
         <script type="text/javascript" src="./css/bootstrap-datetimepicker.es.js"></script>
         <script type="text/javascript" src="./css/jquery.simplecolorpicker.js"></script>
         <script type="text/javascript" src="./css/jasny-bootstrap.min.js"></script>
+        <script src="css/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
     </body>
 </html>

sql/inv-iso.sql

@@ -15,23 +15,6 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
---
--- Table structure for table `Articulos`
---
-
-DROP TABLE IF EXISTS `Articulos`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Articulos` (
-  `id` smallint(6) NOT NULL auto_increment,
-  `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
-  `marca` varchar(20) default NULL COMMENT 'ordenable',
-  `modelo` varchar(20) default NULL COMMENT 'ordenable',
-  `cantidad` int(11) default NULL COMMENT 'ordenable',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=785 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Articulos`
 --
@@ -42,29 +25,6 @@ INSERT INTO `Articulos` VALUES (589,'Armario con puertas y cajones','M. E. C.','
 /*!40000 ALTER TABLE `Articulos` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Elementos`
---
-
-DROP TABLE IF EXISTS `Elementos`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Elementos` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
-  `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-  `numserie` varchar(30) default NULL COMMENT 'ordenable',
-  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
-  `fechaCompra` date NOT NULL COMMENT 'ordenable',
-  PRIMARY KEY  (`id`),
-  KEY `id` (`id`),
-  KEY `id_Articulo` (`id_Articulo`),
-  KEY `id_Ubicacion` (`id_Ubicacion`),
-  CONSTRAINT `Elementos_ibfk_1` FOREIGN KEY (`id_Articulo`) REFERENCES `Articulos` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `Elementos_ibfk_2` FOREIGN KEY (`id_Ubicacion`) REFERENCES `Ubicaciones` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1884 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Elementos`
 --
@@ -75,20 +35,6 @@ INSERT INTO `Elementos` VALUES (1414,589,140,'',1,'2004-12-07 00:00:00'),(1415,5
 /*!40000 ALTER TABLE `Elementos` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Ubicaciones`
---
-
-DROP TABLE IF EXISTS `Ubicaciones`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Ubicaciones` (
-  `id` smallint(5) unsigned NOT NULL auto_increment,
-  `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,link/Ubicacion',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Ubicaciones`
 --
@@ -99,30 +45,6 @@ INSERT INTO `Ubicaciones` VALUES (140,'Secretario'),(141,'Aula Althia'),(142,'Al
 /*!40000 ALTER TABLE `Ubicaciones` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Usuarios`
---
-
-DROP TABLE IF EXISTS `Usuarios`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Usuarios` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `nombre` varchar(16) NOT NULL default '',
-  `clave` varchar(32) NOT NULL default '',
-  `idSesion` varchar(20) NOT NULL default '',
-  `alta` tinyint(1) NOT NULL default '0',
-  `modificacion` tinyint(1) NOT NULL default '0',
-  `borrado` tinyint(1) NOT NULL default '0',
-  `consulta` tinyint(1) NOT NULL default '1',
-  `informe` tinyint(1) NOT NULL default '1',
-  `usuarios` tinyint(1) NOT NULL default '0',
-  `config` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `nombre` (`nombre`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Usuarios`
 --
@@ -133,28 +55,7 @@ INSERT INTO `Usuarios` VALUES (2,'admin','galeote','s3LUSqxg{s',1,1,1,1,1,1,1),(
 /*!40000 ALTER TABLE `Usuarios` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `test`
---
 
-DROP TABLE IF EXISTS `test`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `test` (
-  `id` smallint(6) NOT NULL auto_increment,
-  `Descripcion` varchar(30) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `test`
---
-
-LOCK TABLES `test` WRITE;
-/*!40000 ALTER TABLE `test` DISABLE KEYS */;
-/*!40000 ALTER TABLE `test` ENABLE KEYS */;
-UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

sql/inv-utf.sql

@@ -15,24 +15,6 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
---
--- Table structure for table `Articulos`
---
-
-DROP TABLE IF EXISTS `Articulos`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Articulos` (
-  `id` smallint(6) NOT NULL auto_increment COMMENT 'ordenable',
-  `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
-  `marca` varchar(20) default NULL COMMENT 'ordenable',
-  `modelo` varchar(20) default NULL COMMENT 'ordenable',
-  `cantidad` int(11) default NULL COMMENT 'ordenable',
-  `imagen` varchar(45) DEFAULT NULL COMMENT 'imagen',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=785 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Articulos`
 --
@@ -43,30 +25,6 @@ INSERT INTO `Articulos` (id, descripcion, marca, modelo, cantidad) VALUES (589,'
 /*!40000 ALTER TABLE `Articulos` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Elementos`
---
-
-DROP TABLE IF EXISTS `Elementos`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Elementos` (
-  `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-  `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
-  `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-  `numserie` varchar(30) default NULL COMMENT 'ordenable',
-  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
-  `fechaCompra` date NOT NULL COMMENT 'ordenable',
-  `imagen` varchar(45) DEFAULT NULL COMMENT 'imagen',
-  PRIMARY KEY  (`id`),
-  KEY `id` (`id`),
-  KEY `id_Articulo` (`id_Articulo`),
-  KEY `id_Ubicacion` (`id_Ubicacion`),
-  CONSTRAINT `Elementos_ibfk_1` FOREIGN KEY (`id_Articulo`) REFERENCES `Articulos` (`id`) ON DELETE CASCADE,
-  CONSTRAINT `Elementos_ibfk_2` FOREIGN KEY (`id_Ubicacion`) REFERENCES `Ubicaciones` (`id`) ON UPDATE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=1884 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Elementos`
 --
@@ -77,21 +35,6 @@ INSERT INTO `Elementos` (id, id_Articulo, id_Ubicacion, numserie, cantidad, fech
 /*!40000 ALTER TABLE `Elementos` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Ubicaciones`
---
-
-DROP TABLE IF EXISTS `Ubicaciones`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Ubicaciones` (
-  `id` smallint(5) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-  `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,link/Ubicacion',
-  `imagen` varchar(45) DEFAULT NULL COMMENT 'imagen',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Ubicaciones`
 --
@@ -102,30 +45,6 @@ INSERT INTO `Ubicaciones` (id,descripcion) VALUES (140,'Secretario'),(141,'Aula
 /*!40000 ALTER TABLE `Ubicaciones` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `Usuarios`
---
-
-DROP TABLE IF EXISTS `Usuarios`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `Usuarios` (
-  `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-  `nombre` varchar(16) NOT NULL default '',
-  `clave` varchar(32) NOT NULL default '',
-  `idSesion` varchar(20) NOT NULL default '',
-  `alta` tinyint(1) NOT NULL default '0',
-  `modificacion` tinyint(1) NOT NULL default '0',
-  `borrado` tinyint(1) NOT NULL default '0',
-  `consulta` tinyint(1) NOT NULL default '1',
-  `informe` tinyint(1) NOT NULL default '1',
-  `usuarios` tinyint(1) NOT NULL default '0',
-  `config` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `nombre` (`nombre`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
 --
 -- Dumping data for table `Usuarios`
 --
@@ -136,28 +55,6 @@ INSERT INTO `Usuarios` VALUES (2,'admin','galeote','s3LUSqxg{s',1,1,1,1,1,1,1),(
 /*!40000 ALTER TABLE `Usuarios` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `test`
---
-
-DROP TABLE IF EXISTS `test`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `test` (
-  `id` smallint(6) NOT NULL auto_increment,
-  `Descripcion` varchar(30) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `test`
---
-
-LOCK TABLES `test` WRITE;
-/*!40000 ALTER TABLE `test` DISABLE KEYS */;
-/*!40000 ALTER TABLE `test` ENABLE KEYS */;
-UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

sql/setup.sql

@@ -24,9 +24,9 @@ SET character_set_client = utf8;
 CREATE TABLE `Articulos` (
   `id` smallint(6) NOT NULL auto_increment COMMENT 'ordenable',
   `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
-  `marca` varchar(20) default NULL COMMENT 'ordenable',
-  `modelo` varchar(20) default NULL COMMENT 'ordenable',
-  `cantidad` int(11) default NULL COMMENT 'ordenable',
+  `marca` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+  `modelo` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+  `cantidad` int(11) default NULL COMMENT 'ordenable,ajax/number',
   `imagen` varchar(45) default NULL COMMENT 'imagen',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=785 DEFAULT CHARSET=utf8;
@@ -44,9 +44,9 @@ CREATE TABLE `Elementos` (
   `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
   `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
   `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-  `numserie` varchar(30) default NULL COMMENT 'ordenable',
-  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
-  `fechaCompra` date NOT NULL COMMENT 'ordenable',
+  `numserie` varchar(30) default NULL COMMENT 'ordenable,ajax/text',
+  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable,ajax/number',
+  `fechaCompra` date NOT NULL COMMENT 'ordenable,ajax/combodate',
   `imagen` varchar(45) default NULL COMMENT 'imagen',
   PRIMARY KEY  (`id`),
   KEY `id` (`id`),
@@ -83,9 +83,9 @@ SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `Usuarios` (
   `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-  `nombre` varchar(16) NOT NULL default '',
-  `clave` varchar(32) NOT NULL default '',
-  `idSesion` varchar(20) NOT NULL default '',
+  `nombre` varchar(16) NOT NULL default '' COMMENT 'ajax/text',
+  `clave` varchar(32) NOT NULL default '' COMMENT 'ajax/text',
+  `idSesion` varchar(20) NOT NULL default '' COMMENT 'ajax/text',
   `alta` tinyint(1) NOT NULL default '0',
   `modificacion` tinyint(1) NOT NULL default '0',
   `borrado` tinyint(1) NOT NULL default '0',

tmp/.gitignore

@@ -0,0 +1,5 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
+

xml/mantenimientoElementos.xml

@@ -3,19 +3,21 @@
     <Titulo>Mantenimiento de Elementos</Titulo>
     <Consulta>
             SELECT SQL_CALC_FOUND_ROWS E.id as id,U.Descripcion as ubicacion,A.Descripcion as articulo,A.Marca as marca,A.Modelo as modelo,E.numserie as numserie,
-            DATE_FORMAT(E.fechacompra, '%d/%m/%Y') as fechaCompra,E.cantidad as cantidad, E.imagen as imagen
+            DATE_FORMAT(E.fechacompra, '%d/%m/%Y') as fechaCompra,E.cantidad as cantidad, E.imagen as imagen, A.id as idArticulos, U.id as idUbicaciones
             FROM Elementos E inner join Articulos A on E.id_articulo=A.id inner join 
             Ubicaciones U on E.id_ubicacion=U.id  {buscar} {orden} limit {inferior},{superior};
     </Consulta>
     <Campos>
-        <Col Campo="id" Nombre="id" Ancho="5" Ajuste="D" Titulo="id" Tipo="smallint(6)" Varios="ordenable"/>
-        <Col Campo="id_Ubicacion" Nombre="ubicacion" Ancho="40" Ajuste="L" Titulo="Ubicación" Varios="ordenable,foreign(Ubicaciones->id;{Descripcion})" Editable="si"/>
-        <Col Campo="id_Articulo" Nombre="articulo" Ancho="40" Ajuste="L" Titulo="Artículo" Varios="ordenable,buscable/A.Descripcion,foreign(Articulos->id;{Descripcion/Marca/Modelo})" Editable="si"/>
-        <Col Nombre="marca" Ancho="40" Ajuste="L" Titulo="Marca" Varios="ordenable" Editable="no"/>
-        <Col Nombre="modelo" Ancho="40" Ajuste="L" Titulo="Modelo" Varios="ordenable" Editable="no"/>
-        <Col Campo="numserie" Nombre="numserie" Ancho="30" Ajuste="L" Titulo="Nº Serie" Varios="ordenable" Editable="si"/>
-        <Col Campo="fechaCompra" Nombre="fechaCompra" Ancho="25" Ajuste="L" Titulo="Compra" Varios="ordenable" Tipo="fecha" Editable="si"/>
-        <Col Campo="cantidad" Nombre="cantidad" Ancho="15" Ajuste="D" Titulo="Cant."  Tipo="Int(11)" Editable="si"/>
-        <Col Campo="imagen" Nombre="imagen" Ancho="10" Titulo="Imagen" Tipo="imagen" Editable="si" Varios="imagen"/>
+        <Col Campo="id" Nombre="id" Ancho="5" Ajuste="D" Titulo="id" Tipo="smallint(6)" Varios="ordenable" Visible="si"/>
+        <Col Campo="id_Ubicacion" Nombre="ubicacion" Ancho="40" Ajuste="L" Titulo="Ubicación" Visible="si" Varios="ordenable,foreign(Ubicaciones->id;{Descripcion}),ajax/select-Ubicaciones" Editable="si"/>
+        <Col Campo="id_Articulo" Nombre="articulo" Ancho="40" Ajuste="L" Titulo="Artículo" Visible="si" Varios="ordenable,buscable/A.Descripcion,foreign(Articulos->id;{Descripcion/Marca/Modelo}),ajax/select-Articulos" Editable="si"/>
+        <Col Nombre="marca" Ancho="40" Ajuste="L" Titulo="Marca" Varios="ordenable" Editable="no" Visible="si"/>
+        <Col Nombre="modelo" Ancho="40" Ajuste="L" Titulo="Modelo" Varios="ordenable" Editable="no" Visible="si"/>
+        <Col Campo="numserie" Nombre="numserie" Ancho="30" Ajuste="L" Titulo="Nº Serie" Visible="si" Varios="ordenable,ajax/text" Editable="si"/>
+        <Col Campo="fechaCompra" Nombre="fechaCompra" Ancho="25" Ajuste="L" Titulo="Compra" Visible="si" Varios="ordenable,ajax/combodate" Tipo="fecha" Editable="si"/>
+        <Col Campo="cantidad" Nombre="cantidad" Ancho="15" Ajuste="D" Titulo="Cant."  Tipo="Int(11)" Visible="si" Editable="si" Varios="ajax/number"/>
+        <Col Campo="imagen" Nombre="imagen" Ancho="10" Titulo="Imagen" Tipo="imagen" Editable="si" Visible="si" Varios="imagen"/>
+        <Col Campo="idUbicaciones" Nombre="idUbicaciones" Ancho="10" Titulo="idUbicaciones" Tipo="int" Editable="no" Visible="no" Varios=""/>
+        <Col Campo="idArticulos" Nombre="idArticulos" Ancho="10" Titulo="idArticulos" Tipo="int" Editable="no" Visible="no" Varios=""/>
     </Campos>
 </Mantenimiento>

xml/mantenimientoUsuarios.xml

@@ -7,9 +7,9 @@
     </Consulta>
     <Campos>
         <Col Campo="id" Nombre="id" Ancho="5" Ajuste="D" Titulo="id" Tipo="int(6)" Varios="ordenable"/>
-        <Col Campo="nombre" Nombre="nombre" Ancho="8" Ajuste="L" Titulo="Nombre" Varios="ordenable,buscable/nombre" Editable="si"/>
-        <Col Campo="clave" Nombre="clave" Ancho="16" Ajuste="L" Titulo="Clave" Tipo="Password" Editable="si"/>
-        <Col Campo="idSesion" Nombre="idSesion" Ancho="32" Ajuste="L" Titulo="id Sesión" Editable="si"/>
+        <Col Campo="nombre" Nombre="nombre" Ancho="8" Ajuste="L" Titulo="Nombre" Varios="ordenable,buscable/nombre,ajax/text" Editable="si"/>
+        <Col Campo="clave" Nombre="clave" Ancho="16" Ajuste="L" Titulo="Clave" Tipo="Password" Editable="si" Varios="ajax/text"/>
+        <Col Campo="idSesion" Nombre="idSesion" Ancho="32" Ajuste="L" Titulo="id Sesión" Editable="si" Varios="ajax/text"/>
         <Col Campo="alta" Nombre="alta" Ancho="1" Ajuste="R" Tipo="Boolean" Titulo="Altas" Editable="si"/>
         <Col Campo="modificacion" Nombre="modificacion" Ancho="1" Ajuste="R" Tipo="Boolean" Titulo="Modificaciones" Editable="si"/>
         <Col Campo="borrado" Nombre="borrado" Ancho="1" Ajuste="R" Tipo="Boolean" Titulo="Borrados" Editable="si"/>