Добавил строку итого в табл. common, transactions-очтетов, правка для пустых данных графика

src/public/css/styles-feeds-stat.css

@@ -215,7 +215,7 @@ input[type="checkbox"]
     /* .b-basket-content */
     .table.table-striped.admin.transaction thead tr th.period
         {
-        width: 100px;
+        min-width: 110px;
         }
         
     .table.table-striped.admin thead tr th.Timestamp
@@ -244,7 +244,7 @@ input[type="checkbox"]
         
         .table.table-striped.admin thead tr th.Basket .basket-link
             {
-            width: 520px;
+            width: 530px;
             }
             
         .table.table-striped.admin thead tr th.Basket .quantity
@@ -269,6 +269,14 @@ input[type="checkbox"]
         text-align: right;
         }
         
+    .table.table-striped.admin.transaction tbody tr.total-orders
+        {
+        font-weight: bold;
+        font-size: 13px;
+        }
+    
+        
+    
     .b-basket-content
         {
         margin: 4px;
@@ -287,7 +295,7 @@ input[type="checkbox"]
         .b-basket-content .quantity
             {
             display: inline-block;
-            width: 50px;
+            width: 55px;
             }
             
         .b-basket-content .price

src/public/js/script-feeds-stat-table.js

@@ -59,32 +59,14 @@ $(document).ready(function(){
     {
         var dataPeriod = dataLineChartStat['period'];
         
-        dataTable = dataLineChartStat;
-
-        // Добавляем строку "Итого":
-        if (!dataLineChartStat.report == 'transaction') {
-        
-            $row = $('<tr style="font-weight: bold;">');
-            $row.append($('<td>').html("Итого"));
-            activeLines.forEach(function(item){
-                currentActiveLine = item;
-
-                var isNotSumValue = notFormatFields.indexOf(currentActiveLine) > -1;
-
-                if (!isNotSumValue) {
-                    var totalValue = 0;
-                    for(var i = dataPeriod.length-1; i >= 0; i--) {
-                        totalValue += dataTable[item][i];
-                    }
-                } else {
-                    totalValue = '';
+        //dataTable = dataLineChartStat;
+        dataTable = {};
+        for (var key in dataLineChartStat) {
+            dataTable[key] = dataLineChartStat[key];
         }
+        console.log('AAA dataTable = ', dataLineChartStat.report);
 
-                $row.append($('<td>').html(valueFormat(totalValue)));
-            });
-            $row.appendTo($tableContent);
      
-        }
         
         // Сортировка строк в таблице:
         var
@@ -100,7 +82,7 @@ $(document).ready(function(){
         if (sortField) {
             
             //console.log('AAA sortField = ', sortField, '  isDesc = ', isDesc);
-            //console.log('AAA dataTable = ', dataTable);
+            
             
             var dataTableForSort = [];
             
@@ -140,10 +122,12 @@ $(document).ready(function(){
                 activeLines.forEach(function(line){
                     if (line == 'Basket') {
                         var dataBasket = item[line];
-                        currentActiveLine = 'Price';
+                        //currentActiveLine = 'Price';
+                        currentActiveLine = line;
                         dataBasket.forEach(function(dataBasketItem, ind){
                             dataBasket[ind]['Price'] = valueFormat(dataBasketItem['Price']);
                         });
+                        //console.log('AAA dataBasket = ', dataBasket);
                         $row.append($('<td class="'+ line +'">').append(templateBasketContent({data: dataBasket})));
                     } else if (line == 'Timestamp') {
                         var
@@ -186,7 +170,6 @@ $(document).ready(function(){
                         dataBasket.forEach(function(dataBasketItem, ind){
                             dataBasket[ind]['Price'] = valueFormat(dataBasketItem['Price']);
                         });
-                        console.log('AAA dataBasket = ', dataBasket);
                         $row.append($('<td class="'+ item +'">').append(templateBasketContent({data: dataBasket})));
                     } else if (item == 'Timestamp') {
                         var
@@ -206,6 +189,57 @@ $(document).ready(function(){
             }
         }
         
+        // Добавляем строку "Итого":
+        if (dataLineChartStat.report != 'transaction') {
+        
+            $row = $('<tr style="font-weight: bold;">');
+            $row.append($('<td>').html("Итого"));
+            activeLines.forEach(function(item){
+                currentActiveLine = item;
+
+                var isNotSumValue = notFormatFields.indexOf(currentActiveLine) > -1;
+
+                if (!isNotSumValue) {
+                    var totalValue = 0;
+                    for(var i = dataPeriod.length-1; i >= 0; i--) {
+                        totalValue += dataTable[item][i];
+                    }
+                } else {
+                    totalValue = '';
+                }
+
+                $row.append($('<td>').html(valueFormat(totalValue)));
+            });
+            $row.appendTo($tableContent);
+
+        }
+        
+        // Добавляем строку "Всего заказов":
+        if (dataLineChartStat.report == 'transaction') {
+        
+            $row = $('<tr class="total-orders" style="">');
+            $row.append($('<td>').html("Всего заказов: " + dataPeriod.length));
+            
+            activeLines.forEach(function(item){
+                currentActiveLine = item;
+
+                var isNotSumValue = notFormatFields.indexOf(currentActiveLine) > -1;
+
+                if (!isNotSumValue) {
+                    var totalValue = 0;
+                    for(var i = dataPeriod.length-1; i >= 0; i--) {
+                        totalValue += dataTable[item][i];
+                    }
+                } else {
+                    totalValue = '';
+                }
+
+                $row.append($('<td class="'+ item +'">').html(valueFormat(totalValue)));
+            });
+            $row.appendTo($tableContent);
+
+        }
+        
     }
     
     $.extend({
@@ -218,7 +252,7 @@ $(document).ready(function(){
                     activeLines.push($(this).attr('id'));
                 });
                
-                //console.log('AAA TableStat render: ', dataLineChartStat);
+                console.log('AAA TableStat render: ', dataLineChartStat);
                 //console.log('AAA activeLines: ', activeLines);
 
                 dataTable = {};

src/src/App/Model/Statistics.php

@@ -208,7 +208,8 @@ 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) && ($item<= $stat_to)) {
+                if (($item>= $stat_from)) {
                     $period[] = $day_item;
                     if ($stats['data']['Day'][$day_item]) {
                         AddDataStats($dataStats, $stats['data']['Day'][$day_item], $dataStats['type']);