chellow 1760028799.0.0__py3-none-any.whl → 1761056531.0.0__py3-none-any.whl

chellow/dloads.py

@@ -91,7 +91,7 @@ class DloadFile:
 def open_file(base, user, mode="r", newline=None, is_zip=False):
     global download_id
 
-    base = base.replace("/", "").replace(" ", "")
+    base = "".join(x if (x.isalnum() or x in "_.") else "_" for x in base)
     try:
         lock.acquire()
         if len(list(download_path.iterdir())) == 0:
@@ -108,7 +108,7 @@ def open_file(base, user, mode="r", newline=None, is_zip=False):
             un = user.proxy_username
         else:
             un = user.email_address
-        uname = un.replace("@", "").replace(".", "").replace("\\", "")
+        uname = "".join(x if (x.isalnum() or x in "_") else "_" for x in un)
 
     names = tuple("_".join((serial, v, uname, base)) for v in ("RUNNING", "FINISHED"))
     running_name, finished_name = tuple(download_path / name for name in names)

chellow/e/views.py

@@ -381,7 +381,7 @@ def channel_snags_get():
         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)
+    total_snags = g.sess.scalars(total_snags_q).one()
 
     snag_groups = []
     prev_snag = None

chellow/reports/report_247.py

@@ -1116,10 +1116,7 @@ def do_post(sess):
                 exp_mpan_core if imp_mpan_core is None else imp_mpan_core
             ]
 
-        if "compression" in request.values:
-            compression = req_bool("compression")
-        else:
-            compression = True
+        compression = req_bool("compression")
 
         user = g.user
 

chellow/reports/report_channel_snags.py

