Gabriel/Inventario_material_v1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

consulta toner busqueda terminado falta solicitud y usuario

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-24 16:57:29 -06:00
parent 514d818da2
commit 78db293038
10 changed files with 232 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/sqldialects.xml
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="PROJECT" dialect="MariaDB" />
</component>
</project>
.idea/workspace.xml
Generated
+118 -72
View File
@@ -2,9 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/sitio/admin/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/busqueda.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mysql/procedures.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -12,13 +18,48 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
<option name="HIDDEN_KINDS">
<set />
</option>
<expand />
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conexion.php">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
<state relative-caret-position="44">
<caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="n#style#0;n#td#6;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -69,18 +110,22 @@
<option value="$PROJECT_DIR$/sitio/admin/spapel.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/usuario/alta.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/usuario/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/footer.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/mysql/procedures.sql" />
<option value="$PROJECT_DIR$/sitio/admin/php/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
</list>
</option>
</component>
@@ -91,9 +136,9 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1697" />
<option name="y" value="-23" />
<option name="width" value="1278" />
<option name="x" value="1358" />
<option name="y" value="-8" />
<option name="width" value="1364" />
<option name="height" value="743" />
</component>
<component name="ProjectView">
@@ -123,14 +168,8 @@
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
<item name="solicitud" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -145,18 +184,18 @@
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
<property name="settings.editor.selected.configurable" value="SQL Dialects" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\xampp\htdocs\Inventario\sitio\usuario" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\solicitud" />
<recent name="C:\xampp\htdocs\Inventario\sitio\admin" />
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\php" />
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\solicitud" />
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\js" />
<recent name="C:\xampp\htdocs\inventario" />
<recent name="C:\xampp\htdocs\inventario\SQL" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\xampp\htdocs\Inventario\sitio\usuario" />
</key>
</component>
<component name="RunDashboard">
@@ -197,22 +236,23 @@
<workItem from="1547845757877" duration="5554000" />
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="13059000" />
<workItem from="1548276662999" duration="16891000" />
<workItem from="1548350597375" duration="8303000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="130248000" />
<option name="totallyTimeSpent" value="142383000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.1723301" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.16262136" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="0" weight="0.3295325" />
<window_info anchor="bottom" id="Database Changes" order="1" />
<window_info anchor="bottom" id="Database Changes" order="1" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="3" weight="0.3295325" />
<window_info anchor="bottom" id="Docker" order="4" show_stripe_button="false" />
@@ -283,13 +323,6 @@
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
@@ -318,13 +351,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php" />
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
@@ -346,13 +373,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -407,36 +427,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="20" column="14" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#5;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="88">
<caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mysql/procedures.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_p.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="77" lean-forward="true" selection-start-line="22" selection-start-column="77" selection-end-line="22" selection-end-column="77" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="948">
<caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
<state relative-caret-position="44">
<caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
<state relative-caret-position="154">
<caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="n#style#0;n#td#6;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
conexion.php
+4 -4
View File
@@ -3,22 +3,22 @@
* conexion a viper
* */
/*
$mysqli = new mysqli("132.248.80.194",
"usr_inv_material",
"tint4sBond",
"P_orion_inventario_material");
*/
/*
* conexion local
* */
/*
$mysqli = new mysqli("localhost",
"blender",
"avatares1",
"inventario");
*/
if($mysqli->connect_errno):
echo "Error al conectarse con MYSQL por el error " .$mysqli->connect_error;
endif;
mysql/procedures.sql
+8
View File
@@ -0,0 +1,8 @@
select
a.id_impresora_inventario,c.impresora,a.inventario,d.color,d.modelo,d.clave,d.cantidad
from impresora_inventario a
inner join impresora_toner b
on(a.id_impresora_inventario=b.id_impresora_inventario)
inner join cat_impresora c on(a.id_impresora=c.id_impresora)
inner join toner_entrada d on(d.id_toner=b.id_toner);
sitio/admin/admin.php
+11 -2
View File
@@ -10,6 +10,7 @@
{
header("Location: ../../index.php");
}
require "../../conexion.php";
?>
<html lang="es">
@@ -92,7 +93,14 @@
<article id="tab2">
<h1>Nosotros</h1>
<div class="form-1-2">
<input placeholder="Buscar..." style="width: 30%;" class="form-control" type="text" name="caja_busqueda_t" id="caja_busqueda_t">
</div>
<br>
<div id="datos_t">
</div>
</article>
@@ -129,6 +137,7 @@
<script src="../../js/jquery-3.3.1.min.js"></script>
<script src="../../js/main.js"></script>
<script src="js/secciones.js"></script>
<script src="js/busqueda.js"></script>
<script src="js/busqueda_p.js"></script>
<script src="js/busqueda_t.js"></script>
</body>
</html>
sitio/admin/busqueda.php → sitio/admin/busqueda_p.php
View File
sitio/admin/busqueda_t.php
+53
View File
@@ -0,0 +1,53 @@
<?php
session_start();
require "../../conexion.php";
if($mysqli->connect_error){
die("Conexión fallida: ".$mysqli->connect_error);
}
$salida = "";
$query = "CALL sp_muestra_toner;";
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "CALL sp_busqueda_t('%$q%');";
}
$resultado = $mysqli->query($query);
if($resultado->num_rows > 0){
$salida.="<table class='tabla_datos table'>
<thead class='table-primary'>
<tr>
<td style=\"text-align:center;\">Impresora</td>
<td style=\"text-align:center;\">Inventario</td>
<td style=\"text-align:center;\">Color</td>
<td style=\"text-align:center;\">Modelo</td>
<td style=\"text-align:center;\">Clave</td>
<td style=\"text-align:center;\">Existencia</td>
<td style=\"text-align:center;\">Operacion</td>
</tr>
</thead>
</tbody>";
while($fila = $resultado->fetch_assoc()){
$salida.="<tr>
<td>".$fila['impresora']."</td>
<td style=\"text-align:center;\">".$fila['inventario']."</td>
<td style=\"text-align:center;\">".$fila['color']."</td>
<td style=\"text-align:center;\">".$fila['modelo']."</td>
<td style=\"text-align:center;\">".$fila['clave']."</td>
<td style=\"text-align:center;\">".$fila['cantidad']."</td>
<td style=\"text-align:center;\"> <a href='solicitud/stoner.php?id=".$fila['id_impresora_inventario']."'>Solicitar</a></td>
<tr>";
}
$salida.="</tbody></table>";
}
else{
$salida.= "No hay datos que coincidan con tu busqueda";
}
echo $salida;
$mysqli->close();
?>
sitio/admin/js/busqueda.js → sitio/admin/js/busqueda_p.js
+1 -1
View File
@@ -2,7 +2,7 @@ $(buscar_datos());
function buscar_datos(consulta){
$.ajax({
url: 'busqueda.php',
url: 'busqueda_p.php',
type: 'POST',
dataType: 'html',
data: {consulta: consulta},
sitio/admin/js/busqueda_t.js
+30
View File
@@ -0,0 +1,30 @@
console.log("entro");
$(buscar_datos());
function buscar_datos(consulta){
$.ajax({
url: 'busqueda_t.php',
type: 'POST',
dataType: 'html',
data: {consulta: consulta},
})
.done(function (respuesta) {
$('#datos_t').html(respuesta);
})
.fail(function () {
console.log("error");
})
}
$(document).on('keyup','#caja_busqueda_t', function(){
var valor = $(this).val();
if (valor != "") {
buscar_datos(valor);
}else{
buscar_datos();
}
});
sitio/usuario/js/busqueda.js
+1 -1
View File
@@ -3,7 +3,7 @@ console.log("corre");
function buscar_datos(consulta){
$.ajax({
url: 'busqueda.php',
url: 'busqueda_p.php',
type: 'POST',
dataType: 'html',
data: {consulta: consulta},