chellow 1717489198.0.0__py3-none-any.whl → 1717768383.0.0__py3-none-any.whl

chellow/e/bill_parsers/settlement_dc_stark_xlsx.py

@@ -8,7 +8,7 @@ from openpyxl import load_workbook
 from werkzeug.exceptions import BadRequest
 
 from chellow.models import Session
-from chellow.utils import hh_format, parse_mpan_core, to_utc
+from chellow.utils import parse_mpan_core, to_utc
 
 
 class Parser:
@@ -99,10 +99,18 @@ class Parser:
                     ad_hoc_visits = self.get_dec("P", row)
                     ad_hoc_rate = self.get_dec("Q", row)
                     ad_hoc_gbp = self.get_dec("R", row)
+                    activity_names = set()
+                    activity_gbp = Decimal("0")
+                    if ad_hoc_gbp != 0:
+                        activity_names.add("ad_hoc_visit")
+                        activity_gbp += ad_hoc_gbp
 
                     annual_visits = self.get_int("S", row)
                     annual_rate = self.get_dec("T", row)
                     annual_gbp = self.get_dec("U", row)
+                    if annual_gbp != 0:
+                        activity_names.add("annual_visit")
+                        activity_gbp += annual_gbp
 
                     if cop_3_meters > 0:
                         cop = "3"
@@ -121,19 +129,16 @@ class Parser:
                         "mpan-gbp": mpan_gbp,
                         "ad-hoc-visits": ad_hoc_visits,
                         "ad-hoc-rate": [ad_hoc_rate],
-                        "ad-hoc-gbp": ad_hoc_gbp,
+                        "ad-hoc-gbp-info": ad_hoc_gbp,
                         "annual-visits-count": annual_visits,
                         "annual-visits-rate": [annual_rate],
-                        "annual-visits-gbp": annual_gbp,
+                        "annual-visits-gbp-info": annual_gbp,
                     }
-                    annual_date_cell = self.get_cell("V", row)
-                    annual_date_value = annual_date_cell.value
-                    if annual_date_value is not None:
-                        if isinstance(annual_date_value, Datetime):
-                            annual_date = hh_format(annual_date_value)
-                        else:
-                            annual_date = annual_date_value
-                        breakdown["annual-visits-date"] = [annual_date]
+                    if len(activity_names) > 0:
+                        breakdown["activity-name"] = sorted(activity_names)
+
+                    if activity_gbp != 0:
+                        breakdown["activity-gbp"] = activity_gbp
 
                     bills.append(
                         {

{chellow-1717489198.0.0.dist-info → chellow-1717768383.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1717489198.0.0
+Version: 1717768383.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

{chellow-1717489198.0.0.dist-info → chellow-1717768383.0.0.dist-info}/RECORD

@@ -53,7 +53,7 @@ chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_q
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
 chellow/e/bill_parsers/mm.py,sha256=ShhaVc0IpShpy4Q2pfj3EfjhpjbffQutKsAq6ivNiys,8522
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
-chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=gKeYMdUO4bVycV8n1lWs5AIfF3bHZLkM6tkasD4rhHs,6239
+chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
 chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3xtFhM,7533
 chellow/gas/bill_import.py,sha256=w0lPgK_Drzh8rtnEBQe3qFuxrgzZ6qQSgpaGrrGznMU,6549
@@ -364,6 +364,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1717489198.0.0.dist-info/METADATA,sha256=ot9Lf-fyAnN_scgT4ordJTmGiv3CDAIOUQz3lmqiV28,12205
-chellow-1717489198.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1717489198.0.0.dist-info/RECORD,,
+chellow-1717768383.0.0.dist-info/METADATA,sha256=FSbmmHYytVZN9CdVIekLk3eUbkbT4a-3mLVR3ow7PFM,12205
+chellow-1717768383.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1717768383.0.0.dist-info/RECORD,,