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

detalles en totales empezando alta de material

Browse Source
This commit is contained in:
Gabriel Fuentes Duarte
2019-06-19 22:13:13 -05:00
parent 2e61ff9d8c
commit b3adaec6ed
5 changed files with 309 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public_html/.idea/workspace.xml
Generated
+156 -56
View File
@@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3018e4b5-6a02-4817-909a-b6afcc057cc6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/sitio/admin/gastos.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/gastos.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/admin.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/sitio/admin/totales.php" beforeDir="false" afterPath="$PROJECT_DIR$/sitio/admin/totales.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -12,15 +14,40 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/admin/gastos.php">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="69" column="2" selection-start-line="69" selection-start-column="2" selection-end-line="69" selection-end-column="2" />
<state relative-caret-position="293">
<caret line="119" column="27" selection-start-line="119" selection-start-column="27" selection-end-line="119" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/alta_m.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sitio/admin/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1511" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sitio/admin/alta_m.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
<folding>
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
@@ -35,6 +62,14 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>$j</find>
<find>j</find>
<find>cant</find>
<find>tr</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
@@ -44,18 +79,23 @@
<option value="$PROJECT_DIR$/sitio/admin/js/totales.js" />
<option value="$PROJECT_DIR$/sitio/usuario/usuario.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/gastos.js" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/conexion.php" />
<option value="$PROJECT_DIR$/sitio/admin/totales.php" />
<option value="$PROJECT_DIR$/sitio/admin/gastos.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/busqueda_g.js" />
<option value="$PROJECT_DIR$/sitio/admin/busqueda_g.php" />
<option value="$PROJECT_DIR$/sitio/admin/totales.php" />
<option value="$PROJECT_DIR$/sitio/admin/js/alta.js" />
<option value="$PROJECT_DIR$/sitio/admin/js/alta_m.js" />
<option value="$PROJECT_DIR$/sitio/admin/admin.php" />
<option value="$PROJECT_DIR$/sitio/admin/alta_m.php" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1288" />
<option name="y" value="-21" />
<option name="x" value="-8" />
<option name="y" value="24" />
<option name="width" value="1382" />
<option name="height" value="784" />
<option name="height" value="752" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -91,13 +131,7 @@
<item name="public_html" type="b2602c69:ProjectViewProjectNode" />
<item name="public_html" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="public_html" type="b2602c69:ProjectViewProjectNode" />
<item name="public_html" type="462c0819:PsiDirectoryNode" />
<item name="sitio" type="462c0819:PsiDirectoryNode" />
<item name="usuario" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
@@ -143,18 +177,19 @@
<workItem from="1560279697218" duration="2863000" />
<workItem from="1560458714758" duration="5615000" />
<workItem from="1560802307980" duration="9840000" />
<workItem from="1560887587039" duration="4976000" />
<workItem from="1560887587039" duration="9931000" />
<workItem from="1560981104484" duration="17939000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="23294000" />
<option name="totallyTimeSpent" value="46188000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
<frame x="-8" y="24" width="1382" height="752" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17394821" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17549168" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@@ -186,13 +221,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="33" column="67" selection-start-line="33" selection-start-column="67" selection-end-line="33" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/usuario/js/secciones.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
@@ -223,27 +251,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/totales.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/gastos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3278">
<caret line="149" column="22" selection-start-line="149" selection-start-column="22" selection-end-line="149" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/phpChart_Lite/examples/images/background.jpg" />
<entry file="file://$PROJECT_DIR$/sitio/admin/phpChart_Lite/examples/images/basicline.png" />
<entry file="file://$PROJECT_DIR$/sitio/admin/phpChart_Lite/server/cls_util.php" />
@@ -263,16 +270,28 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/totales.php">
<entry file="file://$PROJECT_DIR$/sitio/admin/js/gastos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="45" column="36" selection-start-line="43" selection-start-column="36" selection-end-line="45" selection-end-column="36" />
<state relative-caret-position="308">
<caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_g.js" />
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_g.php" />
<entry file="file://$PROJECT_DIR$/sitio/admin/busqueda_t.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="68" selection-end-column="2" />
<folding>
<element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/gastos.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<state relative-caret-position="1518">
<caret line="69" column="2" selection-start-line="69" selection-start-column="2" selection-end-line="69" selection-end-column="2" />
<folding>
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
@@ -282,5 +301,86 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/totales.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="53" column="18" lean-forward="true" selection-start-line="53" selection-start-column="18" selection-end-line="53" selection-end-column="18" />
<folding>
<element signature="n#style#0;n#td#0;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#tr#0;n#thead#0;n#table#0;n#!!top" expanded="true" />
<element signature="e#737#838#0#PHP" />
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="e#3494#3603#0#PHP" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#2;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/alta.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1511" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_p.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/totales.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="17" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/js/alta_m.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="119" column="27" selection-start-line="119" selection-start-column="27" selection-end-line="119" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sitio/admin/alta_m.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
public_html/sitio/admin/admin.php
+2 -1
View File
@@ -117,7 +117,7 @@
</article>
<article id="tab5">
<h1>Alta de material</h1>
<div id="alta"></div>
</article>
@@ -148,6 +148,7 @@
<script src="js/busqueda_t.js"></script>
<script src="js/totales.js"></script>
<script src="js/gastos.js"></script>
<script src="js/alta_m.js"></script>
</body>
</html>
public_html/sitio/admin/alta_m.php
+25
View File
@@ -0,0 +1,25 @@
<body>
<p>Demonstrate fadeToggle() with different speed parameters.</p>
<button>Click to fade in/out boxes</button><br><br>
<div id="div1" style="width:80px;height:80px;background-color:red;">
<br>
<div id="div2" style="width:80px;height:80px;background-color:green;"></div>
<br>
<div id="div3" style="width:80px;height:80px;background-color:blue;"></div>
<script>
$(document).ready(function(){
$("button").click(function(){
$("#div1").fadeToggle();
$("#div2").fadeToggle("slow");
$("#div3").fadeToggle(3000);
});
});
</script>
public_html/sitio/admin/js/alta_m.js
+18
View File
@@ -0,0 +1,18 @@
$(alta_material());
function alta_material(consulta){
$.ajax({
url: 'alta_m.php',
dataType: 'html',
data: {consulta: consulta},
})
.done(function (respuesta) {
$('#alta').html(respuesta);
})
.fail(function () {
console.log("error");
})
}
public_html/sitio/admin/totales.php
+108 -22
View File
@@ -3,8 +3,18 @@ session_start();
require "../../conexion.php";
$impresoras = [];
$info = [];
$inv=[];
$imp1 =0;
$imp2 =0;
$i=0;
$n=0;
$c=0;
$m=0;
$a=0;
$cant=0;
$salida = "";
$x=0;
$query = "SELECT impresora from cat_impresora";
$resultado = $conexion->query($query);
@@ -17,15 +27,15 @@ if($resultado->rowCount() > 0){
<td style=\"text-align:center;\">Existencia</td>
</tr>
</thead>
</tbody>";
<tbody>";
while($row = $resultado->fetch(PDO::FETCH_ASSOC)){
$impresoras[$i] =$row;
$i++;
}
$j=0;
//print_r($impresoras[0]['impresora']);
foreach ($impresoras as $impresora) {
$salida.="<tr>
<td style=\"text-align:center;\">".$impresora['impresora']."</td>";
@@ -36,35 +46,111 @@ if($resultado->rowCount() > 0){
$query = "CALL st_totales('$busq');";
$resultado = $conexion->query($query);
while($fila = $resultado->fetch(PDO::FETCH_ASSOC)){
$info[$i] =$fila;
$info[$i]=$fila;
if($i == 0){
if($info[$i]['impresora'] == 'HP Laserjet P3015' or $info[$i]['impresora'] == 'HP Color Laserjet CP1515N' or $info[$i]['impresora'] == 'HP Laserjet 1320') {
if ($info[$i]['impresora'] == 'HP Laserjet P3015') {
$imp1 += $info[$i]['existencia'];
} if ($info[$i]['impresora'] == 'HP Laserjet P3015' and $i>1) {
$salida .= "
<td style=\"text-align:center;\">Negro</td>
<td style=\"text-align:center;\">" . $imp1 . "</td>
</tr>";
}
$salida.="
<td style=\"text-align:center;\">".$info[$i]['color']."</td>
<td style=\"text-align:center;\">".$info[$i]['existencia']."</td>
<tr>";
}else{
$salida.="
if ($info[$i]['impresora'] == 'HP Color Laserjet CP1515N') {
if ($info[$i]['color'] == 'Negro') {
$n += $info[$i]['existencia'];
}
if ($info[$i]['color'] == 'Cyan') {
$c += $info[$i]['existencia'];
}
if ($info[$i]['color'] == 'Magenta') {
$m += $info[$i]['existencia'];
}
if ($info[$i]['color'] == 'Amarillo') {
$a += $info[$i]['existencia'];
}
}
if ($x== 1 and $impresora['impresora'] == 'HP Color Laserjet CP1515N') {
$salida .= "
<td style=\"text-align:center;\"><br></td>
<td style=\"text-align:center;\">Negro</td>
<td style=\"text-align:center;\">" . $n . "</td></tr>
";
$salida .= "
<tr>
<td style=\"text-align:center;\"><br></td>
<td style=\"text-align:center;\">Cyan</td>
<td style=\"text-align:center;\">" . $c . "</td></tr>
";
$salida .= "
<tr>
<td style=\"text-align:center;\"><br></td>
<td style=\"text-align:center;\">Magenta</td>
<td style=\"text-align:center;\">" . $a . "</td></tr>
";
$salida .= "
<tr>
<td style=\"text-align:center;\"><br></td>
<td style=\"text-align:center;\">Amarillo</td>
<td style=\"text-align:center;\">" . $a . "</td>
</tr>
";
$x++;
}
if ($info[$i]['impresora'] == 'HP Laserjet 1320') {
$imp2 += $info[$i]['existencia'];
}
if ($i >1 and $info[$i]['impresora'] == 'HP Laserjet 1320') {
$salida .= "
<td style=\"text-align:center;\">Negro</td>
<td style=\"text-align:center;\">" . $imp2 . "</td>
</tr>";
}
}else{
if($info[$i]['color']== 'Negro' or $info[$i]['color']== 'Negro mate'){
$salida.="
<td style=\"text-align:center;\">".$info[$i]['color']."</td>
<td style=\"text-align:center;\">".$info[$i]['existencia']."</td>
<tr>";
}
</tr>";
}else{
$salida.="
<td style=\"text-align:center;\"><br></td>
<td style=\"text-align:center;\">".$info[$i]['color']."</td>
<td style=\"text-align:center;\">".$info[$i]['existencia']."</td>
</tr>";
}}
$i++;
}
//print_r($info);
//print_r($info);
$j++;
}
$salida.="</tbody></table>";
}
}
$cant=0;
//print_r($info);
//print_r($inv);
$salida.="</tbody></table>";
//echo'<br><br>';echo'<br><br>';echo'<br><br>';echo'<br><br>';echo'<br><br>';
//print_r($info[0])
echo $salida;
echo $n. ' .';
echo $c. ' .';
echo $m. ' .';
echo $a. ' .';
$conexion = null;
?>