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

empezando con toner

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-23 19:51:07 -06:00
parent 17b5c539b0
commit 514d818da2
4 changed files with 128 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+124 -162
View File
@@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.php" afterDir="false" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -12,91 +14,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="588">
<caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="16" selection-start-column="16" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="55" column="25" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
<folding>
<element signature="n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
<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>
</provider>
</entry>
@@ -134,7 +56,6 @@
<option value="$PROJECT_DIR$/js/o.js" />
<option value="$PROJECT_DIR$/js/jquery-3.3.1.min.js" />
<option value="$PROJECT_DIR$/SQL/conexion.php" />
<option value="$PROJECT_DIR$/footer.php" />
<option value="$PROJECT_DIR$/destroy.php" />
<option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/sitio/alta.php" />
@@ -146,10 +67,8 @@
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitar.php" />
<option value="$PROJECT_DIR$/sitio/admin/spapel.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/usuario/alta.php" />
<option value="$PROJECT_DIR$/sitio/usuario/busqueda.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" />
@@ -157,7 +76,10 @@
<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" />
</list>
</option>
@@ -169,8 +91,8 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1359" />
<option name="y" value="-21" />
<option name="x" value="1697" />
<option name="y" value="-23" />
<option name="width" value="1278" />
<option name="height" value="743" />
</component>
@@ -191,6 +113,25 @@
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" 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="admin" 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" />
</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" />
</path>
</expand>
<select />
</subPane>
@@ -256,12 +197,12 @@
<workItem from="1547845757877" duration="5554000" />
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="4631000" />
<workItem from="1548276662999" duration="13059000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="121820000" />
<option name="totallyTimeSpent" value="130248000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -318,13 +259,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/footer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="16" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/estilos.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
@@ -339,20 +273,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="83" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
@@ -360,13 +280,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" selection-end-line="50" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -384,20 +297,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<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>
</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$/sitio/admin/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
@@ -419,24 +318,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="588">
<caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="16" selection-start-column="16" selection-end-column="16" />
<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>
@@ -447,34 +332,111 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.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 relative-caret-position="588">
<caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="308">
<caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
</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>
<caret column="16" selection-start-column="16" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="83" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/footer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="90" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="55" column="25" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="25" />
<state relative-caret-position="-1261">
<caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.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>
</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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
<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>
</provider>
</entry>
sitio/admin/busqueda.php
+2 -3
View File
@@ -7,11 +7,10 @@ require "../../conexion.php";
$salida = "";
$query = "SELECT * FROM cat_papel ORDER BY id_papel";
$query = "CALL sp_despliega_papel;";
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "SELECT id_papel, concepto, tipo, descripcion, marca, existencia FROM cat_papel
WHERE concepto LIKE '%" .$q. "%' OR tipo LIKE '%" .$q. "%'OR descripcion LIKE '%" .$q. "%' OR marca LIKE '%" .$q. "%'";
$query = "CALL sp_busqueda('%$q%');";
}
$resultado = $mysqli->query($query);
sitio/usuario/busqueda.php
+2 -3
View File
@@ -7,11 +7,10 @@ if($mysqli->connect_error){
$salida = "";
$query = "SELECT * FROM cat_papel ORDER BY id_papel";
$query = "CALL sp_despliega_papel;";
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "SELECT id_papel, concepto, tipo, descripcion, marca, existencia FROM cat_papel
WHERE concepto LIKE '%" .$q. "%' OR tipo LIKE '%" .$q. "%'OR descripcion LIKE '%" .$q. "%' OR marca LIKE '%" .$q. "%'";
$query = "CALL sp_busqueda('%$q%');";
}
$resultado = $mysqli->query($query);
sitio/usuario/solicitud/spapel.php
-1
View File
@@ -75,7 +75,6 @@ $query = "SELECT * FROM cat_papel WHERE id_papel ='$id'";
$resultado = $mysqli->query($query) or die($mysqli->error);
$row = $resultado->fetch_assoc() ;
//print_r($row);
print_r($id);
?>
<div class="wrap">
<h1 style="margin-left:40%; margin-bottom: 5%;">Solicitud</h1>