From 7fce38d7012e07bdf23c13c224310b36e91fa0a2 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Mon, 17 Jun 2019 15:44:36 -0500
Subject: [PATCH] totales por imporesora listo OK OK OK

---
 public_html/.idea/workspace.xml     | 99 ++++++++++++++---------------
 public_html/sitio/admin/totales.php | 23 +++++--
 2 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/public_html/.idea/workspace.xml b/public_html/.idea/workspace.xml
index 6c6abac..020f71c 100644
--- a/public_html/.idea/workspace.xml
+++ b/public_html/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="3018e4b5-6a02-4817-909a-b6afcc057cc6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/conexion.php" beforeDir="false" afterPath="$PROJECT_DIR$/conexion.php" 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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
@@ -13,29 +13,23 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/conexion.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="484">
-              <caret line="31" selection-start-line="31" selection-end-line="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
+        <entry file="file://$PROJECT_DIR$/sitio/admin/totales.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="397">
-              <caret line="118" column="24" lean-forward="true" selection-start-line="118" selection-start-column="24" selection-end-line="118" selection-end-column="24" />
+            <state relative-caret-position="785">
+              <caret line="50" column="10" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
+              <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#!!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>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/sitio/admin/js/secciones.js">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -53,8 +47,8 @@
       <list>
         <option value="$PROJECT_DIR$/conexion.php" />
         <option value="$PROJECT_DIR$/sitio/admin/js/totales.js" />
-        <option value="$PROJECT_DIR$/sitio/admin/totales.php" />
         <option value="$PROJECT_DIR$/sitio/admin/admin.php" />
+        <option value="$PROJECT_DIR$/sitio/admin/totales.php" />
       </list>
     </option>
   </component>
@@ -150,16 +144,18 @@
       <updated>1560279679077</updated>
       <workItem from="1560279697218" duration="2863000" />
       <workItem from="1560458714758" duration="5615000" />
+      <workItem from="1560802307980" duration="1435000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8478000" />
+    <option name="totallyTimeSpent" value="9913000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16909385" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17152104" />
       <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" />
@@ -184,13 +180,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/conexion.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="484">
-          <caret line="31" selection-start-line="31" selection-end-line="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/js/busqueda_t.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -205,25 +194,6 @@
         </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="11" column="47" selection-start-line="11" selection-start-column="47" selection-end-line="11" selection-end-column="47" />
-          <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" />
-          </folding>
-        </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="88">
-          <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
-        </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">
@@ -239,8 +209,37 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/sitio/admin/admin.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="397">
-          <caret line="118" column="24" lean-forward="true" selection-start-line="118" selection-start-column="24" selection-end-line="118" selection-end-column="24" />
+        <state relative-caret-position="45">
+          <caret line="118" column="24" selection-start-line="118" selection-start-column="24" selection-end-line="118" selection-end-column="24" />
+        </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="88">
+          <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/conexion.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sitio/admin/totales.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="785">
+          <caret line="50" column="10" selection-start-line="50" selection-start-column="10" selection-end-line="50" selection-end-column="10" />
+          <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#!!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>
diff --git a/public_html/sitio/admin/totales.php b/public_html/sitio/admin/totales.php
index db60169..7581ccb 100644
--- a/public_html/sitio/admin/totales.php
+++ b/public_html/sitio/admin/totales.php
@@ -27,6 +27,9 @@ if($resultado->rowCount() > 0){
     $j=0;
 //print_r($impresoras[0]['impresora']);
     foreach ($impresoras as $impresora) {
+        $salida.="<tr>
+                                <td style=\"text-align:center;\">".$impresora['impresora']."</td>";
+
         $i=0;
 
         $busq=$impresora['impresora'];
@@ -34,13 +37,23 @@ if($resultado->rowCount() > 0){
         $resultado  = $conexion->query($query);
         while($fila = $resultado->fetch(PDO::FETCH_ASSOC)){
             $info[$i] =$fila;
+
+            if($i == 0){
+                $salida.="
+         <td style=\"text-align:center;\">".$info[$i]['color']."</td>
+         <td style=\"text-align:center;\">".$info[$i]['existencia']."</td>
+    <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++;
         }
-        $salida.="<tr>
-                                <td style=\"text-align:center;\">".$info[$j]['impresora']."</td>
-                                <td style=\"text-align:center;\">".$info[$j]['color']."</td>
-                                <td style=\"text-align:center;\">".$info[$j]['existencia']."</td>
-                           <tr>";
+        //print_r($info);
+
         //print_r($info);
         $j++;