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

proceso de peticion completo papel-usuario-admin

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-23 16:39:28 -06:00
parent 9b2343b097
commit 23042cae6b
10 changed files with 549 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+199 -109
View File
@@ -2,8 +2,16 @@
<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" />
@@ -14,19 +22,10 @@
<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/spapel.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="5" selection-start-column="5" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
<state relative-caret-position="308">
<caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
</state>
</provider>
</entry>
@@ -34,17 +33,70 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
<state relative-caret-position="588">
<caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="16" selection-start-column="16" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="969">
<caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conexion.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<state relative-caret-position="330">
<caret line="55" column="25" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="25" />
</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="221">
<caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
<folding>
<element signature="n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
@@ -88,20 +140,25 @@
<option value="$PROJECT_DIR$/sitio/alta.php" />
<option value="$PROJECT_DIR$/js/busqueda.js" />
<option value="$PROJECT_DIR$/sitio/admin/js/secciones.js" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/header.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
<option value="$PROJECT_DIR$/estilos.css" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/sitio/admin/alta.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitar.php" />
<option value="$PROJECT_DIR$/sitio/admin/spapel.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.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" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
<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" />
</list>
</option>
</component>
@@ -112,10 +169,10 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1296" />
<option name="height" value="1040" />
<option name="x" value="1359" />
<option name="y" value="-21" />
<option name="width" value="1278" />
<option name="height" value="743" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
@@ -138,13 +195,13 @@
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="admin" 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="admin" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
<item name="solicitud" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
@@ -160,7 +217,7 @@
<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="web.server" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -210,19 +267,21 @@
<workItem from="1547680637920" duration="19515000" />
<workItem from="1547779591786" duration="10735000" />
<workItem from="1547845757877" duration="5554000" />
<workItem from="1548112972692" duration="9491000" />
<workItem from="1548112972692" duration="10036000" />
<workItem from="1548189496599" duration="4023000" />
<workItem from="1548276662999" duration="4376000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="112621000" />
<option name="totallyTimeSpent" value="121565000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="24" width="1382" height="752" extended-state="6" />
<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 content_ui="combo" id="Project" order="1" weight="0.15733737" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.1723301" />
<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" />
@@ -241,27 +300,6 @@
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
</layout>
<layout-to-restore>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.15733737" />
<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" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="3" weight="0.3295325" />
<window_info anchor="bottom" id="Docker" order="4" show_stripe_button="false" />
<window_info anchor="bottom" id="Message" order="5" />
<window_info anchor="bottom" id="Find" order="6" weight="0.32956383" />
<window_info anchor="bottom" id="Run" order="7" />
<window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="11" />
<window_info anchor="right" id="Database" order="0" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@@ -293,23 +331,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="461">
<caret line="62" column="78" selection-start-line="62" selection-start-column="78" selection-end-line="62" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/footer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
@@ -324,13 +345,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="87" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375">
@@ -345,6 +359,100 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="62" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret lean-forward="true" selection-end-line="50" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/busqueda.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
</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">
<caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="81" lean-forward="true" selection-start-line="81" selection-end-line="81" />
<folding>
<element signature="n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#thead#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="35" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="588">
<caret line="35" column="4" lean-forward="true" selection-start-line="35" selection-start-column="4" selection-end-line="35" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/header.php">
<provider selected="true" editor-type-id="text-editor">
<state>
@@ -352,52 +460,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda.js">
<entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="8" lean-forward="true" selection-start-column="8" selection-end-column="8" />
<state relative-caret-position="969">
<caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="44" lean-forward="true" selection-start-line="44" selection-end-line="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
<caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="5" selection-start-column="5" selection-end-column="5" />
<state relative-caret-position="420">
<caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<entry file="file://$PROJECT_DIR$/sitio/usuario/solicitud/spapel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conexion.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="20" column="2" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<caret line="55" column="25" selection-start-line="55" selection-start-column="25" selection-end-line="55" selection-end-column="25" />
</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/admin.php
+1 -1
View File
@@ -96,7 +96,7 @@
</article>
<article id="tab3">
<article id="tab3">x
<h1>Servicios</h1>
</article>
sitio/admin/solicitud/actualizacion.php
+4 -3
View File
@@ -28,9 +28,10 @@
$id_usuario = $dato['id_usuario'];
$consulta->close();
$insert = $mysqli->prepare("INSERT INTO papel_salida(id_papel_salida,fecha_salida,cantidad,periodo,fecha_registro,cat_id_papel, cat_id_usuario)
VALUES( NULL, ?, ?, ?, ?, ?, ?)");
$insert->bind_param("isissii", $fecha_usuario,$cantidad, $periodo, $fecha_movimiento, $id_papel, $id_usuario);
$q = "INSERT INTO papel_salida(id_papel_salida,fecha_salida,cantidad,periodo,fecha_registro,cat_id_papel, cat_id_usuario)
VALUES( NULL, '${fecha_usuario}', {$cantidad}, '{$periodo}', '{$fecha_movimiento}', {$id_papel}, {$id_usuario})";
echo $q;
$insert = $mysqli->prepare($q);
$insert->execute();
$insert->close();
sitio/admin/solicitud/spapel.php
+4 -3
View File
@@ -79,6 +79,7 @@ include("../../../conexion.php");
$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>
@@ -105,7 +106,7 @@ include("../../../conexion.php");
</table>
<br>
<form action="./actualizacion.php" method="POST">
<form action="actualizacion.php" method="POST">
<div class="input-group mb-3" style="width: 20%; ">
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Periodo</label>
@@ -142,9 +143,9 @@ include("../../../conexion.php");
</div>
<br>
<button type="submit" class="btn btn-primary">Solicitar</button>
</div>
</form>
</form>
</div>
sitio/usuario/busqueda.php
+51
View File
@@ -0,0 +1,51 @@
<?php
session_start();
require "../../conexion.php";
if($mysqli->connect_error){
die("Conexión fallida: ".$mysqli->connect_error);
}
$salida = "";
$query = "SELECT * FROM cat_papel ORDER BY id_papel";
if(isset($_POST['consulta'])){
$q = $mysqli->real_escape_string($_POST['consulta']);
$query = "SELECT id_papel, concepto, tipo, descripcion, marca, existencia FROM cat_papel
WHERE concepto LIKE '%" .$q. "%' OR tipo LIKE '%" .$q. "%'OR descripcion LIKE '%" .$q. "%' OR marca LIKE '%" .$q. "%'";
}
$resultado = $mysqli->query($query);
if($resultado->num_rows > 0){
$salida.="<table class='tabla_datos table'>
<thead class='table-primary'>
<tr>
<td>Concepto</td>
<td style=\"text-align:center;\">Tipo</td>
<td style=\"text-align:center;\">Marca</td>
<td style=\"text-align:center;\">Descripción</td>
<td style=\"text-align:center;\">Existencia</td>
<td style=\"text-align:center;\">Operación</td>
</tr>
</thead>
</tbody>";
while($fila = $resultado->fetch_assoc()){
$salida.="<tr>
<td>".$fila['concepto']."</td>
<td style=\"text-align:center;\">".$fila['tipo']."</td>
<td style=\"text-align:center;\">".$fila['marca']."</td>
<td style=\"text-align:center;\">".$fila['descripcion']."</td>
<td style=\"text-align:center;\">".$fila['existencia']."</td>
<td style=\"text-align:center;\"> <a href='solicitud/spapel.php?id=".$fila['id_papel']."'>Solicitar</a></td>
<tr>";
}
$salida.="</tbody></table>";
}
else{
$salida.= "No hay datos que coincidan con tu busqueda";
}
echo $salida;
$mysqli->close();
?>
sitio/usuario/js/busqueda.js
+29
View File
@@ -0,0 +1,29 @@
$(buscar_datos());
console.log("corre");
function buscar_datos(consulta){
$.ajax({
url: 'busqueda.php',
type: 'POST',
dataType: 'html',
data: {consulta: consulta},
})
.done(function (respuesta) {
$('#datos').html(respuesta);
})
.fail(function () {
console.log("error");
})
}
$(document).on('keyup','#caja_busqueda', function(){
var valor = $(this).val();
if (valor != "") {
buscar_datos(valor);
}else{
buscar_datos();
}
});
sitio/usuario/solicitud/actualizacion.php
+68
View File
@@ -0,0 +1,68 @@
<?php
error_reporting(E_ALL);
ini_set('display_errors', '1');
session_start();
include("../../../conexion.php");
if (isset($_SESSION['usuario'])){
if ($_SESSION['usuario']['perfil'] != "Area"){
header("Location: ../admin/admin.php");
}
}
else
{
header("Location: ../../index.php");
}
$periodo = $_POST['periodo'];
$cantidad = $_POST['cantidad'];
$id_papel = $_POST['id_papel'];
$usuario = $_SESSION['usuario']['nombre'];
$fecha_usuario =$_POST['fecha-u'];
$fecha_movimiento = $_POST['fecha-m'];
$consulta = $mysqli->prepare("SELECT id_usuario FROM cat_usuario WHERE nombre='$usuario' ");
$consulta->execute();
$resultado = $consulta->get_result();
$dato = $resultado->fetch_assoc();
$id_usuario = $dato['id_usuario'];
$consulta->close();
$q = "INSERT INTO papel_salida(id_papel_salida,fecha_salida,cantidad,periodo,fecha_registro,cat_id_papel, cat_id_usuario)
VALUES( NULL, '${fecha_usuario}', {$cantidad}, '{$periodo}', '{$fecha_movimiento}', {$id_papel}, {$id_usuario})";
echo $q;
$insert = $mysqli->prepare($q);
$insert->execute();
$insert->close();
$consulta = $mysqli->prepare("SELECT existencia FROM cat_papel WHERE id_papel='$id_papel' ");
$consulta->execute();
$resultado = $consulta->get_result();
$dato = $resultado->fetch_assoc();
$consulta->close();
$existencia = $dato['existencia'] - $cantidad;
$update = $mysqli->prepare("UPDATE cat_papel SET existencia='$existencia ' WHERE id_papel='$id_papel' ");
$update->execute();
$update->close();
//header("Location: ../usuario.php");
/*
echo "periodo:";
print_r($periodo);
echo" Cantidad:";
print_r($cantidad);
echo" id de papel:";
print_r($id_papel);
echo" Usuario:";
print_r($usuario);
echo" ID Usuario:";
print_r($dato['id_usuario']);
echo" Fecha del movimiento:";
print_r($fecha_movimiento);
echo" Fecha registrada por usuario:";
print_r($fecha_usuario);
*/
?>
sitio/usuario/solicitud/spapel.php
+167
View File
@@ -0,0 +1,167 @@
<?php
session_start();
if (isset($_SESSION['usuario'])){
if ($_SESSION['usuario']['perfil'] != "Area"){
header("Location: ../admin/admin.php");
}
}
else
{
header("Location: ../../index.php");
}
include("../../../conexion.php");
?>
<html lang="es">
<head>
<title>CEDETEC | Inventario </title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<link rel="stylesheet" href="../../../estilos.css">
<link href="https://fonts.googleapis.com/css?family=Spicy+Rice" rel="stylesheet">
<link rel="shortcut icon" type="image/png" href="../../../img/escudo-unam.ico">
</head>
<body>
<header>
<div class="container" style="background-color: #1B3D70;">
<div class="row">
<div class="col-sm-12 col-md-6 d-flex d-sm-none d-md-block justify-content-sm-center justify-content-md-start my-2">
<img src="../../../img/Logo-UNAM.png" alt="">
</div>
<div class="col-sm-12 col-md-6 d-flex justify-content-sm-center justify-content-md-end my-3">
<img src="../../../img/logo_fesa.png" style=" height: 60px;" alt="">
</div>
<div>
<h3 style="margin-left: 20px; color: white;">
<?php echo $_SESSION['usuario']['nombre']; ?>
</h3>
</div>
</div>
</div>
</header>
<!--/HEADER-->
<!--NAVBAR-->
<nav class="container navbar navbar-expand-lg navbar-light bg-gold" style="color: white;">
<div class="container">
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<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" >
Stock
</a>
</li>
<li class="nav-item dropdown my-2 mr-3">
<a class="nav-link-white" href="../../../destroy.php" role="button" >
Cerrar sesion
</a>
</li>
</ul>
</div>
</div>
</nav>
<?php
date_default_timezone_set('America/Mexico_City');
$fecha = date("Y-m-d H:i:s");
$id=$_REQUEST['id'];
$query = "SELECT * FROM cat_papel WHERE id_papel ='$id'";
$resultado = $mysqli->query($query) or die($mysqli->error);
$row = $resultado->fetch_assoc() ;
//print_r($row);
print_r($id);
?>
<div class="wrap">
<h1 style="margin-left:40%; margin-bottom: 5%;">Solicitud</h1>
<h2>Descripcion de solicitud:</h2>
<table class='tabla_datos table'>
<thead class='table-primary'>
<tr>
<td style="text-align:center;">Concepto</td>
<td style="text-align:center;">Tipo</td>
<td style="text-align:center;">Marca</td>
<td style="text-align:center;">Descripción</td>
<td style="text-align:center;">Existencia</td>
</tr>
</thead>
<tbody>
<tr>
<td style="text-align:center;"><?php echo $row['concepto']?></td>
<td style="text-align:center;"><?php echo $row['tipo']?></td>
<td style="text-align:center;"><?php echo $row['marca']?></td>
<td style="text-align:center;"><?php echo $row['descripcion']?></td>
<td style="text-align:center;"><?php echo $row['existencia']?></td>
</tr>
</tbody>
</table>
<br>
<form action="actualizacion.php" method="POST">
<div class="input-group mb-3" style="width: 20%; ">
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Periodo</label>
</div>
<select class="custom-select disabled" name="periodo" id="inputGroupSelect01" style="text-align:center;">
<option value="2019-2" name="1" selected>2019-2</option>
</select>
</div>
<div class="input-group mb-3" style="width: 20%;">
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Cantidad</label>
</div>
<select class="custom-select" id="inputGroupSelect01" name="cantidad" style="text-align:center;" required>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
</select>
</div>
<input type="hidden" name="id_papel" value="<?php echo $row['id_papel'];?>"/>
<input type="hidden" name="usuario" value="<?php echo $_SESSION['usuario']['nombre'];?>"/>
<input type="hidden" name="fecha-m" value="<?php echo $fecha;?>"/>
<div class="input-group-prepend" style="width: 20%;">
<label class="input-group-text" for="inputGroupSelect01">Fecha</label>
<input type="date" name="fecha-u" required>
</div>
<br>
<button type="submit" class="btn btn-primary">Solicitar</button>
</form>
</div>
<footer>
<div class="container" style="background-color: #1B3D70;">
<div class="row">
<div class="col text-center" style="color:#fff; font-size: 90%;">
<p class=" mt-4 mb-0">Hecho en México, todos los derechos reservados 2018.</p>
<p class="my-0">Esta página puede ser reproducida con fines no lucrativos, siempre y cuando no se mutile, se cite la fuente</p>
<p class="my-0">completa y su dirección electrónica. De otra forma, requiere permiso previo por escrito de la institución.</p>
<p>Sitio web administrado por: Facultad de Estudios Superiores Acatlán. web2.0@apolo.acatlan.unam.mx</p>
</div>
</div>
</div>
</footer>
<script src="../../https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="../../https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
<script src="../../../js/jquery-3.3.1.min.js"></script>
<script src="../../../js/main.js"></script>
</body>
</html>
sitio/usuario/usuario.php
+22 -15
View File
@@ -8,9 +8,6 @@
header("Location ../../index.php");
}
?>
<!doctype html>
<html lang="es">
<head>
<title>CEDETEC | Inventario </title>
@@ -59,6 +56,8 @@
</nav>
<div class="wrap">
<h1 style="margin-left:35%; margin-bottom: 5%;">Material en Stock</h1>
<ul class="tabs">
@@ -69,24 +68,34 @@
</ul>
<div class="secciones">
<article id="tab1">
<h1>Inicio</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea numquam odio voluptate. Aliquam incidunt similique, et quasi ducimus quos aut autem non dignissimos dicta sit provident, voluptatibus ut blanditiis perspiciatis cum, vel temporibus minima enim. Asperiores omnis placeat officiis a tenetur sit recusandae, reprehenderit neque. Tempora quibusdam, perferendis id ratione culpa dolorum! Nemo, animi? Eveniet eaque perspiciatis, libero quia, pariatur iusto, ipsum porro quod, ut tempora cum quo non illum. Non eligendi incidunt sequi, molestias quia perspiciatis architecto repudiandae quod.</p>
<div class="form-1-2">
<input placeholder="Buscar..." style="width: 30%;" class="form-control" type="text" name="caja_busqueda" id="caja_busqueda">
</div>
<br>
<div id="datos">
</div>
</article>
<article id="tab2">
<h1>Nosotros</h1>
<p>Lorem ipsum lorem dolor sit amet, consectetur adipisicing elit. Vel voluptates unde, consequuntur aliquid architecto rem numquam expedita minima dolorem pariatur recusandae, eius quod quia aspernatur id impedit, tenetur! Aspernatur incidunt molestiae dolores animi ea praesentium ipsam tenetur voluptas cupiditate perspiciatis eum nihil, natus exercitationem libero earum fuga dignissimos impedit numquam, quasi, placeat officiis voluptates, ad reprehenderit fugiat? Fugiat aperiam et magni, molestiae, numquam consectetur vitae sapiente cupiditate totam laboriosam voluptate obcaecati, aliquam placeat? Suscipit dolores fuga laudantium sed, qui magni iusto dolore quia. Quis fugit exercitationem porro. Rerum nihil omnis recusandae ratione fuga alias eligendi, earum sunt veritatis praesentium eum perspiciatis. Molestias deserunt, iure neque animi quod! Impedit reprehenderit cumque, numquam velit quae cum eius quidem similique laudantium hic deleniti!</p>
</article>
<article id="tab3">
<article id="tab3">x
<h1>Servicios</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea numquam odio voluptate. Aliquam incidunt similique, et quasi ducimus quos aut autem non dignissimos dicta sit provident, voluptatibus ut blanditiis perspiciatis cum, vel temporibus minima enim. Asperiores omnis placeat officiis a tenetur sit recusandae, reprehenderit neque. Tempora quibusdam, perferendis id ratione culpa dolorum! Nemo, animi?</p><br>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatum dignissimos at esse, ipsum rerum assumenda nisi obcaecati! Aliquam iure voluptatem incidunt, explicabo sit labore, perferendis eius ad vel quia. Praesentium, doloribus. Quisquam provident nostrum totam itaque debitis, minima, tempore dolores!</p>
</article>
<article id="tab4">
<h1>Blog</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea numquam odio voluptate. Aliquam incidunt similique, et quasi ducimus quos aut autem non dignissimos dicta sit provident, voluptatibus ut blanditiis perspiciatis cum, vel temporibus minima enim. Asperiores omnis placeat officiis a tenetur sit recusandae, reprehenderit neque. Tempora quibusdam, perferendis id ratione culpa dolorum! Nemo, animi? Eveniet eaque perspiciatis, libero quia, pariatur iusto, ipsum porro quod, ut tempora cum quo non illum. Non eligendi incidunt sequi, molestias quia perspiciatis architecto repudiandae quod.</p><br>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ullam ipsa ducimus amet at cumque sed numquam, explicabo impedit optio quas iste aperiam quidem ipsam rerum libero voluptatibus perferendis officiis voluptatum!</p>
</article>
</div>
</div>
@@ -94,10 +103,6 @@
<footer>
<div class="container" style="background-color: #1B3D70;">
<div class="row">
@@ -115,5 +120,7 @@
<script src="../../js/jquery-3.3.1.min.js"></script>
<script src="../../js/main.js"></script>
<script src="js/secciones.js"></script>
<script src="js/busqueda.js"></script>
</body>
</html>