From c9e600dfee5590a4cab16ddf522317ca87f6ceb4 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Fri, 15 Jan 2016 03:01:18 -0600 Subject: [PATCH 01/35] Added Signature Tracker Added a tool to help track various sites and wormholes --- alliance_auth/settings.py.example | 1 + alliance_auth/urls.py | 7 ++ sigtracker/__init__.py | 0 sigtracker/admin.py | 6 ++ sigtracker/form.py | 20 ++++++ sigtracker/models.py | 18 +++++ sigtracker/tests.py | 1 + sigtracker/views.py | 72 +++++++++++++++++++ stock/templates/public/base.html | 10 +++ stock/templates/registered/addsigniture.html | 38 ++++++++++ .../registered/signituremanagement.html | 67 +++++++++++++++++ stock/templates/registered/sigtracker.html | 45 ++++++++++++ util/__init__.py | 2 + 13 files changed, 287 insertions(+) create mode 100644 sigtracker/__init__.py create mode 100644 sigtracker/admin.py create mode 100644 sigtracker/form.py create mode 100644 sigtracker/models.py create mode 100644 sigtracker/tests.py create mode 100644 sigtracker/views.py create mode 100644 stock/templates/registered/addsigniture.html create mode 100644 stock/templates/registered/signituremanagement.html create mode 100644 stock/templates/registered/sigtracker.html diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 8eb5e13e..59446bed 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -58,6 +58,7 @@ INSTALLED_APPS = ( 'hrapplications', 'timerboard', 'srp', + 'sigtracker', ) MIDDLEWARE_CLASSES = ( diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index 5db17229..977130f8 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -165,4 +165,11 @@ urlpatterns = patterns('', # FLEET FITTINGS url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'), + + # Sig Tracker + url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signiture_view'), + url(r'^add_signiture/$', 'sigtracker.views.add_signiture_view', name='auth_add_signiture_view'), + url(r'^remove_signiture/(\w+)', 'sigtracker.views.remove_signiture', name='auth_remove_signiture') + + ) diff --git a/sigtracker/__init__.py b/sigtracker/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigtracker/admin.py b/sigtracker/admin.py new file mode 100644 index 00000000..00541e4f --- /dev/null +++ b/sigtracker/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin + +from models import sigtracker + +admin.site.register(sigtracker) +# Register your models here. diff --git a/sigtracker/form.py b/sigtracker/form.py new file mode 100644 index 00000000..1d4999f3 --- /dev/null +++ b/sigtracker/form.py @@ -0,0 +1,20 @@ +from django import forms +from django.core.validators import MaxValueValidator, MinValueValidator + + + +class SignitureForm(forms.Form): + sigtype = [('Wormhole', 'Wormhole'), ('Combat', 'Combat'), ('Data', 'Data'), + ('Relic', 'Relic')] + status = [('Open', 'Open'), ('Started', 'Started'), ('Finished', 'Finished')] + + system = forms.CharField(max_length=254, required=True, label='System') + ident = forms.CharField(max_length=254, required=True, label="ID") + sigtype = forms.ChoiceField(choices=sigtype, required=True, label="Signiture Type") + destination = forms.CharField(max_length=254, label="destination", required=True, initial="") + status = forms.ChoiceField(choices=status, required=True, label="Status") + notes = forms.CharField(max_length=254, label="Notes", required=False, initial="") + + + + \ No newline at end of file diff --git a/sigtracker/models.py b/sigtracker/models.py new file mode 100644 index 00000000..2fd0bce5 --- /dev/null +++ b/sigtracker/models.py @@ -0,0 +1,18 @@ +from django.db import models +from django.contrib.auth.models import User + +from eveonline.models import EveCharacter +from eveonline.models import EveCorporationInfo + + +class sigtracker(models.Model): + class Meta: + ordering = ['sigtype'] + ident = models.CharField(max_length=254, default="") + system = models.CharField(max_length=254, default="") + destination = models.CharField(max_length=254, default="") + sigtype = models.CharField(max_length=254, default="") + status = models.CharField(max_length=254, default="") + notes = models.CharField(max_length=254, default="") + + diff --git a/sigtracker/tests.py b/sigtracker/tests.py new file mode 100644 index 00000000..a39b155a --- /dev/null +++ b/sigtracker/tests.py @@ -0,0 +1 @@ +# Create your tests here. diff --git a/sigtracker/views.py b/sigtracker/views.py new file mode 100644 index 00000000..5eef002a --- /dev/null +++ b/sigtracker/views.py @@ -0,0 +1,72 @@ +import datetime + +from django.http import HttpResponseRedirect +from django.template import RequestContext +from django.shortcuts import render_to_response +from django.contrib.auth.decorators import login_required +from django.contrib.auth.decorators import permission_required +from django.contrib.auth.decorators import user_passes_test + +from util import check_if_user_has_permission +from authentication.managers import AuthServicesInfoManager +from eveonline.managers import EveManager +from form import SignitureForm +from models import sigtracker + +import logging + +logger = logging.getLogger(__name__) + +def sigtracker_util_test(user): + return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member') + + +@login_required +@user_passes_test(sigtracker_util_test) +@permission_required('auth.signiture_view') +def sigtracker_view(request): + logger.debug("sigtracker_view called by user %s" % request.user) + sigtracker_list = sigtracker.objects.all() + render_items = {'sigtracker': sigtracker.objects.all()} + + return render_to_response('registered/signituremanagement.html', render_items, context_instance=RequestContext(request)) + + +@login_required +@permission_required('auth.signiture_management') +def add_signiture_view(request): + logger.debug("add_signiture_view called by user %s" % request.user) + if request.method == 'POST': + form = SignitureForm(request.POST) + logger.debug("Request type POST contains form valid: %s" % form.is_valid()) + if form.is_valid(): + # handle valid form + sig = sigtracker() + sig.ident = form.cleaned_data['ident'] + sig.system = form.cleaned_data['system'] + sig.destination = form.cleaned_data['destination'] + sig.sigtype = form.cleaned_data['sigtype'] + sig.status = form.cleaned_data['status'] + sig.notes = form.cleaned_data['notes'] + sig.save() + return HttpResponseRedirect("/sigtracker/") + else: + logger.debug("Returning new SignitureForm") + form = SignitureForm() + + render_items = {'form': form} + + return render_to_response('registered/addsigniture.html', render_items, context_instance=RequestContext(request)) + + +@login_required +@permission_required('auth.signiture_management') +def remove_signiture(request, sigtracker_id): + logger.debug("remove_signiture called by user %s for signiture id %s" % (request.user, sigtracker_id)) + if sigtracker.objects.filter(id=sigtracker_id).exists(): + sig = sigtracker.objects.get(id=sigtracker_id) + sig.delete() + logger.debug("Deleting sigtracker id %s by user %s" % (sigtracker_id, request.user)) + else: + logger.error("Unable to delete signiture id %s for user %s - signiture matching id not found." % (sigtracker_id, request.user)) + return HttpResponseRedirect("/sigtracker/") diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html index 279743d0..1d9f9a8a 100755 --- a/stock/templates/public/base.html +++ b/stock/templates/public/base.html @@ -137,6 +137,16 @@ href="{% url 'auth_fleet_fits' %}"> Fleet Doctrines + {% endif %} + + {% if perms.auth.member or perms.auth.blue_member %} +
  • + Signiture Tracker +
    • + + {% if perms.auth.timer_view %}
  • {% endblock extra_css %} + +{% block content %} +
    +

    Create Signiture

    + +
    +
    +
    + +
    +
    +
    +
    + +{% endblock content %} + +{% block extra_script %} + + $('#id_eve_time').datetimepicker({ + maskInput: true, + format: 'Y-m-d H:i',minDate:0 + }); + +{% endblock extra_script %} diff --git a/stock/templates/registered/signituremanagement.html b/stock/templates/registered/signituremanagement.html new file mode 100644 index 00000000..e35f4441 --- /dev/null +++ b/stock/templates/registered/signituremanagement.html @@ -0,0 +1,67 @@ +{% extends "public/base.html" %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Signiture Management{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} +
    +

    Signitures +
    + + {% if perms.auth.signiture_management %} + + {% endif %} + +
    +

    + + + + + + + + + {% if perms.auth.signiture_management %} + + {% endif %} + + + {% for sigt in sigtracker %} + + + + + + + + + + + + {% if perms.auth.signiture_management %} + + + + {% endif %} + {% endfor %} + +
    IDSystemDestinationSigniture TypeStatusNotesAction
    {{ sigt.ident }} + {{ sigt.system }} + {{ sigt.destination }}{{ sigt.sigtype }}{{ sigt.status }}{{ sigt.notes }} + + + +
    + + +
    + + + + +{% endblock content %} diff --git a/stock/templates/registered/sigtracker.html b/stock/templates/registered/sigtracker.html new file mode 100644 index 00000000..e86c1400 --- /dev/null +++ b/stock/templates/registered/sigtracker.html @@ -0,0 +1,45 @@ +{% extends "public/base.html" %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Signiture Tracker{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} + + + + + + + + +
    +
    +

    System: + Id: + Type: + + + Name: + Status: + + Notes: +

    +
    +
    + + +{% endblock content %} diff --git a/util/__init__.py b/util/__init__.py index 1d4a35e1..f40f4474 100755 --- a/util/__init__.py +++ b/util/__init__.py @@ -22,6 +22,8 @@ def bootstrap_permissions(): Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management") Permission.objects.get_or_create(codename="timer_view", content_type=ct, name="timer_view") Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management") + Permission.objects.get_or_create(codename="signiture_management", content_type=ct, name="signiture_management") + Permission.objects.get_or_create(codename="signiture_view", content_type=ct, name="signiture_view") Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP) Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP) logger.info("Bootstrapped permissions for auth and created default groups.") From 59f73abde08fa1324c7cfa1ad1976af9d106cc07 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Fri, 15 Jan 2016 03:12:26 -0600 Subject: [PATCH 02/35] Added Sig tracker debug code --- alliance_auth/settings.py.example | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 59446bed..70f16ff7 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -439,6 +439,10 @@ LOGGING = { 'handlers': ['log_file', 'console'], 'level': 'DEBUG', }, + 'sigtracker': { + 'handlers': ['log_file', 'console'], + 'level': 'DEBUG', + }, 'util': { 'handlers': ['log_file', 'console'], 'level': 'DEBUG', From 7e9033fd2acb62b1a23398c210f31866d3eb3449 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:19:10 -0600 Subject: [PATCH 03/35] made it look pretty --- alliance_auth/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index 977130f8..f6c5d996 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -169,7 +169,7 @@ urlpatterns = patterns('', # Sig Tracker url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signiture_view'), url(r'^add_signiture/$', 'sigtracker.views.add_signiture_view', name='auth_add_signiture_view'), - url(r'^remove_signiture/(\w+)', 'sigtracker.views.remove_signiture', name='auth_remove_signiture') + url(r'^remove_signiture/(\w+)', 'sigtracker.views.remove_signiture', name='auth_remove_signiture'), ) From dbb5b8e21eb35991f90d069505f47cb4cd4d09a7 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:22:00 -0600 Subject: [PATCH 04/35] typos fixed --- sigtracker/form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sigtracker/form.py b/sigtracker/form.py index 1d4999f3..ebd7ddc8 100644 --- a/sigtracker/form.py +++ b/sigtracker/form.py @@ -3,7 +3,7 @@ from django.core.validators import MaxValueValidator, MinValueValidator -class SignitureForm(forms.Form): +class SignatureForm(forms.Form): sigtype = [('Wormhole', 'Wormhole'), ('Combat', 'Combat'), ('Data', 'Data'), ('Relic', 'Relic')] status = [('Open', 'Open'), ('Started', 'Started'), ('Finished', 'Finished')] @@ -17,4 +17,4 @@ class SignitureForm(forms.Form): - \ No newline at end of file + From 375c97f6eb2176406c744a11eab9dbfed55de5b7 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:23:25 -0600 Subject: [PATCH 05/35] typos fixed --- sigtracker/views.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sigtracker/views.py b/sigtracker/views.py index 5eef002a..77718997 100644 --- a/sigtracker/views.py +++ b/sigtracker/views.py @@ -23,19 +23,19 @@ def sigtracker_util_test(user): @login_required @user_passes_test(sigtracker_util_test) -@permission_required('auth.signiture_view') +@permission_required('auth.signature_view') def sigtracker_view(request): logger.debug("sigtracker_view called by user %s" % request.user) sigtracker_list = sigtracker.objects.all() render_items = {'sigtracker': sigtracker.objects.all()} - return render_to_response('registered/signituremanagement.html', render_items, context_instance=RequestContext(request)) + return render_to_response('registered/signaturemanagement.html', render_items, context_instance=RequestContext(request)) @login_required -@permission_required('auth.signiture_management') +@permission_required('auth.signature_management') def add_signiture_view(request): - logger.debug("add_signiture_view called by user %s" % request.user) + logger.debug("add_signature_view called by user %s" % request.user) if request.method == 'POST': form = SignitureForm(request.POST) logger.debug("Request type POST contains form valid: %s" % form.is_valid()) @@ -51,22 +51,22 @@ def add_signiture_view(request): sig.save() return HttpResponseRedirect("/sigtracker/") else: - logger.debug("Returning new SignitureForm") + logger.debug("Returning new SignatureForm") form = SignitureForm() render_items = {'form': form} - return render_to_response('registered/addsigniture.html', render_items, context_instance=RequestContext(request)) + return render_to_response('registered/addsignature.html', render_items, context_instance=RequestContext(request)) @login_required -@permission_required('auth.signiture_management') +@permission_required('auth.signature_management') def remove_signiture(request, sigtracker_id): - logger.debug("remove_signiture called by user %s for signiture id %s" % (request.user, sigtracker_id)) + logger.debug("remove_signature called by user %s for signature id %s" % (request.user, sigtracker_id)) if sigtracker.objects.filter(id=sigtracker_id).exists(): sig = sigtracker.objects.get(id=sigtracker_id) sig.delete() logger.debug("Deleting sigtracker id %s by user %s" % (sigtracker_id, request.user)) else: - logger.error("Unable to delete signiture id %s for user %s - signiture matching id not found." % (sigtracker_id, request.user)) + logger.error("Unable to delete signature id %s for user %s - signature matching id not found." % (sigtracker_id, request.user)) return HttpResponseRedirect("/sigtracker/") From ce414a6965087865b8b031c004bc6b38d0f79832 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:24:30 -0600 Subject: [PATCH 06/35] typos fixed --- alliance_auth/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py index f6c5d996..c0468ab4 100755 --- a/alliance_auth/urls.py +++ b/alliance_auth/urls.py @@ -167,9 +167,9 @@ urlpatterns = patterns('', url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'), # Sig Tracker - url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signiture_view'), - url(r'^add_signiture/$', 'sigtracker.views.add_signiture_view', name='auth_add_signiture_view'), - url(r'^remove_signiture/(\w+)', 'sigtracker.views.remove_signiture', name='auth_remove_signiture'), + url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'), + url(r'^add_signature/$', 'sigtracker.views.add_signature_view', name='auth_add_signature_view'), + url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'), ) From 6e2ec4d041aa72474799875dc0ac7cd080d336d2 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:25:17 -0600 Subject: [PATCH 07/35] typos fixed --- util/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/__init__.py b/util/__init__.py index f40f4474..84a09d70 100755 --- a/util/__init__.py +++ b/util/__init__.py @@ -22,8 +22,8 @@ def bootstrap_permissions(): Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management") Permission.objects.get_or_create(codename="timer_view", content_type=ct, name="timer_view") Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management") - Permission.objects.get_or_create(codename="signiture_management", content_type=ct, name="signiture_management") - Permission.objects.get_or_create(codename="signiture_view", content_type=ct, name="signiture_view") + Permission.objects.get_or_create(codename="signature_management", content_type=ct, name="signature_management") + Permission.objects.get_or_create(codename="signature_view", content_type=ct, name="signature_view") Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP) Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP) logger.info("Bootstrapped permissions for auth and created default groups.") From dab2383032e1979977f9152992a5421215f3f519 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:26:00 -0600 Subject: [PATCH 08/35] typos fixed --- stock/templates/registered/sigtracker.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/templates/registered/sigtracker.html b/stock/templates/registered/sigtracker.html index e86c1400..09fdce91 100644 --- a/stock/templates/registered/sigtracker.html +++ b/stock/templates/registered/sigtracker.html @@ -3,7 +3,7 @@ {% block title %}Alliance Auth{% endblock %} -{% block page_title %}Signiture Tracker{% endblock page_title %} +{% block page_title %}Signature Tracker{% endblock page_title %} {% block extra_css %}{% endblock extra_css %} {% block content %} From 78086e01ac4af8a900cd02d60e7d166fca5e3004 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:27:46 -0600 Subject: [PATCH 09/35] typos fixed --- ...emanagement.html => signaturemanagement.html} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename stock/templates/registered/{signituremanagement.html => signaturemanagement.html} (81%) diff --git a/stock/templates/registered/signituremanagement.html b/stock/templates/registered/signaturemanagement.html similarity index 81% rename from stock/templates/registered/signituremanagement.html rename to stock/templates/registered/signaturemanagement.html index e35f4441..9a0af7aa 100644 --- a/stock/templates/registered/signituremanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -3,16 +3,16 @@ {% block title %}Alliance Auth{% endblock %} -{% block page_title %}Signiture Management{% endblock page_title %} +{% block page_title %}Signature Management{% endblock page_title %} {% block extra_css %}{% endblock extra_css %} {% block content %}
    -

    Signitures +

    Signatures
    - - {% if perms.auth.signiture_management %} - + + {% if perms.auth.signature_management %} + {% endif %}
    @@ -22,10 +22,10 @@ ID System Destination - Signiture Type + Signature Type Status Notes - {% if perms.auth.signiture_management %} + {% if perms.auth.signature_management %} Action {% endif %} @@ -44,7 +44,7 @@ - {% if perms.auth.signiture_management %} + {% if perms.auth.signature_management %} +

    From 7aa3a19ba5462da435d74684c23c5a6c47e7c86d Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:30:51 -0600 Subject: [PATCH 11/35] typos fixed --- sigtracker/form.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigtracker/form.py b/sigtracker/form.py index ebd7ddc8..accb7cce 100644 --- a/sigtracker/form.py +++ b/sigtracker/form.py @@ -10,7 +10,7 @@ class SignatureForm(forms.Form): system = forms.CharField(max_length=254, required=True, label='System') ident = forms.CharField(max_length=254, required=True, label="ID") - sigtype = forms.ChoiceField(choices=sigtype, required=True, label="Signiture Type") + sigtype = forms.ChoiceField(choices=sigtype, required=True, label="Signature Type") destination = forms.CharField(max_length=254, label="destination", required=True, initial="") status = forms.ChoiceField(choices=status, required=True, label="Status") notes = forms.CharField(max_length=254, label="Notes", required=False, initial="") From d2a683764900436f8a155d062de00399771f63ed Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:32:57 -0600 Subject: [PATCH 12/35] typos fixed --- sigtracker/views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sigtracker/views.py b/sigtracker/views.py index 77718997..acadee19 100644 --- a/sigtracker/views.py +++ b/sigtracker/views.py @@ -10,7 +10,7 @@ from django.contrib.auth.decorators import user_passes_test from util import check_if_user_has_permission from authentication.managers import AuthServicesInfoManager from eveonline.managers import EveManager -from form import SignitureForm +from form import SignatureForm from models import sigtracker import logging @@ -34,10 +34,10 @@ def sigtracker_view(request): @login_required @permission_required('auth.signature_management') -def add_signiture_view(request): +def add_signature_view(request): logger.debug("add_signature_view called by user %s" % request.user) if request.method == 'POST': - form = SignitureForm(request.POST) + form = SignatureForm(request.POST) logger.debug("Request type POST contains form valid: %s" % form.is_valid()) if form.is_valid(): # handle valid form @@ -52,7 +52,7 @@ def add_signiture_view(request): return HttpResponseRedirect("/sigtracker/") else: logger.debug("Returning new SignatureForm") - form = SignitureForm() + form = SignatureForm() render_items = {'form': form} @@ -61,7 +61,7 @@ def add_signiture_view(request): @login_required @permission_required('auth.signature_management') -def remove_signiture(request, sigtracker_id): +def remove_signature(request, sigtracker_id): logger.debug("remove_signature called by user %s for signature id %s" % (request.user, sigtracker_id)) if sigtracker.objects.filter(id=sigtracker_id).exists(): sig = sigtracker.objects.get(id=sigtracker_id) From c08f3693fb6c1eb2c03884746994a7286c43df4f Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:34:31 -0600 Subject: [PATCH 13/35] Update base.html --- stock/templates/public/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html index 1d9f9a8a..e9f02cfc 100755 --- a/stock/templates/public/base.html +++ b/stock/templates/public/base.html @@ -142,8 +142,8 @@ {% if perms.auth.member or perms.auth.blue_member %}
  • Signiture Tracker + href="{% url 'auth_signature_view' %}"> Signature Tracker
    • From 5bf07765ceca02c9a816b22e8b73c2f94df3ca95 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 01:35:31 -0600 Subject: [PATCH 14/35] typos fixed --- stock/templates/registered/signaturemanagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html index 9a0af7aa..dd9ab84e 100644 --- a/stock/templates/registered/signaturemanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -46,7 +46,7 @@ {% if perms.auth.signature_management %} - + From 194556b56d12f0ff45e2dcf4bd06258de99d5fe9 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 22:48:22 -0600 Subject: [PATCH 15/35] Added Creator and timestamps --- sigtracker/views.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sigtracker/views.py b/sigtracker/views.py index acadee19..5a100311 100644 --- a/sigtracker/views.py +++ b/sigtracker/views.py @@ -1,4 +1,4 @@ -import datetime + from django.http import HttpResponseRedirect from django.template import RequestContext @@ -6,6 +6,7 @@ from django.shortcuts import render_to_response from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import user_passes_test +from django.utils import timezone from util import check_if_user_has_permission from authentication.managers import AuthServicesInfoManager @@ -27,7 +28,7 @@ def sigtracker_util_test(user): def sigtracker_view(request): logger.debug("sigtracker_view called by user %s" % request.user) sigtracker_list = sigtracker.objects.all() - render_items = {'sigtracker': sigtracker.objects.all()} + render_items = {'sigtracker': sigtracker.objects.all(),} return render_to_response('registered/signaturemanagement.html', render_items, context_instance=RequestContext(request)) @@ -38,8 +39,13 @@ def add_signature_view(request): logger.debug("add_signature_view called by user %s" % request.user) if request.method == 'POST': form = SignatureForm(request.POST) - logger.debug("Request type POST contains form valid: %s" % form.is_valid()) + logger.debug("Request type POST contains form valid: %s" % form.is_valid()) if form.is_valid(): + #Get Current Time + post_time = timezone.now() + # Get character + auth_info = AuthServicesInfoManager.get_auth_service_info(request.user) + character = EveManager.get_character_by_id(auth_info.main_char_id) # handle valid form sig = sigtracker() sig.ident = form.cleaned_data['ident'] @@ -48,6 +54,8 @@ def add_signature_view(request): sig.sigtype = form.cleaned_data['sigtype'] sig.status = form.cleaned_data['status'] sig.notes = form.cleaned_data['notes'] + sig.create_time = post_time + sig.eve_character = character sig.save() return HttpResponseRedirect("/sigtracker/") else: From c5b384b9a2e0272d74c6581ae03b26e77907dfd2 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 22:49:04 -0600 Subject: [PATCH 16/35] Added Creator and timestamps --- sigtracker/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sigtracker/models.py b/sigtracker/models.py index 2fd0bce5..e1e3a3e4 100644 --- a/sigtracker/models.py +++ b/sigtracker/models.py @@ -1,18 +1,19 @@ from django.db import models from django.contrib.auth.models import User - +from django.utils import timezone from eveonline.models import EveCharacter from eveonline.models import EveCorporationInfo class sigtracker(models.Model): class Meta: - ordering = ['sigtype'] + ordering = ['post_time'] ident = models.CharField(max_length=254, default="") system = models.CharField(max_length=254, default="") destination = models.CharField(max_length=254, default="") sigtype = models.CharField(max_length=254, default="") status = models.CharField(max_length=254, default="") notes = models.CharField(max_length=254, default="") - + post_time = models.DateTimeField(default=timezone.now) + eve_character = models.ForeignKey(EveCharacter) From c0e98035d757a5b17614a53310eefe460dc1403e Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Sun, 17 Jan 2016 22:50:14 -0600 Subject: [PATCH 17/35] Added Creator and timestamps --- .../registered/signaturemanagement.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html index dd9ab84e..ba19ddfe 100644 --- a/stock/templates/registered/signaturemanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -23,28 +23,29 @@ System Destination Signature Type - Status + Status Notes - {% if perms.auth.signature_management %} - Action + Post Time + {% if perms.auth.signature_management %} + Creator + Action {% endif %} {% for sigt in sigtracker %} - {{ sigt.ident }} + {{ sigt.ident }} {{ sigt.system }} {{ sigt.destination }} {{ sigt.sigtype }} - {{ sigt.status }} - {{ sigt.notes }} - - - + {{ sigt.status }} + {{ sigt.notes }} + {{ sigt.post_time}} {% if perms.auth.signature_management %} + {{ sigt.eve_character }} + + + + + + +{% endblock content %} + +{% block extra_script %} + + $('#id_eve_time').datetimepicker({ + maskInput: true, + format: 'Y-m-d H:i',minDate:0 + }); + +{% endblock extra_script %} diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html new file mode 100644 index 00000000..a7f00708 --- /dev/null +++ b/stock/templates/registered/operationmanagement.html @@ -0,0 +1,70 @@ +{% extends "public/base.html" %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Fleet Operation Management{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} +
    +

    Fleet Operation Timers +
    + + {% if perms.auth.optimer_management %} + + {% endif %} + +
    +

    + + + + + + + + + + + {% if perms.auth.optimer_management %} + + + {% endif %} + + + {% for ops in optimer %} + + + + + + + + + + + {% if perms.auth.optimer_management %} + + + + + {% endif %} + {% endfor %} + +
    Operation NameSystemForm Up LocationStart TimeEnd TimeFCDetailsPost TimeCreatorAction
    {{ ops.operation_name }} + {{ ops.system }} + {{ ops.location }}{{ ops.start_time }}{{ ops.end_time }}{{ ops.fc }}{{ ops.details }}{{ ops.post_time}}{{ ops.eve_character }} + + + +
    + + +
    + + + + +{% endblock content %} diff --git a/util/__init__.py b/util/__init__.py index 84a09d70..6c269077 100755 --- a/util/__init__.py +++ b/util/__init__.py @@ -24,6 +24,8 @@ def bootstrap_permissions(): Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management") Permission.objects.get_or_create(codename="signature_management", content_type=ct, name="signature_management") Permission.objects.get_or_create(codename="signature_view", content_type=ct, name="signature_view") + Permission.objects.get_or_create(codename="optimer_management", content_type=ct, name="optimer_management") + Permission.objects.get_or_create(codename="optimer_view", content_type=ct, name="optimer_view") Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP) Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP) logger.info("Bootstrapped permissions for auth and created default groups.") From 5ececa6bfd4933c0a3c43fecf20a103b3fc8991b Mon Sep 17 00:00:00 2001 From: orbitroom Date: Wed, 20 Jan 2016 22:24:07 -0500 Subject: [PATCH 23/35] Changed op timers to Structure Timer and Bug Fixes for Fleet Operations Timer --- stock/templates/public/base.html | 6 +- stock/templates/registered/addtimer.html | 76 +- .../registered/operationmanagement.html | 2 +- .../templates/registered/timermanagement.html | 684 +++++++++--------- 4 files changed, 384 insertions(+), 384 deletions(-) diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html index 9c4f3bde..fc820a98 100755 --- a/stock/templates/public/base.html +++ b/stock/templates/public/base.html @@ -149,15 +149,15 @@
  • Fleet Operations + class="fa fa-exclamation fa-fw grayiconecolor"> Fleet Operations
    • - + {% if perms.auth.timer_view %}
  • OP Timers + class="fa fa-clock-o fa-fw grayiconecolor"> Structure Timers
    • {% endif %} diff --git a/stock/templates/registered/addtimer.html b/stock/templates/registered/addtimer.html index eadd6c01..53939938 100755 --- a/stock/templates/registered/addtimer.html +++ b/stock/templates/registered/addtimer.html @@ -1,38 +1,38 @@ -{% extends "public/base.html" %} -{% load bootstrap %} -{% load staticfiles %} - -{% block title %}Alliance Auth - Timer Create{% endblock %} - -{% block page_title %}Timer Create{% endblock page_title %} -{% block extra_css %} - {% endblock extra_css %} - -{% block content %} -
    -

    Create Timer

    - -
    -
    -
    - -
    -
    -
    -
    - -{% endblock content %} - -{% block extra_script %} - - $('#id_eve_time').datetimepicker({ - maskInput: true, - format: 'Y-m-d H:i',minDate:0 - }); - -{% endblock extra_script %} +{% extends "public/base.html" %} +{% load bootstrap %} +{% load staticfiles %} + +{% block title %}Alliance Auth - Structure Timer Create{% endblock %} + +{% block page_title %}Timer Create{% endblock page_title %} +{% block extra_css %} + {% endblock extra_css %} + +{% block content %} +
    +

    Create Structure Timer

    + +
    +
    +
    + +
    +
    +
    +
    + +{% endblock content %} + +{% block extra_script %} + + $('#id_eve_time').datetimepicker({ + maskInput: true, + format: 'Y-m-d H:i',minDate:0 + }); + +{% endblock extra_script %} diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html index a7f00708..bf31de22 100644 --- a/stock/templates/registered/operationmanagement.html +++ b/stock/templates/registered/operationmanagement.html @@ -49,7 +49,7 @@ {% if perms.auth.optimer_management %} {{ ops.eve_character }} - + diff --git a/stock/templates/registered/timermanagement.html b/stock/templates/registered/timermanagement.html index 3af49280..1064ccd8 100755 --- a/stock/templates/registered/timermanagement.html +++ b/stock/templates/registered/timermanagement.html @@ -1,342 +1,342 @@ -{% extends "public/base.html" %} -{% load staticfiles %} - -{% block title %}Alliance Auth{% endblock %} - -{% block page_title %}Timer Management{% endblock page_title %} -{% block extra_css %}{% endblock extra_css %} - -{% block content %} -
    -

    Operation Timers -
    - - {% if perms.auth.timer_management %} - - {% endif %} - -
    -

    -
    -
    - Current Eve Time: -
    -
    -

    Next Timer

    - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% if closest_timer %} - {% ifequal closest_timer.important True %} - - {% else %} - - {% endifequal %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - {% endif %} - -
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ closest_timer.details }} - {% ifequal closest_timer.objective "Hostile" %} -
    - Hostile -
    - {% endifequal %} - {% ifequal closest_timer.objective "Friendly" %} -
    - Friendly -
    - {% endifequal %} - {% ifequal closest_timer.objective "Neutral" %} -
    - Neutral -
    - {% endifequal %} -     		{{ closest_timer.system }} {{ closest_timer.planet_moon }} - - {% ifequal closest_timer.structure "I-HUB" %} -
    - I-HUB -
    - {% endifequal %} - {% ifequal closest_timer.structure "POCO" %} -
    - POCO -
    - {% endifequal %} - {% ifequal closest_timer.structure "POS[S]" %} -
    - POS [S] -
    - {% endifequal %} - {% ifequal closest_timer.structure "POS[M]" %} -
    - POS [M] -
    - {% endifequal %} - {% ifequal closest_timer.structure "POS[L]" %} -
    - POS [L] -
    - {% endifequal %} - {% ifequal closest_timer.structure "Station" %} -
    - Station -
    - {% endifequal %} - {% ifequal closest_timer.structure "TCU" %} -
    - TCU -
    - {% endifequal %} - {% ifequal closest_timer.structure "Other" %} -
    - Other -
    - {% endifequal %} -     		{{ closest_timer.eve_time | date:"Y-m-d H:i" }}{{ closest_timer.eve_character.character_name }} - - - - -
    - {% if corp_timers %} -

    Corp Timers

    - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in corp_timers %} - {% ifequal timer.important True %} - - {% else %} - - {% endifequal %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% endfor %} -
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ timer.details }} - {% ifequal timer.objective "Hostile" %} -
    - Hostile -
    - {% endifequal %} - {% ifequal timer.objective "Friendly" %} -
    - Friendly -
    - {% endifequal %} - {% ifequal timer.objective "Neutral" %} -
    - Neutral -
    - {% endifequal %} -     		{{ timer.system }} {{ timer.planet_moon }} - - {% ifequal timer.structure "I-HUB" %} -
    - I-HUB -
    - {% endifequal %} - {% ifequal timer.structure "POCO" %} -
    - POCO -
    - {% endifequal %} - {% ifequal timer.structure "POS[S]" %} -
    - POS [S] -
    - {% endifequal %} - {% ifequal timer.structure "POS[M]" %} -
    - POS [M] -
    - {% endifequal %} - {% ifequal timer.structure "POS[L]" %} -
    - POS [L] -
    - {% endifequal %} - {% ifequal timer.structure "Station" %} -
    - Station -
    - {% endifequal %} - {% ifequal timer.structure "TCU" %} -
    - TCU -
    - {% endifequal %} - {% ifequal timer.structure "Other" %} -
    - Other -
    - {% endifequal %} -     		{{ timer.eve_time | date:"Y-m-d H:i" }}
    		{{ timer.eve_character.character_name }} - - - -
    - {% endif %} -

    Future Timers

    - - - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% for timer in timers %} - {% ifnotequal timer closest_timer %} - {% ifequal timer.important True %} - - {% else %} - - {% endifequal %} - - - - - - - - {% if perms.auth.timer_management %} - - {% endif %} - - {% endifnotequal %} - {% endfor %} -
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ timer.details }} - {% ifequal timer.objective "Hostile" %} -
    - Hostile -
    - {% endifequal %} - {% ifequal timer.objective "Friendly" %} -
    - Friendly -
    - {% endifequal %} - {% ifequal timer.objective "Neutral" %} -
    - Neutral -
    - {% endifequal %} -     		{{ timer.system }} {{ timer.planet_moon }} - - {% ifequal timer.structure "I-HUB" %} -
    - I-HUB -
    - {% endifequal %} - {% ifequal timer.structure "POCO" %} -
    - POCO -
    - {% endifequal %} - {% ifequal timer.structure "POS[S]" %} -
    - POS [S] -
    - {% endifequal %} - {% ifequal timer.structure "POS[M]" %} -
    - POS [M] -
    - {% endifequal %} - {% ifequal timer.structure "POS[L]" %} -
    - POS [L] -
    - {% endifequal %} - {% ifequal timer.structure "Station" %} -
    - Station -
    - {% endifequal %} - {% ifequal timer.structure "TCU" %} -
    - TCU -
    - {% endifequal %} - {% ifequal timer.structure "Other" %} -
    - Other -
    - {% endifequal %} -     		{{ timer.eve_time | date:"Y-m-d H:i" }}
    		{{ timer.eve_character.character_name }} - - - -
    -
    - - - - - -{% endblock content %} +{% extends "public/base.html" %} +{% load staticfiles %} + +{% block title %}Alliance Auth{% endblock %} + +{% block page_title %}Structure Timer Management{% endblock page_title %} +{% block extra_css %}{% endblock extra_css %} + +{% block content %} +
    +

    Structure Timers +
    + + {% if perms.auth.timer_management %} + + {% endif %} + +
    +

    +
    +
    + Current Eve Time: +
    +
    +

    Next Timer

    + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% if closest_timer %} + {% ifequal closest_timer.important True %} + + {% else %} + + {% endifequal %} + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + {% endif %} + +
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ closest_timer.details }} + {% ifequal closest_timer.objective "Hostile" %} +
    + Hostile +
    + {% endifequal %} + {% ifequal closest_timer.objective "Friendly" %} +
    + Friendly +
    + {% endifequal %} + {% ifequal closest_timer.objective "Neutral" %} +
    + Neutral +
    + {% endifequal %} +     		{{ closest_timer.system }} {{ closest_timer.planet_moon }} + + {% ifequal closest_timer.structure "I-HUB" %} +
    + I-HUB +
    + {% endifequal %} + {% ifequal closest_timer.structure "POCO" %} +
    + POCO +
    + {% endifequal %} + {% ifequal closest_timer.structure "POS[S]" %} +
    + POS [S] +
    + {% endifequal %} + {% ifequal closest_timer.structure "POS[M]" %} +
    + POS [M] +
    + {% endifequal %} + {% ifequal closest_timer.structure "POS[L]" %} +
    + POS [L] +
    + {% endifequal %} + {% ifequal closest_timer.structure "Station" %} +
    + Station +
    + {% endifequal %} + {% ifequal closest_timer.structure "TCU" %} +
    + TCU +
    + {% endifequal %} + {% ifequal closest_timer.structure "Other" %} +
    + Other +
    + {% endifequal %} +     		{{ closest_timer.eve_time | date:"Y-m-d H:i" }}{{ closest_timer.eve_character.character_name }} + + + + +
    + {% if corp_timers %} +

    Corp Timers

    + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% for timer in corp_timers %} + {% ifequal timer.important True %} + + {% else %} + + {% endifequal %} + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% endfor %} +
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ timer.details }} + {% ifequal timer.objective "Hostile" %} +
    + Hostile +
    + {% endifequal %} + {% ifequal timer.objective "Friendly" %} +
    + Friendly +
    + {% endifequal %} + {% ifequal timer.objective "Neutral" %} +
    + Neutral +
    + {% endifequal %} +     		{{ timer.system }} {{ timer.planet_moon }} + + {% ifequal timer.structure "I-HUB" %} +
    + I-HUB +
    + {% endifequal %} + {% ifequal timer.structure "POCO" %} +
    + POCO +
    + {% endifequal %} + {% ifequal timer.structure "POS[S]" %} +
    + POS [S] +
    + {% endifequal %} + {% ifequal timer.structure "POS[M]" %} +
    + POS [M] +
    + {% endifequal %} + {% ifequal timer.structure "POS[L]" %} +
    + POS [L] +
    + {% endifequal %} + {% ifequal timer.structure "Station" %} +
    + Station +
    + {% endifequal %} + {% ifequal timer.structure "TCU" %} +
    + TCU +
    + {% endifequal %} + {% ifequal timer.structure "Other" %} +
    + Other +
    + {% endifequal %} +     		{{ timer.eve_time | date:"Y-m-d H:i" }}
    		{{ timer.eve_character.character_name }} + + + +
    + {% endif %} +

    Future Timers

    + + + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% for timer in timers %} + {% ifnotequal timer closest_timer %} + {% ifequal timer.important True %} + + {% else %} + + {% endifequal %} + + + + + + + + {% if perms.auth.timer_management %} + + {% endif %} + + {% endifnotequal %} + {% endfor %} +
    DetailsObjectiveSystemStructureEve TimeLocal TimeCreatorAction
    {{ timer.details }} + {% ifequal timer.objective "Hostile" %} +
    + Hostile +
    + {% endifequal %} + {% ifequal timer.objective "Friendly" %} +
    + Friendly +
    + {% endifequal %} + {% ifequal timer.objective "Neutral" %} +
    + Neutral +
    + {% endifequal %} +     		{{ timer.system }} {{ timer.planet_moon }} + + {% ifequal timer.structure "I-HUB" %} +
    + I-HUB +
    + {% endifequal %} + {% ifequal timer.structure "POCO" %} +
    + POCO +
    + {% endifequal %} + {% ifequal timer.structure "POS[S]" %} +
    + POS [S] +
    + {% endifequal %} + {% ifequal timer.structure "POS[M]" %} +
    + POS [M] +
    + {% endifequal %} + {% ifequal timer.structure "POS[L]" %} +
    + POS [L] +
    + {% endifequal %} + {% ifequal timer.structure "Station" %} +
    + Station +
    + {% endifequal %} + {% ifequal timer.structure "TCU" %} +
    + TCU +
    + {% endifequal %} + {% ifequal timer.structure "Other" %} +
    + Other +
    + {% endifequal %} +     		{{ timer.eve_time | date:"Y-m-d H:i" }}
    		{{ timer.eve_character.character_name }} + + + +
    +
    + + + + + +{% endblock content %} From bc22473c161222dd193aa5e4d83d7c578019af90 Mon Sep 17 00:00:00 2001 From: orbitroom Date: Wed, 20 Jan 2016 22:49:20 -0500 Subject: [PATCH 24/35] Changed table header to reduce confusion --- stock/templates/registered/operationmanagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html index bf31de22..90e36962 100644 --- a/stock/templates/registered/operationmanagement.html +++ b/stock/templates/registered/operationmanagement.html @@ -20,7 +20,7 @@ - + From 83c83f8b1be6aab11b61e7acd3c87fc3d1ba9df7 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 21:53:51 -0600 Subject: [PATCH 25/35] Fixed Indentation Error --- optimer/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimer/views.py b/optimer/views.py index 19e98cac..b82756ab 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -57,7 +57,7 @@ def add_optimer_view(request): op.fc = form.cleaned_data['fc'] op.details = form.cleaned_data['details'] op.create_time = post_time - op.eve_character = character + op.eve_character = character op.save() return HttpResponseRedirect("/optimer/") else: From 3127aba80df3e862d7a77ccbb47b1145238d719f Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:21:54 -0600 Subject: [PATCH 26/35] bug fixes for fleet operations timer --- optimer/views.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/optimer/views.py b/optimer/views.py index b82756ab..47edc937 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -26,7 +26,7 @@ def optimer_util_test(user): @user_passes_test(optimer_util_test) @permission_required('auth.optimer_view') def optimer_view(request): - logger.info("optimer_view called by user %s" % request.user) + logger.debug("optimer_view called by user %s" % request.user) optimer_list = optimer.objects.all() render_items = {'optimer': optimer.objects.all(),} @@ -36,10 +36,10 @@ def optimer_view(request): @login_required @permission_required('auth.optimer_management') def add_optimer_view(request): - logger.info("add_optimer_view called by user %s" % request.user) + logger.debug("add_optimer_view called by user %s" % request.user) if request.method == 'POST': - form = opForm(request.POST) - logger.info("Request type POST contains form valid: %s" % form.is_valid()) + form = opForm(request.POST) + logger.info("Request type POST contains form valid: %s" % form.is_valid()) if form.is_valid(): #Get Current Time post_time = timezone.now() @@ -59,9 +59,10 @@ def add_optimer_view(request): op.create_time = post_time op.eve_character = character op.save() + return HttpResponseRedirect("/optimer/") else: - logger.info("Returning new opForm") + logger.debug("Returning new opForm") form = opForm() render_items = {'form': form} @@ -72,7 +73,7 @@ def add_optimer_view(request): @login_required @permission_required('auth.optimer_management') def remove_optimer(request, optimer_id): - logger.info("remove_optimer called by user %s for operation id %s" % (request.user, optimer_id)) + logger.debug("remove_optimer called by user %s for operation id %s" % (request.user, optimer_id)) if optimer.objects.filter(id=optimer_id).exists(): op = optimer.objects.get(id=optimer_id) op.delete() From 1856d091b8b3047c06ea9b5b3bd4047d55355551 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:26:35 -0600 Subject: [PATCH 27/35] added more debug code --- optimer/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimer/views.py b/optimer/views.py index 47edc937..ceeb73f7 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -59,7 +59,7 @@ def add_optimer_view(request): op.create_time = post_time op.eve_character = character op.save() - + logger.debug("User %s created op timer with name %s" % (request.user, op.operation_name)) return HttpResponseRedirect("/optimer/") else: logger.debug("Returning new opForm") From 0c7332852937e6491e9afbed64110d7755d4c10b Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:32:20 -0600 Subject: [PATCH 28/35] added sigtracker and operations timer permissions --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9bdae977..3456128a 100755 --- a/README.md +++ b/README.md @@ -69,6 +69,10 @@ Special Permissions In Admin: auth | user | timer_management ( Access to create and remove timers) auth | user | timer_view ( Access to timerboard to view timers) auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data) + auth | user | sigtracker_management ( Allows for an individual to create and remove signitures) + auth | user | sigtracker_view ( Allows for an individual view signitures) + auth | user | optimer_management ( Allows for an individual to create and remove fleet operations) + auth | user | optimer_view ( Allows for an individual view fleet operations) Active Developers From f20bd4ee2e2818320177243abd92c7ac1e160477 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:36:12 -0600 Subject: [PATCH 29/35] changed nesting --- stock/templates/registered/signaturemanagement.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html index ff7820ad..7f2f5632 100644 --- a/stock/templates/registered/signaturemanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -44,17 +44,17 @@ - {% if perms.auth.signature_management %} - - + - + - {% endif %} + {% endif %} {% endfor %}
    Operation NameSystemForm Up System Form Up Location Start Time End Time{{ sigt.status }} {{ sigt.notes }} {{ sigt.post_time}}{{ sigt.eve_character }} + {% if perms.auth.signature_management %} + {{ sigt.eve_character }}
    From f896971351f1b4c5e4022a21889037e34f17d32b Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:36:44 -0600 Subject: [PATCH 30/35] fixed indentation --- stock/templates/registered/signaturemanagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html index 7f2f5632..ecf70e68 100644 --- a/stock/templates/registered/signaturemanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -51,7 +51,7 @@ - + {% endif %} From 6cecf7dbe204c0719cbc7411917ba2ad23d0aa05 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:46:44 -0600 Subject: [PATCH 31/35] fixed block errors --- .../templates/registered/signaturemanagement.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/stock/templates/registered/signaturemanagement.html b/stock/templates/registered/signaturemanagement.html index ecf70e68..d9010bcc 100644 --- a/stock/templates/registered/signaturemanagement.html +++ b/stock/templates/registered/signaturemanagement.html @@ -43,18 +43,19 @@ {{ sigt.sigtype }} {{ sigt.status }} {{ sigt.notes }} - {{ sigt.post_time}} - {% if perms.auth.signature_management %} - {{ sigt.eve_character }} - - + {{ sigt.post_time}} + {% if perms.auth.signature_management %} + {{ sigt.eve_character }} + + - + - {% endif %} + {% endif %} + {% endfor %} From 182c2bf0e2dbc82a7e3ceb2979fdb54490f0a257 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:49:56 -0600 Subject: [PATCH 32/35] added more debug code --- optimer/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optimer/views.py b/optimer/views.py index ceeb73f7..6aa637c5 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -39,7 +39,7 @@ def add_optimer_view(request): logger.debug("add_optimer_view called by user %s" % request.user) if request.method == 'POST': form = opForm(request.POST) - logger.info("Request type POST contains form valid: %s" % form.is_valid()) + logger.debug("Request type POST contains form valid: %s" % form.is_valid()) if form.is_valid(): #Get Current Time post_time = timezone.now() From 5959519876cf311f225f202e807ad27b9b32ff85 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:51:02 -0600 Subject: [PATCH 33/35] fixed grammer --- optimer/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/optimer/views.py b/optimer/views.py index 6aa637c5..6c06974e 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -59,7 +59,7 @@ def add_optimer_view(request): op.create_time = post_time op.eve_character = character op.save() - logger.debug("User %s created op timer with name %s" % (request.user, op.operation_name)) + logger.info("User %s created op timer with name %s" % (request.user, op.operation_name)) return HttpResponseRedirect("/optimer/") else: logger.debug("Returning new opForm") @@ -79,5 +79,5 @@ def remove_optimer(request, optimer_id): op.delete() logger.info("Deleting optimer id %s by user %s" % (optimer_id, request.user)) else: - logger.error("Unable to delete signature id %s for user %s - operation matching id not found." % (optimer_id, request.user)) + logger.error("Unable to delete optimer id %s for user %s - operation matching id not found." % (optimer_id, request.user)) return HttpResponseRedirect("/optimer/") From b367c878f97347065029667e00ccfb4bc3a909fb Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Wed, 20 Jan 2016 22:53:57 -0600 Subject: [PATCH 34/35] fixed block errors --- stock/templates/registered/operationmanagement.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html index 90e36962..d05d95dd 100644 --- a/stock/templates/registered/operationmanagement.html +++ b/stock/templates/registered/operationmanagement.html @@ -54,9 +54,10 @@ class="glyphicon glyphicon-remove"> - + {% endif %} + {% endfor %} From 586b08d625712b96ed9f23f6bf38db3930323ea2 Mon Sep 17 00:00:00 2001 From: Mr McClain Date: Thu, 21 Jan 2016 03:40:06 -0600 Subject: [PATCH 35/35] fixed installed apps bug forgot to add it to the settings.py example --- alliance_auth/settings.py.example | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 70f16ff7..2a6e22e8 100755 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -59,6 +59,7 @@ INSTALLED_APPS = ( 'timerboard', 'srp', 'sigtracker', + 'optimer', ) MIDDLEWARE_CLASSES = ( @@ -443,6 +444,10 @@ LOGGING = { 'handlers': ['log_file', 'console'], 'level': 'DEBUG', }, + 'optimer': { + 'handlers': ['log_file', 'console'], + 'level': 'DEBUG', + }, 'util': { 'handlers': ['log_file', 'console'], 'level': 'DEBUG',