covid19 stats visualization improved

nightflyza · Nov 10, 2021 · 0553762 · 0553762
1 parent 5633de4
commit 0553762
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-1.2.2 rev 8212
+1.2.2 rev 8213
diff --git a/modules/general/covid19/index.php b/modules/general/covid19/index.php
@@ -232,8 +232,11 @@ public function renderCountry() {
 
                             $charsDataTotal[] = array(__('Date'), __('Confirmed'), __('Deaths'), __('Recovered'));
                             $charsDataMonth[] = array(__('Date'), __('Confirmed'), __('Deaths'), __('Recovered'));
-                            $charsDataPeaks[] = array(__('Date'), __('Confirmed'), __('Deaths'));
+                            $charsDataPeaksAll[] = array(__('Date'), __('Confirmed'), __('Deaths'));
+                            $charsDataPeaksYear[] = array(__('Date'), __('Confirmed'), __('Deaths'));
+                            $charsDataPeaksMonth[] = array(__('Date'), __('Confirmed'), __('Deaths'));
                             $curMonth = curmonth() . '-';
+                            $curYear = curyear() . '-';
                             $prevConf = 0;
                             $prevDeaths = 0;
                             foreach ($countryTimeline as $io => $each) {
@@ -243,9 +246,18 @@ public function renderCountry() {
                                     $charsDataMonth[] = array($date, $each['confirmed'], $each['deaths'], $each['recovered']);
                                     $curMonthCount++;
                                 }
+
                                 $charsDataTotal[] = array($date, $each['confirmed'], $each['deaths'], $each['recovered']);
 
-                                $charsDataPeaks[] = array($date, ($each['confirmed'] - $prevConf), ($each['deaths'] - $prevDeaths));
+                                $peakConfirmed = $each['confirmed'] - $prevConf;
+                                $peakDeaths = $each['deaths'] - $prevDeaths;
+                                $charsDataPeaksAll[] = array($date, $peakConfirmed, $peakDeaths);
+                                if (ispos($date, $curYear)) {
+                                    $charsDataPeaksYear[] = array($date, $peakConfirmed, $peakDeaths);
+                                }
+                                if (ispos($date, $curMonth)) {
+                                    $charsDataPeaksMonth[] = array($date, $peakConfirmed, $peakDeaths);
+                                }
                                 $lastData = $each;
                                 $lastConf = $lastData['confirmed'] - $prevConf;
                                 $lastDeath = $lastData['deaths'] - $prevDeaths;
@@ -261,7 +273,11 @@ public function renderCountry() {
                             $result .= $this->messages->getStyledMessage(__('Recovered') . ' ' . $lastData['recovered'], 'success');
                             $result .= $this->messages->getStyledMessage(__('For the last day') . ' ' . $date . ' (' . __('Confirmed') . '/' . __('Deaths') . ') ' . $lastConf . '/' . $lastDeath, 'info');
 
-                            $result .= wf_gchartsLine($charsDataPeaks, __('By date'), '100%', '300px;', $chartsOptions);
+                            if ($curMonthCount > 0) {
+                                $result .= wf_gchartsLine($charsDataPeaksMonth, __('By date') . ' (' . __('Current month') . ')', '100%', '300px;', $chartsOptions);
+                            }
+                            $result .= wf_gchartsLine($charsDataPeaksYear, __('By date') . ' (' . __('Current year') . ')', '100%', '300px;', $chartsOptions);
+                            $result .= wf_gchartsLine($charsDataPeaksAll, __('By date') . ' (' . __('All time') . ')', '100%', '300px;', $chartsOptions);
                             if ($curMonthCount > 0) {
                                 $result .= wf_gchartsLine($charsDataMonth, __('Month'), '100%', '300px;', $chartsOptions);
                             }