chellow 1714470909.0.0__py3-none-any.whl → 1715252645.0.0__py3-none-any.whl

chellow/reports/report_33.py

@@ -375,7 +375,7 @@ limit 3
             latest_mop_bill_date,
             supply_start_date,
             supply_finish_date,
-            era.properties,
+            None if era.dtc_meter_type is None else era.dtc_meter_type.code,
             imp_tnuos_band,
         ]
         + channel_values
@@ -447,7 +447,7 @@ def _process(sess, f, date, supply_id, mpan_cores):
         "Latest MOP Bill Date",
         "Supply Start Date",
         "Supply Finish Date",
-        "Properties",
+        "DTC Meter Type",
         "tnuos_band",
         "Import ACTIVE?",
         "Import REACTIVE_IMPORT?",

chellow/reports/report_ecoes_comparison.py

@@ -25,7 +25,7 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import req_bool
+from chellow.utils import csv_make_val, req_bool
 from chellow.views import chellow_redirect
 
 
@@ -236,25 +236,30 @@ def _process(
         "ecoes_pc",
         "chellow_pc",
         "ecoes_mtc",
+        "ecoes_mtc_date",
         "chellow_mtc",
         "ecoes_llfc",
+        "ecoes_llfc_from",
         "chellow_llfc",
         "ecoes_ssc",
         "chellow_ssc",
         "ecoes_es",
         "chellow_es",
         "ecoes_supplier",
+        "ecoes_supplier_registration_from",
         "chellow_supplier",
         "chellow_supplier_contract_name",
         "ecoes_dc",
         "chellow_dc",
         "ecoes_mop",
+        "ecoes_mop_appoint_date",
         "chellow_mop",
         "ecoes_gsp_group",
+        "ecoes_gsp_effective_from",
         "chellow_gsp_group",
         "ecoes_msn",
-        "chellow_msn",
         "ecoes_msn_install_date",
+        "chellow_msn",
         "ecoes_meter_type",
         "chellow_meter_type",
         "ignored",
@@ -479,7 +484,11 @@ def _process(
                         "serial numbers do match. "
                     )
 
-                chellow_meter_type = _meter_type(era)
+                chellow_dtc_meter_type = era.dtc_meter_type
+                if chellow_dtc_meter_type is None:
+                    chellow_meter_type = None
+                else:
+                    chellow_meter_type = chellow_dtc_meter_type.code
 
                 if chellow_meter_type != ecoes["meter-type"]:
                     problem += "The DTC meter types don't match."
@@ -493,8 +502,8 @@ def _process(
                 "ecoes_pc": ecoes["pc"],
                 "chellow_pc": chellow_pc,
                 "ecoes_mtc": ecoes["mtc"],
+                "ecoes_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "chellow_mtc": chellow_mtc,
-                "chellow_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "ecoes_llfc": ecoes["llfc"],
                 "ecoes_llfc_from": _parse_date(ecoes["llfc-from"]),
                 "chellow_llfc": chellow_llfc,
@@ -524,7 +533,7 @@ def _process(
                 "ignored": ignore,
                 "problem": problem,
             }
-            writer.writerow(values[t] for t in titles)
+            writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id
             values["chellow_supply_id"] = chellow_supply_id
             values["diffs"] = diffs
@@ -555,7 +564,8 @@ def _process(
 
         msn = "" if era.msn is None else era.msn
 
-        meter_type = _meter_type(era)
+        dtc_meter_type = era.dtc_meter_type
+        meter_type = "" if dtc_meter_type is None else dtc_meter_type.code
 
         values = {
             "mpan_core": mpan_core,
@@ -563,21 +573,26 @@ def _process(
             "ecoes_pc": "",
             "chellow_pc": era.pc.code,
             "ecoes_mtc": "",
+            "ecoes_mtc_date": "",
             "chellow_mtc": era.mtc_participant.mtc.code,
             "ecoes_llfc": "",
+            "ecoes_llfc_from": "",
             "chellow_llfc": llfc.code,
             "ecoes_ssc": "",
             "chellow_ssc": ssc,
             "ecoes_es": "",
             "chellow_es": es,
             "ecoes_supplier": "",
+            "ecoes_supplier_registration_from": "",
             "chellow_supplier": supplier_contract.party.participant.code,
             "chellow_supplier_contract_name": supplier_contract.name,
             "ecoes_dc": "",
             "chellow_dc": dc,
             "ecoes_mop": "",
+            "ecoes_mop_appoint_date": "",
             "chellow_mop": mop,
             "ecoes_gsp_group": "",
+            "ecoes_gsp_effective_from": "",
             "chellow_gsp_group": supply.gsp_group.code,
             "ecoes_msn": "",
             "chellow_msn": msn,
@@ -587,7 +602,7 @@ def _process(
             "ignored": False,
             "problem": "In Chellow, but not in ECOES.",
         }
-        writer.writerow(values[t] for t in titles)
+        writer.writerow(csv_make_val(values[t]) for t in titles)
         values["chellow_supplier_contract_id"] = supplier_contract.id
         values["chellow_supply_id"] = era.supply.id
         values["diffs"] = []
@@ -595,21 +610,6 @@ def _process(
         report_run.insert_row(sess, "", titles, values, {})
 
 
-def _meter_type(era):
-    props = era.props
-    try:
-        return props["meter_type"]
-    except KeyError:
-        if era.pc.code == "00":
-            return "H"
-        elif len(era.channels) > 0:
-            return "RCAMR"
-        elif era.mtc_participant.meter_type.code in ["UM", "PH"]:
-            return ""
-        else:
-            return "N"
-
-
 def do_get(sess):
     show_ignored = req_bool("show_ignored")
     report_run = ReportRun.insert(

chellow/templates/e/dc_contract_edit.html

@@ -11,64 +11,52 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.view == 'confirm_delete' %}
-		<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Are you sure you want to delete this contract?</legend>
-				<input type="submit" name="delete" value="delete">
-				<a href="/e/dc_contracts/{{dc_contract.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-		
-	{% else %}
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update Contract</legend>
-
-				<label>Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						{{ input_option(
-								'party_id', party.id,
-								party.participant.code + ' : ' + party.name,
-								dc_contract.party.id) }}
-					{% endfor %}
-				</select>
-
-				<label>Name</label> {{input_text('name', dc_contract.name)}}
-
-				<label>Charge script</label>
-				{{input_textarea(
-					'charge_script', dc_contract.charge_script, 40, 80)}}
-
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update State</legend>
-				<label>State</label>
-				{{input_textarea('state', dc_contract.state, 40, 80)}}
-				<input type="submit" name="update_state" value="Update">
-			</fieldset>
-		</form>
-
-		<form action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Delete This Contract</legend>
-				<input type="hidden" name="view" value="confirm_delete">
-				<input type="submit" value="Delete">
-			</fieldset>
-		</form>
-
-		<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
-			<fieldset>
-				<legend>Ignore all snags before</legend>
-				{{ input_date('ignore', initial_date) }}
-				<input type="submit" name="ignore_snags" value="Ignore">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{ input_option(
+							'party_id', party.id,
+							party.participant.code + ' : ' + party.name,
+							dc_contract.party.id) }}
+				{% endfor %}
+			</select>
+
+			<label>Name</label> {{input_text('name', dc_contract.name)}}
+
+			<label>Charge script</label>
+			{{input_textarea(
+				'charge_script', dc_contract.charge_script, 40, 80)}}
+
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>
+
+	<form action="/e/dc_contracts/{{dc_contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>
+			<label>State</label>
+			{{input_textarea('state', dc_contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
+
+	<form hx-delete="/e/dc_contracts/{{dc_contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete This Contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
+
+	<form method="post" action="/e/dc_contracts/{{dc_contract.id}}/edit">
+		<fieldset>
+			<legend>Ignore all snags before</legend>
+			{{ input_date('ignore', initial_date) }}
+			<input type="submit" name="ignore_snags" value="Ignore">
+		</fieldset>
+	</form>
 {% endblock %}

chellow/templates/e/dtc_meter_type.html

@@ -1,11 +1,11 @@
 {% extends "base.html" %}
 
 {% block title %}
-	» DTC Meter Types » {{dtc_meter_type_code}}
+	» DTC Meter Types » {{dtc_meter_type.code}}
 {% endblock %}
 
 {% block nav %}
-	<a href="/e/dtc_meter_types">DTC Meter Types</a> &raquo; {{dtc_meter_type_code}}
+	<a href="/e/dtc_meter_types">DTC Meter Types</a> &raquo; {{dtc_meter_type.code}}
 {% endblock %}
 
 {% block content %}
@@ -13,11 +13,11 @@
 	<table>
 		<tr>
 			<th>Code</th>
-			<td>{{dtc_meter_type_code}}</td>
+			<td>{{dtc_meter_type.code}}</td>
 		</tr>
 		<tr>
 				<th>Description</th>
-				<td>{{dtc_meter_type_description}}</td>
+				<td>{{dtc_meter_type.description}}</td>
 		</tr>
 	</table>
 

chellow/templates/e/dtc_meter_types.html

@@ -18,10 +18,10 @@
 			</tr>
 		</thead>
 		<tbody>
-			{% for code, desc in dtc_meter_types.items() %}
+			{% for dtc_meter_type in dtc_meter_types %}
 				<tr>
-					<td><a href="/e/dtc_meter_types/{{code}}">{{code}}</a></td>
-					<td>{{desc}}</td>
+					<td><a href="/e/dtc_meter_types/{{dtc_meter_type.id}}">{{dtc_meter_type.code}}</a></td>
+					<td>{{dtc_meter_type.description}}</td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/templates/e/era_edit.html

@@ -80,6 +80,7 @@
 			{{input_hidden('gsp_group_id', initial=era.supply.gsp_group.id)}}
 			{{input_hidden('mtc_participant_id', initial=era.mtc_participant.id)}}
 			{{input_hidden('ssc_id', initial=era.ssc.id)}}
+			{{input_hidden('dtc_meter_type_id', initial=era.dtc_meter_type.id)}}
 			{{input_hidden('name', initial=era.name)}}
 			{{input_hidden('msn', initial=era.msn)}}
 			{{input_hidden('mop_contract_id', initial=era.mop_contract_id)}}

chellow/templates/e/era_edit_form.html

@@ -89,14 +89,14 @@
 		{% endfor %}
 	</select>
 
-	<label>Properties</label>
-	<div>
-		{{input_textarea('properties', era.properties, 10, 80)}}
-		<p>
-			The <code>meter_type</code> property contains a
-			<a href="/e/dtc_meter_types">DTC Meter Type Code</a>.
-		</p>
-	</div>
+	<label>DTC Meter Type</label>
+	<select name="dtc_meter_type_id">
+		{{input_option('dtc_meter_type_id', '', 'Unmetered')}}
+		{% for dtc_meter_type in dtc_meter_types %}
+			{{input_option('dtc_meter_type_id', dtc_meter_type.id,
+		 		dtc_meter_type.code + ' ' + dtc_meter_type.description, era.dtc_meter_type.id)}}
+		{% endfor %}
+	</select>
 
 	<label>Has An Import MPAN?</label>
 	{{input_checkbox('has_imp_mpan')}}

chellow/templates/e/mop_contract_edit.html

@@ -10,38 +10,24 @@
 {% endblock %}
 
 {% block content %}
-	{% if request.method == 'GET' and request.values.view == 'confirm_delete' %}
-		
-		<form method="post">
-			<fieldset>
-				<legend>Are you sure you want to delete this contract?</legend>
-				<input type="hidden" name="mop_contract_id"
-					value="{{contract.id}}">
-				<input type="submit" name="delete" value="Delete">
-				<a href="/e/mop_contracts/{{contract.id}}/edit">Cancel</a>
-			</fieldset>
-		</form>
-			
-	{% else %}
-		
-		<form method="post">
-			<fieldset>
-				<legend>Update Contract</legend>
-				<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
-				<label>Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						{{input_option('party_id', party.id,
-								party.participant.code + ' : ' + party.name, contract.party.id) }}
-					{% endfor %}
-				</select>
-				<label>Name </label> {{input_text('name', contract.name)}}
-				<label>Charge script</label>
-				{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
-				<label>Properties</label>
-				{{input_textarea('properties', contract.properties, 40, 80)}}
-				<label>Example</label>
-				<code><pre>
+	<form method="post">
+		<fieldset>
+			<legend>Update Contract</legend>
+			<input type="hidden" name="mop_contract_id" value="{{contract.id}}">
+			<label>Party</label>
+			<select name="party_id">
+				{% for party in parties %}
+					{{input_option('party_id', party.id,
+							party.participant.code + ' : ' + party.name, contract.party.id) }}
+				{% endfor %}
+			</select>
+			<label>Name </label> {{input_text('name', contract.name)}}
+			<label>Charge script</label>
+			{{input_textarea('charge_script', contract.charge_script, 40, 80)}}
+			<label>Properties</label>
+			{{input_textarea('properties', contract.properties, 40, 80)}}
+			<label>Example</label>
+			<code><pre>
 has.importer=yes
 file.type=.df2
 hostname=example.com
@@ -49,26 +35,25 @@ username=username
 password=password
 directory0=downloads1
 directory1=downloads2
-				</pre></code>
-				<input type="submit" value="Update">
-			</fieldset>
-		</form>						
+			</pre></code>
+			<input type="submit" value="Update">
+		</fieldset>
+	</form>						
 
-		<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Update State</legend>	
-				<label>State</label>
-				{{input_textarea('state', contract.state, 40, 80)}}
-				<input type="submit" name="update_state" value="Update">
-			</fieldset>
-		</form>
+	<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
+		<fieldset>
+			<legend>Update State</legend>	
+			<label>State</label>
+			{{input_textarea('state', contract.state, 40, 80)}}
+			<input type="submit" name="update_state" value="Update">
+		</fieldset>
+	</form>
 
-		<form action="/e/mop_contracts/{{contract.id}}/edit" method="post">
-			<fieldset>
-				<legend>Delete this contract</legend>
-				<input type="hidden" name="view" value="confirm_delete">
-				<input type="submit" value="Delete">
-			</fieldset>
-		</form>
-	{% endif %}
+	<form hx-delete="/e/mop_contracts/{{contract.id}}/edit"
+		hx-confirm="Are you sure you want to delete this contract?">
+		<fieldset>
+			<legend>Delete this contract</legend>
+			<input type="submit" value="Delete">
+		</fieldset>
+	</form>
 {% endblock %}

chellow/templates/e/scenario_docs.html

@@ -94,16 +94,8 @@
 			  "*": "_L"
       },
 
-      /* Properties are combined with the existing era properties, with the
-         ones here overwriting any duplicates */
-      "properties_overwrite": {
-        "comms_type": "GSM"
-      },
-
-      /* Properties are combined with the existing era properties, with the
-         ones here being overwritten by any duplicates */
-      "properties_overwritten": {
-        "meter_type": "H"
+      "dtc_meter_types": {
+			  "*": "H"
       },
 
       /* Use hh data  rather than register reads for AMRs */

chellow/templates/e/site_add_e_supply.html

@@ -20,6 +20,7 @@
 			<input type="hidden" name="energisation_status_id"
 					value="{{request.values.energisation_status_id}}">
 			<input type="hidden" name="pc_id" value="{{request.values.pc_id}}">
+			<input type="hidden" name="dtc_meter_type_id" value="{{request.values.dtc_meter_type_id}}">
 			<input type="hidden" name="dno_id" value="{{request.values.dno_id}}">
 			<input type="hidden" name="gsp_group_id" value="{{request.values.gsp_group_id}}">
 			<input type="hidden" name="mtc_participant_id"

chellow/templates/e/site_add_e_supply_form.html

@@ -116,7 +116,14 @@
 		{% endfor %}
 	</select>
 
-	<label>Properties</label> {{input_textarea('properties', '{}', 10, 80)}}
+	<label>DTC Meter Type</label>
+	<select name="dtc_meter_type_id">
+		{{input_option('dtc_meter_type_id', '', 'Unmetered')}}
+		{% for dtc_meter_type in dtc_meter_types %}
+			{{input_option( 'dtc_meter_type_id', dtc_meter_type.id,
+		 			dtc_meter_type.code + ' ' + dtc_meter_type.description)}}
+		{% endfor %}
+	</select>
 
 	<label>Has An Import MPAN?</label> {{input_checkbox('has_imp_mpan')}}
 

chellow/templates/e/supply_eras.html

@@ -21,7 +21,7 @@
 					<th rowspan="2">
 						<span title="Standard Settlement Configuration">SSC</span>
 					</th>
-					<th rowspan="2"><span title="Properties">Props</span></th>
+					<th rowspan="2"><span title="DTC Meter Type">Meter</span></th>
 					<th colspan="2"><span title="Meter Operator">MOP</span></th>
 					<th colspan="2"><span title="Data Collector">DC</span></th>
 					<th rowspan="2">
@@ -75,7 +75,8 @@
 					</td>
 					<td rowspan="4">{{ era.msn }}</td>
 					<td rowspan="4">
-							<a href="/e/mtc_participants/{{era.mtc_participant.id}}" title="{{era.mtc_participant.description}}">{{era.mtc_participant.mtc.code}}</a>
+							<a href="/e/mtc_participants/{{era.mtc_participant.id}}"
+							 	title="{{era.mtc_participant.description}}">{{era.mtc_participant.mtc.code}}</a>
 					</td>
 					<td rowspan="4">
 							<a href="/e/cops/{{era.cop.id}}" title="{{era.cop.description}}">{{era.cop.code}}</a>
@@ -88,7 +89,9 @@
 							<a href="/e/sscs/{{era.ssc.id}}" title="{{era.ssc.description}}">{{era.ssc.code}}</a>
 							{% endif %}
 					</td>
-					<td rowspan="4">{{era.properties}}</td>
+					<td rowspan="4">
+						<a href="/e/dtc_meter_types/{{era.dtc_meter_type.id}}">{{era.dtc_meter_type.code}}</a>
+					</td>
 					<td rowspan="4">
 						<a href="/e/mop_contracts/{{era.mop_contract.id}}">{{era.mop_contract.name}}</a>
 					</td>

chellow/templates/general_imports.html

@@ -90,11 +90,9 @@
 				<td>Meter Timeswitch Class</td>
 				<td>CoP</td>
 				<td>Comms Type</td>
-				<td>
-					Standard Settlement Configuration (blank for HH supplies)
-				</td>
+				<td>Standard Settlement Configuration (blank for HH supplies)</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>
@@ -137,7 +135,7 @@
 				<td>Comms Type</td>
 				<td>SSC</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>
@@ -173,7 +171,7 @@
 				<td>Comms Type</td>
 				<td>SSC</td>
 				<td>Energisation Status</td>
-				<td>Properties</td>
+				<td>DTC Meter Type</td>
 				<td>Import MPAN Core</td>
 				<td>Import LLFC</td>
 				<td>Import Supply Capacity</td>

chellow/templates/macros.html

@@ -31,7 +31,7 @@
 
 {%- macro input_option(name, item_id, desc, initial=None) -%}
     <option value="{{ item_id }}"
-        {%- if request.values[name] -%}
+        {%- if name in request.values -%}
             {%- if request.values[name] == '' ~ item_id %} selected
             {%- endif -%}
         {%- else -%}

{chellow-1714470909.0.0.dist-info → chellow-1715252645.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1714470909.0.0
+Version: 1715252645.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)