Определение временного интервала для общей статистики, правки для таблицы

src/public/css/styles-amsystem.css

@@ -391,12 +391,8 @@ textarea#cities-codes
     .table.table-by-cats tr.cat
         {
         background-color: #f9f9f9;
+        font-weight: bold;
         }
-        
-        .table.table-by-cats tr.cat td.period
-            {
-            font-weight: bold;
-            }
     
     .table.table-by-cats span.group b.open
         {

src/public/js/adm/amsystem-campaign.js

@@ -241,7 +241,7 @@ $(document).ready(function () {
             codeCities = JSON.parse($('#cities-codes').val());
         }
         
-        //console.log('AAA dataStat = ', dataSitesStat);
+        console.log('AAA dataStat = ', dataStat);
         
         function ShowCommonStatInfo()
         {
@@ -537,7 +537,7 @@ $(document).ready(function () {
                 if (item['sub']) {
                     for (var zone in item['sub']) {
                         $row = $('<tr class="subcat" data-parent="' + item['site'] + '">');
-                        $row.append($('<td class="subcat-title">').html('зона [' + zone % 100 + '] (' + item['sub'][zone]['size'] + ')'));
+                        $row.append($('<td class="subcat-title">').html('[зона ' + zone % 100 + '] (' + item['sub'][zone]['size'] + ')'));
                         activeLinesId.forEach(function(line){
                             $row.append($('<td class="stat '+ line +'">').html(valueFormatTable(item['sub'][zone][line], line)));
                         });

src/src/App/Action/User/CabinetAmSystem.php

@@ -155,10 +155,11 @@ class CabinetAmSystem extends Common
                     /** @var \App\Model\Statistics $stats */
                     $stats = $this->container->get(\App\Model\Statistics::class);
                     $date_begin = $campaign->getDateBegin();
+                    $date_end_common = $campaign->getDateEnd() ? : null;
                     $date_end = $campaign->getDateEnd() ? : date("Y-m-d");
-                    // последние 90 дней, если кампания долго идет
+                    $dates_common = [$date_begin, $date_end_common];
                     $dates = [$date_begin, $date_end];
-                    $campaign_stat = $stats->getCampaignsStat([(int)$campaign_id], $campaign->getTargetAction(), $dates);
+                    $campaign_stat = $stats->getCampaignsStat([(int)$campaign_id], $campaign->getTargetAction(), $dates_common);
                     $campaign_stat_total = $stats->getCampaignsStat([(int)$campaign_id], $campaign->getTargetAction(), null);
                     
                     $active_line = 'views';

src/src/App/Model/Statistics.php

@@ -356,8 +356,20 @@ class Statistics
         );
         
         if ($dates) {
+            // последние 90 дней, если кампания долго идет
             $dataRequest['data']['start_date'] = $dates[0];
-            $dataRequest['data']['end_date'] = $dates[1];
+            
+            if ($dates[1] && $dates[1] < date("Y-m-d")) {
+                $date_end = $dates[1];
+            } else {
+                $date_end = date("Y-m-d");
+            }
+            $dataRequest['data']['end_date'] = $date_end;
+            
+            //$date_start = $dates[0];
+            //$interval = date($date_end)->diff(date($date_start)); // получаем разницу в виде объекта DateInterval
+            //$dataRequest['data']['diff'] = $interval->d;
+            
             $dataRequest['data']['by_days'] = true;
         }
         
@@ -444,15 +456,24 @@ class Statistics
                     $stat_from = new DateTime($stat_days[0]);
                     $stat_to = new DateTime($stat_days[count($stat_days)-1]);
 
-                    //if (($item >= $stat_from) && ($item <= $stat_to)) {
-                    //if (($item >= $stat_from)) {
-                    if (($item <= $stat_to)) {
+                    if ($dates[1] && $dates[1] < date("Y-m-d")) {
                         $period[] = $day_item;
                         if ($stats[$day_item]) {
                             AddDataStats($dataStats, $stats[$day_item]);
                         } else {
                             AddDataStatsNull($dataStats, $stat_cats);
                         }
+                    } else {
+                        //if (($item >= $stat_from) && ($item <= $stat_to)) {
+                        //if (($item >= $stat_from)) {
+                        if (($item <= $stat_to)) {
+                            $period[] = $day_item;
+                            if ($stats[$day_item]) {
+                                AddDataStats($dataStats, $stats[$day_item]);
+                            } else {
+                                AddDataStatsNull($dataStats, $stat_cats);
+                            }
+                        }
                     }
                 }