mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
Compare commits
1 Commits
1f22470bfd
...
revert-594
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ded31adbb4 |
@@ -943,10 +943,6 @@ class PowerTestRecord(ReviewableModel, RevisionMixin):
|
||||
def activity_feed_string(self):
|
||||
return str(self.event)
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return f"Power Test Record - {self.event}"
|
||||
|
||||
|
||||
class EventCheckIn(models.Model):
|
||||
event = models.ForeignKey('Event', related_name='crew', on_delete=models.CASCADE)
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
<paraStyle name="center" alignment="center"/>
|
||||
<paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
|
||||
|
||||
{% block extrastyles %}
|
||||
{% endblock %}
|
||||
|
||||
<paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
|
||||
<paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
|
||||
<paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
|
||||
@@ -140,7 +137,6 @@
|
||||
<nextFrame/>
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
<namedString id="lastPage"><pageNumber/></namedString>
|
||||
</story>
|
||||
|
||||
</document>
|
||||
|
||||
@@ -165,7 +165,6 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 text-right">
|
||||
{% button 'print' 'pt_print' object.pk %}
|
||||
{% button 'edit' url='pt_edit' pk=object.pk %}
|
||||
{% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
|
||||
{% include 'partials/review_status.html' with perm=perms.RIGS.review_power review='pt_review' %}
|
||||
|
||||
@@ -1,170 +0,0 @@
|
||||
{% extends 'base_print.xml' %}
|
||||
{% load filters %}
|
||||
|
||||
{% block extrastyles %}
|
||||
<paraStyle name="style.powerReviewed" alignment="center" backColor="green" textColor="white"/>
|
||||
<paraStyle name="style.powerUnreviewed" alignment="center" backColor="red" textColor="white"/>
|
||||
|
||||
<blockTableStyle id="powerTable">
|
||||
<blockValign value="middle"/>
|
||||
<lineStyle kind="LINEABOVE" colorName="black" thickness="1"/>
|
||||
<lineStyle kind="LINEBELOW" colorName="black" thickness="1"/>
|
||||
<lineStyle kind="LINEAFTER" colorName="black" thickness="1"/>
|
||||
<lineStyle kind="LINEBEFORE" colorName="black" thickness="1"/>
|
||||
</blockTableStyle>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<spacer length="15"/>
|
||||
<h1>Power Test Record for <strong>{{ object.event }}</strong></h1>
|
||||
<spacer length="15"/>
|
||||
<h2>Client: {{ object.event.person|default:object.event.organisation }} | Venue: {{ object.event.venue }} | MIC: {{ object.event.mic }}</h2>
|
||||
<spacer length="15"/>
|
||||
<hr/>
|
||||
<spacer length="15"/>
|
||||
{% if object.reviewed_by %}
|
||||
<para style="style.powerReviewed"><strong>Reviewed by: {{ object.reviewed_by }} at {{ object.reviewed_at|date:"D d/m/Y" }}</strong></para>
|
||||
{% else %}
|
||||
<para style="style.powerUnreviewed"><strong>Power test results not yet reviewed</strong></para>
|
||||
{% endif %}
|
||||
<spacer length="15"/>
|
||||
<hr/>
|
||||
<spacer length="15"/>
|
||||
|
||||
<h2 fontSize="16">Power Plan Information</h2>
|
||||
<spacer length="15"/>
|
||||
|
||||
<blockTable colWidths="250,250">
|
||||
<tr>
|
||||
<td><para><strong>Power MIC:</strong> {{ object.power_mic }}</para></td>
|
||||
<td><para><strong>Venue:</strong> {{ object.event.venue }}</para></td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para><strong>Event Date:</strong> {{ object.event.start_date |date:"D d/m/Y" }}</para></td>
|
||||
<td><para><strong>Generators:</strong> {{ object.event.riskassessment.generators|yesno|capfirst }}</para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para><strong>Power Test taken at:</strong> {{ object.date_created|date:"D d/m/Y H:i" }}</para></td>
|
||||
<td><para><strong>Other Companies Power:</strong> {{ object.event.riskassessment.other_companies_power|yesno|capfirst }}</para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
||||
<spacer length="15"/>
|
||||
<hr/>
|
||||
<spacer length="15"/>
|
||||
|
||||
<condPageBreak height="10in"/>
|
||||
|
||||
<h2 fontSize="16">Power Test Results</h2>
|
||||
<spacer length="15"/>
|
||||
|
||||
<para><strong>Source RCD protected?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
|
||||
<para><sub>(If cable is more than 3 metres long)</sub></para>
|
||||
|
||||
<spacer length="5"/>
|
||||
|
||||
<para><strong>Appropriate and clear labelling on distribution and cabling?</strong> {{ object.labelling|yesno|capfirst }}</para>
|
||||
|
||||
<spacer length="5"/>
|
||||
|
||||
<para><strong>Equipment appropriately earthed?</strong> {{ object.source_rcd|yesno|capfirst }}</para>
|
||||
<para><sub>(truss, stage, generators etc.)</sub></para>
|
||||
|
||||
<spacer length="5"/>
|
||||
|
||||
<para><strong>All equipment in PAT period?</strong> {{ object.pat|yesno|capfirst }}</para>
|
||||
|
||||
<spacer length="15"/>
|
||||
|
||||
<h2 fontSize="14">Tests at first distro</h2>
|
||||
<spacer length="5"/>
|
||||
|
||||
<blockTable colWidths="100,410">
|
||||
<tr>
|
||||
<td><para><strong>Voltage<br/><sub>(cube meter) / V</sub></strong></para></td>
|
||||
<td>
|
||||
<blockTable colWidths="100,100,100" style="powerTable">
|
||||
<tr>
|
||||
<td><para><strong>L1 - N</strong></para></td>
|
||||
<td><para><strong>L2 - N</strong></para></td>
|
||||
<td><para><strong>L3 - N</strong></para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ object.fd_voltage_l1}}</td>
|
||||
<td>{{ object.fd_voltage_l2}}</td>
|
||||
<td>{{ object.fd_voltage_l3}}</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
||||
<spacer length="15"/>
|
||||
|
||||
<blockTable colWidths="100,100,190,120">
|
||||
<tr>
|
||||
<td><para><strong>Phase Rotation<br/><sub>(if required)</sub></strong></para></td>
|
||||
<td><para>{{ object.fd_phase_rotation|yesno|capfirst }}</para></td>
|
||||
<td><para><strong>Earth Fault Loop Impedance (Z<sub>s</sub>) / Ω</strong></para></td>
|
||||
<td><para>{{ object.fd_earth_fault }}</para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
||||
<spacer length="15"/>
|
||||
|
||||
<para><strong>Prospective Short Circuit Current / A</strong> {{ object.fd_pssc }}</para>
|
||||
|
||||
<spacer length="15"/>
|
||||
|
||||
<h2 fontSize="14">Tests 'Worst Case' points (at least 1 required)</h2>
|
||||
<spacer length="15"/>
|
||||
|
||||
<blockTable colWidths="100,100,190,120" style="powerTable">
|
||||
<tr>
|
||||
<td><para><strong>Description</strong></para></td>
|
||||
<td><para><strong>Polarity checked?</strong></para></td>
|
||||
<td><para><strong>Voltage / V</strong></para></td>
|
||||
<td><para><strong>Earth Fault Loop Impedance (Z<sub>s</sub>) / Ω</strong></para></td>
|
||||
</tr>
|
||||
{% if object.w1_description %}
|
||||
<tr>
|
||||
<td><para><strong>{{ object.w1_description }}</strong></para></td>
|
||||
<td><para>{{ object.w1_polarity|yesno|capfirst }}</para></td>
|
||||
<td><para>{{ object.w1_voltage }} V</para></td>
|
||||
<td><para>{{ object.w1_earth_fault }}</para></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if object.w2_description %}
|
||||
<tr>
|
||||
<td><para><strong>{{ object.w2_description }}</strong></para></td>
|
||||
<td><para>{{ object.w2_polarity|yesno|capfirst }}</para></td>
|
||||
<td><para>{{ object.w2_voltage }} V</para></td>
|
||||
<td><para>{{ object.w2_earth_fault }}</para></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if object.w3_description %}
|
||||
<tr>
|
||||
<td><para><strong>{{ object.w3_description }}</strong></para></td>
|
||||
<td><para>{{ object.w3_polarity|yesno|capfirst }}</para></td>
|
||||
<td><para>{{ object.w3_voltage }} V</para></td>
|
||||
<td><para>{{ object.w3_earth_fault }}</para></td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</blockTable>
|
||||
|
||||
<spacer length="15"/>
|
||||
<h2 fontSize="14">Generic Tests</h2>
|
||||
<spacer length="15"/>
|
||||
|
||||
<blockTable colWidths="250,270" style="powerTable">
|
||||
<tr>
|
||||
<td><para><strong>All circuit RCDs tested?</strong><br/>(using test button)</para></td>
|
||||
<td><para>{{ object.all_rcds_tested|yesno|capfirst }}</para></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><para><strong>Public/performer accessible circuits tested?</strong><br/>(using socket tester)</para></td>
|
||||
<td><para>{{ object.public_sockets_tested|yesno|capfirst }}</para></td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
{% endblock %}
|
||||
@@ -100,7 +100,6 @@ urlpatterns = [
|
||||
name='pt_edit'),
|
||||
path('event/power/<int:pk>/review/', permission_required_with_403('RIGS.review_power')(views.MarkReviewed.as_view()),
|
||||
name='pt_review', kwargs={'model': 'PowerTestRecord'}),
|
||||
path('event/power/<int:pk>/print/', permission_required_with_403('RIGS.view_powertestrecord')(views.PowerPrint.as_view()), name='pt_print'),
|
||||
|
||||
path('event/<int:pk>/checkin/', login_required(views.EventCheckIn.as_view()),
|
||||
name='event_checkin'),
|
||||
|
||||
@@ -232,16 +232,6 @@ class RAPrint(PrintView):
|
||||
return context
|
||||
|
||||
|
||||
class PowerPrint(PrintView):
|
||||
model = models.PowerTestRecord
|
||||
template_name = 'hs/power_print.xml'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['filename'] = f"PowerTestRecord_for_{context['object'].event.display_id}.pdf"
|
||||
return context
|
||||
|
||||
|
||||
class EventCheckIn(generic.CreateView, ModalURLMixin):
|
||||
model = models.EventCheckIn
|
||||
template_name = 'hs/eventcheckin_form.html'
|
||||
|
||||
Reference in New Issue
Block a user