diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index ac31bee0..3c749519 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -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', diff --git a/srp/form.py b/srp/form.py index 0833466f..7f9225e5 100755 --- a/srp/form.py +++ b/srp/form.py @@ -13,4 +13,8 @@ class SrpFleetUserRequestForm(forms.Form): class SrpFleetUpdateCostForm(forms.Form): - srp_total_amount = forms.IntegerField(required=True, label="Total SRP Amount") \ No newline at end of file + 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") \ No newline at end of file diff --git a/srp/models.py b/srp/models.py index f42df466..4400db6b 100755 --- a/srp/models.py +++ b/srp/models.py @@ -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" diff --git a/srp/views.py b/srp/views.py index 55e95bb8..61a160be 100755 --- a/srp/views.py +++ b/srp/views.py @@ -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)) \ No newline at end of file diff --git a/templates/registered/srpfleetupdate.html b/templates/registered/srpfleetupdate.html new file mode 100755 index 00000000..0e09bd37 --- /dev/null +++ b/templates/registered/srpfleetupdate.html @@ -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 %} + {% endblock extra_css %} + +{% block content %} + +
+

Update AAR Link

+ +
+
+
+ {% if no_fleet_id %} + + {% else %} + + {% endif %} +
+
+
+ +
+ +{% endblock content %} + +{% block extra_script %} + + $('#id_fleet_time').datetimepicker({ + maskInput: true, + format: 'Y-m-d H:i',minDate:0 + }); + +{% endblock extra_script %} diff --git a/templates/registered/srpmanagement.html b/templates/registered/srpmanagement.html index 46bfeaa7..150679e9 100755 --- a/templates/registered/srpmanagement.html +++ b/templates/registered/srpmanagement.html @@ -33,6 +33,7 @@ Fleet Time Fleet Doctrine Fleet Commander + Fleet AAR Fleet SRP Code Fleet ISK Cost SRP Status @@ -52,7 +53,8 @@ {{ srpfleet.fleet_commander.character_name }} - + {{ srpfleet.fleet_srp_aar_link }}
- {% for key,value in price_pair.items %} {% if key == srpfleet.id %} ISK: {{ value | intcomma }} {% endif %} {% endfor %} - - @@ -82,12 +81,18 @@ {% endif %} + {% if perms.auth.srp_management %} + + + +