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

probando conexion5

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-14 19:17:37 -06:00
parent 1a3e65b0dd
commit 1c1a5b3945
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+16 -16
View File
@@ -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$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.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" />
@@ -30,20 +30,20 @@
</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="484">
<caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
<state relative-caret-position="243">
<caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" />
<state relative-caret-position="440">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
</state>
</provider>
</entry>
@@ -82,8 +82,8 @@
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/js/main.js" />
</list>
</option>
</component>
@@ -172,12 +172,12 @@
<workItem from="1547170217131" duration="2586000" />
<workItem from="1547236861734" duration="11265000" />
<workItem from="1547503840895" duration="2199000" />
<workItem from="1547508488120" duration="2884000" />
<workItem from="1547508488120" duration="3246000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="43130000" />
<option name="totallyTimeSpent" value="43492000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -271,10 +271,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="48" selection-start-line="22" selection-start-column="48" selection-end-line="22" selection-end-column="48" />
<state relative-caret-position="440">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
</state>
</provider>
</entry>
@@ -285,10 +285,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" />
<state relative-caret-position="243">
<caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
</state>
</provider>
</entry>
js/main.js
+2 -1
View File
@@ -18,7 +18,8 @@ jQuery(document).on('submit','#formlg',function(event){
if (!respuesta.error){
if (respuesta.tipo == 'Jefatura')
{
location.href = '132.248.80.188/Inventario/sitio/admin/admin.php';
//location.href = '132.248.80.188/Inventario/sitio/admin/admin.php';
print("hola mundo =)");
}
else if (respuesta.tipo == 'Area')
{