Merge pull request #87 from FacturaScripts/Tarea-4642-informe-clientes-activos

Añadido gráfico de clientes activos por año

Author: NeoRazorX

Controller/ReportCustomers.php

@@ -99,6 +99,7 @@ public function run(): void
         $this->loadTotalCustomers();
         $this->loadActiveCustomers();
         $this->loadInactiveCustomers();
+        $this->loadActiveCustomersByYear();
         $this->loadActiveCustomersYear();
         $this->loadNewCustomers30Days();
         $this->loadCustomersWithDebt();
@@ -121,6 +122,23 @@ protected function loadActiveCustomers(): void
         $this->activeCustomers = $this->db()->select($sqlActive)[0]['total'];
     }
 
+    protected function loadActiveCustomersByYear(): void
+    {
+        $report = new Report();
+        $report->type = Report::TYPE_BAR;
+        $report->table = 'facturascli';
+        $report->xcolumn = 'fecha';
+        $report->ycolumn = 'codcliente';
+        $report->xoperation = 'YEAR';
+        $report->yoperation = 'COUNT_DISTINCT';
+        $report->addFieldXName('');
+
+        Report::activateAdvancedReport(true);
+        $report->addCustomFilter('idempresa', '=', (int)$this->idempresa);
+
+        $this->charts['activeCustomersByYear'] = $report;
+    }
+
     protected function loadActiveCustomersYear(): void
     {
         $sqlActiveYear = "SELECT COUNT(DISTINCT codcliente) as total FROM facturascli WHERE fecha >= '$this->currentYear-01-01'" . $this->whereEmpresaFacturas;

Lib/ReportChart/BarChart.php

@@ -73,7 +73,7 @@ public function render(array $dataChart = []): string
             . '  },'
             . '  xaxis: {'
             . '    categories: ' . json_encode($data['labels']) . ','
-            . '    position: "' . ($horizontal ? 'bottom' : 'top') . '",'
+            . '    position: "bottom",'
             . '    axisBorder: {'
             . '      show: false'
             . '    },'
@@ -109,8 +109,8 @@ public function render(array $dataChart = []): string
             . '  },'
             . '  title: {'
             . '    text: "' . $this->report->name . '",'
-            . '    floating: ' . ($horizontal ? 'false' : 'true') . ','
-            . '    offsetY: ' . ($horizontal ? 0 : ($chartHeight - 20)) . ','
+            . '    floating: false,'
+            . '    offsetY: 0,'
             . '    align: "' . ($horizontal ? 'left' : 'center') . '",'
             . '    style: {'
             . '      color: "#444"'

Lib/ReportChart/Chart.php

@@ -180,6 +180,7 @@ protected function getSqlMySQL(Report $report): string
             'MAXIMUM' => "MAX(" . $report->ycolumn . ")",
             'MINIMUM' => "MIN(" . $report->ycolumn . ")",
             'COUNT' => "COUNT(" . $report->ycolumn . ")",
+            'COUNT_DISTINCT' => "COUNT(DISTINCT " . $report->ycolumn . ")",
             default => empty($report->ycolumn) ? 'COUNT(*)' : 'SUM(' . $report->ycolumn . ')',
         };
 
@@ -249,6 +250,7 @@ protected function getSqlPostgreSQL(Report $report): string
             'MAXIMUM' => "MAX(" . $report->ycolumn . ")",
             'MINIMUM' => "MIN(" . $report->ycolumn . ")",
             'COUNT' => "COUNT(" . $report->ycolumn . ")",
+            'COUNT_DISTINCT' => "COUNT(DISTINCT " . $report->ycolumn . ")",
             default => empty($report->ycolumn) ? 'COUNT(*)' : 'SUM(' . $report->ycolumn . ')',
         };
 

View/ReportCustomers.html.twig

@@ -150,6 +150,23 @@
             </div>
         </div>
 
+        <div class="row">
+            <div class="col-12">
+                <div class="card shadow-sm mb-4">
+                    <div class="card-header py-3">
+                        <h6 class="m-0 font-weight-bold text-primary">
+                            <i class="fa-solid fa-chart-column me-1"></i>
+                            {{ trans('active-customers') }}
+                            ({{ trans('year') }})
+                        </h6>
+                    </div>
+                    <div class="card-body">
+                        {{ fsc.charts.activeCustomersByYear.getChart().render({'height':250}) | raw }}
+                    </div>
+                </div>
+            </div>
+        </div>
+
         {# Distribución Geográfica y Grupos #}
         <div class="row mb-4">
             <div class="col-lg-4 d-flex">