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

proceso de peticion completo papel-usuario-admin1

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-23 16:40:50 -06:00
parent 23042cae6b
commit 17b5c539b0
2 changed files with 24 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+20 -33
View File
@@ -2,16 +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$/sitio/usuario/busqueda.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/usuario/js/busqueda.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" 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/solicitud/actualizacion.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.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/usuario/usuario.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/usuario.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -69,7 +60,7 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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">
@@ -78,6 +69,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="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">
@@ -150,7 +150,6 @@
<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$/conexion.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" />
@@ -159,6 +158,7 @@
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" />
<option value="$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/conexion.php" />
</list>
</option>
</component>
@@ -191,19 +191,6 @@
<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="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>
@@ -269,12 +256,12 @@
<workItem from="1547845757877" duration="5554000" />
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="4376000" />
<workItem from="1548276662999" duration="4631000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="121565000" />
<option name="totallyTimeSpent" value="121820000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -404,13 +391,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
</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">
@@ -491,5 +471,12 @@
</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>
</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;