Restructure Alliance Auth package (#867)

* Refactor allianceauth into its own package

* Add setup

* Add missing default_app_config declarations

* Fix timerboard namespacing

* Remove obsolete future imports

* Remove py2 mock support

* Remove six

* Add experimental 3.7 support and multiple Dj versions

* Remove python_2_unicode_compatible

* Add navhelper as local package

* Update requirements

allianceauth/optimer/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'allianceauth.optimer.apps.OptimerConfig'

allianceauth/optimer/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from allianceauth.optimer.models import OpTimer
+
+admin.site.register(OpTimer)

allianceauth/optimer/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class OptimerConfig(AppConfig):
+    name = 'allianceauth.optimer'
+    label = 'optimer'

allianceauth/optimer/auth_hooks.py

@@ -0,0 +1,27 @@
+from allianceauth.services.hooks import MenuItemHook, UrlHook
+
+from allianceauth import hooks
+from . import urls
+
+
+class OpTimerboardMenu(MenuItemHook):
+    def __init__(self):
+        MenuItemHook.__init__(self, 'Fleet Operations',
+                              'fa fa-exclamation  fa-fw grayiconecolor',
+                              'optimer:view',
+                              navactive=['optimer:'])
+
+    def render(self, request):
+        if request.user.has_perm('auth.optimer_view'):
+            return MenuItemHook.render(self, request)
+        return ''
+
+
+@hooks.register('menu_item_hook')
+def register_menu():
+    return OpTimerboardMenu()
+
+
+@hooks.register('url_hook')
+def register_url():
+    return UrlHook(urls, 'optimer', r'^optimer/')

allianceauth/optimer/form.py

@@ -0,0 +1,11 @@
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+
+class OpForm(forms.Form):
+    doctrine = forms.CharField(max_length=254, required=True, label=_('Doctrine'))
+    system = forms.CharField(max_length=254, required=True, label=_("System"))
+    start = forms.DateTimeField(required=True, label=_("Start Time"))
+    duration = forms.CharField(max_length=254, required=True, label=_("Duration"))
+    operation_name = forms.CharField(max_length=254, required=True, label=_("Operation Name"))
+    fc = forms.CharField(max_length=254, required=True, label=_("Fleet Commander"))

allianceauth/optimer/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-05 21:40
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('eveonline', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='optimer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('doctrine', models.CharField(default=b'', max_length=254)),
+                ('system', models.CharField(default=b'', max_length=254)),
+                ('location', models.CharField(default=b'', max_length=254)),
+                ('start', models.DateTimeField(default=datetime.datetime.now)),
+                ('duration', models.CharField(default=b'', max_length=25)),
+                ('operation_name', models.CharField(default=b'', max_length=254)),
+                ('fc', models.CharField(default=b'', max_length=254)),
+                ('details', models.CharField(default=b'', max_length=254)),
+                ('post_time', models.DateTimeField(default=django.utils.timezone.now)),
+                ('eve_character', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='eveonline.EveCharacter')),
+            ],
+            options={
+                'ordering': ['start'],
+            },
+        ),
+    ]

allianceauth/optimer/migrations/0002_auto_20170413_0442.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-04-13 04:42
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('optimer', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='optimer',
+            name='details',
+        ),
+        migrations.RemoveField(
+            model_name='optimer',
+            name='location',
+        ),
+    ]

allianceauth/optimer/migrations/0003_make_strings_more_stringy.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-22 23:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('optimer', '0002_auto_20170413_0442'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='optimer',
+            name='doctrine',
+            field=models.CharField(default='', max_length=254),
+        ),
+        migrations.AlterField(
+            model_name='optimer',
+            name='duration',
+            field=models.CharField(default='', max_length=25),
+        ),
+        migrations.AlterField(
+            model_name='optimer',
+            name='fc',
+            field=models.CharField(default='', max_length=254),
+        ),
+        migrations.AlterField(
+            model_name='optimer',
+            name='operation_name',
+            field=models.CharField(default='', max_length=254),
+        ),
+        migrations.AlterField(
+            model_name='optimer',
+            name='system',
+            field=models.CharField(default='', max_length=254),
+        ),
+    ]

