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

prueba de registros en trasaccion de peticion

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-18 16:51:05 -06:00
parent eb5d433236
commit 6043bd488f
4 changed files with 96 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+57 -134
View File
@@ -2,10 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/busqueda.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/solicitar.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/login.php" beforeDir="false" afterPath="$PROJECT_DIR$/login.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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -15,11 +15,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="71" column="74" selection-start-line="71" selection-start-column="4" selection-end-line="71" selection-end-column="74" />
<state relative-caret-position="-2479">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
@@ -27,43 +27,20 @@
<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="2948">
<caret line="134" column="86" selection-start-line="134" selection-start-column="86" selection-end-line="134" selection-end-column="86" />
<state relative-caret-position="-2376">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#h1#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#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#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#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#form#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">
<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="198">
<caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" selection-start-line="19" selection-end-line="19" />
<state relative-caret-position="308">
<caret line="14" column="66" selection-start-line="14" selection-start-column="66" selection-end-line="14" selection-end-column="66" />
</state>
</provider>
</entry>
@@ -71,20 +48,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<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#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;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#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
</folding>
<state>
<caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
</state>
</provider>
</entry>
@@ -107,6 +72,7 @@
<find>print</find>
<find>ech</find>
<find>wra</find>
<find>select1</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -125,7 +91,6 @@
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/destroy.php" />
<option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/alta.php" />
<option value="$PROJECT_DIR$/js/busqueda.js" />
<option value="$PROJECT_DIR$/sitio/admin/js/secciones.js" />
@@ -140,6 +105,7 @@
<option value="$PROJECT_DIR$/sitio/admin/spapel.php" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/spapel.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/sitio/admin/solicitud/actualizacion.php" />
</list>
</option>
@@ -151,9 +117,9 @@
<auto-save>true</auto-save>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="614" />
<option name="y" value="80" />
<option name="width" value="697" />
<option name="x" value="176" />
<option name="y" value="17" />
<option name="width" value="1012" />
<option name="height" value="734" />
</component>
<component name="ProjectView">
@@ -161,6 +127,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -168,34 +135,15 @@
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<item name="Inventario" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Inventario" type="b2602c69:ProjectViewProjectNode" />
<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="admin" 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="solicitud" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../sitio/prestamo-de-libros" />
<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" />
@@ -247,19 +195,20 @@
<workItem from="1547615360096" duration="1682000" />
<workItem from="1547657243783" duration="4303000" />
<workItem from="1547680637920" duration="19515000" />
<workItem from="1547779591786" duration="10583000" />
<workItem from="1547779591786" duration="10735000" />
<workItem from="1547845757877" duration="5259000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="97424000" />
<option name="totallyTimeSpent" value="102835000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="24" width="1382" height="752" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.21255673" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.15506808" />
<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" />
@@ -340,13 +289,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/estilos.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1012">
@@ -368,32 +310,6 @@
</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="418">
<caret line="19" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<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#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;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#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#3;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#4;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#5;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
@@ -408,41 +324,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="71" column="74" selection-start-line="71" selection-start-column="4" selection-end-line="71" selection-end-column="74" />
<state>
<caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/solicitud/spapel.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2948">
<caret line="134" column="86" selection-start-line="134" selection-start-column="86" selection-end-line="134" selection-end-column="86" />
<folding>
<element signature="n#style#0;n#h1#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#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#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#div#0;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state>
<caret column="8" lean-forward="true" selection-start-column="8" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="46" selection-start-line="21" selection-start-column="46" selection-end-line="21" selection-end-column="46" />
</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="198">
<caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
<state relative-caret-position="308">
<caret line="14" column="66" selection-start-line="14" selection-start-column="66" selection-end-line="14" selection-end-column="66" />
</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="-2376">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#div#2;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2479">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
login.php
-4
View File
@@ -20,11 +20,7 @@
if ($resultado->num_rows == 1){
$datos = $resultado->fetch_assoc();
$_SESSION['usuario'] = $datos;
echo json_encode(array('error' => false, 'perfil' => $datos['perfil']));
//session_start();
//$_SESSION['usuario']['perfil'] = $datos['perfil'];
//$_SESSION['usuario']['nombre'] = $datos['nombre'];
}
else{
echo json_encode(array('error' => true));
sitio/admin/solicitud/actualizacion.php
+28 -9
View File
@@ -1,11 +1,30 @@
<?php
session_start();
echo "periodo:";
print_r($_POST['select1']);
echo" Cantidad:";
print_r($_POST['select2']);
echo" id de elemento:";
print_r($_POST['id']);
echo" Usuario:";
print_r($_SESSION['usuario']['nombre']);
session_start();
include("../../../conexion.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'];
$id_usuario = "SELECT id_usuario FROM cat_usuario WHERE nombre='$usuario' ";
$query = "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')";
$resultado = $conexion->query($query) or die($conexion->error);
echo "periodo:";
print_r($_POST['periodo']);
echo" Cantidad:";
print_r($_POST['cantidad']);
echo" id de elemento:";
print_r($_POST['id']);
echo" Usuario:";
print_r($_SESSION['usuario']['nombre']);
echo" Fecha del movimiento:";
print_r($_POST['fecha-m']);
echo" Fecha registrada por usuario:";
print_r($_POST['fecha-u']);
?>
sitio/admin/solicitud/spapel.php
+11 -3
View File
@@ -10,6 +10,7 @@ else
header("Location: ../../index.php");
}
include("../../../conexion.php");
print_r($_SESSION)
?>
@@ -72,6 +73,8 @@ include("../../../conexion.php");
</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);
@@ -108,7 +111,7 @@ include("../../../conexion.php");
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Periodo</label>
</div>
<select class="custom-select disabled" name="select1" id="inputGroupSelect01" style="text-align:center;">
<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>
@@ -117,7 +120,7 @@ include("../../../conexion.php");
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Cantidad</label>
</div>
<select class="custom-select" id="inputGroupSelect01" name="select2" style="text-align:center;">
<select class="custom-select" id="inputGroupSelect01" name="cantidad" style="text-align:center;">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
@@ -131,8 +134,13 @@ include("../../../conexion.php");
</select>
</div>
<input type="hidden" name="id" value="<?php echo $row['id_papel'];?>"/>
<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">
</div>
<br>
<button type="submit" class="btn btn-primary">Solicitar</button>
</div>