{% button 'edit' url='ec_edit' pk=object.pk %}
{% button 'view' url='event_detail' pk=object.event.pk text="Event" %}
+
Create Power Test
{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
{% button 'edit' url='ec_edit' pk=object.pk %}
{% button 'view' url='event_detail' pk=object.pk text="Event" %}
+
Create Power Test
{% include 'partials/review_status.html' with perm=perms.RIGS.review_eventchecklist review='ec_review' %}
diff --git a/RIGS/templates/hs/event_checklist_form.html b/RIGS/templates/hs/event_checklist_form.html
index ea8183a1..373ad306 100644
--- a/RIGS/templates/hs/event_checklist_form.html
+++ b/RIGS/templates/hs/event_checklist_form.html
@@ -24,7 +24,7 @@
{% block content %}
{% include 'form_errors.html' %}
-
+
diff --git a/RIGS/templates/hs/power_detail.html b/RIGS/templates/hs/power_detail.html
index d8253248..958a1d25 100644
--- a/RIGS/templates/hs/power_detail.html
+++ b/RIGS/templates/hs/power_detail.html
@@ -86,7 +86,7 @@
- Voltage
(cube meter) |
+ Voltage
(cube meter) / V |
{{ object|help_text:'fd_voltage_l1' }} |
{{ object|help_text:'fd_voltage_l2' }} |
{{ object|help_text:'fd_voltage_l3' }} |
diff --git a/RIGS/templates/hs/power_form.html b/RIGS/templates/hs/power_form.html
index 315175b7..d77ead1b 100644
--- a/RIGS/templates/hs/power_form.html
+++ b/RIGS/templates/hs/power_form.html
@@ -51,22 +51,18 @@
-
-
@@ -119,7 +115,7 @@
- Voltage
(cube meter) |
+ Voltage
(cube meter) / V |
{{ form.fd_voltage_l1.help_text }} |
{{ form.fd_voltage_l2.help_text }} |
{{ form.fd_voltage_l3.help_text }} |
diff --git a/RIGS/templates/hs/risk_assessment_form.html b/RIGS/templates/hs/risk_assessment_form.html
index 28184cd3..0fcef1be 100644
--- a/RIGS/templates/hs/risk_assessment_form.html
+++ b/RIGS/templates/hs/risk_assessment_form.html
@@ -25,7 +25,7 @@
});
$('input[type=radio][name=outside], input[type=radio][name=generators], input[type=radio][name=other_companies_power], input[type=radio][name=nonstandard_equipment_power], input[type=radio][name=multiple_electrical_environments]').change(function() {
$('#{{ form.power_notes.id_for_label }}').prop('required', parseBool(this.value));
- $('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
+ //$('#{{ form.power_plan.id_for_label }}').prop('required', parseBool(this.value));
});
$('input[type=radio][name=special_structures]').change(function() {
$('#{{ form.persons_responsible_structures.id_for_label }}').prop('hidden', !parseBool(this.value)).prop('required', parseBool(this.value));
diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html
index e4f1ad53..7c521de1 100644
--- a/RIGS/templates/partials/event_status.html
+++ b/RIGS/templates/partials/event_status.html
@@ -15,7 +15,7 @@
{% endif %}
{% endif %}
{% if not event.dry_hire %}
- {% if event.has_checklist %}
+ {% if event.riskassessment %}
RA:
{% else %}
RA:
diff --git a/RIGS/templatetags/filters.py b/RIGS/templatetags/filters.py
index b2480d40..73a8c148 100644
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -171,7 +171,7 @@ def title_spaced(string):
@register.filter(needs_autoescape=True)
def namewithnotes(obj, url, autoescape=True):
if hasattr(obj, 'notes') and obj.notes is not None and len(obj.notes) > 0:
- return mark_safe(obj.name + " ".format(reverse(url, kwargs={'pk': obj.pk})))
+ return mark_safe(obj.name + f" ")
else:
return obj.name
@@ -183,7 +183,7 @@ def linkornone(target, namespace=None, autoescape=True):
link = namespace + "://" + target
else:
link = target
- return mark_safe("{}".format(link, str(target)))
+ return mark_safe(f"{target}")
else:
return "None"
diff --git a/RIGS/tests/pages.py b/RIGS/tests/pages.py
index 7745c0c1..a2765830 100644
--- a/RIGS/tests/pages.py
+++ b/RIGS/tests/pages.py
@@ -114,7 +114,7 @@ class CreateEvent(FormPage):
}
def select_event_type(self, type_name):
- self.find_element(By.XPATH, '//button[.="{}"]'.format(type_name)).click()
+ self.find_element(By.XPATH, f'//button[.="{type_name}"]').click()
def item_row(self, ID):
return rigs_regions.ItemRow(self, self.find_element(By.ID, "item-" + ID))
diff --git a/RIGS/tests/test_unit.py b/RIGS/tests/test_unit.py
index 3c038e46..2426a59a 100644
--- a/RIGS/tests/test_unit.py
+++ b/RIGS/tests/test_unit.py
@@ -259,7 +259,7 @@ class TestPrintPaperwork(TestCase):
def test_login_redirect(client, django_user_model):
request_url = reverse('event_embed', kwargs={'pk': 1})
- expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
+ expected_url = f"{reverse('login_embed')}?next={request_url}"
# Request the page and check it redirects
response = client.get(request_url, follow=True)
@@ -372,7 +372,8 @@ def test_ra_redirect(admin_client, admin_user, ra):
class TestMarkdownTemplateTags(TestCase):
- markdown = open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md")).read()
+ with open(os.path.join(settings.BASE_DIR, "RIGS/tests/sample.md"), encoding="utf-8") as f:
+ markdown = f.read()
def test_html_safe(self):
html = markdown_filter(self.markdown)
diff --git a/RIGS/views/hs.py b/RIGS/views/hs.py
index a2ac9786..a4a53cb6 100644
--- a/RIGS/views/hs.py
+++ b/RIGS/views/hs.py
@@ -13,31 +13,24 @@ from django.shortcuts import redirect
class HSCreateView(generic.CreateView):
- def get_form(self, **kwargs):
- form = super().get_form(**kwargs)
- epk = self.kwargs.get('pk')
- event = models.Event.objects.get(pk=epk)
- form.instance.event = event
- return form
-
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- epk = self.kwargs.get('pk')
- event = models.Event.objects.get(pk=epk)
+ event = models.Event.objects.get(pk=self.kwargs.get('pk'))
context['event'] = event
context['page_title'] = f'Create {self.model.__name__} for Event {event.display_id}'
+ get_related(context['form'], context)
return context
-class MarkReviewed(generic.View):
- def get(self, *args, **kwargs):
+class MarkReviewed(generic.RedirectView):
+ def get_redirect_url(self, *args, **kwargs):
obj = apps.get_model('RIGS', kwargs.get('model')).objects.get(pk=kwargs.get('pk'))
with reversion.create_revision():
reversion.set_user(self.request.user)
obj.reviewed_by = self.request.user
obj.reviewed_at = timezone.now()
obj.save()
- return HttpResponseRedirect(reverse('hs_list'))
+ return self.request.META.get('HTTP_REFERER', reverse('hs_list'))
class EventRiskAssessmentCreate(HSCreateView):
@@ -55,11 +48,17 @@ class EventRiskAssessmentCreate(HSCreateView):
if ra is not None:
return HttpResponseRedirect(reverse('ra_edit', kwargs={'pk': ra.pk}))
- return super(EventRiskAssessmentCreate, self).get(self)
+ return super().get(self)
def get_success_url(self):
return reverse('ra_detail', kwargs={'pk': self.object.pk})
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ if context['event'].mic:
+ context['power_mic'] = context['event'].mic
+ return context
+
class EventRiskAssessmentEdit(generic.UpdateView):
model = models.RiskAssessment
@@ -74,7 +73,7 @@ class EventRiskAssessmentEdit(generic.UpdateView):
return reverse('ra_detail', kwargs={'pk': self.object.pk})
def get_context_data(self, **kwargs):
- context = super(EventRiskAssessmentEdit, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
rpk = self.kwargs.get('pk')
ra = models.RiskAssessment.objects.get(pk=rpk)
context['event'] = ra.event
@@ -89,7 +88,7 @@ class EventRiskAssessmentDetail(generic.DetailView):
template_name = 'hs/risk_assessment_detail.html'
def get_context_data(self, **kwargs):
- context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['page_title'] = f"Risk Assessment for Event {self.object.event.display_id} {self.object.event.name}"
return context
@@ -99,7 +98,7 @@ class EventChecklistDetail(generic.DetailView):
template_name = 'hs/event_checklist_detail.html'
def get_context_data(self, **kwargs):
- context = super(EventChecklistDetail, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['page_title'] = f"Event Checklist for Event {self.object.event.display_id} {self.object.event.name}"
return context
@@ -117,7 +116,7 @@ class EventChecklistEdit(generic.UpdateView):
return reverse('ec_detail', kwargs={'pk': self.object.pk})
def get_context_data(self, **kwargs):
- context = super(EventChecklistEdit, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
pk = self.kwargs.get('pk')
ec = models.EventChecklist.objects.get(pk=pk)
context['event'] = ec.event
@@ -136,19 +135,22 @@ class EventChecklistCreate(HSCreateView):
def get(self, *args, **kwargs):
epk = kwargs.get('pk')
event = models.Event.objects.get(pk=epk)
-
# Check if RA exists
ra = models.RiskAssessment.objects.filter(event=event).first()
-
if ra is None:
messages.error(self.request, f'A Risk Assessment must exist prior to creating any Event Checklists for {event}! Please create one now.')
return HttpResponseRedirect(reverse('event_ra', kwargs={'pk': epk}))
-
- return super(EventChecklistCreate, self).get(self)
+ return super().get(self)
def get_success_url(self):
return reverse('ec_detail', kwargs={'pk': self.object.pk})
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ if context['event'].venue:
+ context['venue'] = context['event'].venue
+ return context
+
class PowerTestDetail(generic.DetailView):
model = models.PowerTestRecord
@@ -179,7 +181,7 @@ class PowerTestEdit(generic.UpdateView):
context['event'] = ec.event
context['edit'] = True
context['page_title'] = f'Edit Power Test Record for Event {ec.event.display_id}'
- # get_related(context['form'], context)
+ get_related(context['form'], context)
return context
@@ -191,7 +193,6 @@ class PowerTestCreate(HSCreateView):
def get(self, *args, **kwargs):
epk = kwargs.get('pk')
event = models.Event.objects.get(pk=epk)
-
# Check if RA exists
ra = models.RiskAssessment.objects.filter(event=event).first()
@@ -204,6 +205,14 @@ class PowerTestCreate(HSCreateView):
def get_success_url(self):
return reverse('pt_detail', kwargs={'pk': self.object.pk})
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ if context['event'].venue:
+ context['venue'] = context['event'].venue
+ if context['event'].riskassessment.power_mic:
+ context['power_mic'] = context['event'].riskassessment.power_mic
+ return context
+
class HSList(generic.ListView):
paginate_by = 20
@@ -211,10 +220,10 @@ class HSList(generic.ListView):
template_name = 'hs/hs_list.html'
def get_queryset(self):
- return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
+ return models.Event.objects.all().exclude(status=models.Event.CANCELLED).exclude(dry_hire=True).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists')
def get_context_data(self, **kwargs):
- context = super(HSList, self).get_context_data(**kwargs)
+ context = super().get_context_data(**kwargs)
context['page_title'] = 'H&S Overview'
return context
diff --git a/assets/migrations/0028_alter_asset_length.py b/assets/migrations/0028_alter_asset_length.py
new file mode 100644
index 00000000..78fadbdf
--- /dev/null
+++ b/assets/migrations/0028_alter_asset_length.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-05-24 22:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('assets', '0027_asset_nickname'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='asset',
+ name='length',
+ field=models.DecimalField(blank=True, decimal_places=2, help_text='m', max_digits=10, null=True),
+ ),
+ ]
diff --git a/assets/models.py b/assets/models.py
index 32331029..3d8f70c8 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -135,7 +135,7 @@ class Asset(models.Model, RevisionMixin):
# Cable assets
is_cable = models.BooleanField(default=False)
cable_type = models.ForeignKey(to=CableType, blank=True, null=True, on_delete=models.SET_NULL)
- length = models.DecimalField(decimal_places=1, max_digits=10,
+ length = models.DecimalField(decimal_places=2, max_digits=10,
blank=True, null=True, help_text='m')
csa = models.DecimalField(decimal_places=2, max_digits=10,
blank=True, null=True, help_text='mm²')
@@ -192,5 +192,5 @@ class Asset(models.Model, RevisionMixin):
return str(self.asset_id)
@property
- def name(self):
+ def display_name(self):
return f"{self.display_id} | {self.description}"
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index 057d2dae..73711dbb 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -35,6 +35,11 @@
function onAuditClick(assetID) {
$('#' + assetID).remove();
}
+ $('#modal').on('hidden.bs.modal', function (e) {
+ searchbar = document.getElementById('id_q');
+ searchbar.value = "";
+ setTimeout(searchbar.focus(), 2000);
+ })
{% endblock %}
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 7496875b..af61c8e4 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -12,7 +12,6 @@
{{ block.super }}
-
{% endblock %}
{% block js %}
@@ -35,9 +34,10 @@
$(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
});
+
{% endblock %}
diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html
index d5963b00..e5136eb4 100644
--- a/assets/templates/partials/asset_list_table.html
+++ b/assets/templates/partials/asset_list_table.html
@@ -12,7 +12,7 @@
{% for item in object_list %}
-
+
| {{ item.asset_id }} |
{{ item.description }} |
{{ item.category }} |
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index 9fa226b9..dc627fc9 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -34,7 +34,7 @@
@@ -42,7 +42,7 @@
diff --git a/assets/tests/pages.py b/assets/tests/pages.py
index a9815f31..9f5afa32 100644
--- a/assets/tests/pages.py
+++ b/assets/tests/pages.py
@@ -77,7 +77,7 @@ class AssetForm(FormPage):
'description': (regions.TextBox, (By.ID, 'id_description')),
'is_cable': (regions.CheckBox, (By.ID, 'id_is_cable')),
'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')),
- 'comments': (regions.SimpleMDETextArea, (By.ID, 'id_comments')),
+ 'comments': (regions.TextBox, (By.ID, 'id_comments')),
'purchase_price': (regions.TextBox, (By.ID, 'id_purchase_price')),
'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')),
diff --git a/package-lock.json b/package-lock.json
index 9180f996..0a2350ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "PyRIGS",
"version": "1.0.0",
"license": "Custom",
"dependencies": {
diff --git a/pipeline/source_assets/js/interaction.js b/pipeline/source_assets/js/interaction.js
index 308fe5af..f18bb317 100644
--- a/pipeline/source_assets/js/interaction.js
+++ b/pipeline/source_assets/js/interaction.js
@@ -6,11 +6,6 @@ function setupItemTable(items_json) {
newitem = -1;
}
-function nl2br(str, is_xhtml) {
- var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '
' : '
';
- return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ breakTag +'$2');
-}
-
function escapeHtml(str) {
return $('').text(str).html();
}
diff --git a/templates/base_ajax.html b/templates/base_ajax.html
index 435b7607..1fd3fa46 100644
--- a/templates/base_ajax.html
+++ b/templates/base_ajax.html
@@ -17,7 +17,6 @@
e.preventDefault();
data = $(this).serialize();
action = $(this).attr('action');
- console.log(action)
$.post(action, data, function(resp) {
$('#modal').html(resp);
});
diff --git a/assets/templates/partials/form_field.html b/templates/partials/form_field.html
similarity index 52%
rename from assets/templates/partials/form_field.html
rename to templates/partials/form_field.html
index 027a2cce..b7b75418 100644
--- a/assets/templates/partials/form_field.html
+++ b/templates/partials/form_field.html
@@ -1,15 +1,15 @@
{% load widget_tweaks %}
{% load title_spaced from filters %}
{% spaceless %}
-
+{% if not nolabel %}{%endif%}
{% if append or prepend %}
-