chellow 1725528079.0.0__tar.gz → 1726485186.0.0__tar.gz

{chellow-1725528079.0.0 → chellow-1726485186.0.0}/PKG-INFO

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

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

{chellow-1725528079.0.0 → chellow-1726485186.0.0}/chellow/e/mdd_importer.py

@@ -248,6 +248,10 @@ def _import_Market_Participant_Role(sess, rows, ctx):
         dno_code_str = values[14]
         dno_code = None if len(dno_code_str) == 0 else dno_code_str
 
+        if participant_code == "CIDC" and dno_code == "99":
+            # We already use 99 with CROW
+            continue
+
         if party is None:
             participant.insert_party(
                 sess,

{chellow-1725528079.0.0 → chellow-1726485186.0.0}/chellow/e/views.py

@@ -5898,11 +5898,23 @@ def supply_months_get(supply_id):
 @e.route("/supplies/<int:supply_id>/edit")
 def supply_edit_get(supply_id):
     supply = Supply.get_by_id(g.sess, supply_id)
-    sources = g.sess.query(Source).order_by(Source.code)
-    generator_types = g.sess.query(GeneratorType).order_by(GeneratorType.code)
-    gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
-    eras = (
-        g.sess.query(Era).filter(Era.supply == supply).order_by(Era.start_date.desc())
+    sources = g.sess.scalars(select(Source).order_by(Source.code))
+    generator_types = g.sess.scalars(select(GeneratorType).order_by(GeneratorType.code))
+
+    dno_contract = Contract.get_dno_by_name(g.sess, supply.dno.dno_code)
+    dno_rate_script = dno_contract.find_rate_script_at(
+        g.sess, supply.eras[-1].start_date
+    )
+    dno_props = dno_rate_script.make_script()
+    allowed_gsp_group_codes = list(dno_props.keys())
+
+    gsp_groups = g.sess.scalars(
+        select(GspGroup)
+        .where(GspGroup.code.in_(allowed_gsp_group_codes))
+        .order_by(GspGroup.code)
+    )
+    eras = g.sess.scalars(
+        select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
     )
     return render_template(
         "supply_edit.html",
@@ -5914,50 +5926,127 @@ def supply_edit_get(supply_id):
     )
 
 
-@e.route("/supplies/<int:supply_id>/edit", methods=["POST"])
-def supply_edit_post(supply_id):
+@e.route("/supplies/<int:supply_id>/edit", methods=["DELETE"])
+def supply_edit_delete(supply_id):
     try:
         supply = Supply.get_by_id(g.sess, supply_id)
 
-        if "delete" in request.form:
-            site_id = None
-            for site_era in supply.eras[-1].site_eras:
-                if site_era.is_physical:
-                    site_id = site_era.site.id
-                    break
+        site_id = None
+        for site_era in supply.eras[-1].site_eras:
+            if site_era.is_physical:
+                site_id = site_era.site.id
+                break
 
-            supply.delete(g.sess)
-            g.sess.commit()
-            return credirect(f"/sites/{site_id}", 303)
-        elif "insert_era" in request.form:
-            start_date = req_date("start")
-            supply.insert_era_at(g.sess, start_date)
-            g.sess.commit()
-            return chellow_redirect(f"/supplies/{supply.id}", 303)
+        supply.delete(g.sess)
+        g.sess.commit()
+        return hx_redirect(f"/sites/{site_id}", 303)
+    except BadRequest as e:
+        g.sess.rollback()
+        flash(e.description)
+        sources = g.sess.scalars(select(Source).order_by(Source.code))
+        generator_types = g.sess.scalars(
+            select(GeneratorType).order_by(GeneratorType.code)
+        )
+        dno_contract = Contract.get_dno_by_name(g.sess, supply.dno.dno_code)
+        dno_rate_script = dno_contract.find_rate_script_at(
+            g.sess, supply.eras[-1].start_date
+        )
+        dno_props = dno_rate_script.make_script()
+        allowed_gsp_group_codes = list(dno_props.keys())
+
+        gsp_groups = g.sess.scalars(
+            select(GspGroup)
+            .where(GspGroup.code.in_(allowed_gsp_group_codes))
+            .order_by(GspGroup.code)
+        )
+        eras = g.sess.scalars(
+            select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
+        )
+        return make_response(
+            render_template(
+                "supply_edit.html",
+                supply=supply,
+                sources=sources,
+                generator_types=generator_types,
+                gsp_groups=gsp_groups,
+                eras=eras,
+            ),
+            400,
+        )
+
+
+@e.route("/supplies/<int:supply_id>/edit", methods=["PATCH"])
+def supply_edit_patch(supply_id):
+    try:
+        supply = Supply.get_by_id(g.sess, supply_id)
+
+        name = req_str("name")
+        source_id = req_int("source_id")
+        gsp_group_id = req_int("gsp_group_id")
+        source = Source.get_by_id(g.sess, source_id)
+        if source.code in ("gen", "gen-grid"):
+            generator_type_id = req_int("generator_type_id")
+            generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
         else:
-            name = req_str("name")
-            source_id = req_int("source_id")
-            gsp_group_id = req_int("gsp_group_id")
-            source = Source.get_by_id(g.sess, source_id)
-            if source.code in ("gen", "gen-grid"):
-                generator_type_id = req_int("generator_type_id")
-                generator_type = GeneratorType.get_by_id(g.sess, generator_type_id)
-            else:
-                generator_type = None
-            gsp_group = GspGroup.get_by_id(g.sess, gsp_group_id)
-            supply.update(name, source, generator_type, gsp_group, supply.dno)
-            g.sess.commit()
-            return chellow_redirect(f"/supplies/{supply.id}", 303)
+            generator_type = None
+        gsp_group = GspGroup.get_by_id(g.sess, gsp_group_id)
+        supply.update(name, source, generator_type, gsp_group, supply.dno)
+        g.sess.commit()
+        return hx_redirect(f"/supplies/{supply.id}", 303)
     except BadRequest as e:
         g.sess.rollback()
         flash(e.description)
-        sources = g.sess.query(Source).order_by(Source.code)
-        generator_types = g.sess.query(GeneratorType).order_by(GeneratorType.code)
-        gsp_groups = g.sess.query(GspGroup).order_by(GspGroup.code)
-        eras = (
-            g.sess.query(Era)
-            .filter(Era.supply == supply)
-            .order_by(Era.start_date.desc())
+        sources = g.sess.scalars(select(Source).order_by(Source.code))
+        generator_types = g.sess.scalars(
+            select(GeneratorType).order_by(GeneratorType.code)
+        )
+        dno_contract = Contract.get_dno_by_name(g.sess, supply.dno.dno_code)
+        dno_rate_script = dno_contract.find_rate_script_at(
+            g.sess, supply.eras[-1].start_date
+        )
+        dno_props = dno_rate_script.make_script()
+        allowed_gsp_group_codes = list(dno_props.keys())
+
+        gsp_groups = g.sess.scalars(
+            select(GspGroup)
+            .where(GspGroup.code.in_(allowed_gsp_group_codes))
+            .order_by(GspGroup.code)
+        )
+        eras = g.sess.scalars(
+            select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
+        )
+        return make_response(
+            render_template(
+                "supply_edit.html",
+                supply=supply,
+                sources=sources,
+                generator_types=generator_types,
+                gsp_groups=gsp_groups,
+                eras=eras,
+            ),
+            400,
+        )
+
+
+@e.route("/supplies/<int:supply_id>/edit", methods=["POST"])
+def supply_edit_post(supply_id):
+    try:
+        supply = Supply.get_by_id(g.sess, supply_id)
+
+        start_date = req_date("start")
+        supply.insert_era_at(g.sess, start_date)
+        g.sess.commit()
+        return chellow_redirect(f"/supplies/{supply.id}", 303)
+    except BadRequest as e:
+        g.sess.rollback()
+        flash(e.description)
+        sources = g.sess.scalars(select(Source).order_by(Source.code))
+        generator_types = g.sess.scalars(
+            select(GeneratorType).order_by(GeneratorType.code)
+        )
+        gsp_groups = g.sess.scalars(select(GspGroup).order_by(GspGroup.code))
+        eras = g.sess.scalars(
+            select(Era).where(Era.supply == supply).order_by(Era.start_date.desc())
         )
         return make_response(
             render_template(

{chellow-1725528079.0.0 → chellow-1726485186.0.0}/chellow/models.py

@@ -7511,6 +7511,19 @@ def db_upgrade_49_to_50(sess, root_path):
     sess.flush()
 
 
+def db_upgrade_50_to_51(sess, root_path):
+    participant_cidc = Participant.get_by_code(sess, "CIDC")
+    dno_99 = sess.scalars(
+        select(Party).where(
+            Party.dno_code == "99", Party.participant == participant_cidc
+        )
+    ).one_or_none()
+    if dno_99 is not None:
+        sess.execute(delete(Llfc).where(Llfc.dno == dno_99))
+
+        sess.execute(delete(Party).where(Party.id == dno_99.id))
+
+
 upgrade_funcs = [None] * 18
 upgrade_funcs.extend(
     [
@@ -7546,6 +7559,7 @@ upgrade_funcs.extend(
         db_upgrade_47_to_48,
         db_upgrade_48_to_49,
         db_upgrade_49_to_50,
+        db_upgrade_50_to_51,
     ]
 )
 

chellow-1726485186.0.0/chellow/templates/e/supply_edit.html

@@ -0,0 +1,90 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplies » {{supply.id}} » Edit
+{% endblock %}
+
+{% block nav %}
+	<a href="/e/supplies">Supplies</a> &raquo; 
+	<a href="/e/supplies/{{supply.id}}">{{supply.id}}</a> &raquo; Edit
+{% endblock %}
+
+{% block content %}
+
+	<form hx-patch="/e/supplies/{{supply.id}}/edit">
+		<fieldset>
+			<legend>Update this supply</legend>
+			<label>Name</label> {{input_text('name', supply.name)}}
+			<label>Source</label>
+			<select name="source_id">
+				{% for source in sources %}
+					{{input_option('source_id', source.id, source.code, supply.source.id)}}
+				{% endfor %}
+			</select>
+			<label>Generator Type (if source is 'gen' or 'gen-net')</label>
+			<select name="generator_type_id">
+				{% for generator_type in generator_types %}
+					{{input_option(
+						'generator_type_id', generator_type.id, generator_type.code,
+						supply.generator_type.id)}}
+				{% endfor %}
+			</select>
+			<label>GSP Group</label>
+			<select name="gsp_group_id">
+				{% for gsp_group in gsp_groups %}
+					{{input_option(
+						'gsp_group_id', gsp_group.id,
+						gsp_group.code + ' '  + gsp_group.description, supply.gsp_group.id)}}
+				{% endfor %}
+			</select>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/supplies/{{supply.id}}/edit"
+		hx-confirm="Are you sure you want to delete this supply?">
+		<fieldset>
+			<legend>Delete this supply</legend>
+			<input type="submit" name="delete" value="Delete">
+		</fieldset>
+	</form>					
+
+	<form method="post" action="/e/supplies/{{supply.id}}/edit">
+		<fieldset>
+			<legend>Insert a new era</legend>
+			<label>Start date</label> {{input_date('start', None)}}
+			<input type="submit" name="insert_era" value="Insert">
+		</fieldset>
+	</form>
+
+	<table>
+		<caption>Existing Eras</caption>
+		<thead>
+			<tr>
+				<th>Start date</th>
+				<th>Finish date</th>
+				<th>Import Mpan Core</th>
+				<th>Export Mpan Core</th>
+			</tr>
+		</thead>
+		<tbody>
+		{% for era in eras %}
+			<tr>
+				<td>{{era.start_date|hh_format}}</td>
+				<td>{{era.finish_date|hh_format}}</td>
+				<td>
+					{% if era.imp_mpan_core %}
+						{{era.imp_mpan_core}}
+					{% endif %}
+				</td>
+				<td>
+					{% if era.exp_mpan_core %}
+						{{era.exp_mpan_core}}
+					{% endif %}
+				</td>
+			</tr>
+		{% endfor %}
+		</tbody>
+	</table>
+
+{% endblock %}

chellow-1725528079.0.0/VERSION

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

chellow-1725528079.0.0/chellow/templates/e/supply_edit.html

@@ -1,105 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Supplies » {{supply.id}} » Edit
-{% endblock %}
-
-{% block nav %}
-	<a href="/e/supplies">Supplies</a> &raquo; 
-	<a href="/e/supplies/{{supply.id}}">{{supply.id}}</a> &raquo; Edit
-{% endblock %}
-
-{% block content %}
-
-	{% if request.method == 'GET' and request.values.delete %}	
-
-		<form method="post">
-			<fieldset>						
-				<legend>Are you sure you want to delete this supply?</legend>
-				<input type="submit" name="delete" value="Delete">
-				<a class="btn" href="/e/supplies/{{supply.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-
-	{% else %}
-
-		<form method="post" action="/e/supplies/{{supply.id}}/edit">
-			<fieldset>
-				<legend>Update this supply</legend>
-				<label>Name</label> {{input_text('name', supply.name)}}
-				<label>Source</label>
-				<select name="source_id">
-					{% for source in sources %}
-						{{input_option('source_id', source.id, source.code, supply.source.id)}}
-					{% endfor %}
-				</select>
-				<label>Generator Type (if source is 'gen' or 'gen-net')</label>
-				<select name="generator_type_id">
-					{% for generator_type in generator_types %}
-						{{input_option(
-							'generator_type_id', generator_type.id, generator_type.code,
-							supply.generator_type.id)}}
-					{% endfor %}
-				</select>
-					</div>
-				</div>
-				<label>GSP Group</label>
-				<select name="gsp_group_id">
-					{% for gsp_group in gsp_groups %}
-						{{input_option(
-							'gsp_group_id', gsp_group.id,
-							gsp_group.code + ' '  + gsp_group.description, supply.gsp_group.id)}}
-					{% endfor %}
-				</select>
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/supplies/{{supply.id}}/edit">
-			<fieldset>
-				<legend>Delete this supply</legend>
-				<input type="submit" name="delete" value="Delete">
-			</fieldset>
-		</form>					
-
-		<form method="post" action="/e/supplies/{{supply.id}}/edit">
-			<fieldset>
-				<legend>Insert a new era</legend>
-				<label>Start date</label> {{input_date('start', None)}}
-				<input type="submit" name="insert_era" value="Insert">
-			</fieldset>
-		</form>
-
-		<table>
-			<caption>Existing Eras</caption>
-			<thead>
-				<tr>
-					<th>Start date</th>
-					<th>Finish date</th>
-					<th>Import Mpan Core</th>
-					<th>Export Mpan Core</th>
-				</tr>
-			</thead>
-			<tbody>
-			{% for era in eras %}
-				<tr>
-					<td>{{era.start_date|hh_format}}</td>
-					<td>{{era.finish_date|hh_format}}</td>
-					<td>
-						{% if era.imp_mpan_core %}
-							{{era.imp_mpan_core}}
-						{% endif %}
-					</td>
-					<td>
-						{% if era.exp_mpan_core %}
-							{{era.exp_mpan_core}}
-						{% endif %}
-					</td>
-				</tr>
-			{% endfor %}
-			</tbody>
-		</table>
-
-	{% endif %}
-
-{% endblock %}