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

consulta toner busqueda terminado falta solicitud y usuario1

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-24 16:58:44 -06:00
parent 78db293038
commit 777f311279
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+24 -23
View File
@@ -2,15 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/mysql/procedures.sql" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" afterDir="false" />
<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/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -52,11 +44,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="258">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<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>
@@ -64,6 +56,15 @@
</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="396">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -118,7 +119,6 @@
<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" />
<option value="$PROJECT_DIR$/mysql/procedures.sql" />
<option value="$PROJECT_DIR$/sitio/admin/php/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
@@ -126,6 +126,7 @@
<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" />
</list>
</option>
</component>
@@ -237,12 +238,12 @@
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="16891000" />
<workItem from="1548350597375" duration="8303000" />
<workItem from="1548350597375" duration="8555000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="142383000" />
<option name="totallyTimeSpent" value="142635000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -427,13 +428,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="6" column="25" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mysql/procedures.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
@@ -478,13 +472,20 @@
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<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>
</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" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
</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;