From 2dee673d65edb1b0b321c47c7cdea93ea8de4282 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Thu, 24 Jan 2019 19:33:11 -0600
Subject: [PATCH] consulta toner busqueda terminado falta solicitud y usuario4

---
 .idea/workspace.xml | 56 +++++++++++++++------------------------------
 conexion.php        |  8 +++----
 2 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9adfc6f..70bc579 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
-      <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/busqueda_p.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_p.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/busqueda_t.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -64,20 +59,20 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="81">
-              <caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
+            <state relative-caret-position="616">
+              <caret line="28" column="2" lean-forward="true" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="2" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
+      <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="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+            <state relative-caret-position="66">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -141,11 +136,11 @@
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda.js" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda.php" />
         <option value="$PROJECT_DIR$/sitio/admin/admin.php" />
-        <option value="$PROJECT_DIR$/conexion.php" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda_t.php" />
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda_t.js" />
         <option value="$PROJECT_DIR$/sitio/admin/busqueda_p.php" />
         <option value="$PROJECT_DIR$/sitio/admin/js/busqueda_p.js" />
+        <option value="$PROJECT_DIR$/conexion.php" />
       </list>
     </option>
   </component>
@@ -178,19 +173,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="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="js" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -257,12 +239,12 @@
       <workItem from="1548112972692" duration="10036000" />
       <workItem from="1548189496599" duration="4023000" />
       <workItem from="1548276662999" duration="16891000" />
-      <workItem from="1548350597375" duration="16313000" />
+      <workItem from="1548350597375" duration="16533000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="150393000" />
+    <option name="totallyTimeSpent" value="150613000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -461,13 +443,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="287">
@@ -501,8 +476,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
+        <state relative-caret-position="616">
+          <caret line="28" column="2" lean-forward="true" selection-start-line="28" selection-start-column="2" selection-end-line="28" selection-end-column="2" />
+        </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>
diff --git a/conexion.php b/conexion.php
index 7916679..c8ba8d1 100644
--- a/conexion.php
+++ b/conexion.php
@@ -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;