From 33fc7fff01a27771178730c9e466f8a1749a9081 Mon Sep 17 00:00:00 2001 From: Yinyin Liu Date: Thu, 19 Mar 2026 12:22:48 +0100 Subject: [PATCH 1/4] unify report email and pdf download and add inesco logo --- csharp/App/Backend/Controller.cs | 85 +++++++++++++ .../Backend/Services/ReportEmailService.cs | 113 +++++++++++++++++- .../images/inesco_logo_for_dark_bg.svg | 1 + .../SodiohomeInstallations/DailySection.tsx | 11 +- .../SodiohomeInstallations/WeeklyReport.tsx | 95 ++++++++++++--- 5 files changed, 281 insertions(+), 24 deletions(-) create mode 100644 typescript/frontend-marios2/src/Resources/images/inesco_logo_for_dark_bg.svg diff --git a/csharp/App/Backend/Controller.cs b/csharp/App/Backend/Controller.cs index 5f38d6266..69d76a324 100644 --- a/csharp/App/Backend/Controller.cs +++ b/csharp/App/Backend/Controller.cs @@ -1471,6 +1471,91 @@ public class Controller : ControllerBase } } + // ── Report HTML (for PDF download) ───────────────────────────── + + [HttpGet(nameof(GetWeeklyReportHtml))] + public async Task GetWeeklyReportHtml(Int64 installationId, Token authToken, String? language = null) + { + var user = Db.GetSession(authToken)?.User; + if (user == null) return Unauthorized(); + + var installation = Db.GetInstallationById(installationId); + if (installation is null || !user.HasAccessTo(installation)) return Unauthorized(); + + var lang = language ?? user.Language ?? "en"; + var report = await WeeklyReportService.GenerateReportAsync(installationId, installation.Name, lang); + var html = ReportEmailService.BuildHtmlEmail(report, lang); + return Content(html, "text/html"); + } + + [HttpGet(nameof(GetMonthlyReportHtml))] + public async Task GetMonthlyReportHtml(Int64 installationId, Int32 year, Int32 month, Token authToken, String? language = null) + { + var user = Db.GetSession(authToken)?.User; + if (user == null) return Unauthorized(); + + var installation = Db.GetInstallationById(installationId); + if (installation is null || !user.HasAccessTo(installation)) return Unauthorized(); + + var lang = language ?? user.Language ?? "en"; + var report = Db.GetMonthlyReports(installationId).FirstOrDefault(r => r.Year == year && r.Month == month); + if (report == null) return BadRequest($"No monthly report found for {year}-{month:D2}."); + + report.AiInsight = await ReportAggregationService.GetOrGenerateMonthlyInsightAsync(report, lang); + var s = ReportEmailService.GetAggregatedStrings(lang, "monthly"); + var html = ReportEmailService.BuildAggregatedHtmlEmail( + report.PeriodStart, report.PeriodEnd, installation.Name, + report.TotalPvProduction, report.TotalConsumption, report.TotalGridImport, report.TotalGridExport, + report.TotalBatteryCharged, report.TotalBatteryDischarged, report.TotalEnergySaved, report.TotalSavingsCHF, + report.SelfSufficiencyPercent, report.BatteryEfficiencyPercent, report.AiInsight, + $"{report.WeekCount} {s.CountLabel}", s); + return Content(html, "text/html"); + } + + [HttpGet(nameof(GetYearlyReportHtml))] + public async Task GetYearlyReportHtml(Int64 installationId, Int32 year, Token authToken, String? language = null) + { + var user = Db.GetSession(authToken)?.User; + if (user == null) return Unauthorized(); + + var installation = Db.GetInstallationById(installationId); + if (installation is null || !user.HasAccessTo(installation)) return Unauthorized(); + + var lang = language ?? user.Language ?? "en"; + var report = Db.GetYearlyReports(installationId).FirstOrDefault(r => r.Year == year); + if (report == null) return BadRequest($"No yearly report found for {year}."); + + report.AiInsight = await ReportAggregationService.GetOrGenerateYearlyInsightAsync(report, lang); + var s = ReportEmailService.GetAggregatedStrings(lang, "yearly"); + var html = ReportEmailService.BuildAggregatedHtmlEmail( + report.PeriodStart, report.PeriodEnd, installation.Name, + report.TotalPvProduction, report.TotalConsumption, report.TotalGridImport, report.TotalGridExport, + report.TotalBatteryCharged, report.TotalBatteryDischarged, report.TotalEnergySaved, report.TotalSavingsCHF, + report.SelfSufficiencyPercent, report.BatteryEfficiencyPercent, report.AiInsight, + $"{report.MonthCount} {s.CountLabel}", s); + return Content(html, "text/html"); + } + + [HttpGet(nameof(GetDailyReportHtml))] + public ActionResult GetDailyReportHtml(Int64 installationId, String date, Token authToken, String? language = null) + { + var user = Db.GetSession(authToken)?.User; + if (user == null) return Unauthorized(); + + var installation = Db.GetInstallationById(installationId); + if (installation is null || !user.HasAccessTo(installation)) return Unauthorized(); + + if (!DateOnly.TryParseExact(date, "yyyy-MM-dd", out var parsedDate)) + return BadRequest("date must be in yyyy-MM-dd format."); + + var records = Db.GetDailyRecords(installationId, parsedDate, parsedDate); + if (records.Count == 0) return BadRequest($"No daily record found for {date}."); + + var lang = language ?? user.Language ?? "en"; + var html = ReportEmailService.BuildDailyHtmlEmail(records[0], installation.Name, lang); + return Content(html, "text/html"); + } + [HttpGet(nameof(GetWeeklyReportSummaries))] public async Task>> GetWeeklyReportSummaries( Int64 installationId, Int32 year, Int32 month, Token authToken, String? language = null) diff --git a/csharp/App/Backend/Services/ReportEmailService.cs b/csharp/App/Backend/Services/ReportEmailService.cs index e484a7501..d0ef5c7bd 100644 --- a/csharp/App/Backend/Services/ReportEmailService.cs +++ b/csharp/App/Backend/Services/ReportEmailService.cs @@ -9,6 +9,11 @@ namespace InnovEnergy.App.Backend.Services; public static class ReportEmailService { + // inesco logo (dark background variant, SVG) embedded as base64 data URI for emails and PDF reports + private const string LogoBase64 = "data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8"?><svg id="_Слой_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 666.33 237.83"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#00b050;}</style></defs><path class="cls-2" d="m5.09,32.22C1.7,28.83,0,24.31,0,18.65S1.7,8.48,5.09,5.09C8.48,1.7,13.24,0,19.38,0s10.66,1.7,14.05,5.09c3.39,3.39,5.09,7.91,5.09,13.56s-1.7,10.17-5.09,13.57c-3.39,3.39-8.08,5.09-14.05,5.09s-10.9-1.7-14.29-5.09Z"/><rect class="cls-1" x="2.66" y="53.78" width="33.43" height="123.78"/><path class="cls-1" d="m63.17,177.56V61.53c16.63-7.11,34.88-10.66,54.75-10.66,17.76,0,31.49,4.28,41.18,12.84,9.69,8.56,14.54,20.83,14.54,36.82v77.03h-33.43v-74.61c0-16.31-7.51-24.47-22.53-24.47-7.91,0-15.02,1.45-21.32,4.36v94.72h-33.19Z"/><path class="cls-1" d="m305.41,105.86c0,5.81-.33,11.95-.97,18.41h-76.55c3.07,18.74,14.37,28.1,33.91,28.1,11.3,0,22.53-2.34,33.67-7.03l5.33,26.89c-12.11,5.49-26.25,8.24-42.39,8.24-19.7,0-35.57-5.85-47.6-17.56-12.03-11.71-18.05-27.49-18.05-47.36s5.57-34.8,16.71-46.75c11.14-11.95,25.59-17.92,43.36-17.92,15.82,0,28.54,5.09,38.15,15.26,9.61,10.17,14.41,23.42,14.41,39.73Zm-31.98-1.94v-2.91c0-6.94-1.82-12.6-5.45-16.96-3.63-4.36-8.68-6.54-15.14-6.54-6.95,0-12.64,2.34-17.08,7.02-4.44,4.69-7.23,11.14-8.36,19.38h46.03Z"/><path class="cls-1" d="m403.56,85.02c-14.37-4.36-25.6-6.54-33.67-6.54-11.3,0-16.96,3.31-16.96,9.93,0,3.39,1.37,5.93,4.12,7.63,2.74,1.7,8.07,3.67,15.99,5.93,14.69,4.04,25.23,8.92,31.61,14.66,6.38,5.74,9.57,14.01,9.57,24.83,0,12.6-4.64,22.25-13.93,28.95-9.29,6.7-21.6,10.05-36.94,10.05-16.96,0-31.57-2.67-43.85-8l4.6-27.37c13.4,5.17,26.24,7.75,38.52,7.75,5.65,0,10.21-.93,13.69-2.79,3.47-1.85,5.21-4.48,5.21-7.87,0-3.71-1.66-6.5-4.97-8.36-3.31-1.85-10.29-4.32-20.95-7.39-11.79-3.07-20.67-7.51-26.65-13.32-5.98-5.81-8.96-13.81-8.96-23.98,0-12.27,4.16-21.72,12.48-28.34,8.32-6.62,19.9-9.93,34.76-9.93s28.18,2.34,39.97,7.02l-3.63,27.13Z"/><path class="cls-1" d="m523.63,58.14l-6.3,26.4c-9.53-4.03-18.65-6.06-27.37-6.06-9.69,0-17.16,3.23-22.41,9.69-5.25,6.46-7.87,15.42-7.87,26.89,0,25.19,10.66,37.79,31.98,37.79,8.56,0,17.52-2.1,26.89-6.3l5.33,26.89c-9.37,4.68-21,7.03-34.88,7.03-20.03,0-35.61-5.77-46.75-17.32-11.14-11.54-16.71-27.25-16.71-47.12s5.49-35.69,16.47-47.48c10.98-11.79,26-17.68,45.06-17.68,13.89,0,26.08,2.42,36.58,7.27Z"/><path class="cls-1" d="m619.26,139.54c-12.45,9.44-30.27,8.49-41.63-2.87-11.36-11.36-12.31-29.17-2.87-41.63l-24.5-24.5c-22.85,26.03-21.87,65.69,2.98,90.53,24.84,24.84,64.5,25.83,90.53,2.98l-24.51-24.51Z"/><rect class="cls-2" x="563.25" y="62.27" width="4.37" height="34.51" transform="translate(109.37 423.11) rotate(-45)"/><rect class="cls-2" x="569.8" y="56.78" width="4.37" height="34.51" transform="translate(61.01 341.53) rotate(-35.01)"/><rect class="cls-2" x="577.2" y="52.51" width="4.37" height="34.51" transform="translate(24.87 251.61) rotate(-25.02)"/><rect class="cls-2" x="585.23" y="49.59" width="4.37" height="34.51" transform="translate(2.73 154.42) rotate(-15.01)"/><rect class="cls-2" x="593.65" y="48.1" width="4.37" height="34.51" transform="translate(-3.43 52.21) rotate(-5)"/><rect class="cls-2" x="587.12" y="63.17" width="34.51" height="4.37" transform="translate(486.55 661.73) rotate(-85)"/><rect class="cls-2" x="595.54" y="64.66" width="34.51" height="4.37" transform="translate(389.64 641.46) rotate(-75)"/><rect class="cls-2" x="603.57" y="67.58" width="34.51" height="4.37" transform="translate(295.29 602.98) rotate(-65.01)"/><rect class="cls-2" x="610.97" y="71.85" width="34.51" height="4.37" transform="translate(207.3 546.23) rotate(-55.01)"/><rect class="cls-2" x="617.52" y="77.35" width="34.51" height="4.37" transform="translate(129.61 472.05) rotate(-44.99)"/><rect class="cls-2" x="623.01" y="83.89" width="34.51" height="4.37" transform="translate(66.34 382.65) rotate(-34.98)"/><rect class="cls-2" x="627.28" y="91.29" width="34.51" height="4.36" transform="translate(20.93 281.3) rotate(-25.01)"/><rect class="cls-2" x="630.21" y="99.33" width="34.51" height="4.36" transform="translate(-4.21 171.08) rotate(-15)"/><rect class="cls-2" x="631.69" y="107.74" width="34.51" height="4.37" transform="translate(-7.1 56.86) rotate(-4.99)"/><rect class="cls-2" x="646.76" y="101.22" width="4.37" height="34.51" transform="translate(474.47 754.65) rotate(-85.01)"/><rect class="cls-2" x="645.28" y="109.63" width="4.37" height="34.51" transform="translate(357.3 719.43) rotate(-75)"/><rect class="cls-2" x="642.36" y="117.66" width="4.36" height="34.51" transform="translate(249.72 661.94) rotate(-64.98)"/><polygon class="cls-2" points="627.39 130.63 624.88 134.21 653.15 154 655.65 150.43 627.39 130.63"/><polygon class="cls-2" points="624.12 135.12 621.03 138.21 645.43 162.61 648.51 159.53 624.12 135.12"/><polygon class="cls-1" points="9.11 224.67 23.78 224.67 23.78 217.79 9.11 217.79 9.11 212.81 34.28 212.81 34.28 205.78 0 205.78 0 237.83 34.64 237.83 34.64 230.59 9.11 230.59 9.11 224.67"/><polygon class="cls-1" points="152.16 225.12 127.45 205.78 121.25 205.78 121.25 237.83 129.57 237.83 129.57 218.21 154.04 237.65 154.26 237.83 160.48 237.83 160.48 205.78 152.16 205.78 152.16 225.12"/><polygon class="cls-1" points="256.21 224.67 270.87 224.67 270.87 217.79 256.21 217.79 256.21 212.81 281.37 212.81 281.37 205.78 247.1 205.78 247.1 237.83 281.73 237.83 281.73 230.59 256.21 230.59 256.21 224.67"/><path class="cls-1" d="m396.55,226.32c2.66,0,4.58-.49,5.89-1.5,1.36-1.04,2.04-2.78,2.04-5.14v-7.19c0-2.41-.69-4.17-2.04-5.21-1.31-1.01-3.24-1.5-5.89-1.5h-28.21v32.05h8.97v-11.5h5.84l12.73,11.5h13.29l-14.45-11.5h1.83Zm-19.24-13.66h16.08c1.19,0,1.82.2,2.13.37.29.16.44.58.44,1.26v3.52c0,.68-.15,1.1-.44,1.26-.31.17-.93.37-2.13.37h-16.08v-6.78Z"/><path class="cls-1" d="m533.12,207.31c-1.36-1.03-3.52-1.53-6.61-1.53h-22c-1.53,0-2.85.11-3.91.34-1.14.24-2.08.68-2.8,1.29-.75.63-1.28,1.51-1.59,2.59-.29,1.01-.43,2.25-.43,3.78v16.03c0,1.53.14,2.76.43,3.75.3,1.05.82,1.92,1.52,2.57.71.65,1.65,1.1,2.79,1.35,1.06.23,2.4.34,3.98.34h22c1.53,0,2.86-.11,3.94-.34,1.17-.24,2.12-.7,2.83-1.35.71-.65,1.22-1.52,1.52-2.57.28-.98.43-2.24.43-3.75v-11.31h-20.97v7.03h12.08v4.84h-21.52v-17.35h21.52v3.38l8.89-1.5v-1.48c0-3.03-.69-5.03-2.12-6.11Z"/><polygon class="cls-1" points="655.32 205.78 644.66 216.78 634.15 205.78 621.85 205.78 639.6 223.69 639.6 237.83 648.64 237.83 648.64 223.54 666.33 205.78 655.32 205.78"/></svg>"; + + // NOTE: old PNG constant removed — using SVG dark-bg variant (data:image/png;base64,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"; + /// /// Sends the weekly report as a nicely formatted HTML email in the user's language. /// Uses MailKit directly (same config as existing Mailer library) but with HTML support. @@ -16,7 +21,8 @@ public static class ReportEmailService public static async Task SendReportEmailAsync(WeeklyReportResponse report, string recipientEmail, string language = "en", string customerName = null) { var strings = GetStrings(language); - var subject = $"{strings.Title} — {report.InstallationName} ({report.PeriodStart} to {report.PeriodEnd})"; + var installSegment = !string.IsNullOrWhiteSpace(report.InstallationName) ? $" — {report.InstallationName}" : ""; + var subject = $"{strings.Title}{installSegment} ({report.PeriodStart} to {report.PeriodEnd})"; var html = BuildHtmlEmail(report, strings, customerName); var config = await ReadMailerConfig(); @@ -334,6 +340,7 @@ public static class ReportEmailService +
{s.Title}
{r.InstallationName}
{r.PeriodStart} — {r.PeriodEnd}
@@ -467,7 +474,8 @@ public static class ReportEmailService var monthNames = language switch { "de" => MonthNamesDe, "fr" => MonthNamesFr, "it" => MonthNamesIt, _ => MonthNamesEn }; var monthName = report.Month >= 1 && report.Month <= 12 ? monthNames[report.Month] : report.Month.ToString(); var s = GetAggregatedStrings(language, "monthly"); - var subject = $"{s.Title} — {installationName} ({monthName} {report.Year})"; + var installSegment = !string.IsNullOrWhiteSpace(installationName) ? $" — {installationName}" : ""; + var subject = $"{s.Title}{installSegment} ({monthName} {report.Year})"; var html = BuildAggregatedHtmlEmail(report.PeriodStart, report.PeriodEnd, installationName, report.TotalPvProduction, report.TotalConsumption, report.TotalGridImport, report.TotalGridExport, report.TotalBatteryCharged, report.TotalBatteryDischarged, report.TotalEnergySaved, report.TotalSavingsCHF, @@ -485,7 +493,8 @@ public static class ReportEmailService string customerName = null) { var s = GetAggregatedStrings(language, "yearly"); - var subject = $"{s.Title} — {installationName} ({report.Year})"; + var installSegment = !string.IsNullOrWhiteSpace(installationName) ? $" — {installationName}" : ""; + var subject = $"{s.Title}{installSegment} ({report.Year})"; var html = BuildAggregatedHtmlEmail(report.PeriodStart, report.PeriodEnd, installationName, report.TotalPvProduction, report.TotalConsumption, report.TotalGridImport, report.TotalGridExport, report.TotalBatteryCharged, report.TotalBatteryDischarged, report.TotalEnergySaved, report.TotalSavingsCHF, @@ -520,7 +529,7 @@ public static class ReportEmailService // ── Aggregated report translation strings ───────────────────────────── - private record AggregatedEmailStrings( + public record AggregatedEmailStrings( string Title, string Insights, string Summary, string SavingsHeader, string Metric, string Total, string PvProduction, string Consumption, string GridImport, string GridExport, string BatteryInOut, @@ -530,7 +539,7 @@ public static class ReportEmailService string FooterLink ); - private static AggregatedEmailStrings GetAggregatedStrings(string language, string type) => (language, type) switch + public static AggregatedEmailStrings GetAggregatedStrings(string language, string type) => (language, type) switch { ("de", "monthly") => new AggregatedEmailStrings( "Monatlicher Leistungsbericht", "Monatliche Erkenntnisse", "Monatliche Zusammenfassung", "Ihre Ersparnisse diesen Monat", @@ -592,7 +601,98 @@ public static class ReportEmailService // ── Aggregated HTML email template ──────────────────────────────────── - private static string BuildAggregatedHtmlEmail( + // ── Daily Report HTML ──────────────────────────────────────────── + + public static string BuildDailyHtmlEmail( + DailyEnergyRecord record, string installationName, string language = "en") + { + var s = GetAggregatedStrings(language, "monthly"); // reuse monthly strings for metric labels + + var dailyTitle = language switch + { + "de" => "Täglicher Energiebericht", + "fr" => "Rapport énergétique quotidien", + "it" => "Rapporto energetico giornaliero", + _ => "Daily Energy Report" + }; + + var selfSufficiency = record.LoadConsumption > 0 + ? Math.Max(0, (1 - record.GridImport / record.LoadConsumption)) * 100 + : 0; + var batteryEfficiency = record.BatteryCharged > 0 + ? Math.Min(100, record.BatteryDischarged / record.BatteryCharged * 100) + : 0; + var energySaved = Math.Max(0, record.LoadConsumption - record.GridImport); + var savingsCHF = energySaved * 0.39; + + return $@" + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
{dailyTitle}
+
{installationName}
+
{record.Date}
+
+
{s.Summary}
+ + + + + + + + + + +
{s.Metric}{s.Total}
{s.PvProduction}{record.PvProduction:F1} kWh
{s.Consumption}{record.LoadConsumption:F1} kWh
{s.GridImport}{record.GridImport:F1} kWh
{s.GridExport}{record.GridExport:F1} kWh
{s.BatteryInOut}{record.BatteryCharged:F1} / {record.BatteryDischarged:F1} kWh
+
+
{s.SavingsHeader}
+ + + {SavingsBox(s.SolarEnergyUsed, $"{energySaved:F1} kWh", s.StayedAtHome, "#27ae60")} + {SavingsBox(s.EstMoneySaved, $"~{savingsCHF:F0} CHF", s.AtRate, "#2980b9")} + {SavingsBox(s.SolarCoverage, $"{selfSufficiency:F0}%", s.FromSolar, "#8e44ad")} + {SavingsBox(s.BatteryEff, $"{batteryEfficiency:F0}%", s.OutVsIn, "#e67e22")} + +
+
+ {s.Footer} + +
+
+ +"; + } + + public static string BuildAggregatedHtmlEmail( string periodStart, string periodEnd, string installationName, double pvProduction, double consumption, double gridImport, double gridExport, double batteryCharged, double batteryDischarged, double energySaved, double savingsCHF, @@ -623,6 +723,7 @@ public static class ReportEmailService +
{s.Title}
{installationName}
{periodStart} — {periodEnd}
diff --git a/typescript/frontend-marios2/src/Resources/images/inesco_logo_for_dark_bg.svg b/typescript/frontend-marios2/src/Resources/images/inesco_logo_for_dark_bg.svg new file mode 100644 index 000000000..c58778608 --- /dev/null +++ b/typescript/frontend-marios2/src/Resources/images/inesco_logo_for_dark_bg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/DailySection.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/DailySection.tsx index e21c151e4..c1206734e 100644 --- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/DailySection.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/DailySection.tsx @@ -97,10 +97,12 @@ function getCurrentWeekDays(currentMonday: Date): Date[] { export default function DailySection({ installationId, - onHasData + onHasData, + onPeriodChange }: { installationId: number; onHasData?: (hasData: boolean) => void; + onPeriodChange?: (date: string) => void; }) { const intl = useIntl(); const currentMonday = useMemo(() => getCurrentMonday(), []); @@ -113,7 +115,11 @@ export default function DailySection({ const [allRecords, setAllRecords] = useState([]); const [allHourlyRecords, setAllHourlyRecords] = useState([]); - const [selectedDate, setSelectedDate] = useState(formatDateISO(yesterday)); + const [selectedDate, setSelectedDate] = useState(() => { + const date = formatDateISO(yesterday); + onPeriodChange?.(date); + return date; + }); const [selectedDayRecord, setSelectedDayRecord] = useState(null); const [hourlyRecords, setHourlyRecords] = useState([]); const [loadingWeek, setLoadingWeek] = useState(false); @@ -174,6 +180,7 @@ export default function DailySection({ const handleStripSelect = (date: string) => { setSelectedDate(date); setNoData(false); + onPeriodChange?.(date); }; const dt = new Date(selectedDate + 'T00:00:00'); diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/WeeklyReport.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/WeeklyReport.tsx index 326621352..f19929a26 100644 --- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/WeeklyReport.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/WeeklyReport.tsx @@ -236,6 +236,8 @@ function WeeklyReport({ installationId }: WeeklyReportProps) { const [regenerating, setRegenerating] = useState(false); const [dailyHasData, setDailyHasData] = useState(false); const [weeklyHasData, setWeeklyHasData] = useState(false); + const [downloadingPdf, setDownloadingPdf] = useState(false); + const [reportPeriod, setReportPeriod] = useState<{ start: string; end: string; year?: number; month?: number } | null>(null); const weeklyRef = useRef(null); const fetchReportData = () => { @@ -302,16 +304,56 @@ function WeeklyReport({ installationId }: WeeklyReportProps) { return false; })(); + const handleDownloadPdf = async () => { + const reportType = tabs[safeTab]?.key ?? 'report'; + let endpoint = ''; + const params: Record = { installationId, language: intl.locale }; + + switch (reportType) { + case 'daily': + endpoint = '/GetDailyReportHtml'; + if (reportPeriod?.start) params.date = reportPeriod.start; + break; + case 'weekly': + endpoint = '/GetWeeklyReportHtml'; + break; + case 'monthly': + endpoint = '/GetMonthlyReportHtml'; + if (reportPeriod?.year) params.year = reportPeriod.year; + if (reportPeriod?.month) params.month = reportPeriod.month; + break; + case 'yearly': + endpoint = '/GetYearlyReportHtml'; + if (reportPeriod?.year) params.year = reportPeriod.year; + break; + } + + if (!endpoint) return; + + setDownloadingPdf(true); + try { + const res = await axiosConfig.get(endpoint, { params, responseType: 'text' }); + const printWindow = window.open('', '_blank'); + if (!printWindow) return; + + const dateRange = reportPeriod + ? `${reportPeriod.start.replace(/-/g, '')}-${reportPeriod.end.replace(/-/g, '')}` + : new Date().toISOString().split('T')[0].replace(/-/g, ''); + + printWindow.document.write(res.data); + printWindow.document.close(); + printWindow.document.title = `inesco-energy-${installationId}-${reportType}-${dateRange}`; + printWindow.onafterprint = () => printWindow.close(); + setTimeout(() => printWindow.print(), 500); + } catch (err) { + console.error('PDF download failed', err); + } finally { + setDownloadingPdf(false); + } + }; + return ( - } - onClick={() => window.print()} + startIcon={downloadingPdf ? : } + onClick={handleDownloadPdf} + disabled={downloadingPdf} sx={{ ml: 2, whiteSpace: 'nowrap' }} > @@ -361,7 +404,7 @@ function WeeklyReport({ installationId }: WeeklyReportProps) { - + setReportPeriod({ start: date, end: date })} /> setReportPeriod({ start, end })} /> @@ -384,6 +428,7 @@ function WeeklyReport({ installationId }: WeeklyReportProps) { onGenerate={handleGenerateMonthly} selectedIdx={selectedMonthlyIdx} onSelectedIdxChange={setSelectedMonthlyIdx} + onPeriodChange={(r: MonthlyReport) => setReportPeriod({ start: r.periodStart, end: r.periodEnd, year: r.year, month: r.month })} /> @@ -395,6 +440,7 @@ function WeeklyReport({ installationId }: WeeklyReportProps) { onGenerate={handleGenerateYearly} selectedIdx={selectedYearlyIdx} onSelectedIdxChange={setSelectedYearlyIdx} + onPeriodChange={(r: YearlyReport) => setReportPeriod({ start: r.periodStart, end: r.periodEnd, year: r.year })} /> @@ -407,8 +453,8 @@ interface WeeklySectionHandle { regenerate: () => void; } -const WeeklySection = forwardRef void }>( - ({ installationId, latestMonthlyPeriodEnd, onHasData }, ref) => { +const WeeklySection = forwardRef void; onPeriodChange?: (start: string, end: string) => void }>( + ({ installationId, latestMonthlyPeriodEnd, onHasData, onPeriodChange }, ref) => { const intl = useIntl(); const [report, setReport] = useState(null); const [loading, setLoading] = useState(true); @@ -427,6 +473,7 @@ const WeeklySection = forwardRef void; selectedIdx: number; onSelectedIdxChange: (idx: number) => void; + onPeriodChange?: (report: MonthlyReport) => void; }) { const intl = useIntl(); @@ -871,6 +920,7 @@ function MonthlySection({ sendParamsFn={(r: MonthlyReport) => ({ installationId, year: r.year, month: r.month })} controlledIdx={selectedIdx} onIdxChange={onSelectedIdxChange} + onPeriodChange={onPeriodChange} /> ) : pendingMonths.length === 0 ? ( @@ -892,7 +942,8 @@ function YearlySection({ generating, onGenerate, selectedIdx, - onSelectedIdxChange + onSelectedIdxChange, + onPeriodChange }: { installationId: number; reports: YearlyReport[]; @@ -901,6 +952,7 @@ function YearlySection({ onGenerate: (year: number) => void; selectedIdx: number; onSelectedIdxChange: (idx: number) => void; + onPeriodChange?: (report: YearlyReport) => void; }) { const intl = useIntl(); @@ -952,6 +1004,7 @@ function YearlySection({ sendParamsFn={(r: YearlyReport) => ({ installationId, year: r.year })} controlledIdx={selectedIdx} onIdxChange={onSelectedIdxChange} + onPeriodChange={onPeriodChange} /> ) : pendingYears.length === 0 ? ( @@ -975,7 +1028,8 @@ function AggregatedSection({ sendEndpoint, sendParamsFn, controlledIdx, - onIdxChange + onIdxChange, + onPeriodChange }: { reports: T[]; type: 'monthly' | 'yearly'; @@ -986,6 +1040,7 @@ function AggregatedSection({ sendParamsFn: (r: T) => object; controlledIdx?: number; onIdxChange?: (idx: number) => void; + onPeriodChange?: (report: T) => void; }) { const intl = useIntl(); const [internalIdx, setInternalIdx] = useState(0); @@ -993,8 +1048,16 @@ function AggregatedSection({ const handleIdxChange = (idx: number) => { setInternalIdx(idx); onIdxChange?.(idx); + if (reports[idx]) onPeriodChange?.(reports[idx]); }; + // Report initial period on mount + useEffect(() => { + if (reports.length > 0 && reports[selectedIdx]) { + onPeriodChange?.(reports[selectedIdx]); + } + }, [reports.length]); + if (reports.length === 0) { return ( From 2d612876c20da9def3470b42bb196a8eaa2f069c Mon Sep 17 00:00:00 2001 From: Yinyin Liu Date: Thu, 19 Mar 2026 12:56:03 +0100 Subject: [PATCH 2/4] fixed always check battery priority setting when it's in other priority mode --- .../SodistoreHomeConfiguration.tsx | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx index 620a8f388..a6caf051b 100644 --- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx @@ -100,14 +100,16 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) { clusterNumber: props.values.Config.ClusterNumber ?? 1, PvNumber: props.values.Config.PvNumber ?? 0, timeChargeandDischargePower: props.values.Config?.TimeChargeandDischargePower ?? 0, - startTimeChargeandDischargeDayandTime: - props.values.Config?.StartTimeChargeandDischargeDayandTime - ? dayjs(props.values.Config.StartTimeChargeandDischargeDayandTime).toDate() - : null, - stopTimeChargeandDischargeDayandTime: - props.values.Config?.StopTimeChargeandDischargeDayandTime - ? dayjs(props.values.Config.StopTimeChargeandDischargeDayandTime).toDate() - : null, + startTimeChargeandDischargeDayandTime: (() => { + const raw = props.values.Config?.StartTimeChargeandDischargeDayandTime; + const parsed = raw ? dayjs(raw) : null; + return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date(); + })(), + stopTimeChargeandDischargeDayandTime: (() => { + const raw = props.values.Config?.StopTimeChargeandDischargeDayandTime; + const parsed = raw ? dayjs(raw) : null; + return parsed && parsed.year() >= 2020 ? parsed.toDate() : new Date(); + })(), controlPermission: String(props.values.Config.ControlPermission).toLowerCase() === "true", }); @@ -200,9 +202,11 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) { }); }; -// Add time validation function +// Add time validation function — only relevant for Sinexcel BatteryPriority const validateTimeOnly = () => { - if (formValues.startTimeChargeandDischargeDayandTime && + if (device === 4 && + OperatingPriorityOptions[formValues.operatingPriority] === 'BatteryPriority' && + formValues.startTimeChargeandDischargeDayandTime && formValues.stopTimeChargeandDischargeDayandTime) { const startHours = formValues.startTimeChargeandDischargeDayandTime.getHours(); const startMinutes = formValues.startTimeChargeandDischargeDayandTime.getMinutes(); From 897f3137f5db87d7cfe0d557415f9b02d7c08dce Mon Sep 17 00:00:00 2001 From: Yinyin Liu Date: Thu, 19 Mar 2026 13:34:37 +0100 Subject: [PATCH 3/4] allow multiple inverter SN regiter --- .../Information/InformationSodistoreHome.tsx | 156 +++++++++++++++--- 1 file changed, 136 insertions(+), 20 deletions(-) diff --git a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx index b7b8b6cfa..0b3308884 100644 --- a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx @@ -53,6 +53,50 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { [] ); + // Parse inverter/datalogger serial numbers from various legacy formats: + // Slash-separated: "SN001/SN002" + // Labeled comma: "Inverter 1: SN001, Inverter 2: SN002" + // Labeled comma: "Datalogger 1: SN001, Datalogger 2: SN002" + // Plain string: "SN001" + const parseSerialNumbers = (value: string | undefined): string[] => { + if (!value || value.trim() === '') return []; + + // Check for labeled comma format: "Inverter 1: SN001, Inverter 2: SN002" + if (/(?:Inverter|Datalogger)\s*\d+\s*:/i.test(value)) { + const matches = value.match(/(?:Inverter|Datalogger)\s*\d+\s*:\s*([^,]+)/gi); + if (matches) { + return matches + .map((m) => m.replace(/^(?:Inverter|Datalogger)\s*\d+\s*:\s*/i, '').trim()) + .filter((s) => s !== ''); + } + } + + // Slash-separated format: "SN001/SN002" + if (value.includes('/')) { + return value.split('/').filter((s) => s.trim() !== ''); + } + + // Single value + return [value.trim()]; + }; + + const [inverterNumber, setInverterNumber] = useState(() => { + const parts = parseSerialNumbers(props.values.inverterSN); + return parts.length > 0 ? parts.length : 1; + }); + const [inverterSerialNumbers, setInverterSerialNumbers] = useState( + () => { + const parts = parseSerialNumbers(props.values.inverterSN); + return parts.length > 0 ? parts : ['']; + } + ); + const [dataloggerSerialNumbers, setDataloggerSerialNumbers] = useState( + () => { + const parts = parseSerialNumbers(props.values.dataloggerSN); + return parts.length > 0 ? parts : ['']; + } + ); + const DeviceTypes = [ { id: 3, name: 'Growatt' }, { id: 4, name: 'Sinexcel' } @@ -141,6 +185,59 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { } } }; + const handleInverterNumberChange = (e) => { + const inputValue = e.target.value; + // Allow empty while user is mid-edit + if (inputValue === '') { + setInverterNumber(''); + return; + } + if (/^\d+$/.test(inputValue)) { + const value = Math.max(1, parseInt(inputValue)); + setInverterNumber(value); + + const newInverterSNs = Array.from({ length: value }, (_, i) => + inverterSerialNumbers[i] || '' + ); + const newDataloggerSNs = Array.from({ length: value }, (_, i) => + dataloggerSerialNumbers[i] || '' + ); + setInverterSerialNumbers(newInverterSNs); + setDataloggerSerialNumbers(newDataloggerSNs); + setFormValues({ + ...formValues, + inverterSN: newInverterSNs.filter((s) => s !== '').join('/'), + dataloggerSN: newDataloggerSNs.filter((s) => s !== '').join('/') + }); + } + }; + + const handleInverterNumberBlur = () => { + if (inverterNumber === '' || inverterNumber < 1) { + setInverterNumber(1); + } + }; + + const handleInverterSerialNumberChange = (index: number, value: string) => { + const updated = [...inverterSerialNumbers]; + updated[index] = value; + setInverterSerialNumbers(updated); + setFormValues({ + ...formValues, + inverterSN: updated.filter((s) => s !== '').join('/') + }); + }; + + const handleDataloggerSerialNumberChange = (index: number, value: string) => { + const updated = [...dataloggerSerialNumbers]; + updated[index] = value; + setDataloggerSerialNumbers(updated); + setFormValues({ + ...formValues, + dataloggerSN: updated.filter((s) => s !== '').join('/') + }); + }; + const handleSubmit = () => { setLoading(true); setError(false); @@ -495,35 +592,54 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { } - name="inverterSN" - value={formValues.inverterSN} - onChange={handleChange} + name="inverterNumber" + type="text" + value={inverterNumber} + onChange={handleInverterNumberChange} + onBlur={handleInverterNumberBlur} variant="outlined" fullWidth inputProps={{ readOnly: !canEdit }} /> -
- 0 && + inverterSerialNumbers.map((sn, index) => ( +
+ + handleInverterSerialNumberChange(index, e.target.value) + } + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} /> - } - name="dataloggerSN" - value={formValues.dataloggerSN} - onChange={handleChange} - variant="outlined" - fullWidth - inputProps={{ readOnly: !canEdit }} - /> -
+
+ ))} + + {typeof inverterNumber === 'number' && inverterNumber > 0 && + dataloggerSerialNumbers.map((sn, index) => ( +
+ + handleDataloggerSerialNumberChange(index, e.target.value) + } + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} + /> +
+ ))}
Date: Mon, 23 Mar 2026 13:19:14 +0100 Subject: [PATCH 4/4] restructure sodistore home Information tab --- csharp/App/Backend/DataTypes/Installation.cs | 5 +- csharp/App/Backend/Database/Db.cs | 5 + .../Information/InformationSodistoreHome.tsx | 881 ++++++++++-------- .../Information/installationSetupUtils.ts | 112 +++ .../SodistorehomeInstallationForm.tsx | 41 +- .../src/interfaces/InstallationTypes.tsx | 4 + typescript/frontend-marios2/src/lang/de.json | 19 + typescript/frontend-marios2/src/lang/en.json | 19 + typescript/frontend-marios2/src/lang/fr.json | 19 + typescript/frontend-marios2/src/lang/it.json | 19 + 10 files changed, 752 insertions(+), 372 deletions(-) create mode 100644 typescript/frontend-marios2/src/content/dashboards/Information/installationSetupUtils.ts diff --git a/csharp/App/Backend/DataTypes/Installation.cs b/csharp/App/Backend/DataTypes/Installation.cs index c1b612192..bdf63571d 100644 --- a/csharp/App/Backend/DataTypes/Installation.cs +++ b/csharp/App/Backend/DataTypes/Installation.cs @@ -49,7 +49,10 @@ public class Installation : TreeNode public int BatteryClusterNumber { get; set; } = 0; public int BatteryNumber { get; set; } = 0; public string BatterySerialNumbers { get; set; } = ""; - + public string PvStringsPerInverter { get; set; } = ""; + public string InstallationModel { get; set; } = ""; + public string ExternalEms { get; set; } = "No"; + [Ignore] public String OrderNumbers { get; set; } public String VrmLink { get; set; } = ""; diff --git a/csharp/App/Backend/Database/Db.cs b/csharp/App/Backend/Database/Db.cs index 73a22eb0a..e8a197206 100644 --- a/csharp/App/Backend/Database/Db.cs +++ b/csharp/App/Backend/Database/Db.cs @@ -130,6 +130,11 @@ public static partial class Db fileConnection.CreateTable(); fileConnection.CreateTable(); + // Migrate new columns: set defaults for existing rows where NULL or empty + fileConnection.Execute("UPDATE Installation SET ExternalEms = 'No' WHERE ExternalEms IS NULL OR ExternalEms = ''"); + fileConnection.Execute("UPDATE Installation SET InstallationModel = '' WHERE InstallationModel IS NULL"); + fileConnection.Execute("UPDATE Installation SET PvStringsPerInverter = '' WHERE PvStringsPerInverter IS NULL"); + return fileConnection; //return CopyDbToMemory(fileConnection); } diff --git a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx index 0b3308884..3cb43e526 100644 --- a/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx @@ -1,8 +1,12 @@ import { + Accordion, + AccordionDetails, + AccordionSummary, Alert, Autocomplete, Box, CardContent, + Chip, CircularProgress, Container, FormControl, @@ -16,10 +20,11 @@ import { Typography, useTheme } from '@mui/material'; -import { FormattedMessage } from 'react-intl'; +import { FormattedMessage, useIntl } from 'react-intl'; import Button from '@mui/material/Button'; import { Close as CloseIcon } from '@mui/icons-material'; -import React, { useContext, useState, useEffect, useRef } from 'react'; +import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; +import React, { useContext, useState, useEffect } from 'react'; import { I_S3Credentials } from '../../../interfaces/S3Types'; import { I_Installation } from '../../../interfaces/InstallationTypes'; import { InstallationsContext } from '../../../contexts/InstallationsContextProvider'; @@ -28,6 +33,16 @@ import routes from '../../../Resources/routes.json'; import { useNavigate } from 'react-router-dom'; import { UserType } from '../../../interfaces/UserTypes'; import axiosConfig from '../../../Resources/axiosConfig'; +import { + INSTALLATION_PRESETS, + PresetConfig, + BatterySnTree, + parseBatterySnTree, + buildEmptyTree, + remapTree, + computeFlatValues, + wouldLoseData, +} from './installationSetupUtils'; interface InformationSodistorehomeProps { values: I_Installation; @@ -43,15 +58,13 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { const context = useContext(UserContext); const { currentUser } = context; const theme = useTheme(); + const intl = useIntl(); const [formValues, setFormValues] = useState(props.values); const requiredFields = ['name', 'region', 'location', 'country']; const [openModalDeleteInstallation, setOpenModalDeleteInstallation] = useState(false); + const [pendingPreset, setPendingPreset] = useState(null); const navigate = useNavigate(); - const [batteryNumber, setBatteryNumber] = useState(0); - const [batterySerialNumbers, setBatterySerialNumbers] = useState( - [] - ); // Parse inverter/datalogger serial numbers from various legacy formats: // Slash-separated: "SN001/SN002" @@ -71,51 +84,179 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { } } - // Slash-separated format: "SN001/SN002" + // Slash-separated format: "SN001/SN002" — preserve empty positions if (value.includes('/')) { - return value.split('/').filter((s) => s.trim() !== ''); + return value.split('/'); } // Single value return [value.trim()]; }; - const [inverterNumber, setInverterNumber] = useState(() => { - const parts = parseSerialNumbers(props.values.inverterSN); - return parts.length > 0 ? parts.length : 1; - }); - const [inverterSerialNumbers, setInverterSerialNumbers] = useState( - () => { - const parts = parseSerialNumbers(props.values.inverterSN); - return parts.length > 0 ? parts : ['']; - } - ); - const [dataloggerSerialNumbers, setDataloggerSerialNumbers] = useState( - () => { - const parts = parseSerialNumbers(props.values.dataloggerSN); - return parts.length > 0 ? parts : ['']; - } - ); - const DeviceTypes = [ { id: 3, name: 'Growatt' }, { id: 4, name: 'Sinexcel' } ]; - const batterySnRefs = useRef<(HTMLInputElement | null)[]>([]); + // Preset state — initializes from persisted installationModel, empty for legacy + const [selectedPreset, setSelectedPreset] = useState( + props.values.installationModel || '' + ); + const presetConfig: PresetConfig | null = INSTALLATION_PRESETS[selectedPreset] || null; - // Initialize battery data from props - useEffect(() => { - if (props.values.batteryNumber) { - setBatteryNumber(props.values.batteryNumber); + const [batterySnTree, setBatterySnTree] = useState(() => { + if (presetConfig) { + return parseBatterySnTree(props.values.batterySerialNumbers || '', presetConfig); } - if (props.values.batterySerialNumbers) { - const serialNumbers = props.values.batterySerialNumbers - .split(',') - .filter((sn) => sn.trim() !== ''); - setBatterySerialNumbers(serialNumbers); + return []; + }); + + const [inverterSerialNumbers, setInverterSerialNumbers] = useState(() => + parseSerialNumbers(props.values.inverterSN) + ); + const [dataloggerSerialNumbers, setDataloggerSerialNumbers] = useState(() => + parseSerialNumbers(props.values.dataloggerSN) + ); + + // PV strings per inverter — persisted as comma-separated, default "1" per inverter + const [pvStringsPerInverter, setPvStringsPerInverter] = useState(() => { + const stored = props.values.pvStringsPerInverter; + if (stored && stored.trim() !== '') { + return stored.split(',').map((s) => s.trim()); } - }, []); + const invCount = presetConfig?.length + || parseSerialNumbers(props.values.inverterSN).length + || 1; + return Array.from({ length: invCount }, () => '1'); + }); + + const handlePresetChange = (newPreset: string) => { + const newConfig = INSTALLATION_PRESETS[newPreset]; + if (!newConfig) return; + + // Check for data loss — either from existing tree or legacy flat data + const treeToCheck = batterySnTree.length > 0 + ? batterySnTree + : props.values.batterySerialNumbers + ? parseBatterySnTree(props.values.batterySerialNumbers, newConfig) + : []; + if (treeToCheck.length > 0 && wouldLoseData(treeToCheck, newConfig)) { + setPendingPreset(newPreset); + return; + } + + applyPreset(newPreset); + }; + + const handlePresetChangeConfirm = () => { + if (pendingPreset) { + applyPreset(pendingPreset); + setPendingPreset(null); + } + }; + + const handlePresetChangeCancel = () => { + setPendingPreset(null); + }; + + const applyPreset = (newPreset: string) => { + const newConfig = INSTALLATION_PRESETS[newPreset]; + if (!newConfig) return; + + setSelectedPreset(newPreset); + + let newTree: BatterySnTree; + if (presetConfig && batterySnTree.length > 0) { + // Switching between presets — remap existing tree + newTree = remapTree(batterySnTree, newConfig); + } else if (props.values.batterySerialNumbers) { + // First preset selection on legacy installation — parse existing flat data + newTree = parseBatterySnTree(props.values.batterySerialNumbers, newConfig); + } else { + newTree = buildEmptyTree(newConfig); + } + setBatterySnTree(newTree); + + const newInvCount = newConfig.length; + const newInvSNs = Array.from({ length: newInvCount }, (_, i) => + inverterSerialNumbers[i] || '' + ); + const newDlSNs = Array.from({ length: newInvCount }, (_, i) => + dataloggerSerialNumbers[i] || '' + ); + const newPvStrings = Array.from({ length: newInvCount }, (_, i) => + pvStringsPerInverter[i] || '1' + ); + setInverterSerialNumbers(newInvSNs); + setDataloggerSerialNumbers(newDlSNs); + setPvStringsPerInverter(newPvStrings); + + const flat = computeFlatValues(newConfig, newTree); + setFormValues({ + ...formValues, + ...flat, + installationModel: newPreset, + inverterSN: newInvSNs.join('/'), + dataloggerSN: newDlSNs.join('/'), + pvStringsPerInverter: newPvStrings.join(','), + }); + }; + + const handleInverterSnChange = (invIdx: number, value: string) => { + const updated = [...inverterSerialNumbers]; + updated[invIdx] = value; + setInverterSerialNumbers(updated); + setFormValues({ + ...formValues, + inverterSN: updated.join('/'), + }); + }; + + const handleDataloggerSnChange = (invIdx: number, value: string) => { + const updated = [...dataloggerSerialNumbers]; + updated[invIdx] = value; + setDataloggerSerialNumbers(updated); + setFormValues({ + ...formValues, + dataloggerSN: updated.join('/'), + }); + }; + + const handlePvStringsChange = (invIdx: number, value: string) => { + if (value !== '' && !/^\d+$/.test(value)) return; + const updated = [...pvStringsPerInverter]; + updated[invIdx] = value; + setPvStringsPerInverter(updated); + setFormValues({ + ...formValues, + pvStringsPerInverter: updated.join(','), + }); + }; + + const handleBatterySnTreeChange = ( + invIdx: number, + clIdx: number, + batIdx: number, + value: string + ) => { + const newTree = batterySnTree.map((inv, i) => + i === invIdx + ? inv.map((cl, j) => + j === clIdx + ? cl.map((bat, k) => (k === batIdx ? value : bat)) + : cl + ) + : inv + ); + setBatterySnTree(newTree); + if (presetConfig) { + const flat = computeFlatValues(presetConfig, newTree); + setFormValues({ + ...formValues, + ...flat, + }); + } + }; const installationContext = useContext(InstallationsContext); const { @@ -137,107 +278,6 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { }); }; - const handleBatteryNumberChange = (e) => { - const inputValue = e.target.value; - // Only allow numeric input - if (inputValue === '' || /^\d+$/.test(inputValue)) { - const value = inputValue === '' ? 0 : parseInt(inputValue); - setBatteryNumber(value); - - if (value > 0) { - // Resize array: preserve existing serial numbers, add empty for new slots - const newSerialNumbers = Array.from({ length: value }, (_, index) => { - return batterySerialNumbers[index] || ''; - }); - setBatterySerialNumbers(newSerialNumbers); - - setFormValues({ - ...formValues, - batteryNumber: value, - batterySerialNumbers: newSerialNumbers.filter((sn) => sn !== '').join(',') - }); - } else { - // Field is empty (user is mid-edit) — don't clear serial numbers - setFormValues({ - ...formValues, - batteryNumber: 0 - }); - } - } - }; - - const handleBatterySerialNumberChange = (index: number, value: string) => { - const updatedSerialNumbers = [...batterySerialNumbers]; - updatedSerialNumbers[index] = value; - setBatterySerialNumbers(updatedSerialNumbers); - setFormValues({ - ...formValues, - batterySerialNumbers: updatedSerialNumbers.filter((sn) => sn !== '').join(',') - }); - }; - - const handleBatterySnKeyDown = (e: React.KeyboardEvent, index: number) => { - if (e.key === 'Enter') { - e.preventDefault(); - const nextIndex = index + 1; - if (nextIndex < batteryNumber && batterySnRefs.current[nextIndex]) { - batterySnRefs.current[nextIndex].focus(); - } - } - }; - const handleInverterNumberChange = (e) => { - const inputValue = e.target.value; - // Allow empty while user is mid-edit - if (inputValue === '') { - setInverterNumber(''); - return; - } - if (/^\d+$/.test(inputValue)) { - const value = Math.max(1, parseInt(inputValue)); - setInverterNumber(value); - - const newInverterSNs = Array.from({ length: value }, (_, i) => - inverterSerialNumbers[i] || '' - ); - const newDataloggerSNs = Array.from({ length: value }, (_, i) => - dataloggerSerialNumbers[i] || '' - ); - setInverterSerialNumbers(newInverterSNs); - setDataloggerSerialNumbers(newDataloggerSNs); - setFormValues({ - ...formValues, - inverterSN: newInverterSNs.filter((s) => s !== '').join('/'), - dataloggerSN: newDataloggerSNs.filter((s) => s !== '').join('/') - }); - } - }; - - const handleInverterNumberBlur = () => { - if (inverterNumber === '' || inverterNumber < 1) { - setInverterNumber(1); - } - }; - - const handleInverterSerialNumberChange = (index: number, value: string) => { - const updated = [...inverterSerialNumbers]; - updated[index] = value; - setInverterSerialNumbers(updated); - setFormValues({ - ...formValues, - inverterSN: updated.filter((s) => s !== '').join('/') - }); - }; - - const handleDataloggerSerialNumberChange = (index: number, value: string) => { - const updated = [...dataloggerSerialNumbers]; - updated[index] = value; - setDataloggerSerialNumbers(updated); - setFormValues({ - ...formValues, - dataloggerSN: updated.filter((s) => s !== '').join('/') - }); - }; - const handleSubmit = () => { setLoading(true); setError(false); @@ -389,6 +429,75 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { )} + {pendingPreset !== null && ( + + + + + + +
+ + +
+ + + )} + + + + +
- } + label={} name="name" value={formValues.name} onChange={handleChange} @@ -425,9 +533,7 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
- } + label={} name="region" value={formValues.region} onChange={handleChange} @@ -440,12 +546,7 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
- } + label={} name="location" value={formValues.location} onChange={handleChange} @@ -458,9 +559,7 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
- } + label={} name="country" value={formValues.country} onChange={handleChange} @@ -472,87 +571,22 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { />
-
- - setFormValues({ - ...formValues, - networkProvider: (val as string) || '' - }) - } - onInputChange={(_e, val) => - setFormValues({ - ...formValues, - networkProvider: val || '' - }) - } - disabled={!canEdit && !isPartner} - loading={loadingProviders} - renderInput={(params) => ( - - } - variant="outlined" - fullWidth - InputProps={{ - ...params.InputProps, - endAdornment: ( - <> - {loadingProviders ? ( - - ) : null} - {params.InputProps.endAdornment} - - ) - }} - /> - )} - /> -
- - {canEdit && ( + {formValues.installationModel && (
- } - name="vpnIp" - value={formValues.vpnIp} - onChange={handleChange} + label={} + value={formValues.installationModel} variant="outlined" fullWidth + inputProps={{ readOnly: true }} />
)}
- - - + + + { + const val = e.target.value as string; + setFormValues({ ...formValues, externalEms: val }); + }} + inputProps={{ readOnly: !canEdit && !isPartner }} + > + + Solar Manager + Smart Fox + Loxone + + + +
- {typeof inverterNumber === 'number' && inverterNumber > 0 && - inverterSerialNumbers.map((sn, index) => ( -
- - handleInverterSerialNumberChange(index, e.target.value) - } - variant="outlined" - fullWidth - inputProps={{ readOnly: !canEdit }} - /> -
- ))} - - {typeof inverterNumber === 'number' && inverterNumber > 0 && - dataloggerSerialNumbers.map((sn, index) => ( -
- - handleDataloggerSerialNumberChange(index, e.target.value) - } - variant="outlined" - fullWidth - inputProps={{ readOnly: !canEdit }} - /> -
- ))} - -
- - } - name="batteryClusterNumber" - value={formValues.batteryClusterNumber} - onChange={handleChange} - variant="outlined" - fullWidth - inputProps={{ readOnly: !canEdit }} - /> -
- -
- - } - name="batteryNumber" - type="text" - value={batteryNumber === 0 ? '' : batteryNumber} - onChange={handleBatteryNumberChange} - variant="outlined" - fullWidth - placeholder={canEdit ? 'Enter number of batteries' : ''} - inputProps={{ readOnly: !canEdit }} - /> -
- - {batteryNumber > 0 && - batterySerialNumbers.map((serialNumber, index) => ( -
- - handleBatterySerialNumberChange(index, e.target.value) - } - onKeyDown={(e) => handleBatterySnKeyDown(e, index)} - inputRef={(el) => (batterySnRefs.current[index] = el)} - variant="outlined" - fullWidth - placeholder={canEdit ? 'Scan or enter serial number' : ''} - inputProps={{ readOnly: !canEdit }} - /> -
- ))} - + {formValues.externalEms && + !['No', 'Solar Manager', 'Smart Fox', 'Loxone'].includes(formValues.externalEms) && ( +
+ } + name="externalEms" + value={formValues.externalEms === 'Other' ? '' : formValues.externalEms} + onChange={handleChange} + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit && !isPartner }} + /> +
)}
- } + label={} name="information" value={formValues.information} onChange={handleChange} @@ -716,35 +690,202 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) { />
- {canEdit && ( + {(canEdit || isPartner) && ( <> + + + +
- + + + Installation Model + + +
+
+ } + name="serialNumber" + value={formValues.serialNumber} + onChange={handleChange} + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} + /> +
+ + {presetConfig && presetConfig.map((clusters, invIdx) => { + const invSn = inverterSerialNumbers[invIdx] || ''; + const totalBat = clusters.reduce((a, b) => a + b, 0); + const filledBat = (batterySnTree[invIdx] || []).flat().filter((s) => s !== '').length; + const filledClusters = (batterySnTree[invIdx] || []).filter( + (cl) => cl.some((s) => s !== '') + ).length; + + return ( + + } + sx={{ + '& .MuiAccordionSummary-content': { flexGrow: 0, justifyContent: 'flex-start' }, + justifyContent: 'flex-start', + '& .MuiAccordionSummary-expandIconWrapper': { ml: 1 } + }} + > + + + + + + + handleInverterSnChange(invIdx, e.target.value)} + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} + /> + handleDataloggerSnChange(invIdx, e.target.value)} + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} + /> + handlePvStringsChange(invIdx, e.target.value)} + variant="outlined" + fullWidth + inputProps={{ readOnly: !canEdit }} + /> + + {clusters.map((batteryCount, clIdx) => { + const filledInCluster = (batterySnTree[invIdx]?.[clIdx] || []).filter((s) => s !== '').length; + return ( + + } + sx={{ + '& .MuiAccordionSummary-content': { flexGrow: 0, justifyContent: 'flex-start' }, + justifyContent: 'flex-start', + '& .MuiAccordionSummary-expandIconWrapper': { ml: 1 } + }} + > + + + + + + + {Array.from({ length: batteryCount }, (_, batIdx) => ( + + handleBatterySnTreeChange(invIdx, clIdx, batIdx, e.target.value) + } + variant="outlined" + fullWidth + placeholder={canEdit ? 'Scan or enter serial number' : ''} + inputProps={{ readOnly: !canEdit }} + /> + ))} + + + ); })} + + + ); + })} + + )} + + {canEdit && ( + <> + + + + +
+ } + name="vpnIp" + value={formValues.vpnIp} + onChange={handleChange} + variant="outlined" + fullWidth + /> +
+
+ +
-
= { + 'sodistore home 9': [[1, 1]], + 'sodistore home 18': [[2, 2]], + 'sodistore home 27': [[2, 2], [1, 1]], + 'sodistore home 36': [[2, 2], [2, 2]], +}; + +export const buildEmptyTree = (preset: PresetConfig): BatterySnTree => { + return preset.map((inv) => + inv.map((batteryCount) => Array.from({ length: batteryCount }, () => '')) + ); +}; + +export const parseBatterySnTree = ( + raw: string, + preset: PresetConfig +): BatterySnTree => { + if (!raw || raw.trim() === '') { + return buildEmptyTree(preset); + } + + const isStructured = raw.includes('/') || raw.includes('|'); + + if (isStructured) { + const inverters = raw.split('/'); + return preset.map((invPreset, invIdx) => { + const clusterStr = inverters[invIdx] || ''; + const clusters = clusterStr ? clusterStr.split('|') : []; + return invPreset.map((batteryCount, clIdx) => { + const batteries = clusters[clIdx] + ? clusters[clIdx].split(',').map((s) => s.trim()) + : []; + return Array.from({ length: batteryCount }, (_, i) => batteries[i] || ''); + }); + }); + } + + // Legacy flat format: distribute by preset layout + const allSns = raw + .split(',') + .map((s) => s.trim()) + .filter((s) => s !== ''); + let idx = 0; + return preset.map((inv) => + inv.map((batteryCount) => + Array.from({ length: batteryCount }, () => allSns[idx++] || '') + ) + ); +}; + +export const serializeBatterySnTree = (tree: BatterySnTree): string => { + return tree + .map((inv) => inv.map((cluster) => cluster.join(',')).join('|')) + .join('/'); +}; + +export const remapTree = ( + oldTree: BatterySnTree, + newPreset: PresetConfig +): BatterySnTree => { + return newPreset.map((inv, invIdx) => + inv.map((batteryCount, clIdx) => + Array.from( + { length: batteryCount }, + (_, batIdx) => oldTree[invIdx]?.[clIdx]?.[batIdx] || '' + ) + ) + ); +}; + +export const computeFlatValues = ( + preset: PresetConfig, + tree: BatterySnTree +) => { + const totalBatteries = preset.flat().reduce((a, b) => a + b, 0); + const totalClusters = preset.reduce((sum, inv) => sum + inv.length, 0); + return { + batteryNumber: totalBatteries, + batteryClusterNumber: totalClusters, + batterySerialNumbers: serializeBatterySnTree(tree), + }; +}; + +export const wouldLoseData = ( + oldTree: BatterySnTree, + newPreset: PresetConfig +): boolean => { + for (let invIdx = 0; invIdx < oldTree.length; invIdx++) { + for (let clIdx = 0; clIdx < (oldTree[invIdx] || []).length; clIdx++) { + for ( + let batIdx = 0; + batIdx < (oldTree[invIdx][clIdx] || []).length; + batIdx++ + ) { + const sn = oldTree[invIdx][clIdx][batIdx]; + if (sn && sn.trim() !== '') { + if (invIdx >= newPreset.length) return true; + if (clIdx >= (newPreset[invIdx] || []).length) return true; + const newBatCount = newPreset[invIdx]?.[clIdx] ?? 0; + if (batIdx >= newBatCount) return true; + } + } + } + } + return false; +}; diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistorehomeInstallationForm.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistorehomeInstallationForm.tsx index 89bffedd4..764189e54 100644 --- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistorehomeInstallationForm.tsx +++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistorehomeInstallationForm.tsx @@ -17,6 +17,7 @@ import { Close as CloseIcon } from '@mui/icons-material'; import { I_Installation } from 'src/interfaces/InstallationTypes'; import { InstallationsContext } from 'src/contexts/InstallationsContextProvider'; import { FormattedMessage } from 'react-intl'; +import { INSTALLATION_PRESETS } from '../Information/installationSetupUtils'; interface SodistorehomeInstallationFormPros { cancel: () => void; @@ -33,8 +34,10 @@ function SodistorehomeInstallationForm(props: SodistorehomeInstallationFormPros) location: '', country: '', vpnIp: '', + installationModel: '', + externalEms: 'No', }); - const requiredFields = ['name', 'location', 'country', 'vpnIp']; + const requiredFields = ['name', 'location', 'country', 'vpnIp', 'installationModel']; const DeviceTypes = [ { id: 3, name: 'Growatt' }, @@ -171,6 +174,42 @@ function SodistorehomeInstallationForm(props: SodistorehomeInstallationFormPros) />
+
+ + + + + + +
+