From 05e1d90b34a9b0b41de85e3e1d387e6b9bd20bd8 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 21 Jan 2019 19:56:13 -0600
Subject: [PATCH] lista la actualizacion por peticion2.2

---
 .idea/workspace.xml | 33 +++++++++++++++++++++------------
 conexion.php        | 10 +++++-----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d5ec49c..0abcbe6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
-      <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$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -30,7 +30,7 @@
           </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="461">
@@ -39,6 +39,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="44">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -73,7 +82,6 @@
         <option value="$PROJECT_DIR$/js/jquery-3.3.1.min.js" />
         <option value="$PROJECT_DIR$/SQL/conexion.php" />
         <option value="$PROJECT_DIR$/footer.php" />
-        <option value="$PROJECT_DIR$/conexion.php" />
         <option value="$PROJECT_DIR$/destroy.php" />
         <option value="$PROJECT_DIR$/js/main.js" />
         <option value="$PROJECT_DIR$/sitio/alta.php" />
@@ -92,6 +100,7 @@
         <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$/conexion.php" />
       </list>
     </option>
   </component>
@@ -200,12 +209,12 @@
       <workItem from="1547680637920" duration="19515000" />
       <workItem from="1547779591786" duration="10735000" />
       <workItem from="1547845757877" duration="5554000" />
-      <workItem from="1548112972692" duration="7692000" />
+      <workItem from="1548112972692" duration="8188000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="110822000" />
+    <option name="totallyTimeSpent" value="111318000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="24" width="1382" height="752" extended-state="6" />
@@ -279,13 +288,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="17" column="3" lean-forward="true" selection-start-line="16" selection-end-line="19" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/footer.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="22">
@@ -370,5 +372,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/conexion.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/conexion.php b/conexion.php
index d1fa271..c8ba8d1 100644
--- a/conexion.php
+++ b/conexion.php
@@ -3,22 +3,22 @@
  * conexion a viper
  * */
 
-/*
- * $mysqli = new mysqli("132.248.80.194",
+
+  $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;