Skip to content

Commit 2559c92

Browse files
jb3jb3
authored
Power test export refactoring (#607)
1 parent 3afa4de commit 2559c92

File tree

1 file changed

+86
-31
lines changed

1 file changed

+86
-31
lines changed

‎RIGS/templates/hs/power_print.xml‎

Lines changed: 86 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
{% load filters %}
33

44
{% block extrastyles %}
5-
<paraStyle name="style.powerReviewed" alignment="center" backColor="green" textColor="white"/>
6-
<paraStyle name="style.powerUnreviewed" alignment="center" backColor="red" textColor="white"/>
5+
<paraStyle name="style.powerReviewed" borderPadding="3" alignment="center" backColor="green" textColor="white"/>
6+
<paraStyle name="style.powerUnreviewed" borderPadding="3" alignment="center" backColor="red" textColor="white"/>
7+
<paraStyle name="style.smallText" fontSize="8"/>
8+
9+
<paraStyle leftIndent="2in" rightIndent="2in" name="style.smallEvent" fontSize="10" alignment="center" backColor="green" textColor="white" borderPadding="4" borderColor="black"/>
10+
<paraStyle leftIndent="2in" rightIndent="2in" name="style.mediumEvent" fontSize="10" alignment="center" backColor="orange" textColor="white" borderPadding="4" borderColor="black"/>
11+
<paraStyle leftIndent="2in" rightIndent="2in" name="style.largeEvent" fontSize="10" alignment="center" backColor="red" textColor="white" borderPadding="4" borderColor="black"/>
712

813
<blockTableStyle id="powerTable">
914
<blockValign value="middle"/>
@@ -12,6 +17,10 @@
1217
<lineStyle kind="LINEAFTER" colorName="black" thickness="1"/>
1318
<lineStyle kind="LINEBEFORE" colorName="black" thickness="1"/>
1419
</blockTableStyle>
20+
21+
<blockTableStyle id="voltageTable">
22+
<blockValign value="middle"/>
23+
</blockTableStyle>
1524
{% endblock %}
1625

1726
{% block content %}
@@ -34,6 +43,16 @@
3443
<h2 fontSize="16">Power Plan Information</h2>
3544
<spacer length="15"/>
3645

46+
{% if object.event.riskassessment.event_size == 0 %}
47+
<para style="style.smallEvent"><strong>Small Event</strong></para>
48+
{% elif object.event.riskassessment.event_size == 1 %}
49+
<para style="style.mediumEvent"><strong>Medium Event</strong></para>
50+
{% elif object.event.riskassessment.event_size == 2 %}
51+
<para style="style.largeEvent"><strong>Large Event</strong></para>
52+
{% endif %}
53+
54+
<spacer length="15"/>
55+
3756
<blockTable colWidths="250,250">
3857
<tr>
3958
<td><para><strong>Power MIC:</strong> {{ object.power_mic }}</para></td>
@@ -54,35 +73,56 @@
5473
<hr/>
5574
<spacer length="15"/>
5675

57-
<condPageBreak height="10in"/>
58-
59-
<h2 fontSize="16">Power Test Results</h2>
60-
<spacer length="15"/>
61-
62-
<para><strong>Source RCD protected?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
63-
<para><sub>(If cable is more than 3 metres long)</sub></para>
76+
{% comment %}
77+
0 - Small event
78+
1 - Medium event (extra power records)
79+
2 - Large event (extra power records)
80+
{% endcomment %}
6481

65-
<spacer length="5"/>
82+
{% if object.event.riskassessment.event_size >= 1 %}
6683

67-
<para><strong>Appropriate and clear labelling on distribution and cabling?</strong> {{ object.labelling|yesno|capfirst }}</para>
84+
<para alignment="center"><strong>Power Test results enclosed on next page</strong></para>
6885

69-
<spacer length="5"/>
70-
71-
<para><strong>Equipment appropriately earthed?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
72-
<para><sub>(truss, stage, generators etc.)</sub></para>
86+
<condPageBreak height="10in"/>
7387

74-
<spacer length="5"/>
88+
<h2 fontSize="16">Event Power Checklist</h2>
89+
<spacer length="15"/>
7590

76-
<para><strong>All equipment in PAT period?</strong> {{ object.pat|yesno|capfirst }}</para>
91+
<blockTable colWidths="250,270" style="powerTable">
92+
<tr>
93+
<td><para><strong>All circuit RCDs tested?</strong></para><para style="style.smallText">(using test button)</para></td>
94+
<td><para>{{ object.all_rcds_tested|yesno|capfirst }}</para></td>
95+
</tr>
96+
<tr>
97+
<td><para><strong>Public/performer accessible circuits tested?</strong></para><para style="style.smallText">(using socket tester)</para></td>
98+
<td><para>{{ object.public_sockets_tested|yesno|capfirst }}</para></td>
99+
</tr>
100+
<tr>
101+
<td><para><strong>Source RCD protected?</strong></para><para style="style.smallText">(if cable is more than 3m long)</para></td>
102+
<td><para>{{ object.source_rcd|yesno|capfirst }}</para></td>
103+
</tr>
104+
<tr>
105+
<td><para><strong>Appropriate and clear labelling on distribution and cabling?</strong></para></td>
106+
<td><para>{{ object.labelling|yesno|capfirst }}</para></td>
107+
</tr>
108+
<tr>
109+
<td><para><strong>Equipment appropriately earthed?</strong></para><para style="style.smallText">(truss, stage, generators, etc.)</para></td>
110+
<td><para>{{ object.earthing|yesno|capfirst }}</para></td>
111+
</tr>
112+
<tr>
113+
<td><para><strong>All equipment in PAT period?</strong><br/><br/></para></td>
114+
<td><para>{{ object.pat|yesno|capfirst }}</para></td>
115+
</tr>
116+
</blockTable>
77117

78118
<spacer length="15"/>
79119

80-
<h2 fontSize="14">Tests at first distro</h2>
120+
<h2 fontSize="14">Power tests (First Distro)</h2>
81121
<spacer length="5"/>
82122

83-
<blockTable colWidths="100,410">
123+
<blockTable colWidths="100,410" style="voltageTable">
84124
<tr>
85-
<td><para><strong>Voltage<br/><sub>(cube meter) / V</sub></strong></para></td>
125+
<td><para><strong>Voltage</strong></para><para style="style.smallText">(cube meter) / V</para></td>
86126
<td>
87127
<blockTable colWidths="100,100,100" style="powerTable">
88128
<tr>
@@ -100,11 +140,11 @@
100140
</tr>
101141
</blockTable>
102142

103-
<spacer length="15"/>
143+
<spacer length="10"/>
104144

105-
<blockTable colWidths="100,100,190,120">
145+
<blockTable colWidths="100,100,190,120" style="voltageTable">
106146
<tr>
107-
<td><para><strong>Phase Rotation<br/><sub>(if required)</sub></strong></para></td>
147+
<td><para><strong>Phase Rotation</strong></para><para style="style.smallText">(if required)</para></td>
108148
<td><para>{{ object.fd_phase_rotation|yesno|capfirst }}</para></td>
109149
<td><para><strong>Earth Fault Loop Impedance (Z<sub>s</sub>) / Ω</strong></para></td>
110150
<td><para>{{ object.fd_earth_fault }}</para></td>
@@ -113,11 +153,11 @@
113153

114154
<spacer length="15"/>
115155

116-
<para><strong>Prospective Short Circuit Current / A</strong> {{ object.fd_pssc }}</para>
156+
<para><strong>Prospective Short Circuit Current (PSCC)</strong> {{ object.fd_pssc }} A</para>
117157

118158
<spacer length="15"/>
119159

120-
<h2 fontSize="14">Tests 'Worst Case' points (at least 1 required)</h2>
160+
<h2 fontSize="14">Power Tests (Worst Case Points)</h2>
121161
<spacer length="15"/>
122162

123163
<blockTable colWidths="100,100,190,120" style="powerTable">
@@ -153,18 +193,33 @@
153193
{% endif %}
154194
</blockTable>
155195

156-
<spacer length="15"/>
157-
<h2 fontSize="14">Generic Tests</h2>
196+
{% else %}
197+
198+
{% comment %}
199+
Small power test
200+
{% endcomment %}
201+
202+
<h2 fontSize="16">Power Checklist</h2>
158203
<spacer length="15"/>
159204

160205
<blockTable colWidths="250,270" style="powerTable">
161206
<tr>
162-
<td><para><strong>All circuit RCDs tested?</strong><br/>(using test button)</para></td>
163-
<td><para>{{ object.all_rcds_tested|yesno|capfirst }}</para></td>
207+
<td><para><strong>RCDs installed where needed and tested?</strong><br/><br/></para></td>
208+
<td><para>{{ object.rcds|yesno|capfirst }}</para></td>
164209
</tr>
165210
<tr>
166-
<td><para><strong>Public/performer accessible circuits tested?</strong><br/>(using socket tester)</para></td>
167-
<td><para>{{ object.public_sockets_tested|yesno|capfirst }}</para></td>
211+
<td><para><strong>Electrical supplies tested?</strong><br/><br/></para></td>
212+
<td><para>{{ object.supply_test|yesno|capfirst }}</para></td>
213+
</tr>
214+
<tr>
215+
<td><para><strong>Equipment appropriately earthed?</strong></para><para style="style.smallText">(truss, stage, generators, etc.)</para></td>
216+
<td><para>{{ object.earthing|yesno|capfirst }}</para></td>
217+
</tr>
218+
<tr>
219+
<td><para><strong>All equipment in PAT period?</strong><br/><br/></para></td>
220+
<td><para>{{ object.pat|yesno|capfirst }}</para></td>
168221
</tr>
169222
</blockTable>
223+
{% endif %}
224+
170225
{% endblock %}

0 commit comments

Comments
 (0)