Merge pull request #198 from orbitroom/master

Added Signature / Wormhole Tracking Tool

alliance_auth/settings.py.example

@@ -58,6 +58,7 @@ INSTALLED_APPS = (
     'hrapplications',
     'timerboard',
     'srp',
+    'sigtracker',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -438,6 +439,10 @@ LOGGING = {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',
         },
+        'sigtracker': {
+            'handlers': ['log_file', 'console'],
+            'level': 'DEBUG',
+        },
         'util': {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',

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_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'),
+			
+
 )

sigtracker/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from models import sigtracker
+
+admin.site.register(sigtracker)
+# Register your models here.

sigtracker/form.py

@@ -0,0 +1,20 @@
+from django import forms
+from django.core.validators import MaxValueValidator, MinValueValidator
+
+
+
+class SignatureForm(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="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="")
+    
+    
+    
+    

sigtracker/models.py

@@ -0,0 +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 = ['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)
+    

sigtracker/tests.py

@@ -0,0 +1 @@
+# Create your tests here.

sigtracker/views.py

@@ -0,0 +1,78 @@
+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 django.utils import timezone
+
+from util import check_if_user_has_permission
+from authentication.managers import AuthServicesInfoManager
+from eveonline.managers import EveManager
+from form import SignatureForm
+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.signature_view')
+def sigtracker_view(request):
+    logger.info("sigtracker_view called by user %s" % request.user)
+    sigtracker_list = sigtracker.objects.all()
+    render_items = {'sigtracker': sigtracker.objects.all(),}
+
+    return render_to_response('registered/signaturemanagement.html', render_items, context_instance=RequestContext(request))
+
+
+@login_required
+@permission_required('auth.signature_management')
+def add_signature_view(request):
+    logger.info("add_signature_view called by user %s" % request.user)
+    if request.method == 'POST':
+    	form = SignatureForm(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()
+            # 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']
+            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.create_time = post_time
+            sig.eve_character = character
+            sig.save()
+            return HttpResponseRedirect("/sigtracker/")
+    else:
+        logger.info("Returning new SignatureForm")
+        form = SignatureForm()
+
+    render_items = {'form': form}
+
+    return render_to_response('registered/addsignature.html', render_items, context_instance=RequestContext(request))
+
+
+@login_required
+@permission_required('auth.signature_management')
+def remove_signature(request, sigtracker_id):
+    logger.info("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.info("Deleting sigtracker id %s by user %s" % (sigtracker_id, request.user))
+    else:
+        logger.info("Unable to delete signature id %s for user %s - signature matching id not found." % (sigtracker_id, request.user))
+    return HttpResponseRedirect("/sigtracker/")

stock/templates/public/base.html

@@ -137,6 +137,16 @@
                                                                                   href="{% url 'auth_fleet_fits' %}"><i
                                         class="fa fa-bolt fa-fw grayiconecolor"></i> Fleet Doctrines</a>
                             </li>
+			{% endif %}
+
+                        {% if  perms.auth.member or perms.auth.blue_member %}
+							<li>
+                                <a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
+                                                                                  href="{% url 'auth_signature_view' %}"><i
+                                        class="fa fa-compass fa-fw grayiconecolor"></i> Signature Tracker</a>
+                            </li>
+
+
                             {% if perms.auth.timer_view %}
                                 <li>
                                     <a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}

stock/templates/registered/addsignature.html

@@ -0,0 +1,38 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth - Signature Create{% endblock %}
+
+{% block page_title %}Create Signature{% 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">Create Signature</h1>
+
+        <div class="container-fluid">
+            <div class="col-md-4 col-md-offset-4">
+                <div class="row">
+                        <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">Create Signature</button>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+
+{% block extra_script %}
+
+    $('#id_eve_time').datetimepicker({
+    maskInput: true,
+    format: 'Y-m-d H:i',minDate:0
+    });
+
+{% endblock extra_script %}

stock/templates/registered/signaturemanagement.html

@@ -0,0 +1,68 @@
+{% extends "public/base.html" %}
+{% load staticfiles %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Signature Management{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Signatures
+            <div class="text-right">
+                <a href="{% url 'auth_add_signature_view' %}">
+                    {% if perms.auth.signature_management %}
+                        <button type="button" class="btn btn-success">Create Signature</button>
+                    {% endif %}
+                </a>
+            </div>
+        </h1>
+        <table class="table table-responsive table-bordered">
+            <tr>
+                <th class="text-center">ID</th>
+                <th class="text-center">System</th>
+                <th class="text-center">Destination</th>
+                <th class="text-center">Signature Type</th>
+		<th class="text-center">Status</th>
+                <th class="text-center">Notes</th>
+		<th class="text-center">Post Time</th>
+		{% if perms.auth.signature_management %}
+                   <th class="text-center">Creator</th> 
+		   <th class="text-center">Action</th>
+                {% endif %}
+            </tr>
+            	              
+                {% for sigt in sigtracker %}
+                <tr>
+                <td style="width:150px" class="text-center">{{ sigt.ident }}</td>
+                
+                <td class="text-center">
+                <a href="http://evemaps.dotlan.net/system/{{ sigt.system }}">{{ sigt.system }}</a>
+                </td>
+                <td style="width:150px" class="text-center">{{ sigt.destination }}</td>
+                <td style="width:150px" class="text-center">{{ sigt.sigtype }}</td>
+		<td style="width:150px" class="text-center">{{ sigt.status }}</td>
+		<td style="width:150px" class="text-center">{{ sigt.notes }}</td>
+                <td style="width:150px" class="text-center">{{ sigt.post_time}}</td>   			 
+                {% if perms.auth.signature_management %}
+                <td style="width:150px" class="text-center">{{ sigt.eve_character }}</td>
+                    <td class="text-center">
+                        <a href="/remove_signature/{{ sigt.id }}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    </td>
+              </tr>
+              
+              {% endif %}
+              {% endfor %}
+            </tr>
+        </table>
+
+        
+    </div>
+
+
+
+
+{% endblock content %}

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="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.")