arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Proof of concept for JSON parsing/storage

Browse Source 
\o/
This commit is contained in:
FreneticScribbler
2020-08-25 16:00:19 +01:00
parent 8bb08724b6
commit 9cf081efc7
3 changed files with 89 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
RIGS/templates/event_checklist_detail.html
View File

@@ -1,6 +1,9 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
{% block title %}Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
{% load help_text from filters %}
{% load get_json_element from filters %}
{% load get_item from filters %}
{% load profile_by_index from filters %}
{% block content %}
<div class="row my-3 py-3">
@@ -16,35 +19,63 @@
<div class="card-header">General</div>
<div class="card-body">
<dl class="row">
<dt class="col-10">{{ object|help_text:'power_mic' }}</dt>
<dd class="col-2">
{{ object.power_mic.name }}
</dd>
</dl>
<p>{{ object|help_text:'vehicles' }}</p>
<ul>
{% for i in object.vehicles %}
<li>Vehicle <strong>{{ object.vehicles|get_item:i|get_item:'vehicle'|default:'none' }}</strong> driven by <strong>{{ object.vehicles|get_item:i|get_item:'driver'|profile_by_index|default:'nobody'}}</strong></li>
{% endfor %}
</ul>
</div>
</div>
<div class="card card-default mb-3">
<div class="card-header">Safety Checks</div>
<div class="card-body">
<dl class="row">
<dt class="col-10">{{ object|help_text:'safe_parking'|safe }}</dt>
<dd class="col-2">
{{ object.safe_parking|yesno|title }}
</dd>
<dt class="col-10">{{ object|help_text:'safe_packing'|safe }}</dt>
<dd class="col-2">
{{ object.safe_packing|yesno|title }}
</dd>
<dt class="col-10">{{ object|help_text:'exits'|safe }}</dt>
<dd class="col-2">
{{ object.exits|yesno|title }}
</dd>
<dt class="col-10">{{ object|help_text:'trip_hazard'|safe }}</dt>
<dd class="col-2">
{{ object.trip_hazard|yesno|title }}
</dd>
<dt class="col-10">{{ object|help_text:'warning_signs'|safe }}</dt>
<dd class="col-2">
{{ object.warning_signs|yesno|title }}
</dd>
<dt class="col-10">{{ object|help_text:'ear_plugs'|safe }}</dt>
<dd class="col-2">
{{ object.ear_plugs|yesno|title }}
</dd>
</dl>
</div>
</div>
<div class="card card-default mb-3">
<div class="card-header">Power</div>
<div class="card-body">
{% if object.medium_event %}
<span class="badge badge-success">Small Event</span>
{% else %}
<span class="badge badge-warning">Medium Event</span>
{% endif %}
<dl class="row">
</dl>
</div>
</div>
<div class="card card-default mb-3">
<div class="card-header">Sound</div>
<div class="card-body">
<dl class="row">
</dl>
</div>
</div>
<div class="card card-default mb-3">
<div class="card-header">Site Details</div>
<div class="card-body">
<dl class="row">
</dl>
</div>
</div>
<div class="card card-default mb-3">
<div class="card-header">Structures</div>
<div class="card-body">
</div>
</div>
</div>
</div>
<div class="col-12 text-right">

25
RIGS/templates/event_checklist_form.html
View File

@@ -2,6 +2,9 @@
{% load widget_tweaks %}
{% load static %}
{% load help_text from filters %}
{% load get_json_element from filters %}
{% load get_item from filters %}
{% load profile_by_index from filters %}
{% block title %}{% if edit %}Edit{% else %}Create{% endif %} Event Checklist for Event N{{ event.pk|stringformat:"05d" }}{% endblock %}
@@ -53,7 +56,18 @@
}
});
$("form").submit(function( event ) {
$({{form.vehicles.id_for_label}}).val(JSON.stringify($('*[data-serialize]').serializeArray()));
// Mmmm Javascript data mangling...
var raw = $('*[data-serialize]').serializeArray();
var post = raw.reduce(function (result, current) {
var index = current.name.split('_')[1];
var name = current.name.split('_')[0];
result[index] = result[index] || {};
var nested = result[index] || {};
nested[name] = current.value;
result[index] = nested;
return result;
}, {});
$({{form.vehicles.id_for_label}}).val(JSON.stringify(post));
});
});
</script>
@@ -97,7 +111,7 @@
</div>
<label class="col-12 pt-3" for="{{ form.vehicles.id_for_label }}">{{ form.vehicles.help_text }}</label>
<input name="{{ form.vehicles.name }}" id="{{ form.vehicles.id_for_label }}"
value="{{ form.vehicles.value }}"/>
value="{{ form.vehicles.value }}" style="display: none"/>
<table class="table">
<thead>
<tr>
@@ -107,10 +121,13 @@
</thead>
<tbody>
{% for i in '012'|make_list %}
<tr id="vehicles">
<td><input name="vehicle_{{i}}" type="text" class="form-control" data-serialize="true"/></td>
<tr id="vehicles_{{i}}">
<td><input name="vehicle_{{i}}" type="text" class="form-control" data-serialize="true" value="{{ form.vehicles.value|get_json_element:i|get_item:'vehicle' }}"/></td>
<th scope="row">
<select name="driver_{{i}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" data-serialize="true">
{% if form.vehicles.value|get_json_element:i|get_item:'driver' is not 0 %}
<option value="{{ form.vehicles.value|get_json_element:i|get_item:'driver' }}" selected="selected">{{form.vehicles.value|get_json_element:i|get_item:'driver'|profile_by_index}}</option>
{% endif %}
</select>
</th>
</tr>

18
RIGS/templatetags/filters.py
View File

@@ -6,6 +6,8 @@ from django.utils.text import normalize_newlines
from django.template.defaultfilters import stringfilter
from django.utils.safestring import SafeData, mark_safe
from django.utils.html import escape
from RIGS import models
import json
register = template.Library()
@@ -126,3 +128,19 @@ def verbose_name(obj, field):
@register.filter
def get_list(dictionary, key):
return dictionary.getlist(key)
@register.filter
def profile_by_index(value):
if(value):
return models.Profile.objects.get(pk=int(value))
else:
return ""
@register.filter
def get_json_element(value, element):
return json.loads(value)[element]
@register.filter
def get_item(dictionary, key):
return dictionary.get(key)