chellow 1723807645.0.0__tar.gz → 1724062841.0.0__tar.gz

{chellow-1723807645.0.0 → chellow-1724062841.0.0}/PKG-INFO

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

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

{chellow-1723807645.0.0 → chellow-1724062841.0.0}/chellow/e/views.py

@@ -37,6 +37,7 @@ from chellow.models import (
     BatchFile,
     Bill,
     BillType,
+    CHANNEL_TYPES,
     Channel,
     ClockInterval,
     Comm,
@@ -193,13 +194,25 @@ def csv_bills_get():
 
 @e.route("/eras/<int:era_id>/add_channel")
 def channel_add_get(era_id):
+    channel_sets = {True: set(CHANNEL_TYPES), False: set(CHANNEL_TYPES)}
     era = Era.get_by_id(g.sess, era_id)
-    channels = (
-        g.sess.query(Channel)
-        .filter(Channel.era == era)
+    channels = g.sess.scalars(
+        select(Channel)
+        .where(Channel.era == era)
         .order_by(Channel.imp_related, Channel.channel_type)
+    ).all()
+    for channel in channels:
+        channel_sets[channel.imp_related].remove(channel.channel_type)
+    add_channels = [
+        {"imp_related": imp_related, "channel_type": channel_type}
+        for imp_related, channel_set in channel_sets.items()
+        for channel_type in CHANNEL_TYPES
+        if channel_type in channel_set
+    ]
+
+    return render_template(
+        "channel_add.html", era=era, channels=channels, add_channels=add_channels
     )
-    return render_template("channel_add.html", era=era, channels=channels)
 
 
 @e.route("/eras/<int:era_id>/add_channel", methods=["POST"])

chellow-1724062841.0.0/chellow/templates/e/channel_add.html

@@ -0,0 +1,81 @@
+{% extends "base.html" %}
+
+{% block title %}
+	» Supplies » Supply {{era.supply.id}} Era {{era.start_date|hh_format}} » 
+ 	Add Channel
+{% endblock %}
+
+{% block nav %}
+	<a href="/supplies">Supplies</a> &raquo; 
+	<a href="/e/supplies/{{era.supply.id}}">Supply {{era.supply.id}} Era
+	{{era.start_date|hh_format}}</a> &raquo; 
+	Add Channel
+{% endblock %}
+
+{% block content %}
+
+	<table>
+		<caption>Existing Channels</caption>	
+		<thead>
+			<tr>
+				<th>View</th>
+				<th>Import / Export Related?</th>
+				<th>Type</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for channel in channels %}
+				<tr>
+					<td><a href="/e/channels/{{channel.id}}">View</a></td>
+					<td>
+						{% if channel.imp_related %}
+							Import
+						{% else %}
+							Export
+						{% endif %}
+					</td>
+					<td>
+						{{channel.channel_type}}
+					</td>
+				</tr>
+			{% endfor %}
+		<tbody>
+	</table>
+
+	<table>
+		<caption>Add Channels</caption>	
+		<thead>
+			<tr>
+				<th>Import / Export Related?</th>
+				<th>Type</th>
+				<th>Add</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for channel in add_channels %}
+				<tr>
+					<td>
+						{% if channel.imp_related %}
+							Import
+						{% else %}
+							Export
+						{% endif %}
+					</td>
+					<td>
+						{{channel.channel_type}}
+					</td>
+					<td>
+						<form action="/e/eras/{{era.id}}/add_channel" method="post">
+							<fieldset>
+								<input type="hidden" name="imp_related" value="{{channel.imp_related|lower}}">
+								<input type="hidden" name="channel_type" value="{{channel.channel_type}}">
+								<input type="submit" value="Add">
+							</fieldset>
+						</form>
+					</td>
+				</tr>
+			{% endfor %}
+		<tbody>
+	</table>
+
+{% endblock %}

chellow-1723807645.0.0/VERSION

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

chellow-1723807645.0.0/chellow/templates/e/channel_add.html

@@ -1,61 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}
-	» Supplies » Supply {{era.supply.id}} Era {{era.start_date|hh_format}} » 
- 	Add Channel
-{% endblock %}
-
-{% block nav %}
-	<a href="/supplies">Supplies</a> &raquo; 
-	<a href="/e/supplies/{{era.supply.id}}">Supply {{era.supply.id}} Era
-	{{era.start_date|hh_format}}</a> &raquo; 
-	Add Channel
-{% endblock %}
-
-{% block content %}
-	<table>
-		<caption>Existing Channels</caption>	
-		<thead>
-			<tr>
-				<th>Import / Export Related?</th>
-				<th>Type</th>
-			</tr>
-		</thead>
-		<tbody>
-			{% for channel in channels %}
-				<tr>
-					<td>
-						{% if channel.imp_related %}
-							Import
-						{% else %}
-							Export
-						{% endif %}
-					</td>
-					<td>
-						{{channel.channel_type}}
-					</td>
-				</tr>
-			{% endfor %}
-		<tbody>
-	</table>
-
-	<form action="/e/eras/{{era.id}}/add_channel" method="post">
-		<fieldset>
-			<legend>Add a channel</legend>	
-			<label>Import / Export</label>
-			<select name="imp_related">
-				{% for lb, vl in (('Import Related', 'true'), ('Export Related', 'false')) %}
-					{{input_option('is_import', vl, lb)}}
-				{% endfor %}
-			</select>
-			<label>Channel Type</label>
-			<select name="channel_type">
-				{{input_option('channel_type', 'ACTIVE', 'ACTIVE')}}
-				{{input_option('channel_type', 'REACTIVE_IMP', 'REACTIVE_IMP')}}
-				{{input_option('channel_type', 'REACTIVE_EXP', 'REACTIVE_EXP')}}
-			</select>
-			<input type="submit" value="Add">
-		</fieldset>
-	</form>
-
-{% endblock %}