viajes sin pagar en dashboard

mortinp · Jul 7, 2016 · 3fce59b · 3fce59b
1 parent 8e8c8aa
commit 3fce59b
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/app/Controller/MetricsController.php b/app/Controller/MetricsController.php
@@ -191,6 +191,21 @@ public function travels_count2($iniDate, $endDate) {
 
             GROUP BY year, month";
 
+        $queryDoneNotPaid = "Select year(travels.date) as year, month(travels.date) as month, travels.date as date,
+            count( distinct travels.id) as travels_done_not_paid_count
+
+            FROM travels
+
+            INNER JOIN users ON travels.user_id = users.id AND users.role != 'admin' AND users.role != 'tester'
+
+            INNER JOIN drivers_travels ON travels.id = drivers_travels.travel_id
+
+            INNER JOIN travels_conversations_meta ON drivers_travels.id = travels_conversations_meta.conversation_id AND (travels_conversations_meta.state = 'D')
+
+            WHERE travels.date BETWEEN '$iniDate' AND '$endDate'
+
+            GROUP BY year, month";
+
 
         $fixedTravels = array();
         $months = array('Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic');
@@ -249,6 +264,27 @@ public function travels_count2($iniDate, $endDate) {
             }
         }
 
+        $travelsDoneNotPaid = $this->Travel->query($queryDoneNotPaid);        
+        foreach ($travelsDoneNotPaid as $value) {
+
+            $appended = false;
+            foreach ($fixedTravels as &$t) {
+                if($value[0]['year'] == $t['year'] && $months[$value[0]['month'] - 1] == $t['month']) {
+                    $t['travels_done_not_paid_count'] = $value[0]['travels_done_not_paid_count'];
+                    $appended = true;
+                    break;
+                }
+            }
+            if(!$appended) {
+                $fixedTravels[] = array();
+                $entries = count($fixedTravels);
+                $fixedTravels[$entries - 1]['date'] = $value['travels']['date'];
+                $fixedTravels[$entries - 1]['travels_done_not_paid_count'] = $value[0]['travels_done_not_paid_count'];
+                $fixedTravels[$entries - 1]['year'] = $value[0]['year'];
+                $fixedTravels[$entries - 1]['month'] = $months[$value[0]['month'] - 1];
+            }
+        }
+
 
         return $fixedTravels;
     }

diff --git a/app/View/Metrics/dashboard.ctp b/app/View/Metrics/dashboard.ctp
@@ -20,16 +20,19 @@ App::uses('DriverTravelerConversation', 'Model');
             $cantViajes = 0;
             $cantViajesExpirados = 0;
             $cantViajesRealizados = 0;
+            $cantViajesRealizadosNoPagados = 0;
             foreach ($travels_count as $c) {
                 if(isset ($c['travels_created_count'])) $cantViajes += $c['travels_created_count'];
                 if(isset ($c['travels_expired_count'])) $cantViajesExpirados += $c['travels_expired_count'];
                 if(isset ($c['travels_done_count'])) $cantViajesRealizados += $c['travels_done_count'];
+                if(isset ($c['travels_done_not_paid_count'])) $cantViajesRealizadosNoPagados += $c['travels_done_not_paid_count'];
             }
             ?>
             <div>
                 <big><span class="label label-primary"><?php echo $cantViajes?> solicitudes creadas</span></big>
                 <big><span class="label label-default info" title="Estas son solicitudes que la fecha de realización del viaje expira ese mes. Puede ser que la solicitud se haya creado antes."><?php echo $cantViajesExpirados?> solicitudes expiradas</span></big>
                 <big><span class="label label-warning"><i class="glyphicon glyphicon-thumbs-up"></i> <?php echo $cantViajesRealizados?> viajes realizados</span></big>
+                <big><span class="label label-danger"><i class="glyphicon glyphicon-warning-sign"></i> <?php echo $cantViajesRealizadosNoPagados?> viajes sin pagar</span></big>
             </div>
             <br/>
         </div>
@@ -217,6 +220,17 @@ function travels_count_chart() {
     graph.fillColors = "#f0ad4e";
     chart.addGraph(graph);
 
+    // REALIZADOS
+    var graph = new AmCharts.AmGraph();
+    graph.title = 'Sin pagar';
+    graph.valueField = "travels_done_not_paid_count";
+    graph.balloonText = "[[month]]: [[value]] viajes sin pagar";
+    graph.type = "column";
+    graph.lineAlpha = 0;
+    graph.fillAlphas = 1;
+    graph.fillColors = "#d9534f";
+    chart.addGraph(graph);
+
 
     var legend = new AmCharts.AmLegend();
     legend.position = 'top';