1 parent
2406f58a91
commit
9e110a467a
9 files changed
+70
-70
No files matched your search
@@ -251,23 +251,23 @@ namespace Elwig.Helpers.Billing {
|
||||
|
||||
try {
|
||||
return new JsonObject() {
|
||||
["15kmw"] = Math.Round(y.Distinct().Single(), prec)
|
||||
["15kmw"] = Math.Round((decimal)y.Distinct().Single(), prec)
|
||||
};
|
||||
} catch { }
|
||||
|
||||
var data = new JsonObject();
|
||||
if (y[0] != y[1]) {
|
||||
data[$"{x[0]}{mode}"] = Math.Round(y[0], prec);
|
||||
data[$"{x[0]}{mode}"] = Math.Round((decimal)y[0], prec);
|
||||
}
|
||||
for (int i = 1; i < x.Length - 1; i++) {
|
||||
var d1 = Math.Round(y[i] - y[i - 1], prec);
|
||||
var d2 = Math.Round(y[i + 1] - y[i], prec);
|
||||
var d1 = Math.Round((decimal)(y[i] - y[i - 1]), prec);
|
||||
var d2 = Math.Round((decimal)(y[i + 1] - y[i]), prec);
|
||||
if (d1 != d2) {
|
||||
data[$"{x[i]}{mode}"] = Math.Round(y[i], prec);
|
||||
data[$"{x[i]}{mode}"] = Math.Round((decimal)y[i], prec);
|
||||
}
|
||||
}
|
||||
if (y[^1] != y[^2]) {
|
||||
data[$"{x[^1]}{mode}"] = Math.Round(y[^1], prec);
|
||||
data[$"{x[^1]}{mode}"] = Math.Round((decimal)y[^1], prec);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
@@ -275,7 +275,7 @@ namespace Elwig.Helpers.Billing {
|
||||
protected static JsonNode GraphEntryToJson(GraphEntry entry) {
|
||||
try {
|
||||
if (entry.ContractedFlatBonus == null) {
|
||||
return JsonValue.Create((decimal)entry.DataGraph.DataY.Distinct().Single());
|
||||
return JsonValue.Create(Math.Round((decimal)entry.DataGraph.DataY.Distinct().Single(), entry.DataGraph.Precision));
|
||||
}
|
||||
} catch { }
|
||||
|
||||
@@ -287,7 +287,7 @@ namespace Elwig.Helpers.Billing {
|
||||
curve["data"] = GraphToJson(entry.DataGraph, entry.Mode.ToString().ToLower());
|
||||
|
||||
if (entry.ContractedFlatBonus != null) {
|
||||
curve["ctrd"] = (decimal)entry.ContractedFlatBonus;
|
||||
curve["ctrd"] = Math.Round((decimal)entry.ContractedFlatBonus, entry.ContractedGraph?.Precision ?? entry.DataGraph.Precision);
|
||||
} else if (entry.ContractedGraph != null) {
|
||||
curve["ctrd"] = GraphToJson(entry.ContractedGraph, entry.Mode.ToString().ToLower());
|
||||
}
|
||||
|
||||
@@ -579,7 +579,7 @@ namespace Elwig.Helpers {
|
||||
body.Add(doc.AsEmailAttachment($"{name}.pdf"));
|
||||
}
|
||||
msg.Body = body;
|
||||
await client!.SendAsync(msg);
|
||||
await client!.SendAsync(new SmtpSendRequest(msg));
|
||||
await AddSentMails([(
|
||||
"email", member.MgNr, member.AdministrativeName,
|
||||
member.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
|
||||
|
||||
Reference in new issue
Block a user