chellow 1726827015.0.0__py3-none-any.whl → 1727166948.0.0__py3-none-any.whl

chellow/e/views.py

@@ -340,38 +340,41 @@ def channel_edit_post(channel_id):
 
 @e.route("/channel_snags")
 def channel_snags_get():
-    contract_id = req_int("dc_contract_id")
-    contract = Contract.get_dc_by_id(g.sess, contract_id)
+    contract_id = req_int_none("dc_contract_id")
+    if contract_id is None:
+        contract = None
+    else:
+        contract = Contract.get_dc_by_id(g.sess, contract_id)
     days_hidden = req_int("days_hidden")
     is_ignored = req_bool("is_ignored")
 
-    total_snags = (
-        g.sess.query(Snag)
+    cutoff_date = utc_datetime_now() - relativedelta(days=days_hidden)
+
+    total_snags_q = (
+        select(func.count())
+        .select_from(Snag)
         .join(Channel)
         .join(Era)
-        .filter(
-            Snag.is_ignored == false(),
-            Era.dc_contract == contract,
-            Snag.start_date < utc_datetime_now() - relativedelta(days=days_hidden),
-        )
-        .count()
+        .where(Snag.is_ignored == false(), Snag.start_date < cutoff_date)
     )
-    snags = (
-        g.sess.query(Snag)
+    snags_q = (
+        select(Snag)
         .join(Channel)
         .join(Era)
         .join(Era.site_eras)
         .join(SiteEra.site)
-        .filter(
-            Snag.is_ignored == is_ignored,
-            Era.dc_contract == contract,
-            Snag.start_date < utc_datetime_now() - relativedelta(days=days_hidden),
-        )
+        .where(Snag.is_ignored == is_ignored, Snag.start_date < cutoff_date)
         .order_by(Site.code, Era.id, Snag.start_date, Snag.finish_date, Snag.channel_id)
     )
+    if contract is not None:
+        total_snags_q = total_snags_q.where(Era.dc_contract == contract)
+        snags_q = snags_q.where(Era.dc_contract == contract)
+
+    total_snags = g.sess.execute(total_snags_q)
+
     snag_groups = []
     prev_snag = None
-    for snag in islice(snags, 200):
+    for snag in islice(g.sess.scalars(snags_q), 200):
         if (
             prev_snag is None
             or snag.channel.era != prev_snag.channel.era
@@ -382,10 +385,12 @@ def channel_snags_get():
             era = snag.channel.era
             snag_group = {
                 "snags": [],
-                "sites": g.sess.query(Site)
-                .join(Site.site_eras)
-                .filter(SiteEra.era == era)
-                .order_by(Site.code),
+                "sites": g.sess.scalars(
+                    select(Site)
+                    .join(Site.site_eras)
+                    .where(SiteEra.era == era)
+                    .order_by(Site.code)
+                ),
                 "era": era,
                 "description": snag.description,
                 "start_date": snag.start_date,
@@ -398,7 +403,6 @@ def channel_snags_get():
     return render_template(
         "channel_snags.html",
         contract=contract,
-        snags=snags,
         total_snags=total_snags,
         snag_groups=snag_groups,
         is_ignored=is_ignored,

chellow/reports/report_233.py

@@ -7,6 +7,7 @@ from dateutil.relativedelta import relativedelta
 
 from flask import g
 
+from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import false, select, true
 
 from chellow.dloads import open_file
@@ -21,7 +22,14 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import csv_make_val, hh_before, req_bool, req_int, utc_datetime_now
+from chellow.utils import (
+    csv_make_val,
+    hh_before,
+    req_bool,
+    req_int,
+    req_int_none,
+    utc_datetime_now,
+)
 from chellow.views import chellow_redirect
 
 
@@ -30,9 +38,17 @@ def content(contract_id, days_hidden, is_ignored, user_id):
     try:
         with Session() as sess:
             user = User.get_by_id(sess, user_id)
-            f = open_file("channel_snags.csv", user, mode="w", newline="")
+            if contract_id is None:
+                contract = None
+                namef = "all"
+            else:
+                contract = Contract.get_dc_by_id(sess, contract_id)
+                namef = "".join(x if x.isalnum() else "_" for x in contract.name)
+
+            f = open_file(f"channel_snags_{namef}.csv", user, mode="w", newline="")
             writer = csv.writer(f, lineterminator="\n")
             titles = (
+                "contract",
                 "Hidden Days",
                 "Chellow Id",
                 "Imp MPAN Core",
@@ -50,8 +66,6 @@ def content(contract_id, days_hidden, is_ignored, user_id):
             )
             writer.writerow(titles)
 
-            contract = Contract.get_dc_by_id(sess, contract_id)
-
             now = utc_datetime_now()
             cutoff_date = now - relativedelta(days=days_hidden)
             q = (
@@ -63,7 +77,6 @@ def content(contract_id, days_hidden, is_ignored, user_id):
                 .join(Site, SiteEra.site_id == Site.id)
                 .where(
                     SiteEra.is_physical == true(),
-                    Era.dc_contract == contract,
                     Snag.start_date < cutoff_date,
                 )
                 .order_by(
@@ -75,7 +88,11 @@ def content(contract_id, days_hidden, is_ignored, user_id):
                     Snag.start_date,
                     Snag.id,
                 )
+                .options(joinedload(Era.dc_contract))
             )
+            if contract is not None:
+                q = q.where(Era.dc_contract == contract)
+
             if not is_ignored:
                 q = q.where(Snag.is_ignored == false())
 
@@ -97,6 +114,7 @@ def content(contract_id, days_hidden, is_ignored, user_id):
                         age_of_snag = delta.days
 
                 vals = {
+                    "contract": era.dc_contract.name,
                     "Hidden Days": days_hidden,
                     "Chellow Id": snag.id,
                     "Imp MPAN Core": imp_mc,
@@ -124,7 +142,7 @@ def content(contract_id, days_hidden, is_ignored, user_id):
 
 
 def do_get(sess):
-    contract_id = req_int("dc_contract_id")
+    contract_id = req_int_none("dc_contract_id")
     days_hidden = req_int("days_hidden")
     is_ignored = req_bool("is_ignored")
 

chellow/templates/e/channel_snags.html

@@ -1,12 +1,18 @@
 {% extends "base.html" %}
 
 {% block title %}
-	» DC Contracts » {{contract.name}} » Channel Snags
+	» DC Contracts » 
+	{% if contract %}
+		{{contract.name}} »
+	{% endif %}
+	Channel Snags
 {% endblock %}
 
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
-	<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a> &raquo;
+	{% if contract %}
+		<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a> &raquo;
+	{% endif %}
  	Channel Snags
 {% endblock %}
 
@@ -31,7 +37,11 @@
 	<form action="/e/channel_snags">
 		<fieldset>
 			<legend>Show Channel Snags</legend>	
-			<input type="hidden" name="dc_contract_id" value="{{contract.id}}">
+			<input type="hidden" name="dc_contract_id" value="
+				{%- if contract -%}
+					{{contract.id}}
+				{%- endif -%}
+			">
 			<label>Hide snags &lt; days old</label>
 		 	{{input_text('days_hidden', '0', 3, 3)}}
 			<label>Include ignored snags</label> {{input_checkbox('is_ignored', False)}} 
@@ -51,6 +61,7 @@
 		<thead>
 			<tr>
 				<th>View</th>
+				<th>Contract</th>
 				<th>Import MPAN Core</th>
 				<th>Export MPAN Core</th>
 				<th>Sites</th>
@@ -73,6 +84,7 @@
 							{% endfor %}
 						</ul>
 					</td>
+					<td>{{snag_group.era.dc_contract}}</td>
 					<td>
 						{% if snag_group.era.imp_mpan_core %}
 							{{snag_group.era.imp_mpan_core}}

chellow/templates/e/dc_contracts.html

@@ -31,6 +31,12 @@
 		</tbody>
 	</table>
 
+	<ul>
+		<li>
+			<a href="/e/channel_snags?dc_contract_id=&amp;days_hidden=5">Channel Snags</a>
+		</li>
+	</ul>
+
 	<table>
 		<caption>Latest File Imports</caption>
 		<thead>

{chellow-1726827015.0.0.dist-info → chellow-1727166948.0.0.dist-info}/METADATA

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

@@ -39,7 +39,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=LG9KeYfXDkOvd7GrywuQPG1qDnpFvKe1oa95H0wRlqY,220618
+chellow/e/views.py,sha256=AL7h9vqFUoCKjHmm769CScuaW2APy61poK2SIS0yN-c,220804
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -77,7 +77,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=cA0lfJKnJg41Zc4_gZB1KUXZ9JeJo0TiTlu5jm1bdDM,7158
 chellow/reports/report_231.py,sha256=uhO1algP7sibpZVaniqGs56HOCPCQeDO-Y-UfvFQwnI,5311
-chellow/reports/report_233.py,sha256=cIatj-HHYW_GNIRsji-DlsmYjt8rUdm_5xujPLOYL8U,4537
+chellow/reports/report_233.py,sha256=HJRn4wH7RsYIduD2MNZYjFTbgb5LIu8_-jmUuRc0Q6Y,5016
 chellow/reports/report_241.py,sha256=AlFmSHnfG2HWv_ICmWX7fNpPwLHjq7mo1QtOTjSKO3k,5384
 chellow/reports/report_247.py,sha256=0Tvce9acMR5nWB0ITJh9n2V5qlEVtSWFEle-ca0P2Bw,44368
 chellow/reports/report_29.py,sha256=KDFjgrLBv4WbG9efCdu_geMR7gT_QV9N97Wfdt7aDc4,2736
@@ -161,7 +161,7 @@ chellow/templates/e/channel_add.html,sha256=szwQJBHx2kAoSFomXDHD0N_7PSd4drqOoAWh
 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=tDZWp8s0gt5AtqArpclSl6hOafQCetz7Sp4MfZJ7dWQ,2964
+chellow/templates/e/channel_snags.html,sha256=KZZnCzaif-v8Inkc-FwhYtl1_SzwbKUqZQTKUeqnZkU,3152
 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
@@ -192,7 +192,7 @@ chellow/templates/e/dc_contract_hh_import.html,sha256=JncR3L6cOK4jghsGyr-itEqlIe
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
 chellow/templates/e/dc_contract_properties.html,sha256=2EmA91gYWZcTOHQ3PxXQrpTOb8dm0OGjwRWsW6qNI9s,455
 chellow/templates/e/dc_contract_properties_edit.html,sha256=TGYcHTlWbk5WmjZPkdbHhRVZcOpEfhowCp2penZcGiE,1704
-chellow/templates/e/dc_contracts.html,sha256=vatnEwXJ9xvk97_NI537rTKqIExAuDGhquQ8k07s5xA,1708
+chellow/templates/e/dc_contracts.html,sha256=FPZUM7fkw-R6sRELHZCQTUkKSRqad8HOLHnyyYhQEEw,1819
 chellow/templates/e/dc_contracts_add.html,sha256=2lrGrNqAoKp16OiMoNDNlJxBMW3QdSPfgEFheSg826s,710
 chellow/templates/e/dc_rate_script.html,sha256=gfKUHV2IMsTQT-cYfjl4aiEBqGEWSj3uW22UZpoyGq4,1219
 chellow/templates/e/dc_rate_script_add.html,sha256=5MlE4r5eLww3xI9qZRlu8hE8bU7RVwyDJcr20-0e4uY,644
@@ -366,6 +366,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1726827015.0.0.dist-info/METADATA,sha256=_RtwmQ5grjvRyA7QXWSTTrJffG-mtTxPlzLPA0XudjU,12204
-chellow-1726827015.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1726827015.0.0.dist-info/RECORD,,
+chellow-1727166948.0.0.dist-info/METADATA,sha256=OFqmReMcR3x1oI4pDpOfuE-psdPEqI8sF4QQV5SPCsE,12204
+chellow-1727166948.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1727166948.0.0.dist-info/RECORD,,