From 714c8193e481f017af88cf0e2cd15fd8187ac116 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 14 Jan 2019 20:17:16 -0600
Subject: [PATCH] probando conexion5

---
 .idea/workspace.xml | 36 +++++++++++++++++++++---------------
 js/main.js          |  4 +---
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5109122..5417257 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/usuario/usuario.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/usuario/usuario.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/main.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,11 +21,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/js/main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
-              <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+            <state relative-caret-position="396">
+              <caret line="18" column="49" selection-start-line="18" selection-start-column="49" selection-end-line="18" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -39,7 +39,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/usuario.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="792">
@@ -84,8 +84,8 @@
         <option value="$PROJECT_DIR$/conexion.php" />
         <option value="$PROJECT_DIR$/index.php" />
         <option value="$PROJECT_DIR$/login.php" />
-        <option value="$PROJECT_DIR$/js/main.js" />
         <option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
+        <option value="$PROJECT_DIR$/js/main.js" />
       </list>
     </option>
   </component>
@@ -123,6 +123,12 @@
               <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" />
@@ -180,12 +186,12 @@
       <workItem from="1547170217131" duration="2586000" />
       <workItem from="1547236861734" duration="11265000" />
       <workItem from="1547503840895" duration="2199000" />
-      <workItem from="1547508488120" duration="6694000" />
+      <workItem from="1547508488120" duration="6806000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46940000" />
+    <option name="totallyTimeSpent" value="47052000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -286,13 +292,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sitio/usuario/usuario.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="792">
@@ -300,5 +299,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/main.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="18" column="49" selection-start-line="18" selection-start-column="49" selection-end-line="18" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index da79024..83eb2c9 100644
--- a/js/main.js
+++ b/js/main.js
@@ -14,11 +14,9 @@ jQuery(document).on('submit','#formlg',function(event){
             console.log(respuesta);
 
             if (!respuesta.error){
-                console.log("despues de error");
                 if (respuesta.perfil == 'Jefatura')
                     {
-                        //location.href = '132.248.80.188/Inventario/sitio/admin/admin.php';
-                        console.log("jefatura");
+                        location.href = 'sitio/admin/admin.php'
                     }
                 else if (respuesta.perfil == 'Area')
                     {