@@ -0,0 +1,288 @@
+import csv
+import sys
+import threading
+import traceback
+
+from dateutil.relativedelta import relativedelta
+
+from flask import g, redirect, render_template
+
+from sqlalchemy.orm import joinedload
+from sqlalchemy.sql.expression import false, select, true
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.dloads import open_file
+from chellow.models import (
+    Channel,
+    Contract,
+    Era,
+    Party,
+    RSession,
+    Site,
+    SiteEra,
+    Snag,
+    Supply,
+    User,
+)
+from chellow.utils import (
+    csv_make_val,
+    hh_before,
+    req_bool,
+    req_int,
+    req_int_none,
+    req_str,
+    utc_datetime_now,
+)
+
+
+def _make_rows(
+    sess,
+    now,
+    contract,
+    days_hidden,
+    is_ignored,
+    show_settlement,
+    only_ongoing,
+    days_long_hidden,
+    limit=None,
+):
+    cutoff_date = now - relativedelta(days=days_hidden)
+    q = (
+        select(Snag, Channel, Era, Supply, SiteEra, Site, Contract)
+        .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)
+        .join(Contract, Era.dc_contract_id == Contract.id)
+        .where(
+            SiteEra.is_physical == true(),
+            Snag.start_date < cutoff_date,
+        )
+        .order_by(
+            Site.code,
+            Supply.id,
+            Channel.imp_related,
+            Channel.channel_type,
+            Snag.description,
+            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())
+
+    if show_settlement == "yes":
+        q = q.join(Party, Supply.dno_id == Party.id).where(Party.dno_code != "99")
+    elif show_settlement == "no":
+        q = q.join(Party, Supply.dno_id == Party.id).where(Party.dno_code == "99")
+    elif show_settlement == "both":
+        pass
+    else:
+        raise BadRequest("show_settlement must be 'yes', 'no' or 'both'.")
+
+    snag_groups = []
+    prev_snag = None
+    for snag, channel, era, supply, site_era, site, contract in sess.execute(q):
+        snag_start = snag.start_date
+        snag_finish = snag.finish_date
+
+        if snag_finish is None:
+            duration = now - snag_start
+            age_of_snag = None
+        else:
+            duration = snag_finish - snag_start
+            if hh_before(cutoff_date, snag_finish):
+                age_of_snag = None
+            else:
+                delta = now - snag_finish
+                age_of_snag = delta.days
+
+        if only_ongoing and age_of_snag is not None:
+            continue
+
+        if days_long_hidden is not None and duration < days_long_hidden:
+            continue
+
+        if (
+            prev_snag is None
+            or channel.era != prev_snag.channel.era
+            or snag.start_date != prev_snag.start_date
+            or snag.finish_date != prev_snag.finish_date
+            or snag.description != prev_snag.description
+        ):
+            if limit is not None and len(snag_groups) > limit:
+                break
+
+            snag_group = {
+                "snags": [],
+                "site": site,
+                "era": era,
+                "supply": supply,
+                "description": snag.description,
+                "start_date": snag.start_date,
+                "finish_date": snag.finish_date,
+                "contract": contract,
+                "contract_name": contract.name,
+                "hidden_days": days_hidden,
+                "chellow_id": snag.id,
+                "imp_mpan_core": era.imp_mpan_core,
+                "exp_mpan_core": era.exp_mpan_core,
+                "site_code": site.code,
+                "site_name": site.name,
+                "snag_description": snag.description,
+                "channel_type": channel.channel_type,
+                "is_ignored": snag.is_ignored,
+                "days_since_finished": age_of_snag,
+                "duration": duration.days,
+            }
+            snag_groups.append(snag_group)
+        snag_group["snags"].append(snag)
+        prev_snag = snag
+
+    def make_key(item):
+        return item["duration"]
+
+    snag_groups.sort(key=make_key, reverse=True)
+    return snag_groups
+
+
+def content(
+    contract_id,
+    days_hidden,
+    is_ignored,
+    user_id,
+    only_ongoing,
+    show_settlement,
+    days_long_hidden,
+):
+    f = writer = None
+    try:
+        with RSession() as sess:
+            user = User.get_by_id(sess, user_id)
+            if contract_id is None:
+                contract = None
+                namef = "all"
+            else:
+                contract = Contract.get_dc_by_id(sess, contract_id)
+                namef = 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_ids",
+                "imp_mpan_core",
+                "exp_mpan_core",
+                "site_code",
+                "site_name",
+                "snag_description",
+                "channel_types",
+                "start_date",
+                "finish_date",
+                "is_ignored",
+                "days_since_finished",
+                "duration",
+            )
+            writer.writerow(titles)
+
+            now = utc_datetime_now()
+            for snag_group in _make_rows(
+                sess,
+                now,
+                contract,
+                days_hidden,
+                is_ignored,
+                show_settlement,
+                only_ongoing,
+                days_long_hidden,
+            ):
+
+                vals = {
+                    "contract": snag_group["contract"].name,
+                    "hidden_days": days_hidden,
+                    "chellow_ids": [snag.id for snag in snag_group["snags"]],
+                    "imp_mpan_core": snag_group["imp_mpan_core"],
+                    "exp_mpan_core": snag_group["exp_mpan_core"],
+                    "site": snag_group["site"],
+                    "site_code": snag_group["site"].code,
+                    "site_name": snag_group["site"].name,
+                    "snag_description": snag_group["description"],
+                    "channel_types": [
+                        f"{s.channel.imp_related}_{s.channel.channel_type}"
+                        for s in snag_group["snags"]
+                    ],
+                    "start_date": snag_group["start_date"],
+                    "finish_date": snag_group["finish_date"],
+                    "is_ignored": snag_group["is_ignored"],
+                    "days_since_finished": snag_group["days_since_finished"],
+                    "duration": snag_group["duration"],
+                }
+
+                writer.writerow(csv_make_val(vals[t]) for t in titles)
+    except BaseException:
+        msg = traceback.format_exc()
+        sys.stderr.write(msg)
+        writer.writerow([msg])
+    finally:
+        if f is not None:
+            f.close()
+
+
+LIMIT = 200
+
+
+def do_get(sess):
+    contract_id = req_int_none("dc_contract_id")
+    days_hidden = req_int("days_hidden")
+    is_ignored = req_bool("is_ignored")
+    only_ongoing = req_bool("only_ongoing")
+    show_settlement = req_str("show_settlement")
+    as_csv = req_bool("as_csv")
+    days_long_hidden = req_int_none("days_long_hidden")
+
+    if as_csv:
+        args = (
+            contract_id,
+            days_hidden,
+            is_ignored,
+            g.user.id,
+            only_ongoing,
+            show_settlement,
+        )
+        threading.Thread(target=content, args=args).start()
+        return redirect("/downloads", 303)
+    else:
+        if contract_id is None:
+            contract = None
+        else:
+            contract = Contract.get_dc_by_id(sess, contract_id)
+        now = utc_datetime_now()
+        snag_groups = _make_rows(
+            sess,
+            now,
+            contract,
+            days_hidden,
+            is_ignored,
+            show_settlement,
+            only_ongoing,
+            days_long_hidden,
+            limit=LIMIT,
+        )
+        return render_template(
+            "reports/channel_snags.html",
+            contract=contract,
+            limit=LIMIT,
+            snag_groups=snag_groups,
+            days_hidden=days_hidden,
+            is_ignored=is_ignored,
+            only_ongoing=only_ongoing,
+            show_settlement=show_settlement,
+            days_long_hidden=days_long_hidden,
+        )

