Просмотр исходного кода

added missing years in DealsSales

Piotr Labudda 10 лет назад
Родитель
Сommit
d47efcc1c9
1 измененных файлов с 19 добавлено и 7 удалено
  1. 19 7
      SE/se-lib/Route/DealsSales.php

+ 19 - 7
SE/se-lib/Route/DealsSales.php

@@ -490,6 +490,17 @@ class Route_DealsSales extends RouteBase {
 	$initData->obrotyToMarki = $obrotyToMarki;
 	$initData->months = $monthsOut;
 	$initData->years = array_keys($obrotyByYear);
+		{
+			$lastYear = date("Y", mktime(date('H'), date('i'), date('s'), date("m") + 3, date("d"), date("Y")));
+			$firstYear = end($initData->years);
+			if ($firstYear <= $lastYear) {
+				$years = array();
+				for ($i = $firstYear; $i <= $lastYear; $i++) {
+					$years[] = $i;
+				}
+				$initData->years = array_reverse($years);
+			}
+		}
 	//DBG::_(true, true, "initData", $initData, __CLASS__, __FUNCTION__, __LINE__);
 
 ?>
@@ -845,15 +856,16 @@ class Route_DealsSales extends RouteBase {
 				$.each(_state.months, function(monthsIdx, vMonth) {
 					var td$Node = $('<td></td>').appendTo(tr$Node);
 
-					if (_state.fltrMarka) {
-						if (_state.fltrMarka != _state.obrotyToMarki[vYearId][vMonth]) {
-							return;
+					td$Node.css({textAlign: 'right'});
+					var saleValue = NaN;
+					if (vSalesByMonth) {
+						saleValue = parseFloat(vSalesByMonth[vMonth]);
+						if (_state.fltrMarka) {
+							if (_state.fltrMarka != _state.obrotyToMarki[vYearId][vMonth]) {
+								saleValue = NaN;
+							}
 						}
 					}
-
-					td$Node.css({textAlign: 'right'});
-					var saleValue = parseFloat(vSalesByMonth[vMonth]);
-					//if (!vSalesByMonth.hasOwnProperty(vMonth)) {
 					if (isNaN(saleValue)) {
 						td$Node.text('...');
 						td$Node.css({color: '#ddd'});