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

consulta toner busqueda terminado falta solicitud y usuario3

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-24 19:32:13 -06:00
parent 777f311279
commit e17ff6e9f6
6 changed files with 119 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+63 -44
View File
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" line="2" mnemonic="7" />
</component>
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<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/busqueda_p.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -29,17 +37,20 @@
<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="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 relative-caret-position="287">
<caret line="85" column="18" lean-forward="true" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_p.php">
<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 relative-caret-position="216">
<caret line="9" column="44" lean-forward="true" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
<folding>
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -47,20 +58,26 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="82">
<caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
<folding>
<element signature="n#style#0;n#td#6;n#tr#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="198">
<caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conexion.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
</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="396">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
</state>
</provider>
</entry>
@@ -123,10 +140,12 @@
<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" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_p.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" />
</list>
</option>
</component>
@@ -137,9 +156,9 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1358" />
<option name="y" value="-8" />
<option name="width" value="1364" />
<option name="x" value="1297" />
<option name="y" value="-16" />
<option name="width" value="1278" />
<option name="height" value="743" />
</component>
<component name="ProjectView">
@@ -238,12 +257,12 @@
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="16891000" />
<workItem from="1548350597375" duration="8555000" />
<workItem from="1548350597375" duration="16313000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="142635000" />
<option name="totallyTimeSpent" value="150393000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -442,48 +461,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_p.php">
<entry file="file://$PROJECT_DIR$/conexion.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 relative-caret-position="242">
<caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<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$/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 relative-caret-position="287">
<caret line="85" column="18" lean-forward="true" selection-start-line="85" selection-start-column="18" selection-end-line="85" selection-end-column="18" />
</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="82">
<caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
<state relative-caret-position="198">
<caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
</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="216">
<caret line="9" column="44" lean-forward="true" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
<folding>
<element signature="n#style#0;n#td#6;n#tr#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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<state relative-caret-position="81">
<caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
</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;
sitio/admin/busqueda_p.php
+4 -3
View File
@@ -7,13 +7,14 @@ require "../../conexion.php";
$salida = "";
$query = "CALL sp_despliega_papel;";
$query = "CALL st_despliega_papel('');";
print_r($_POST);
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "CALL sp_busqueda('%$q%');";
$query = "CALL st_despliega_papel('%$q%');";
}
$resultado = $mysqli->query($query);
if($resultado->num_rows > 0){
$salida.="<table class='tabla_datos table'>
<thead class='table-primary'>
sitio/admin/busqueda_t.php
+11 -10
View File
@@ -1,19 +1,20 @@
<?php
session_start();
require "../../conexion.php";
if($mysqli->connect_error){
die("Conexión fallida: ".$mysqli->connect_error);
}
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%');";
}
$salida = "";
$query = "CALL st_muestra_toner('');";
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "CALL st_muestra_toner('%$q%');";
}
$resultado = $mysqli->query($query);
$resultado = $mysqli->query($query);
if($resultado->num_rows > 0){
$salida.="<table class='tabla_datos table'>
<thead class='table-primary'>
sitio/admin/js/busqueda_p.js
+37 -6
View File
@@ -1,6 +1,6 @@
$(buscar_datos());
$(buscar_datos_p());
function buscar_datos(consulta){
function buscar_datos_p(consulta){
$.ajax({
url: 'busqueda_p.php',
type: 'POST',
@@ -9,7 +9,6 @@ function buscar_datos(consulta){
})
.done(function (respuesta) {
$('#datos').html(respuesta);
})
.fail(function () {
@@ -20,9 +19,41 @@ function buscar_datos(consulta){
$(document).on('keyup','#caja_busqueda', function(){
var valor = $(this).val();
console.log(valor);
if (valor != "") {
buscar_datos(valor);
buscar_datos_p(valor);
}else{
buscar_datos();
buscar_datos_p();
}
});
});
/*
//funcion global
var buscar = function(consulta){
$.ajax({
url: 'busqueda_p.php',
type: 'POST',
dataType: 'html',
data: {consulta: consulta, text:'asd'},
})
.done(function (respuesta) {
$('#datos').html(respuesta);
console.log(respuesta)
})
.fail(function () {
console.log("error");
})
}
buscar()
let input = document.getElementById('caja_busqueda')
input.addEventListener("keyup",function(){
if (input.value == ""){
buscar()
}else{
console.log("lleno")
buscar(input.value)
}
})*/
sitio/admin/js/busqueda_t.js
-2
View File
@@ -1,5 +1,3 @@
console.log("entro");
$(buscar_datos());
function buscar_datos(consulta){