Add comments, fix little issues

symcon · Aug 2, 2023 · 3bb8509 · 3bb8509
1 parent 5427912
commit 3bb8509
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/CSVZipExport/module.php b/CSVZipExport/module.php
@@ -112,7 +112,7 @@ public function Export(int $ArchiveVariable, int $AggregationStage, string $Aggr
         while ($loopAgain) {
             $content = '';
             if ($AggregationStage != 7) {
-                $loggedValues = AC_GetAggregatedValues($archiveControlID, $ArchiveVariable, $AggregationStage, $startTimeStamp, $endTimeStamp - 1, $limit);
+                $loggedValues = AC_GetAggregatedValues($archiveControlID, $ArchiveVariable, $AggregationStage, $startTimeStamp, $endTimeStamp, $limit);
                 $loopAgain = count($loggedValues) == $limit;
                 for ($j = 0; $j < count($loggedValues); $j++) {
                     $content .= date('d.m.Y H:i:s', $loggedValues[$j]['TimeStamp']) . ';' . $loggedValues[$j]['Avg'] . "\n";
@@ -122,10 +122,9 @@ public function Export(int $ArchiveVariable, int $AggregationStage, string $Aggr
                 $loopAgain = count($loggedValues) == $limit;
 
                 //Protect values to duplicate on limit border
+                //endElements are the last element on the previous array
                 foreach ($endElements as $element) {
-                    if ($element == reset($loggedValues)) {
-                        array_shift($loggedValues);
-                    }
+                    array_shift($loggedValues);
                 }
 
                 for ($j = 0; $j < count($loggedValues); $j++) {
@@ -136,10 +135,16 @@ public function Export(int $ArchiveVariable, int $AggregationStage, string $Aggr
 
             if ($loopAgain) {
                 $endTimeStamp = end($loggedValues)['TimeStamp'];
-                $endElements = array_filter($loggedValues, function ($element) use ($endTimeStamp)
-                {
-                    return $element['TimeStamp'] == $endTimeStamp;
-                });
+
+                if ($AggregationStage != 7) {
+                    $endTimeStamp -= 1;
+                } else {
+                    //Only logged values can have duplicates on the same timestamp
+                    $endElements = array_filter($loggedValues, function ($element) use ($endTimeStamp)
+                    {
+                        return $element['TimeStamp'] == $endTimeStamp;
+                    });
+                }
             }
         }