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

proceso de actualizacion

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-30 13:27:50 -06:00
parent 43228988f2
commit 3429e09a3e
4 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+63 -60
View File
@@ -5,6 +5,9 @@
</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/usuario/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,32 +35,38 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="20" column="2" lean-forward="true" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<state relative-caret-position="484">
<caret line="24" column="2" lean-forward="true" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="104" column="13" lean-forward="true" selection-start-line="87" selection-start-column="8" selection-end-line="104" selection-end-column="13" />
<state relative-caret-position="132">
<caret line="74" column="14" lean-forward="true" selection-start-line="74" selection-start-column="14" selection-end-line="74" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="102" column="13" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="396">
<caret line="30" column="38" lean-forward="true" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
</state>
</provider>
</entry>
@@ -129,10 +138,10 @@
<option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
<option value="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" />
</list>
</option>
</component>
@@ -143,10 +152,10 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1719" />
<option name="y" value="-13" />
<option name="width" value="1248" />
<option name="height" value="712" />
<option name="x" value="1358" />
<option name="y" value="-8" />
<option name="width" value="1296" />
<option name="height" value="1010" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
@@ -204,12 +213,9 @@
<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="SQL Dialects" />
<property name="settings.editor.selected.configurable" value="editor.preferences.completion" />
</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" />
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\php" />
@@ -217,6 +223,9 @@
<recent name="C:\xampp\htdocs\Inventario\sitio\admin\js" />
<recent name="C:\xampp\htdocs\inventario" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\xampp\htdocs\Inventario\sitio\usuario" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -260,19 +269,20 @@
<workItem from="1548350597375" duration="17969000" />
<workItem from="1548442486112" duration="10568000" />
<workItem from="1548805530548" duration="295000" />
<workItem from="1548805926584" duration="8405000" />
<workItem from="1548805926584" duration="9007000" />
<workItem from="1548871474944" duration="2969000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="171317000" />
<option name="totallyTimeSpent" value="174888000" />
</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.18851133" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.19093852" />
<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" show_stripe_button="false" />
@@ -413,13 +423,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="89" column="32" selection-start-line="89" selection-start-column="32" selection-end-line="89" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda_p.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
@@ -469,17 +472,6 @@
</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="308">
<caret line="30" column="38" lean-forward="true" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
<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#5;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -487,39 +479,50 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="836">
<caret line="38" column="91" lean-forward="true" selection-start-line="38" selection-start-column="91" selection-end-line="38" selection-end-column="91" />
<state relative-caret-position="2288">
<caret line="104" column="13" selection-start-line="87" selection-start-column="8" selection-end-line="104" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="89" column="32" selection-start-line="89" selection-start-column="32" selection-end-line="89" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="20" column="2" lean-forward="true" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
<caret line="104" column="13" lean-forward="true" selection-start-line="87" selection-start-column="8" selection-end-line="104" selection-end-column="13" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="484">
<caret line="24" column="2" lean-forward="true" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="102" column="13" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
<state relative-caret-position="132">
<caret line="74" column="14" lean-forward="true" selection-start-line="74" selection-start-column="14" selection-end-line="74" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#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_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="30" column="38" lean-forward="true" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
</state>
</provider>
</entry>
</component>
</project>
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/usuario/busqueda_t.php
+3 -1
View File
@@ -15,6 +15,8 @@ if(isset($_POST['consulta'])){
$resultado = $mysqli->query($query);
$fila = $resultado->fetch_assoc();
print_r($fila);
if($resultado->num_rows > 0){
$salida.="<table class='tabla_datos table'>
<thead class='table-primary'>
@@ -37,7 +39,7 @@ if($resultado->num_rows > 0){
<td style=\"text-align:center;\">".$fila['modelo']."</td>
<td style=\"text-align:center;\">".$fila['clave']."</td>
<td style=\"text-align:center;\">".$fila['existencia']."</td>
<td style=\"text-align:center;\"> <a href='solicitud/stoner.php?id=".$fila['inventario']."'>Solicitar</a></td>
<td style=\"text-align:center;\"> <a href='solicitud/stoner.php?id=".$fila['id_impresora_inventario']."'>Solicitar</a></td>
<tr>";
}
sitio/usuario/solicitud/stoner.php
+2 -6
View File
@@ -51,15 +51,10 @@ include("../../../conexion.php");
<ul class="navbar-nav mr-auto">
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="../admin.php" role="button" >
<a class="nav-link-white" href="../usuario.php" role="button" >
Stock
</a>
</li>
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="../admin.php" role="button" >
Alta de Material
</a>
</li>
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="../../../destroy.php" role="button" >
Cerrar sesion
@@ -77,6 +72,7 @@ $concepto=$_REQUEST['id'];
$query = "CALL st_muestra_toner('$concepto')";
$resultado = $mysqli->query($query) or die($mysqli->error);
$row = $resultado->fetch_assoc();
print_r($row);
?>
<div class="wrap">
<h1 style="margin-left:40%; margin-bottom: 5%;">Solicitud</h1>