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:42:36 -06:00
parent ef7a0f86f2
commit ca5541f826
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+12 -12
View File
@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3c96782-c39e-4629-8661-f34ca5efc2af" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.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" />
@@ -25,8 +24,8 @@
<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="363">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
<state relative-caret-position="309">
<caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
</state>
</provider>
</entry>
@@ -34,8 +33,8 @@
<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="440">
<caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
<state relative-caret-position="110">
<caret line="5" column="59" selection-start-line="5" selection-start-column="59" selection-end-line="5" selection-end-column="59" />
</state>
</provider>
</entry>
@@ -54,6 +53,7 @@
<find>tit</find>
<find>usuario.php</find>
<find>respues</find>
<find>respu</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -74,8 +74,8 @@
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/login.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/js/main.js" />
</list>
</option>
@@ -165,12 +165,12 @@
<workItem from="1547170217131" duration="2586000" />
<workItem from="1547236861734" duration="11265000" />
<workItem from="1547503840895" duration="2199000" />
<workItem from="1547508488120" duration="4453000" />
<workItem from="1547508488120" duration="4736000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44699000" />
<option name="totallyTimeSpent" value="44982000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -273,15 +273,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="30" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
<state relative-caret-position="110">
<caret line="5" column="59" selection-start-line="5" selection-start-column="59" selection-end-line="5" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="363">
<caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
<state relative-caret-position="309">
<caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
</state>
</provider>
</entry>
js/main.js
+4 -4
View File
@@ -14,14 +14,14 @@ jQuery(document).on('submit','#formlg',function(event){
.done(function (respuesta) {
console.log(respuesta);
print("hola mundo =)");
if (!respuesta.error){
if (respuesta.perfil == 'Jefatura')
if (respuesta.tipo == 'Jefatura')
{
//location.href = '132.248.80.188/Inventario/sitio/admin/admin.php';
print("hola mundo =)");
}
else if (respuesta.perfil == 'Area')
else if (respuesta.tipo == 'Area')
{
location.href = '132.248.80.188/Inventario/sitio/usuario/usuario.php';
}