diff --git a/csharp/App/Backend/Controller.cs b/csharp/App/Backend/Controller.cs
index 41c7f70c6..0dcbeb057 100644
--- a/csharp/App/Backend/Controller.cs
+++ b/csharp/App/Backend/Controller.cs
@@ -194,9 +194,13 @@ public class Controller : ControllerBase
while (startTimestamp <= endTimestamp)
{
- string bucketPath = installation.Product==(int)ProductType.Salimax || installation.Product==(int)ProductType.SodiStoreMax?
- "s3://"+installation.S3BucketId + "-3e5b3069-214a-43ee-8d85-57d72000c19d/"+startTimestamp :
- "s3://"+installation.S3BucketId + "-c0436b6a-d276-4cd8-9c44-1eae86cf5d0e/"+startTimestamp;
+ string bucketPath;
+ if (installation.Product == (int)ProductType.Salimax || installation.Product == (int)ProductType.SodiStoreMax)
+ bucketPath = "s3://" + installation.S3BucketId + "-3e5b3069-214a-43ee-8d85-57d72000c19d/" + startTimestamp;
+ else if (installation.Product == (int)ProductType.SodioHome)
+ bucketPath = "s3://" + installation.S3BucketId + "-e7b9a240-3c5d-4d2e-a019-6d8b1f7b73fa/" + startTimestamp;
+ else
+ bucketPath = "s3://" + installation.S3BucketId + "-c0436b6a-d276-4cd8-9c44-1eae86cf5d0e/" + startTimestamp;
Console.WriteLine("Fetching data for "+startTimestamp);
try
diff --git a/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx b/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
index b7c699e0e..8e0a4a249 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Overview/overview.tsx
@@ -118,6 +118,12 @@ function Overview(props: OverviewProps) {
resultPromise
.then((result) => {
+ if (result.chartData.soc.data.length === 0) {
+ setDateSelectionError('No data available for the selected date range. Please choose a more recent date.');
+ setErrorDateModalOpen(true);
+ setLoading(false);
+ return;
+ }
setDailyDataArray((prevData) =>
prevData.concat({
chartData: result.chartData,
@@ -281,6 +287,12 @@ function Overview(props: OverviewProps) {
resultPromise
.then((result) => {
+ if (result.chartData.soc.data.length === 0) {
+ setDateSelectionError('No data available for the selected date range. Please choose a more recent date.');
+ setErrorDateModalOpen(true);
+ setLoading(false);
+ return;
+ }
setDailyDataArray((prevData) =>
prevData.concat({
chartData: result.chartData,
@@ -511,20 +523,22 @@ function Overview(props: OverviewProps) {
>
-
+ {product !== 2 && (
+
+ )}
{/*{aggregatedData && (*/}