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

proceso de actualizacion3

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-30 14:57:30 -06:00
parent 5250c3046a
commit db64bd0ced
4 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+35 -40
View File
@@ -5,8 +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/admin/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -33,29 +34,17 @@
<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="396">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
<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/usuario/solicitud/stoner.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<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#5;n#tr#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="353">
<caret line="81" column="14" lean-forward="true" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="14" />
</state>
</provider>
</entry>
@@ -63,8 +52,11 @@
<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="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 relative-caret-position="499">
<caret line="40" column="129" selection-start-line="40" selection-start-column="129" selection-end-line="40" selection-end-column="129" />
<folding>
<element signature="n#style#0;n#td#6;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -135,10 +127,10 @@
<option value="$PROJECT_DIR$/login.php" />
<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/admin/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/sitio/usuario/busqueda_t.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/conexion.php" />
</list>
</option>
@@ -268,12 +260,12 @@
<workItem from="1548442486112" duration="10568000" />
<workItem from="1548805530548" duration="295000" />
<workItem from="1548805926584" duration="9007000" />
<workItem from="1548871474944" duration="3658000" />
<workItem from="1548871474944" duration="5255000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="175577000" />
<option name="totallyTimeSpent" value="177174000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -477,13 +469,6 @@
</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="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">
@@ -491,6 +476,16 @@
</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="638">
<caret line="41" column="106" selection-start-line="41" selection-start-column="106" selection-end-line="41" selection-end-column="129" />
<folding>
<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/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -498,27 +493,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda_t.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/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" />
<state relative-caret-position="499">
<caret line="40" column="129" selection-start-line="40" selection-start-column="129" selection-end-line="40" selection-end-column="129" />
<folding>
<element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#6;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/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="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 relative-caret-position="353">
<caret line="81" column="14" lean-forward="true" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="14" />
</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" lean-forward="true" selection-start-line="20" selection-end-line="20" />
<state relative-caret-position="66">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</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_t.php
+1 -1
View File
@@ -38,7 +38,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/admin/solicitud/stoner.php
+2 -1
View File
@@ -76,9 +76,10 @@ date_default_timezone_set('America/Mexico_City');
$fecha = date("Y-m-d H:i:s");
$concepto=$_REQUEST['id'];
$query = "CALL st_muestra_toner('$concepto')";
print_r($concepto);
$resultado = $mysqli->query($query) or die($mysqli->error);
$row = $resultado->fetch_assoc();
//print_r($row);
print_r($row);
?>
<div class="wrap">
<h1 style="margin-left:40%; margin-bottom: 5%;">Solicitud</h1>