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

actualizacion pendiente asi como store procedure toner1

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-29 20:26:22 -06:00
parent 32cc5ab525
commit 730cdeb4d3
2 changed files with 23 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+21 -116
View File
@@ -5,14 +5,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$/login.php" beforeDir="false" afterPath="$PROJECT_DIR$/login.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/actualizacion_p.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion_p.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/stoner.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" />
<option name="SHOW_DIALOG" value="false" />
@@ -36,33 +29,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/admin/solicitud/actualizacion_p.php">
<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="367">
<caret line="35" column="20" lean-forward="true" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
</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="-264">
<caret line="8" column="1" lean-forward="true" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<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="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 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>
@@ -70,72 +41,15 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
<state relative-caret-position="88">
<caret line="80" column="2" selection-start-line="80" selection-start-column="2" selection-end-line="80" selection-end-column="2" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;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#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#2;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#3;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#4;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#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</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="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>
</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>
<caret selection-end-line="12" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/stoner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1716">
<caret line="78" column="33" selection-start-line="78" selection-start-column="33" selection-end-line="78" selection-end-column="33" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;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#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#2;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#3;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#4;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#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</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>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -204,8 +118,8 @@
<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$/sitio/usuario/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/stoner.php" />
<option value="$PROJECT_DIR$/conexion.php" />
</list>
</option>
@@ -334,12 +248,12 @@
<workItem from="1548350597375" duration="17969000" />
<workItem from="1548442486112" duration="10568000" />
<workItem from="1548805530548" duration="295000" />
<workItem from="1548805926584" duration="8041000" />
<workItem from="1548805926584" duration="8321000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="170953000" />
<option name="totallyTimeSpent" value="171233000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -568,25 +482,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="66">
<caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;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#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#2;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#3;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#4;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#tbody#0;n#table#0;n#div#0;n#body#0;n#html#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="1716">
@@ -606,10 +501,20 @@
</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="88">
<caret line="80" column="2" selection-start-line="80" selection-start-column="2" selection-end-line="80" selection-end-column="2" />
<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>
</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="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>
sitio/admin/solicitud/stoner.php
+2 -1
View File
@@ -78,6 +78,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>
@@ -95,10 +96,10 @@ $row = $resultado->fetch_assoc();
</thead>
<tbody>
<tr>
<td style="text-align:center;"><?php echo $row['impresora']?></td>
<td style="text-align:center;"><?php echo $row['inventario']?></td>
<td style="text-align:center;"><?php echo $row['color']?></td>
<td style="text-align:center;"><?php echo $row['modelo']?></td>
<td style="text-align:center;"><?php echo $row['modelo']?></td>
<td style="text-align:center;"><?php echo $row['clave']?></td>
<td style="text-align:center;"><?php echo $row['existencia']?></td>
</tr>