chellow 1715329858.0.0__py3-none-any.whl → 1715873476.0.0__py3-none-any.whl

chellow/reports/report_233.py

@@ -7,7 +7,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import g
 
-from sqlalchemy.sql.expression import true
+from sqlalchemy.sql.expression import false, select, true
 
 from chellow.dloads import open_file
 from chellow.models import (
@@ -21,11 +21,11 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import csv_make_val, hh_before, req_int, utc_datetime_now
+from chellow.utils import csv_make_val, hh_before, req_bool, req_int, utc_datetime_now
 from chellow.views import chellow_redirect
 
 
-def content(contract_id, days_hidden, user_id):
+def content(contract_id, days_hidden, is_ignored, user_id):
     f = writer = None
     try:
         with Session() as sess:
@@ -54,15 +54,14 @@ def content(contract_id, days_hidden, user_id):
 
             now = utc_datetime_now()
             cutoff_date = now - relativedelta(days=days_hidden)
-
-            for snag, channel, era, supply, site_era, site in (
-                sess.query(Snag, Channel, Era, Supply, SiteEra, Site)
+            q = (
+                select(Snag, Channel, Era, Supply, SiteEra, Site)
                 .join(Channel, Snag.channel_id == Channel.id)
                 .join(Era, Channel.era_id == Era.id)
                 .join(Supply, Era.supply_id == Supply.id)
                 .join(SiteEra, Era.site_eras)
                 .join(Site, SiteEra.site_id == Site.id)
-                .filter(
+                .where(
                     SiteEra.is_physical == true(),
                     Era.dc_contract == contract,
                     Snag.start_date < cutoff_date,
@@ -76,7 +75,11 @@ def content(contract_id, days_hidden, user_id):
                     Snag.start_date,
                     Snag.id,
                 )
-            ):
+            )
+            if not is_ignored:
+                q = q.where(Snag.is_ignored == false())
+
+            for snag, channel, era, supply, site_era, site in sess.execute(q):
                 snag_start = snag.start_date
                 snag_finish = snag.finish_date
                 imp_mc = "" if era.imp_mpan_core is None else era.imp_mpan_core
@@ -123,7 +126,8 @@ def content(contract_id, days_hidden, user_id):
 def do_get(sess):
     contract_id = req_int("dc_contract_id")
     days_hidden = req_int("days_hidden")
+    is_ignored = req_bool("is_ignored")
 
-    args = contract_id, days_hidden, g.user.id
+    args = contract_id, days_hidden, is_ignored, g.user.id
     threading.Thread(target=content, args=args).start()
     return chellow_redirect("/downloads", 303)

chellow/reports/report_59.py

@@ -166,7 +166,7 @@ def _process_site(
                         "imp-mpan-core": "displaced",
                         "site-code": site.code,
                         "site-name": site.name,
-                        "associated-site-ids": set(),
+                        "associated-site-codes": set(),
                         "source": "displaced",
                         "supply-name": "displaced",
                     },
@@ -211,7 +211,7 @@ def _process_site(
                         "finish-date": main_ss.finish_date,
                         "site-code": site.code,
                         "site-name": site.name,
-                        "associated-site-ids": set(),
+                        "associated-site-codes": set(),
                     },
                 )
 
@@ -405,7 +405,7 @@ def _process_site(
 
             vals["imp-mpan-core"] = imp_mpan_core
             vals["exp-mpan-core"] = exp_mpan_core
-            vals["associated-site-ids"] = era_associates
+            vals["associated-site-codes"] = era_associates
             vals["era-start-date"] = sss.era.start_date
             vals["era-finish-date"] = sss.era.finish_date
             vals["imp-supplier-contract"] = imp_supplier_contract_name
@@ -435,7 +435,7 @@ def _process_site(
 
             supply_data["imp-mpan-core"] = imp_mpan_core
             supply_data["exp-mpan-core"] = exp_mpan_core
-            supply_data["associated-site-ids"].update(era_associates)
+            supply_data["associated-site-codes"].update(era_associates)
             supply_data["start-date"] = min(sss.start_date, supply_data["start-date"])
             supply_data["finish-date"] = max(
                 sss.finish_date, supply_data["finish-date"]
@@ -844,9 +844,9 @@ def content(
                 "finish-date",
                 "imp-mpan-core",
                 "exp-mpan-core",
-                "site-id",
+                "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "era-start-date",
                 "era-finish-date",
                 "imp-supplier-contract",
@@ -870,7 +870,7 @@ def content(
                 "exp-mpan-core",
                 "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "source",
                 "generator-type",
                 "supply-name",
@@ -881,9 +881,9 @@ def content(
             ]
             site_header_titles = [
                 "creation-date",
-                "site-id",
+                "site-code",
                 "site-name",
-                "associated-site-ids",
+                "associated-site-codes",
                 "start-date",
                 "finish-date",
                 "metering-type",

chellow/templates/e/channel_snags.html

@@ -17,7 +17,8 @@
 			<legend>Download CSV</legend>	
 			<input type="hidden" name="dc_contract_id" value="{{contract.id}}">
 			<label>Hide snags &lt; days old</label>
-			<input size="3" maxlength="3" name="days_hidden" value="0">
+		 	{{input_text('days_hidden', '0', 3, 3)}}
+			<label>Include ignored snags</label> {{input_checkbox('is_ignored', False)}} 
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>

{chellow-1715329858.0.0.dist-info → chellow-1715873476.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1715329858.0.0
+Version: 1715873476.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-1715329858.0.0.dist-info → chellow-1715873476.0.0.dist-info}/RECORD

@@ -74,7 +74,7 @@ chellow/reports/report_183.py,sha256=DZX-hHJPl_Tbgkt31C_cuLZg_5L2b6iCPQ5foOZizR0
 chellow/reports/report_187.py,sha256=UvpaYHjyJFNV5puYq8_KxfzoBtVrwFgIGUOmC5oGA9A,9956
 chellow/reports/report_219.py,sha256=o2eEg3mX9_raP2b4gjc2Gu4vqnMqcvvJBYQ1oQjxvpE,6637
 chellow/reports/report_231.py,sha256=gOb1AkXZQvwVpRg5cIenO7iR7Se1_zsWnJp9l2BlgpA,5008
-chellow/reports/report_233.py,sha256=DLAmkoHFKH-N8OEIoX4jeCxAaCfJK0e7ssjFJJpPqzw,4334
+chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
 chellow/reports/report_247.py,sha256=ozgCcee8XeqYbOpZCyU2STJKaz6h2x7TYQogagTaYLw,46626
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
@@ -83,7 +83,7 @@ chellow/reports/report_33.py,sha256=laVz-itDbJTdvC6LxLEeuY0eKpYx43Un4adiExPTEEE,
 chellow/reports/report_387.py,sha256=KcClrEOK5IRvePp0Jgbzs1Gwf-_CqYmEtFFlXrr_Z3E,5670
 chellow/reports/report_41.py,sha256=QQeTshA1Og7N3wPaoZ8ynJzwsvZ1mgSFc7DDkVqIZoM,7447
 chellow/reports/report_429.py,sha256=0GCc0rQnOSG0fusw69yMMOCxnWApBd3P2sGWIg1py9M,12359
-chellow/reports/report_59.py,sha256=21uNlcuYQCOAvrRir241HR-6SsuL9bWEPVCcU_jOxfE,44731
+chellow/reports/report_59.py,sha256=d3qosO0s0y7xsn4i-ZGQLF420Zaax0lYI2KnolIPNi8,44749
 chellow/reports/report_81.py,sha256=UYr0Dm4TmCCYUbIWw3hWNI0GdQRhH27vwVk3Ytdsrcg,5288
 chellow/reports/report_87.py,sha256=ZadBo40rUORN0Fi926-dDHeTFn6L-fBzp3b4k7v5MdY,6802
 chellow/reports/report_asset_comparison.py,sha256=UN298MHuzyUDUiiZr7F_Ua6SrdVOlFLjgKjnIbrA-14,6118
@@ -158,7 +158,7 @@ chellow/templates/e/channel_add.html,sha256=X1hi0b-ZjchlQ2m7uZYCyqkqU-Qd1s3_5u4z
 chellow/templates/e/channel_edit.html,sha256=OUkdiS2NBQ_w4gmxRxXAcRToM5BT8DWWJrtQMFs-GUU,2198
 chellow/templates/e/channel_snag.html,sha256=wBJ5KBfeJdAeRmaB0qu0AD9Z4nM5fn6tJ_8bNqTWtoo,1477
 chellow/templates/e/channel_snag_edit.html,sha256=sUFI4Ml3F1B35x8_t_Pz3hWuQN9Xtxr3kt4u8hdxNwY,1911
-chellow/templates/e/channel_snags.html,sha256=57bVmu2SwetdpWQbImMykO-qgY7wXi6Y9plRqykOGy4,2901
+chellow/templates/e/channel_snags.html,sha256=tDZWp8s0gt5AtqArpclSl6hOafQCetz7Sp4MfZJ7dWQ,2964
 chellow/templates/e/comm.html,sha256=DSlAaDg1r4KYq9VUgDtt2lgW6apZjZvwhMujIJINmps,383
 chellow/templates/e/comms.html,sha256=bUXZePnMfpKk1E71qLGOSkx8r3GxdPPD_-MosIXXq4s,434
 chellow/templates/e/cop.html,sha256=ULv7ALFJHMUgPX96hQNm2irc3edtKYHS6fYAxvmzj8M,376
@@ -363,6 +363,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-1715329858.0.0.dist-info/METADATA,sha256=BQZ9tHpLeOFjIHah8sWynsNdPnzLkwfnXQPYiBVjBN4,12205
-chellow-1715329858.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1715329858.0.0.dist-info/RECORD,,
+chellow-1715873476.0.0.dist-info/METADATA,sha256=5qysvugFv1uEf-D4XOI0puLlQnhADi536FsnFnyivXU,12205
+chellow-1715873476.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1715873476.0.0.dist-info/RECORD,,