chellow 1726485186.0.0__py3-none-any.whl → 1726510224.0.0__py3-none-any.whl

chellow/e/views.py

@@ -3943,20 +3943,58 @@ def scenario_add_get():
 
 @e.route("/scenarios/<int:scenario_id>")
 def scenario_get(scenario_id):
+    start_date = None
+    finish_date = None
+    duration = 1
+
     scenario = Scenario.get_by_id(g.sess, scenario_id)
     props = scenario.props
-    _, finish_date_ct = list(
-        c_months_c(
-            start_year=props["scenario_start_year"],
-            start_month=props["scenario_start_month"],
-            months=props["scenario_duration"],
+    site_codes = "\n".join(props.get("site_codes", []))
+    try:
+        duration = props["scenario_duration"]
+        _, finish_date_ct = list(
+            c_months_c(
+                start_year=props["scenario_start_year"],
+                start_month=props["scenario_start_month"],
+                months=duration,
+            )
+        )[-1]
+        finish_date = to_utc(finish_date_ct)
+    except KeyError:
+        pass
+
+    try:
+        start_date = to_utc(
+            ct_datetime(
+                props["scenario_start_year"],
+                props["scenario_start_month"],
+                props["scenario_start_day"],
+                props["scenario_start_hour"],
+                props["scenario_start_minute"],
+            )
         )
-    )[-1]
+    except KeyError:
+        pass
+
+    try:
+        finish_date = to_utc(
+            ct_datetime(
+                props["scenario_finish_year"],
+                props["scenario_finish_month"],
+                props["scenario_finish_day"],
+                props["scenario_finish_hour"],
+                props["scenario_finish_minute"],
+            )
+        )
+    except KeyError:
+        pass
     return render_template(
         "scenario.html",
         scenario=scenario,
-        scenario_finish_date=to_utc(finish_date_ct),
-        scenario_duration=props["scenario_duration"],
+        scenario_start_date=start_date,
+        scenario_finish_date=finish_date,
+        scenario_duration=duration,
+        site_codes=site_codes,
     )
 
 

chellow/templates/e/dc_contracts.html

@@ -13,6 +13,7 @@
 		<caption>Current DC Contracts</caption>
 		<thead>
 			<tr>
+				<th>View</th>
 				<th>Name</th>
 				<th>Start Date</th>
 				<th>DC</th>
@@ -21,14 +22,10 @@
 		<tbody>
 			{% for contract in current_dc_contracts %}
 				<tr>
-					<td>
-						<a href="/e/dc_contracts/{{contract.id}}">{{contract.name}}</a>
-					</td>
+					<td><a href="/e/dc_contracts/{{contract.id}}">View</a></td>
+					<td>{{contract.name}}</td>
 					<td>{{ contract.start_rate_script.start_date|hh_format }}</td>
-					<td>
-						<a href="/e/parties/{{contract.party.id}}"
-							>{{contract.party.name}}</a>
-					</td>
+					<td><a href="/e/parties/{{contract.party.id}}">{{contract.party.name}}</a></td>
 				</tr>
 			{% endfor %}
 		</tbody>

chellow/templates/e/scenario.html

@@ -28,8 +28,12 @@
 		<fieldset>
 			<legend>Run With Duration</legend>
 			<input type="hidden" name="scenario_id" value="{{scenario.id}}">
+			<label>Start Date</label>
+			{{ input_date('start', scenario_start_date) }}
+			<label>Finish Date</label>
+			{{ input_date('finish', scenario_finish_date) }}
 			<label>Site Codes</label>
-			{{input_textarea('site_codes', '', 5, 40,
+			{{input_textarea('site_codes', site_codes, 5, 40,
 			  placeholder='One on each line, includes all if left blank')}}    						
 			<input type="submit" value="Run">
 		</fieldset>	

chellow/templates/e/supplier_batch.html

@@ -153,7 +153,7 @@
 	<form action="/reports/111">
 		<fieldset>
 			<input type="hidden" name="batch_id" value="{{batch.id}}">
-			<legend>Download McBill Check</legend>
+			<legend>Download Bill Check</legend>
 			<label>MPAN Cores</label>
 			{{input_textarea(
 				'mpan_cores', '', 5, 40,

{chellow-1726485186.0.0.dist-info → chellow-1726510224.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1726485186.0.0
+Version: 1726510224.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.dist-info → chellow-1726510224.0.0.dist-info}/RECORD

@@ -38,7 +38,7 @@ chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,623
 chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
 chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=lIQj7EdUrcFwEqleuHZXYU_bfzIwNOqUVVxB3NPQt4A,13710
-chellow/e/views.py,sha256=NwDgs0iZ6nmfX4qF5sSwFlecSsqDBMRsf46vxuIkgVg,219605
+chellow/e/views.py,sha256=aljiDbLvO_rUl00ohDDxs-3-xPmsuguaOyo69lcXcBA,220624
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJpHB-t-qOdSaB8qY6GLog,4071
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
@@ -191,7 +191,7 @@ chellow/templates/e/dc_contract_hh_import.html,sha256=UODiBFNohb60MjH1w-9JW1JE0O
 chellow/templates/e/dc_contract_hh_imports.html,sha256=eXFDGyzSgag4JRism81_p5yTzQOjCIXaVkQ8tl3dDcM,8172
 chellow/templates/e/dc_contract_properties.html,sha256=2EmA91gYWZcTOHQ3PxXQrpTOb8dm0OGjwRWsW6qNI9s,455
 chellow/templates/e/dc_contract_properties_edit.html,sha256=TGYcHTlWbk5WmjZPkdbHhRVZcOpEfhowCp2penZcGiE,1704
-chellow/templates/e/dc_contracts.html,sha256=v8czpEcMzndngfWNXIKXib6Xrz9OwJjQAmNQNrQ6Y08,1705
+chellow/templates/e/dc_contracts.html,sha256=vatnEwXJ9xvk97_NI537rTKqIExAuDGhquQ8k07s5xA,1708
 chellow/templates/e/dc_contracts_add.html,sha256=2lrGrNqAoKp16OiMoNDNlJxBMW3QdSPfgEFheSg826s,710
 chellow/templates/e/dc_rate_script.html,sha256=gfKUHV2IMsTQT-cYfjl4aiEBqGEWSj3uW22UZpoyGq4,1219
 chellow/templates/e/dc_rate_script_add.html,sha256=5MlE4r5eLww3xI9qZRlu8hE8bU7RVwyDJcr20-0e4uY,644
@@ -272,7 +272,7 @@ chellow/templates/e/read_add.html,sha256=PGNPKTQiXkTEANMKOXCzBLGwJJJfQIkIgpGRAb-
 chellow/templates/e/read_edit.html,sha256=JWnHn8Dcq3t_LUGLUV9IAMnhuacw38On7552kGn4QiU,3147
 chellow/templates/e/read_type.html,sha256=volKteZB79famXrzN_Bgqy9JT9C4a50vXLkuZ0ObBq0,403
 chellow/templates/e/read_types.html,sha256=CknHXNEkBnsAprqI66ftvnnMFBdR_kqI7o26rxjlrJA,473
-chellow/templates/e/scenario.html,sha256=ZPkRsRcl_qgkFxSYanTfLDPQCzEqsV5u1m-swv4QNaU,1353
+chellow/templates/e/scenario.html,sha256=E8o3WQwAEejzaMPzeuUqyt9fWWNSDtN96qkJz0slDEo,1522
 chellow/templates/e/scenario_add.html,sha256=qQpxvhlrQqrNYiIQTHu_NvSoeSKuRNEJQYwLqRlQ8_U,516
 chellow/templates/e/scenario_docs.html,sha256=hOg6hrrnOcvdk7jXRsMrk1wtwK7K0IpqcBukX_vlvRg,4878
 chellow/templates/e/scenario_edit.html,sha256=Uf64v_qsBP0BxaFEIz214CC_dZXlvro4zvQXH_towhA,1070
@@ -289,7 +289,7 @@ chellow/templates/e/source.html,sha256=6cLjZWKS2w9Zy1C4hzi1lTKXAdKKFQ8wSxbwAjhP3
 chellow/templates/e/sources.html,sha256=AW_ysj5ZzArTLz0-FWappMsUEU1AO9gw7D4XSHbINu4,453
 chellow/templates/e/ssc.html,sha256=NiTbn9yLYYG_DV4j9S73rnIVmzTAzTbyaXomverHNnI,811
 chellow/templates/e/sscs.html,sha256=r4uVLWSCMVhYeN_r5e9QVJGLPc4R9yhdJxGXON9Xma8,983
-chellow/templates/e/supplier_batch.html,sha256=xr17ydDxKALMOcs8rfz-9T4wGyHKJqPpOQqz9brT9eY,5013
+chellow/templates/e/supplier_batch.html,sha256=A-iut_y8jCJ2nm0QQF_uPuRJWnWH9eN056cUJlmBJ6Q,5011
 chellow/templates/e/supplier_batch_add.html,sha256=RabJ20yLpsF_npSLL5aeLlPDa2tL99fENaIzDYZJy1w,1240
 chellow/templates/e/supplier_batch_edit.html,sha256=wFnhGHLo51omagJdE8viIYgmift7Y3n0C39sMru7XWU,1190
 chellow/templates/e/supplier_batch_file.html,sha256=fohdthY3ibO9a_2BJsYWyJhZL369F0gaUV7McFzWhMQ,1226
@@ -365,6 +365,6 @@ 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-1726485186.0.0.dist-info/METADATA,sha256=A-SuyKUAjAIHqSedTnVcPU5whqX-d8hImIz4IW0ANfA,12204
-chellow-1726485186.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1726485186.0.0.dist-info/RECORD,,
+chellow-1726510224.0.0.dist-info/METADATA,sha256=5yHyg_hOusHvyLO5578hobk7B9yosB2-EFVHM94oE7U,12204
+chellow-1726510224.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1726510224.0.0.dist-info/RECORD,,