allianceauth/optimer/models.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+
+from django.db import models
+from django.utils import timezone
+
+from allianceauth.eveonline.models import EveCharacter
+
+
+class OpTimer(models.Model):
+    class Meta:
+        ordering = ['start']
+
+    doctrine = models.CharField(max_length=254, default="")
+    system = models.CharField(max_length=254, default="")
+    start = models.DateTimeField(default=datetime.now)
+    duration = models.CharField(max_length=25, default="")
+    operation_name = models.CharField(max_length=254, default="")
+    fc = models.CharField(max_length=254, default="")
+    post_time = models.DateTimeField(default=timezone.now)
+    eve_character = models.ForeignKey(EveCharacter)
+
+    def __str__(self):
+        return self.operation_name

allianceauth/optimer/templates/optimer/add.html

@@ -0,0 +1,46 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+{% block title %}{% trans "Alliance Auth - Fleet Operation Create" %}{% endblock %}
+
+{% block page_title %}{% trans "Create Operation" %}{% endblock page_title %}
+{% block extra_css %}
+    {% include 'bundles/jquery-datetimepicker-css.html' %}
+{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Create Fleet Operation" %}</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">{% trans "Create Fleet Operation" %}</button>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/jquery-datetimepicker-js.html' %}
+{% endblock %}
+
+{% block extra_script %}
+
+    $('#id_start').datetimepicker({
+    lang: '{{ LANGUAGE_CODE }}',
+    maskInput: true,
+    format: 'Y-m-d H:i',minDate:0
+    });
+
+{% endblock extra_script %}

allianceauth/optimer/templates/optimer/fleetoptable.html

@@ -0,0 +1,44 @@
+{% load i18n %}
+
+{% block content %}
+     <table class="table">
+        <thead>
+            <tr>
+                <th class="text-center col-lg-3">{% trans "Operation Name" %}</th>
+                <th class="text-center col lg-2">{% trans "Doctrine" %}</th>
+                <th class="text-center col-lg-1">{% trans "Form Up System" %}</th>
+                <th class="text-center col-lg-1">{% trans "Start Time" %}</th>
+                <th class="text-center col-lg-1">{% trans "Local Time" %}</th>
+                <th class="text-center col-lg-1">{% trans "Duration" %}</th>
+                <th class="text-center col-lg-1">{% trans "FC" %}</th>
+                {% if perms.auth.optimer_management %}
+                <th class="text-center col-lg-1">{% trans "Creator" %}</th>
+                <th class="text-center col-lg-2">{% trans "Action" %}</th>
+                {% endif %}
+            </tr>
+        </thead>
+     {% for ops in timers %}
+         <tbody>
+            <tr>
+                <td class="text-center">{{ ops.operation_name }}</td>
+                <td class="text-center">{{ ops.doctrine }}</td>
+                <td class="text-center">
+                    <a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
+                </td>
+                <td class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
+                <td class="text-center" nowrap><div id="localtime{{ ops.id }}"></div><div id="countdown{{ ops.id }}"></div></td>
+                <td class="text-center">{{ ops.duration }}</td>
+                <td class="text-center">{{ ops.fc }}</td>
+                {% if perms.auth.optimer_management %}
+                    <td class="text-center">{{ ops.eve_character }}</td>
+                    <td class="text-center">
+                        <a href="{% url 'optimer:remove' ops.id %}" class="btn btn-danger">
+                        <span class="glyphicon glyphicon-remove"></span>
+                    </a><a href="{% url 'optimer:edit' ops.id %}" class="btn btn-info"><span class="glyphicon glyphicon-pencil"></span></a>
+                    </td>
+                {% endif %}
+            </tr>
+        </tbody>
+    {% endfor %}
+    </table>
+{% endblock content %}

allianceauth/optimer/templates/optimer/management.html

@@ -0,0 +1,119 @@
+{% extends "registered/base.html" %}
+{% load staticfiles %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}{% trans "Fleet Operation Management" %}{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Fleet Operation Timers" %}
+            <div class="text-right">
+                {% if perms.auth.optimer_management %}
+                    <a href="{% url 'optimer:add' %}" class="btn btn-success">{% trans "Create Operation" %}</a>
+                {% endif %}
+            </div>
+        </h1>
+
+        <div class="col-lg-12 text-center row">
+            <div class="label label-info text-left">
+                <b>{% trans "Current Eve Time:" %} </b>
+            </div><div class="label label-info text-left" id="current-time"></div>
+            <br  />
+        </div>
+
+        <h4><b>{% trans "Next Timers" %}</b></h4>
+        {% if future_timers %}
+            {% include "optimer/fleetoptable.html" with timers=future_timers %}
+        {% else %}
+            <div class="alert alert-warning text-center">{% trans "No upcoming timers." %}</div>
+        {% endif %}
+
+        <h4><b>{% trans "Past Timers" %}</b></h4>
+        {% if past_timers %}
+            {% include "optimer/fleetoptable.html" with timers=past_timers %}
+        {% else %}
+            <div class="alert alert-warning text-center">{% trans "No past timers." %}</div>
+        {% endif %}
+    </div>
+
+    {% include 'bundles/moment-js.html' with locale=True %}
+    <script src="{% static 'js/timers.js' %}"></script>
+    <script type="text/javascript">
+        // Data
+        var timers = [
+        {% for op in optimer %}
+            {
+                'id': {{ op.id }},
+                'start': moment("{{ op.start | date:"c" }}"),
+                'expired': false
+            },
+        {% endfor %}
+        ];
+    </script>
+    <script type="text/javascript">
+
+        timedUpdate();
+        setAllLocalTimes();
+
+        // Start timed updates
+        setInterval(timedUpdate, 1000);
+
+        function timedUpdate() {
+            updateClock();
+            updateAllTimers();
+        }
+
+        function updateAllTimers () {
+            var l = timers.length;
+            for (var i=0; i < l; ++i) {
+                if (timers[i].expired) continue;
+                updateTimer(timers[i]);
+            }
+        }
+
+        /**
+         * Update a timer
+         * @param timer Timer information
+         * @param timer.start Date of the timer
+         * @param timer.id Id number of the timer
+         * @param timer.expired
+         */
+        function updateTimer(timer) {
+            if (timer.start.isAfter(Date.now())) {
+                var duration = moment.duration(timer.start - moment(), 'milliseconds');
+                document.getElementById("countdown" + timer.id).innerHTML = getDurationString(duration);
+            } else {
+                timer.expired = true;
+                document.getElementById("countdown" + timer.id).innerHTML = "";
+            }
+        }
+
+        /**
+         * Set all local time fields
+         */
+        function setAllLocalTimes() {
+            var l = timers.length;
+            for (var i=0; i < l; ++i) {
+                setLocalTime(timers[i]);
+            }
+        }
+
+        /**
+         * Set the local time info for the timer
+         * @param timer Timer information
+         * @param timer.start Date of the timer
+         * @param timer.id Id number of the timer
+         */
+        function setLocalTime(timer) {
+            document.getElementById("localtime" + timer.id).innerHTML = timer.start.format("ddd @ LT");
+        }
+
+        function updateClock() {
+            document.getElementById("current-time").innerHTML = "<b>" + moment.utc().format('LLLL') + "</b>";
+        }
+    </script>
+{% endblock content %}

allianceauth/optimer/templates/optimer/update.html

@@ -0,0 +1,54 @@
+{% extends "registered/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+{% get_current_language as LANGUAGE_CODE %}
+
+{% block title %}Alliance Auth - Update Fleet Operation {% endblock %}
+
+{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
+
+{% block extra_css %}
+    {% include 'bundles/jquery-datetimepicker-css.html' %}
+{% endblock extra_css %}
+
+{% block content %}
+
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Update Fleet Operation" %}</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">{% trans "Fleet Operation 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">{% trans "Update Fleet Operation" %}
+                            </button>
+                        </form>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+{% endblock content %}
+
+{% block extra_javascript %}
+    {% include 'bundles/jquery-datetimepicker-js.html' %}
+{% endblock %}
+
+{% block extra_script %}
+
+    $('#id_start').datetimepicker({
+    lang: '{{ LANGUAGE_CODE }}',
+    maskInput: true,
+    format: 'Y-m-d H:i',minDate:0
+    });
+
+{% endblock extra_script %}

allianceauth/optimer/tests.py

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

allianceauth/optimer/urls.py

@@ -0,0 +1,12 @@
+from django.conf.urls import url
+
+from . import views
+
+app_name = 'optimer'
+
+urlpatterns = [
+    url(r'^$', views.optimer_view, name='view'),
+    url(r'^add$', views.add_optimer_view, name='add'),
+    url(r'^(\w+)/remove$', views.remove_optimer, name='remove'),
+    url(r'^(\w+)/edit$', views.edit_optimer, name='edit'),
+    ]

allianceauth/optimer/views.py

@@ -0,0 +1,107 @@
+import logging
+
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import permission_required
+from django.shortcuts import get_object_or_404
+from django.shortcuts import render, redirect
+from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+from .form import OpForm
+
+from .models import OpTimer
+
+logger = logging.getLogger(__name__)
+
+
+@login_required
+@permission_required('auth.optimer_view')
+def optimer_view(request):
+    logger.debug("optimer_view called by user %s" % request.user)
+    render_items = {'optimer': OpTimer.objects.all(),
+                    'future_timers': OpTimer.objects.all().filter(
+                        start__gte=timezone.now()),
+                    'past_timers': OpTimer.objects.all().filter(
+                        start__lt=timezone.now()).order_by('-start')}
+
+    return render(request, 'optimer/management.html', context=render_items)
+
+
+@login_required
+@permission_required('auth.optimer_management')
+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.debug("Request type POST contains form valid: %s" % form.is_valid())
+        if form.is_valid():
+            # Get Current Time
+            post_time = timezone.now()
+            # Get character
+            character = request.user.profile.main_character
+            # handle valid form
+            op = OpTimer()
+            op.doctrine = form.cleaned_data['doctrine']
+            op.system = form.cleaned_data['system']
+            op.start = form.cleaned_data['start']
+            op.duration = form.cleaned_data['duration']
+            op.operation_name = form.cleaned_data['operation_name']
+            op.fc = form.cleaned_data['fc']
+            op.create_time = post_time
+            op.eve_character = character
+            op.save()
+            logger.info("User %s created op timer with name %s" % (request.user, op.operation_name))
+            messages.success(request, _('Created operation timer for %(opname)s.') % {"opname": op.operation_name})
+            return redirect("optimer:view")
+    else:
+        logger.debug("Returning new opForm")
+        form = OpForm()
+
+    render_items = {'form': form}
+
+    return render(request, 'optimer/add.html', context=render_items)
+
+
+@login_required
+@permission_required('auth.optimer_management')
+def remove_optimer(request, optimer_id):
+    logger.debug("remove_optimer called by user %s for operation id %s" % (request.user, optimer_id))
+    op = get_object_or_404(OpTimer, id=optimer_id)
+    op.delete()
+    logger.info("Deleting optimer id %s by user %s" % (optimer_id, request.user))
+    messages.success(request, _('Removed operation timer for %(opname)s.') % {"opname": op.operation_name})
+    return redirect("optimer:view")
+
+
+@login_required
+@permission_required('auth.optimer_management')
+def edit_optimer(request, optimer_id):
+    logger.debug("edit_optimer called by user %s for optimer id %s" % (request.user, optimer_id))
+    op = get_object_or_404(OpTimer, id=optimer_id)
+    if request.method == 'POST':
+        form = OpForm(request.POST)
+        logger.debug("Received POST request containing update optimer form, is valid: %s" % form.is_valid())
+        if form.is_valid():
+            character = request.user.profile.main_character
+            op.doctrine = form.cleaned_data['doctrine']
+            op.system = form.cleaned_data['system']
+            op.start = form.cleaned_data['start']
+            op.duration = form.cleaned_data['duration']
+            op.operation_name = form.cleaned_data['operation_name']
+            op.fc = form.cleaned_data['fc']
+            op.eve_character = character
+            logger.info("User %s updating optimer id %s " % (request.user, optimer_id))
+            op.save()
+            messages.success(request, _('Saved changes to operation timer for %(opname)s.') % {"opname": op.operation_name})
+            return redirect("optimer:view")
+    else:
+        data = {
+            'doctrine': op.doctrine,
+            'system': op.system,
+            'start': op.start,
+            'duration': op.duration,
+            'operation_name': op.operation_name,
+            'fc': op.fc,
+        }
+        form = OpForm(initial=data)
+    return render(request, 'optimer/update.html', context={'form': form})