Added edit and fleet aar link to the srp management

This commit is contained in:
Raynaldo Rivera 2014-11-28 01:41:06 -07:00
parent 62e06f2c2c
commit ebc966504e
6 changed files with 86 additions and 5 deletions

View File

@ -140,6 +140,7 @@ urlpatterns = patterns('',
url(r'^srp_fleet_view/(\w+)$', 'srp.views.srp_fleet_view', name='auth_srp_fleet_view'),
url(r'^srp_fleet_add_view/$', 'srp.views.srp_fleet_add_view', name='auth_srp_fleet_add_view'),
url(r'^srp_fleet_remove/(\w+)$', 'srp.views.srp_fleet_remove', name='auth_srp_flet_remove'),
url(r'^srp_fleet_edit/(\w+)$', 'srp.views.srp_fleet_edit_view', name='auth_srp_fleet_edit_view'),
url(r'^srp_fleet_mark_completed/(\w+)', 'srp.views.srp_fleet_mark_completed',
name='auth_srp_fleet_mark_completed'),
url(r'^srp_fleet_mark_uncompleted/(\w+)', 'srp.views.srp_fleet_mark_uncompleted',

View File

@ -13,4 +13,8 @@ class SrpFleetUserRequestForm(forms.Form):
class SrpFleetUpdateCostForm(forms.Form):
srp_total_amount = forms.IntegerField(required=True, label="Total SRP Amount")
srp_total_amount = forms.IntegerField(required=True, label="Total SRP Amount")
class SrpFleetMainUpdateForm(forms.Form):
fleet_aar_link = forms.CharField(required=True, label="After Action Report Link")

View File

@ -10,6 +10,7 @@ class SrpFleetMain(models.Model):
fleet_srp_code = models.CharField(max_length=254, default="", unique=True)
fleet_srp_status = models.CharField(max_length=254, default="")
fleet_commander = models.ForeignKey(EveCharacter)
fleet_srp_aar_link = models.CharField(max_length=254, default="")
def __str__(self):
return self.fleet_name + " - SrpFleetMain"

View File

@ -14,6 +14,7 @@ from models import SrpUserRequest
from form import SrpFleetMainForm
from form import SrpFleetUserRequestForm
from form import SrpFleetUpdateCostForm
from form import SrpFleetMainUpdateForm
def srp_util_test(user):
@ -249,3 +250,27 @@ def srp_request_update_amount_view(request, fleet_srp_request_id):
return render_to_response('registered/srpfleetrequestamount.html', render_items,
context_instance=RequestContext(request))
@login_required
@permission_required('auth.srp_management')
def srp_fleet_edit_view(request, fleet_id):
no_fleet_id = False
form = None
if SrpFleetMain.objects.filter(id=fleet_id).exists():
if request.method == 'POST':
form = SrpFleetMainUpdateForm(request.POST)
if form.is_valid():
srpfleetmain = SrpFleetMain.objects.get(id=fleet_id)
srpfleetmain.fleet_srp_aar_link = form.cleaned_data['fleet_aar_link']
srpfleetmain.save()
return HttpResponseRedirect("/srp")
else:
form = SrpFleetMainUpdateForm()
else:
no_fleet_id = True
render_items = {'form': form, "no_fleet_id": no_fleet_id}
return render_to_response('registered/srpfleetupdate.html', render_items,
context_instance=RequestContext(request))

View File

@ -0,0 +1,45 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth - Update AAR Link{% endblock %}
{% block page_title %}Update AAR Link{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">Update AAR Link</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if no_fleet_id %}
<div class="alert alert-danger" role="alert">SRP Fleet Does Not Exist</div>
{% else %}
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">Update AAR Link
</button>
</form>
{% endif %}
</div>
</div>
</div>
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

View File

@ -33,6 +33,7 @@
<th class="text-center">Fleet Time</th>
<th class="text-center">Fleet Doctrine</th>
<th class="text-center">Fleet Commander</th>
<th class="text-center">Fleet AAR</th>
<th class="text-center">Fleet SRP Code</th>
<th class="text-center">Fleet ISK Cost</th>
<th class="text-center">SRP Status</th>
@ -52,7 +53,8 @@
{{ srpfleet.fleet_commander.character_name }}
</div>
</td>
<th class="text-center"><a href="{{ srpfleet.fleet_srp_aar_link }}"
target="_blank">{{ srpfleet.fleet_srp_aar_link }}</a></th>
<th class="text-center">
<div class="label label-warning">
<a href="/srp_request/{{ srpfleet.fleet_srp_code }}"
@ -60,14 +62,11 @@
</div>
</th>
<td class="text-center">
{% for key,value in price_pair.items %}
{% if key == srpfleet.id %}
ISK: {{ value | intcomma }}
{% endif %}
{% endfor %}
</td>
<td class="text-center">
@ -82,12 +81,18 @@
{% endif %}
</td>
<td class="text-center">
<a href="/srp_fleet_view/{{ srpfleet.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
</a>
{% if perms.auth.srp_management %}
<a href="/srp_fleet_edit/{{ srpfleet.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="/srp_fleet_remove/{{ srpfleet.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>