chellow/templates/e/channel_snags.html

@@ -8,6 +8,15 @@
 	Channel Snags
 {% endblock %}
 
+{% block inside_head %}
+	<style>
+		#snags.htmx-swapping {
+			opacity: 0;
+			transition: opacity 1s ease-out;
+		}
+	</style>
+{% endblock %}
+
 {% block nav %}
 	<a href="/e/dc_contracts">DC Contracts</a> &raquo; 
 	{% if contract %}
@@ -17,113 +26,36 @@
 {% endblock %}
 
 {% block content %}
-
-	<form action="/reports/233">
+	<form hx-get="/reports/channel_snags" hx-params="*" hx-include="this" hx-trigger="load, change"
+			hx-target="#snags" hx-swap="outerHTML swap:1s">
 		<fieldset>
-			<legend>Download CSV</legend>	
+			<legend>Filters</legend>	
 			<input type="hidden" name="dc_contract_id" value="{{contract.id}}">
 			<label>Hide snags &lt; days old</label>
-		 	{{input_text('days_hidden', '0', 3, 3)}}
+			{{input_text('days_hidden', initial='5', size=3, maxlength=3)}}
 			<label>Include ignored snags</label> {{input_checkbox('is_ignored', False)}} 
-			<input type="submit" value="Download">
-		</fieldset>
-	</form>
 
-	<p>
-		The 'Days Since Snag Finished' column is blank if the snag is ongoing (ie. if the
-	 	finish date is 'ongoing' or if it finished less than 'Days Hidden' ago).
-	</p>
+			<label>Only show ongoing snags</label>
+			{{input_checkbox('only_ongoing', initial=True)}} 
 
-	<form action="/e/channel_snags">
-		<fieldset>
-			<legend>Show Channel Snags</legend>	
-			<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)}} 
-			<input type="submit" value="Show">
-		</fieldset>
-	</form>
+			<fieldset>
+
+				<label>Show settlement only</label>
+				{{input_radio('show_settlement', 'yes', initial=False)}} 
+
+				<label>Show non-settlement only</label>
+				{{input_radio('show_settlement', 'no', initial=False)}} 
 
-	<p>
-		There are {{total_snags}} snag(s) older than {{request.values.days_hidden}} days
-		{%- if not is_ignored %}
-			that aren't ignored
-		{%- endif -%}.
-	</p>
+				<label>Show both</label>
+				{{input_radio('show_settlement', 'both', initial=True)}} 
 
