Browse Source

Fix monthly charts showing too many months

Alan Lam 2 năm trước cách đây
mục cha
commit
34188ade18
1 tập tin đã thay đổi với 43 bổ sung và 24 xóa
  1. 43 24
      controllers/reports.php

+ 43 - 24
controllers/reports.php

@@ -1,5 +1,7 @@
 <?php /** @noinspection PhpUnhandledExceptionInspection */
 
+use Carbon\CarbonImmutable;
+
 Core::addScript("public/js/app-reports.js");
 
 Core::addBreadcrumb("/account", "Account");
@@ -200,6 +202,10 @@ if($submit) {
 
 				$min_dts = "$min_year-01-01";
 				$max_dts = "$max_year-12-31 23:59:59";
+
+				$dt_min = CarbonImmutable::parse($min_dts, "UTC")->startOfDay();
+				$dt_max = CarbonImmutable::parse($max_dts, "UTC")->endOfDay();
+
 				break;
 
 			case "unbound":
@@ -219,6 +225,9 @@ if($submit) {
 				$min_dts = "$min_year-01-01";
 				$max_dts = "$max_year-12-31 23:59:59";
 
+				$dt_min = CarbonImmutable::parse($min_dts, "UTC")->startOfDay();
+				$dt_max = CarbonImmutable::parse($max_dts, "UTC")->endOfDay();
+
 				break;
 
 			case "custom":
@@ -244,6 +253,9 @@ if($submit) {
 					$date_range_label = $min_year === $max_year ? $min_year : "$min_year - $max_year";
 				}
 
+				$dt_min = CarbonImmutable::parse($min_dts, "UTC")->startOfDay();
+				$dt_max = CarbonImmutable::parse($max_dts, "UTC")->endOfDay();
+
 				break;
 		}
 
@@ -367,41 +379,48 @@ if($submit) {
 
 		$resolution_name = "Quarter";
 
-		for($year = $min_year; $year <= $max_year; $year++) {
-			switch($date_resolution) {
-				case "monthly":
+		if($date_resolution === "monthly") {
+			$resolution_name = "Month";
 
-					$resolution_name = "Month";
+			$dt_month = $dt_min->startOfMonth();
 
-					foreach(range(1, 12) as $month) {
-						if(!$same_year) $label = date("M Y", mktime(0, 0, 0, $month, 1, date("Y")));
-						else $label = date("M", mktime(0, 0, 0, $month, 1, date("Y")));
+			do {
+				$year = $dt_month->year;
 
-						$month = str_pad($month, 2, "0", STR_PAD_LEFT);
+				if(!$same_year) {
+					$label = $dt_month->format("M Y");
+				}
+				else {
+					$label = $dt_month->format("M");
+				}
 
-						$keys[] = "$year-$month";
-						$key_labels[] = $label;
-					}
+				$month = $dt_month->format("m");
 
-					break;
+				$keys[] = "$year-$month";
+				$key_labels[] = $label;
 
-				case "quarterly":
-				default:
+				$dt_month = $dt_month->addMonth();
 
-					$resolution_name = "Quarter";
+			} while($dt_month < $dt_max);
+		}
+		else {
+			for($year = $min_year; $year <= $max_year; $year++) {
+				switch($date_resolution) {
+					case "quarterly":
+					default:
+						$resolution_name = "Quarter";
 
-					foreach(range(1, 4) as $quarter) {
-						if(!$same_year) $label = "Q$quarter $year";
-						else $label = "Q$quarter";
+						foreach(range(1, 4) as $quarter) {
+							if(!$same_year) $label = "Q$quarter $year";
+							else $label = "Q$quarter";
 
-						$keys[] = "$year-$quarter";
-						$key_labels[] = $label;
-					}
+							$keys[] = "$year-$quarter";
+							$key_labels[] = $label;
+						}
 
-					break;
+						break;
+				}
 			}
-
-
 		}
 
 		/**