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

Fixed frontend for updating existing items

Browse Source
This commit is contained in:
Tom Price
2014-12-04 23:35:56 +00:00
parent 697bbb9479
commit 3a816dfe63
3 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
RIGS/static/js/interaction.js
View File

@@ -3,10 +3,20 @@ function setupItemTable(items_json) {
$.each(objectitems, function(key, val) { $.each(objectitems, function(key, val) {
objectitems[key] = JSON.parse(val); objectitems[key] = JSON.parse(val);
}) })
newitem = -1
} }
function updatePrices() { function updatePrices() {
// individual rows
$('.item_row').each(function() {
var pk = $(this).data('pk');
var fields = objectitems[pk].fields;
var sub = fields.cost * fields.quantity;
$('#item-'+pk+' .sub-total').html(parseFloat(sub).toFixed(2)).data('subtotal', sub);
})
var sum = 0; var sum = 0;
$('.sub-total').each(function() { $('.sub-total').each(function() {
sum += Number($(this).data('subtotal')); sum += Number($(this).data('subtotal'));
}); });
@@ -16,18 +26,6 @@ function updatePrices() {
$('#total').text(parseFloat(sum+vat).toFixed(2)); $('#total').text(parseFloat(sum+vat).toFixed(2));
} }
function updateItemRow(pk) {
$row = $('#item-'+pk)
url = $row.data('url');
$.ajax({
url:url,
success:function(r) {
$row.replaceWith(r);
updatePrices();
}
})
}
function addItemRow(url) { function addItemRow(url) {
$tbody = $('#item-table tbody'); $tbody = $('#item-table tbody');
$.ajax({ $.ajax({
@@ -54,63 +52,65 @@ $.ajaxSetup({
}); });
$('#item-table').on('click', '.item-delete', function() { $('#item-table').on('click', '.item-delete', function() {
var row = $('#item-'+$(this).data('pk')); delete objectitems[$(this).data('pk')]
$.ajax({ $('#item-'+$(this).data('pk')).remove();
type:"POST", updatePrices();
url:$(this).data('url'),
success:function(r) {
row.remove();
updatePrices();
}
});
}); });
$('#item-table').on('click', '.item-add', function() { $('#item-table').on('click', '.item-add', function() {
$.ajax({ $('#item-form').data('pk', newitem--);
url:$(this).data('url'),
success:function(r) { // Set the form values
$('#itemModal .modal-content').html(r); var fields = objectitems[pk].fields;
$('#item-table tbody').sortable('refresh'); $('#item_name').val('');
} $('#item_description').val('');
}); $('#item_quantity').val('');
$('#item_cost').val('');
}); });
$('#item-table').on('click', '.item-edit', function() { $('#item-table').on('click', '.item-edit', function() {
var url = $(this).data('url'); // set the pk as we will need this later
$('#itemModal').data('pk', $(this).data('pk')); var pk = $(this).data('pk');
$.ajax({ $('#item-form').data('pk', pk);
url:url,
success:function(r) { // Set the form values
$('#itemModal .modal-content').html(r); var fields = objectitems[pk].fields;
} $('#item_name').val(fields.name);
}) $('#item_description').val(fields.description);
$('#item_quantity').val(fields.quantity);
$('#item_cost').val(fields.cost);
}); });
$('#itemModal').on('hidden.bs.modal', function() { $('body').on('submit','#item-form', function(e) {
pk = $(this).data('pk');
updateItemRow(pk);
$('#itemModal .modal-content').html('');
})
$('body').on('submit','.item-form', function(e) {
e.preventDefault(); e.preventDefault();
url = $(this).data('url'); var pk = $(this).data('pk');
data = $(this).serialize(); $('#itemModal').modal('hide');
$.ajax({
type:'POST',
url:url,
data:data,
success: function(r) {
$('#itemModal .modal-content').html(r)
}
})
})
function addItem(url) { if(pk < 0) {
$.get(url, function(r) { // @todo: Add new item
$('#item-table tbody').append(r); } else {
}); // update data structure
} var fields = objectitems[pk].fields;
fields.name = $('#item_name').val()
fields.description = $('#item_description').val();
fields.cost = $('#item_cost').val();
fields.quantity = $('#item_quantity').val();
objectitems[pk].fields = fields;
// update the table
$row = $('#item-'+pk);
$row.find('.name').html(fields.name);
$row.find('.description').html(fields.description);
$row.find('.cost').html(parseFloat(fields.cost).toFixed(2));
$row.find('.quantity').html(fields.quantity);
updatePrices();
}
});
$('body').on('submit', '.itemised_form', function(e) {
$('#id_items_json').val(JSON.stringify(objectitems));
});
// Return a helper with preserved width of cells // Return a helper with preserved width of cells
var fixHelper = function(e, ui) { var fixHelper = function(e, ui) {
@@ -127,7 +127,7 @@ $("#item-table tbody").sortable({
itemorder = new Array(); itemorder = new Array();
$.each(info, function(key, value) { $.each(info, function(key, value) {
pk = $('#'+value).data('pk'); pk = $('#'+value).data('pk');
itemorder[key] = pk; objectitems[pk].fields.order = key;
}); });
} }

67
RIGS/templates/RIGS/event_form.html
View File

@@ -62,7 +62,7 @@
{% endif %} {% endif %}
}) })
$(document).ready(function() { $(document).ready(function () {
setupItemTable($("#{{ form.items_json.id_for_label }}").val()); setupItemTable($("#{{ form.items_json.id_for_label }}").val());
}); });
</script> </script>
@@ -77,9 +77,10 @@
{% endif %} {% endif %}
</h2> </h2>
{% include 'form_errors.html' %} {% include 'form_errors.html' %}
<form class="form-horizontal" role="form" method="POST">{% csrf_token %} <form class="form-horizontal itemised_form" role="form" method="POST">{% csrf_token %}
{% render_field form.is_rig style="display: none" %} {% render_field form.is_rig style="display: none" %}
<input type="hidden" name="{{ form.items_json.name }}" id="{{ form.items_json.id_for_label }}" value="{{ form.items_json.value }}" /> <input type="hidden" name="{{ form.items_json.name }}" id="{{ form.items_json.id_for_label }}"
value="{{ form.items_json.value }}"/>
{# New rig buttons #} {# New rig buttons #}
{% if not object.pk %} {% if not object.pk %}
@@ -335,7 +336,67 @@
<div class="modal fade" id="itemModal" role="dialog" aria-labelledby="itemModal" aria-hidded="true"> <div class="modal fade" id="itemModal" role="dialog" aria-labelledby="itemModal" aria-hidded="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span
aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
</div>
<form class="form-horizontal" id="item-form">
<div class="modal-body">
<div class="form-group">
<label for="item_name" class="col-sm-2 control-label">Item Name</label>
<div class="col-sm-10">
<input type="text" placeholder="Item Name" class="form-control" required maxlength="255"
id="item_name"/>
</div>
</div>
<div class="form-group">
<label for="item_description" class="col-sm-2 control-label">Description</label>
<div class="col-sm-10">
<textarea type="text" placeholder="Description" class="form-control"
id="item_description"></textarea>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label for="item_quantity" class="col-sm-4 control-label">Quantity</label>
<div class="col-sm-8">
<input type="number" placeholder="Quantity" class="form-control" required
min="1" id="item_quantity"/>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label for="item_cost" class="col-sm-4 control-label">Cost</label>
<div class="col-sm-8">
<div class="input-group">
<div class="input-group-addon">£</div>
<input type="number" placeholder="Cost" class="form-control" required
min="-99999999.99" max="99999999.99" step="0.01"
id="item_cost"/>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="col-sm-12">
<div class="pull-right">
<input type="submit" class="btn btn-primary">
</div>
</div>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>

15
RIGS/templates/RIGS/item_row.html
View File

@@ -1,14 +1,15 @@
<tr id="item-{{item.pk}}" data-url="{% url 'api_secure' item.pk %}" data-pk="{{item.pk}}"> <tr id="item-{{item.pk}}" data-url="{% url 'api_secure' item.pk %}" data-pk="{{item.pk}}" class="item_row">
<td> <td>
{{ item.name }} <span class="name">{{ item.name }}</span>
{% if item.description %} {% if item.description %}
<br /> <div class="description">
<em>{{item.description|linebreaksbr}}</em> <em>{{item.description|linebreaksbr}}</em>
</div>
{% endif %} {% endif %}
</td> </td>
<td>£&nbsp;{{item.cost}}</td> <td>£&nbsp;<span class="cost">{{item.cost|floatformat:2}}</span></td>
<td>{{item.quantity}}</td> <td class="quantity">{{item.quantity}}</td>
<td class="sub-total" data-subtotal="{{item.total_cost}}">£&nbsp;{{item.total_cost}}</td> <td>£&nbsp;<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
{% if edit %} {% if edit %}
<td class="vert-align text-right"> <td class="vert-align text-right">
<button type="button" class="item-edit btn btn-xs btn-default" <button type="button" class="item-edit btn btn-xs btn-default"