-	<table>
-		<caption>Snags (truncated after 200)</caption>
-		<thead>
-			<tr>
-				<th>View</th>
-				<th>Contract</th>
-				<th>Import MPAN Core</th>
-				<th>Export MPAN Core</th>
-				<th>Sites</th>
-				<th>Snag Description</th>
-				<th>Channels</th>
-				<th>Duration</th>
-			</tr>
-		</thead>
-		<tbody>
-			{% for snag_group in snag_groups %}
-				<tr>
-					<td>
-						<ul>
-							{% for snag in snag_group.snags %}
-								<li>
-									<a href="/e/channel_snags/{{snag.id}}">view</a>
-									[<a href="/e/channel_snags/{{snag.id}}/edit">edit</a>]
-									{% if snag.is_ignored %} ignored{% endif %}
-								</li>
-							{% endfor %}
-						</ul>
-					</td>
-					<td>{{snag_group.era.dc_contract.name}}</td>
-					<td>
-						{% if snag_group.era.imp_mpan_core %}
-							{{snag_group.era.imp_mpan_core}}
-						{% endif %}
-					</td>
-					<td>
-						{% if snag_group.era.exp_mpan_core %}
-							{{snag_group.era.exp_mpan_core}}
-						{% endif %}
-					</td>
-					<td>
-						<ul>
-							{% for site in snag_group.sites %}
-								<li>{{site.code}} {{site.name}}</li>
-							{% endfor %}
-						</ul>
-					</td>
-					<td>{{snag_group.description}}</td>
-					<td>
-						<ul>
-							{% for snag in snag_group.snags %}
-								<li>
-									{% if snag.channel.imp_related %}
-										Import
-									{% else %}
-										Export
-									{% endif %}
-									{{snag.channel.channel_type}}
-								</li>
-							{% endfor %}
-						</ul>
-					</td>
-					<td>
-						{{snag_group.start_date|hh_format}} to
-						{{snag_group.finish_date|hh_format}}
-					</td>
-				</tr>
-			{% endfor %}
-		</tbody>
-	</table>
+			</fieldset>
+
+			<label>Hide snags &lt; days long</label>
+			{{input_text('days_long_hidden', initial='', size=3, maxlength=3)}}
+
+		</fieldset>
+	</form>
 
+	<div id="snags"></div>
 {% endblock %}

chellow/templates/macros.html

@@ -124,13 +124,23 @@
 	</div>
 {%- endmacro -%}
 
-{%- macro input_checkbox(name, initial) %}
-	<input type="checkbox" name="{{ name }}" value="true"
+{%- macro input_checkbox(name, initial=False, value='true') %}
+	<input type="checkbox" name="{{ name }}" value="{{value}}"
 		{%- if request.values[name] -%}
-				{%- if request.values[name] == 'true' %} checked
+				{%- if request.values[name] == value %} checked
 				{%- endif -%}
 		{%- else -%}
-				{%- if initial == True %} checked{% endif -%}
+				{%- if initial %} checked{% endif -%}
+		{%- endif -%}>
+{%- endmacro -%}
+
+{%- macro input_radio(name, value, initial=False) %}
+	<input type="radio" name="{{ name }}" value="{{value}}"
+		{%- if request.values[name] -%}
+				{%- if request.values[name] == value %} checked
+				{%- endif -%}
+		{%- else -%}
+				{%- if initial %} checked{% endif -%}
 		{%- endif -%}>
 {%- endmacro -%}
 

chellow/templates/reports/channel_snags.html

