chellow 1726820485.0.0__tar.gz → 1727166948.0.0__tar.gz

{chellow-1726820485.0.0 → chellow-1727166948.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1726820485.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-1727166948.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1727166948.0.0"

{chellow-1726820485.0.0 → chellow-1727166948.0.0}/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-1726820485.0.0 → chellow-1727166948.0.0}/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-1726820485.0.0 → chellow-1727166948.0.0}/chellow/reports/report_59.py

@@ -670,7 +670,7 @@ def _process_site(
 
                     _add_bills(era_vals, bills, chunk_start, chunk_finish)
 
-                    era_rows.append([make_val(vals.get(t)) for t in era_titles])
+                    era_rows.append([make_val(era_vals.get(t)) for t in era_titles])
                     for t in summary_titles:
                         v = era_vals.get(t)
                         if v is not None:
@@ -1066,7 +1066,9 @@ def content(
             ef.write(msg + "\n")
             ef.close()
         else:
-            write_spreadsheet(rf, compression, site_rows, era_rows, normal_read_rows)
+            write_spreadsheet(
+                rf, compression, site_rows, supply_rows, era_rows, normal_read_rows
+            )
     finally:
         if rf is not None:
             rf.close()

{chellow-1726820485.0.0 → chellow-1727166948.0.0}/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-1726820485.0.0 → chellow-1727166948.0.0}/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>