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

proceso de actualizacion2

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-01-30 14:00:31 -06:00
parent 1fae9d3928
commit 5250c3046a
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+7 -6
View File
@@ -5,6 +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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,8 +33,8 @@
<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="66">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
<state relative-caret-position="396">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
</entry>
@@ -267,12 +268,12 @@
<workItem from="1548442486112" duration="10568000" />
<workItem from="1548805530548" duration="295000" />
<workItem from="1548805926584" duration="9007000" />
<workItem from="1548871474944" duration="3034000" />
<workItem from="1548871474944" duration="3658000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="174953000" />
<option name="totallyTimeSpent" value="175577000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -516,8 +517,8 @@
</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 relative-caret-position="396">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
</entry>
conexion.php
+4 -4
View File
@@ -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;