@@ -0,0 +1,91 @@
+{% extends "macros.html" %}
+
+{% block html %}
+	<table class="sticky" id="snags">
+		<caption>
+			Snags (truncated after 200)
+			<a href="/reports/channel_snags?dc_contract_id={{contract.id}}&amp;days_hidden={{days_hidden}}&amp;is_ignored={{is_ignored}}&amp;only_ongoing={{only_ongoing}}&amp;show_settlement={{show_settlement}}&amp;as_csv=true">Download as CSV</a>
+		</caption>
+		<thead>
+			<tr>
+				<th>View</th>
+				<th>Contract</th>
+				<th>Import MPAN Core</th>
+				<th>Export MPAN Core</th>
+				<th>Site</th>
+				<th>Description</th>
+				<th>Channels</th>
+				<th>Start Date</th>
+				<th>Finish Date</th>
+				<th>
+					<span title="Blank if the snag is ongoing (ie. if the finish date is 'ongoing' or if it finished less than 'Days Hidden' ago).">Days Since Finished</span>
+				</th>
+				<th>Duration</th>
+				<th>Comm</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for snag_group in snag_groups %}
+				<tr>
+					<td>
+						<ul>
+							{% for snag in snag_group.snags %}
+								<li>
+									<a href="/e/channel_snags/{{snag.id}}">view</a>
+									[<a href="/e/channel_snags/{{snag.id}}/edit">edit</a>]
+									{% if snag.is_ignored %} ignored{% endif %}
+								</li>
+							{% endfor %}
+						</ul>
+					</td>
+					<td>
+						<a href="/e/dc_contracts/{{snag_group.contract.id}}">{{snag_group.contract.name}}</a>
+					</td>
+					<td>
+						{% if snag_group.era.imp_mpan_core %}
+							<a href="/e/supplies/{{snag_group.supply.id}}">{{snag_group.era.imp_mpan_core}}</a>
+						{% endif %}
+					</td>
+					<td>
+						{% if snag_group.era.exp_mpan_core %}
+							<a href="/e/supplies/{{snag_group.supply.id}}">{{snag_group.era.exp_mpan_core}}</a>
+						{% endif %}
+					</td>
+					<td>
+						<a href="/sites/{{snag_group.site.id}}">{{snag_group.site.code}} {{snag_group.site.name}}</a>
+					</td>
+					<td>{{snag_group.description}}</td>
+					<td>
+						<ul>
+							{% for snag in snag_group.snags %}
+								<li>
+									{% if snag.channel.imp_related %}
+										Import
+									{% else %}
+										Export
+									{% endif %}
+									{{snag.channel.channel_type}}
+								</li>
+							{% endfor %}
+						</ul>
+					</td>
+					<td>
+						{{snag_group.start_date|hh_format}}
+					</td>
+					<td>
+						{{snag_group.finish_date|hh_format}}
+					</td>
+					<td>
+						{% if snag_group.days_since_finished %}
+							{{snag_group.days_since_finished}}
+						{% endif %}
+					</td>
+					<td>{{snag_group.duration}}</td>
+					<td>
+						<a href="/e/comms/{{snag_group.era.comm.id}}" title="{{snag_group.era.comm.description}}">{{snag_group.era.comm.code}}</a>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endblock %}

chellow/utils.py

@@ -29,11 +29,15 @@ def req_str(name):
         raise BadRequest(f"The field {name} is required.")
 
 
-def req_bool(name):
+def req_strs(name):
     try:
-        return request.values[name] == "true"
+        return request.values.getlist(name)
     except KeyError:
-        return False
+        raise BadRequest(f"The field {name} is required.")
+
+
+def req_bool(name):
+    return name in request.values
 
 
 def req_int(name):
@@ -43,6 +47,13 @@ def req_int(name):
         raise BadRequest(f"Problem parsing the field {name} as an integer: {e}")
 
 
+def req_ints(name):
+    try:
+        return [int(v) for v in req_strs(name)]
+    except ValueError as e:
+        raise BadRequest(f"Problem parsing the field {name} as an integer: {e}")
+
+
 def req_int_none(name):
     val = req_str(name)
     if val == "":

