From cb774d19506ce5933132e13d3b390fd492f92c54 Mon Sep 17 00:00:00 2001 From: MarkBryanMilligan Date: Mon, 9 Aug 2021 12:43:47 -0500 Subject: [PATCH] Fix some timezone bugs. --- .../lanternsoftware/datamodel/currentmonitor/BillingMode.java | 1 + .../lanternsoftware/datamodel/currentmonitor/BillingRate.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingMode.java b/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingMode.java index 1e52ef7..e353294 100644 --- a/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingMode.java +++ b/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingMode.java @@ -1,6 +1,7 @@ package com.lanternsoftware.datamodel.currentmonitor; public enum BillingMode { + ANY_DIRECTION, CONSUMPTION, PRODUCTION; } diff --git a/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingRate.java b/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingRate.java index b834ee3..1c52a91 100644 --- a/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingRate.java +++ b/currentmonitor/lantern-datamodel-currentmonitor/src/main/java/com/lanternsoftware/datamodel/currentmonitor/BillingRate.java @@ -119,9 +119,9 @@ public class BillingRate { } public boolean isApplicable(BillingMode _mode, int _meter, double _monthKWh, Date _time, TimeZone _tz) { - if (mode != _mode) + if ((mode != BillingMode.ANY_DIRECTION) && (mode != _mode)) return false; - if (_meter != meter) + if ((meter != -1) && (_meter != meter)) return false; if ((monthKWhStart > 0) && (_monthKWh < monthKWhStart)) return false;