{chellow-1760028799.0.0.dist-info → chellow-1761056531.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1760028799.0.0
+Version: 1761056531.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-1760028799.0.0.dist-info → chellow-1761056531.0.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ chellow/__init__.py,sha256=9aoSbGmHCIHwzI_c_TLSg5CeKwqAq0I6kKaMvTrTMqg,10936
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
-chellow/dloads.py,sha256=dixp-O0MF2_mlwrnKx3D9DH09Qu05BjTo0rZfigTjR4,5534
+chellow/dloads.py,sha256=sNAPMe4LeHqfisEubGXvraDsUS0F-ujI3WG0Md8DywM,5565
 chellow/edi_lib.py,sha256=Lq70TUJuogoP5KGrphzUEUfyfgftEclg_iA3mpNAaDI,51324
 chellow/fake_batch_updater.py,sha256=khAmvSUn9qN04w8C92kRg1UeyQvfLztE7QXv9tUz6nE,11611
 chellow/general_import.py,sha256=ghybbden66VT4q5J0vYwiNg-6G2vg71EgCN_x3fvhW0,69200
@@ -12,7 +12,7 @@ chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=RwJo-AzBIdzxx7PAtboZEUH1nUjAeJckw0bk06-9oyM,5672
 chellow/rrun.py,sha256=sWm_tuJ_6xH3T28TY1w63k1Q44N_S_p_pYF5YCeztqU,2226
 chellow/testing.py,sha256=Dj2c1NX8lVlygueOrh2eyYawLW6qKEHxNhXVVUaNRO0,3637
-chellow/utils.py,sha256=i3GQK9MIcweosZk2gi-nX_IFq2DxURAJDyNoLBg6YwM,19421
+chellow/utils.py,sha256=x6yReQkhFaFGnsuhs6PqrEkE1OfZSPrrC7IqstRXKKU,19701
 chellow/views.py,sha256=9IUUbYjqEmQQzbYQB4w-ygCo25gecIxYVbxTXRF-YfY,86078
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
@@ -45,7 +45,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=pyL32hPiYd09FbpXVMnBjHsWFEQHs-Az945V7EShGiY,9116
 chellow/e/tnuos.py,sha256=NBmc-f3oezrl4gviAKobljHfICTpBKxxxEGBGJi_lRk,4927
 chellow/e/triad.py,sha256=uQIngSrz8irBXQ0Rp_s8nAUzu-y2Ms7aj4B38_Ff8y8,13720
-chellow/e/views.py,sha256=UH9Wc6UOiCcs9OtXWU8MK2eBi9d_J2xJN6qmHgZVat0,234245
+chellow/e/views.py,sha256=7WKLrqYtk018oXjmx9YBv72B5hpgOV0eTJYqsIoBYsE,234251
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=hcbjxqLOe7qkDjS7enCpmfyGwm3d-pq3u5VQIaUmVTw,3796
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=yoEGQS0qcrv3TWFfxELIIi8f1CyKcIzh0xVaPoz2w2s,4191
@@ -86,9 +86,8 @@ chellow/reports/report_183.py,sha256=fGONpKEIXTqIT_3dE5jZKBIesWPgLq-chHO6X22dIv0
 chellow/reports/report_187.py,sha256=RCvxDnkfRu7ocKUPEX0qtVphGOBEl9RULy790uteXcQ,9915
 chellow/reports/report_219.py,sha256=3Zs16ka6dWWY_lCDoA-ZFrlPb4vHk1LQoa2yrlTMntA,7117
 chellow/reports/report_231.py,sha256=WARLztV2HzBFSi5_xvY_DTXVyuBBbBYiU0RazfjKw-Y,5270
-chellow/reports/report_233.py,sha256=qJdPFuBgQAWD24BsljgGJ44L_RGdHOA1RqsxGjTWhFc,4975
 chellow/reports/report_241.py,sha256=lfivElRkV_CZAhck0rxAuhqzgponj3aWwmwGMNQvUxg,5343
-chellow/reports/report_247.py,sha256=KuNCWfYt1WByFv3EfiJF1-5blhJVWLbAdhlI5KD9HxQ,43346
+chellow/reports/report_247.py,sha256=pbWfM-fUeuakZxH1Ovlx7-XfUg6SL9t51swK3yMc1lc,43253
 chellow/reports/report_29.py,sha256=ZXnq6Kg5on-IPquUsH4bn46mBVESY_WhwqDWZPXOJwo,2695
 chellow/reports/report_291.py,sha256=BnWtxe0eWN2QKKWpwjs5-RI5LbReBKL119QbkrkNhV8,7478
 chellow/reports/report_33.py,sha256=lt1EN_LNx6u-AgdaS3YRkPMZA33JgMcELolHF4oJUMw,16689
@@ -101,6 +100,7 @@ chellow/reports/report_87.py,sha256=udzbCuXcckWD-OHmfJCT6bwg_paYhm4vfDWlL8WM-jA,
 chellow/reports/report_asset_comparison.py,sha256=Cl2NgvbclqhOVvKuUu3sajTVO2JupMfzK3bV0_K8eNs,6077
 chellow/reports/report_batches.py,sha256=MoCv2dE-JgaJzaMjMA-kZrPkYR13uDoXer5UuF12OYc,4757
 chellow/reports/report_bills.py,sha256=LP7XDxzO0Fp10c8xDE67e4tHTEc7nN74ESQBy762Nx4,3401
+chellow/reports/report_channel_snags.py,sha256=RV5L3zRwFmuZws7w9H9VzLCFlQ6U3-ZU6jn4j5VydNc,8626
 chellow/reports/report_csv_llfcs.py,sha256=mMB06b6Jems5kcQU4H4Le_fyKgVr8THP8BCx3pkvg5E,1903
 chellow/reports/report_csv_site_hh_data.py,sha256=ik0OkGVo1bfTXLdcT3gPUHnxSkSdorzZheP3qgnOR5c,4331
 chellow/reports/report_csv_site_snags.py,sha256=AuAy6vjL0g7vwPPAZhBqxOyITL9_jnyFj012MnUcxxk,2627
@@ -134,7 +134,7 @@ chellow/templates/home.html,sha256=7xiD6QLju3ugALzMlzTJosRyMUmQGWPK6jDF7oZbnAQ,5
 chellow/templates/input_date.html,sha256=rpgB5n0LfN8Y5djN_ZiuSxqdskxzCoKrEqI7hyJkVQo,1248
 chellow/templates/local_report.html,sha256=pV7_0QwyQ-D3OS9LXrly5pq3qprZnwTCoq6vCnMTkS4,1332
 chellow/templates/local_reports.html,sha256=4wbfVkY4wUfSSfWjxqIsvCpIsa9k7H_dGAjznrG5jNM,701
-chellow/templates/macros.html,sha256=zd5P3irbRMXiK6LnWdbv5M0SYX2roZKhEzNTt2_uPyM,5031
+chellow/templates/macros.html,sha256=FlRTl9W2avRXErnS3vzeOxciGXJYoKptiR08iVmSpfw,5353
 chellow/templates/national_grid.html,sha256=8W92tsjlqPSB0J--nyFIi-wzFae9CyDr6fODXLZp8ic,991
 chellow/templates/non_core_auto_importer.html,sha256=s9SluRN1bHTHjd8GP6uFhk6LrZYG8dqBG3y94zUKe5Q,944
 chellow/templates/non_core_contract.html,sha256=BdGtxErTvw4DwXLb6B2vimuU6ode3fFA-90kBmHCwYc,1754
@@ -181,7 +181,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=PuYnDycsQcwmmW9TfCCa_WgJRHOFn9HAnNm51rH7l9k,3157
+chellow/templates/e/channel_snags.html,sha256=TgRhS6DcOMyoAowwrCjPtq9iuX6lpvG3uchcd3g80kk,1593
 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
@@ -400,6 +400,7 @@ 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-1760028799.0.0.dist-info/METADATA,sha256=zm1x1B_QH5ZI_HiJ4vFBX0RbyndLd_v2iw77jNS4QqU,12500
-chellow-1760028799.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-chellow-1760028799.0.0.dist-info/RECORD,,
+chellow/templates/reports/channel_snags.html,sha256=_aAgFgMlTkK2HuKFU8YisAIcUYfg6Hqhgyf5MZpdK8c,2629
+chellow-1761056531.0.0.dist-info/METADATA,sha256=x465BtJg_0nCB84ep2IVjHyEpTTyZZixgcyJ_zKU7fk,12500
+chellow-1761056531.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+chellow-1761056531.0.0.dist-info/RECORD,,

chellow/reports/report_233.py

@@ -1,150 +0,0 @@
-import csv
-import sys
-import threading
-import traceback
-
-from dateutil.relativedelta import relativedelta
-
-from flask import g, redirect
-
-from sqlalchemy.orm import joinedload
-from sqlalchemy.sql.expression import false, select, true
-
-from chellow.dloads import open_file
-from chellow.models import (
-    Channel,
-    Contract,
-    Era,
-    Session,
-    Site,
-    SiteEra,
-    Snag,
-    Supply,
-    User,
-)
-from chellow.utils import (
-    csv_make_val,
-    hh_before,
-    req_bool,
-    req_int,
-    req_int_none,
-    utc_datetime_now,
-)
-
-
-def content(contract_id, days_hidden, is_ignored, user_id):
-    f = writer = None
-    try:
-        with Session() as sess:
-            user = User.get_by_id(sess, user_id)
-            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",
-                "Exp MPAN Core",
-                "Site Code",
-                "Site Name",
-                "Snag Description",
-                "Import Related?",
-                "Channel Type",
-                "Start Date",
-                "Finish Date",
-                "Is Ignored?",
-                "Days Since Snag Finished",
-                "Duration Of Snag (Days)",
-            )
-            writer.writerow(titles)
-
-            now = utc_datetime_now()
-            cutoff_date = now - relativedelta(days=days_hidden)
-            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)
-                .where(
-                    SiteEra.is_physical == true(),
-                    Snag.start_date < cutoff_date,
-                )
-                .order_by(
-                    Site.code,
-                    Supply.id,
-                    Channel.imp_related,
-                    Channel.channel_type,
-                    Snag.description,
-                    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())
-
-            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
-                exp_mc = "" if era.exp_mpan_core is None else era.exp_mpan_core
-
-                if snag_finish is None:
-                    duration = now - snag_start
-                    age_of_snag = None
-                else:
-                    duration = snag_finish - snag_start
-                    if hh_before(cutoff_date, snag_finish):
-                        age_of_snag = None
-                    else:
-                        delta = now - snag_finish
-                        age_of_snag = delta.days
-
-                vals = {
-                    "contract": era.dc_contract.name,
-                    "Hidden Days": days_hidden,
-                    "Chellow Id": snag.id,
-                    "Imp MPAN Core": imp_mc,
-                    "Exp MPAN Core": exp_mc,
-                    "Site Code": site.code,
-                    "Site Name": site.name,
-                    "Snag Description": snag.description,
-                    "Import Related?": channel.imp_related,
-                    "Channel Type": channel.channel_type,
-                    "Start Date": snag_start,
-                    "Finish Date": snag_finish,
-                    "Is Ignored?": snag.is_ignored,
-                    "Days Since Snag Finished": age_of_snag,
-                    "Duration Of Snag (Days)": duration.days,
-                }
-
-                writer.writerow(csv_make_val(vals[t]) for t in titles)
-    except BaseException:
-        msg = traceback.format_exc()
-        sys.stderr.write(msg)
-        writer.writerow([msg])
-    finally:
-        if f is not None:
-            f.close()
-
-
-def do_get(sess):
-    contract_id = req_int_none("dc_contract_id")
-    days_hidden = req_int("days_hidden")
-    is_ignored = req_bool("is_ignored")
-
-    args = contract_id, days_hidden, is_ignored, g.user.id
-    threading.Thread(target=content, args=args).start()
-    return redirect("/downloads", 303)