EVE Swagger Interface (#591)

FAT uses ESI tokens to get character location/ship
 - closes #564

 Pull corp memebrship data from ESI

Additional permissions for non-api viewing.
 - migration to convert permissions from old users.

Standardize EVE datasource responses.
 - allow different sources for EVE data types.

Allow empty values for character alliance id and name

Allow multiple corps and alliances to be considered 'members'

fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html

@@ -0,0 +1,25 @@
+{% extends 'public/base.html' %}
+{% block title %}Fleet Participation{% endblock %}
+{% block page_title %}Fleet Participation{% endblock %}
+<div class="col-lg-12">
+    <h1 class="page-header text-center">Character not found!</h1>
+    <div class="col-lg-12 container" id="example">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">{{ character_name }}</div>
+                    <div class="panel-body">
+                        <div class="col-lg-2 col-sm-2">
+                             <img class="ra-avatar img-responsive" src="https://image.eveonline.com/Character/{{ character_id }}_128.jpg">
+                        </div>
+                        <div class="col-lg-10 col-sm-2">
+                            <div class="alert alert-danger" role="alert">Character not registered!</div>
+                            This character is not part of any registered API-key. You must go to <a href=" {% url 'auth_api_key_management' %}">API key management</a> and add an API with the character on before being able to click fleet attendance links.
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html

@@ -0,0 +1,37 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth - Fatlink Create{% endblock %}
+
+{% block page_title %}{% trans "Create Fatlink" %}{% 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">{% trans "Create Fleet Operation" %}</h1>
+
+        <div class="container-fluid">
+            {% if badrequest %}
+            <div class="alert alert-danger" role="alert">{% trans "Bad request!" %}</div>
+            {% endif %}
+            {% for message in errormessages %}
+            <div class="alert alert-danger" role="alert">{{ message }}</div>
+            {% endfor %}
+            <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" name="submit_fat">{% trans "Create fatlink" %}</button>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+

fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html

@@ -0,0 +1,63 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+{% load bootstrap_pagination %}
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% blocktrans %}Edit fatlink "{{ fatlink }}"{% endblocktrans %}
+            <div class="text-right">
+                <form>
+                    <button type="submit" onclick="return confirm('Are you sure?')" class="btn btn-danger" name="deletefat" value="True">
+                        {% trans "Delete fat" %}
+                    </button>
+                </form>
+            </div>
+        </h1>
+        <div class="panel panel-default">
+            <div class="panel-heading">{% trans "Registered characters" %}</div>
+            <div class="panel-body">
+                <div class="text-center">
+                    {% bootstrap_paginate registered_fats range=10 %}
+                </div>
+                <table class="table table-responsive table-hover">
+                    <tr>
+                        <th class="text-center">{% trans "User" %}</th>
+                        <th class="text-center">{% trans "Character" %}</th>
+                        <th class="text-center">{% trans "System" %}</th>
+                        <th class="text-center">{% trans "Ship" %}</th>
+                        <th class="text-center">{% trans "Eve Time" %}</th>
+                        <th></th>
+                    </tr>
+                    {% for fat in registered_fats %}
+                        <tr>
+                            <td class="text-center">{{ fat.user }}</td>
+                            <td class="text-center">{{ fat.character.character_name }}</td>
+                            {%  if fat.station != "No Station" %}
+                                <td class="text-center">Docked in {{ fat.system }}</td>
+                            {% else %}
+                                <td class="text-center">{{ fat.system }}</td>
+                            {% endif %}
+                            <td class="text-center">{{ fat.shiptype }}</td>
+                            <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
+                            <td class="text-center">
+                                <form>
+                                    <button type="submit" class="btn btn-warning" name="removechar" value="{{ fat.character.character_id }}">
+                                        <span class="glyphicon glyphicon-remove"></span>
+                                    </button>
+                                </form>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+
+{% endblock content %}

fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html

@@ -0,0 +1,68 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Participation data statistics for" %} {{ month }}, {{ year }}
+            {% if char_id %}
+            <div class="text-right">
+                <a href="{% url 'auth_fatlink_view_user_statistics_month' char_id previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% trans "Previous month" %}</a>
+                <a href="{% url 'auth_fatlink_view_user_statistics_month' char_id next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% trans "Next month" %}</a>
+            </div>
+            {% endif %}
+        </h1>
+        <h2>{% blocktrans %}{{ user }} has collected {{ n_fats }} links this month.{% endblocktrans %}</h2>
+        <table class="table table-responsive">
+            <tr>
+                <th class="col-md-2 text-center">{% trans "Ship" %}</th>
+                <th class="col-md-2 text-center">{% trans "Times used" %}</th>
+            </tr>
+            {% for ship, n_fats in shipStats %}
+            <tr>
+                <td class="text-center">{{ ship }}</td>
+                <td class="text-center">{{ n_fats }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        {%  if created_fats %}
+         <h2>{% blocktrans %}{{ user }} has created {{ n_created_fats }} links this month.{% endblocktrans %}</h2>
+        {% if created_fats %}
+        <table class="table">
+            <tr>
+                <th class="text-center">{% trans "Name" %}</th>
+                <th class="text-center">{% trans "Creator" %}</th>
+                <th class="text-center">{% trans "Fleet" %}</th>
+                <th class="text-center">{% trans "Eve Time" %}</th>
+                <th class="text-center">{% trans "Duration" %}</th>
+                <th class="text-center">{% trans "Edit" %}</th>
+            </tr>
+            {% for link in created_fats %}
+            <tr>
+                <td class="text-center"><a href="{%  url 'auth_click_fatlink_view' %}{{ link.hash }}/{{ link.name }}">{{ link.name }}</a></td>
+                <td class="text-center">{{ link.creator.username }}</td>
+                <td class="text-center">{{ link.fleet }}</td>
+                <td class="text-center">{{ link.fatdatetime }}</td>
+                <td class="text-center">{{ link.duration }}</td>
+                <td class="text-center">
+                    <a href="{%  url 'auth_modify_fatlink_view' %}{{ link.hash }}/{{ link.name }}">
+                        <button type="button" class="btn btn-info"><span
+                                class="glyphicon glyphicon-edit"></span></button>
+                    </a>
+                </td>
+            </tr>
+            {%  endfor %}
+
+        </table>
+        {% endif %}
+        {% endif %}
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+
+{% endblock content %}

fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html

@@ -0,0 +1,42 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}{% trans "Personal fatlink statistics" %}{% endblock page_title %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Participation data statistics for" %} {{ year }}
+            <div class="text-right">
+                <a href="{% url 'auth_fatlink_view_personal_statistics_year' previous_year %}" class="btn btn-info">{% trans "Previous year" %}</a>
+                {%  if next_year %}
+                <a href="{% url 'auth_fatlink_view_personal_statistics_year' next_year  %}" class="btn btn-info">{% trans "Next year" %}</a>
+                {%  endif %}
+            </div>
+        </h1>
+        <div class="col-lg-2 col-lg-offset-5">
+        <table class="table table-responsive">
+            <tr>
+                <th class="col-md-2 text-center">{% trans "Month" %}</th>
+                <th class="col-md-2 text-center">{% trans "Fats" %}</th>
+            </tr>
+            {% for monthnr, month, n_fats in monthlystats %}
+            <tr>
+                <td class="text-center">
+                    <a href="{% url 'auth_fatlink_view_personal_statistics_month' year monthnr %}">
+                        {{ month }}
+                    </a>
+                </td>
+                <td class="text-center">{{ n_fats }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        </div>
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+
+{% endblock content %}

fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html

@@ -0,0 +1,48 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}{% trans "Fatlink statistics" %}{% endblock page_title %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ month }}, {{ year }}{% endblocktrans %}
+            <div class="text-right">
+                <a href="{% url 'auth_fatlink_view_statistics_month' previous_month|date:"Y" previous_month|date:"m"  %}" class="btn btn-info">{% trans "Previous month" %}</a>
+                {%  if next_month %}
+                <a href="{% url 'auth_fatlink_view_statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% trans "Next month" %}</a>
+                {%  endif %}
+            </div>
+        </h1>
+        {% if fatStats %}
+        <table class="table table-responsive">
+            <tr>
+                <th class="col-md-1"></th>
+                <th class="col-md-2 text-center">{% trans "Ticker" %}</th>
+                <th class="col-md-5 text-center">{% trans "Corp" %}</th>
+                <th class="col-md-2 text-center">{% trans "Members" %}</th>
+                <th class="col-md-2 text-center">{% trans "Fats" %}</th>
+                <th class="col-md-2 text-center">{% trans "Average fats" %}</th>
+            </tr>
+            {% for corpStat in fatStats %}
+            <tr>
+                <td>
+                    <img src="https://image.eveonline.com/Corporation/{{ corpStat.corp.corporation_id }}_32.png" class="ra-avatar img-responsive">
+                </td>
+                <td class="text-center">[{{ corpStat.corp.corporation_ticker }}]</td>
+                <td class="text-center">{{ corpStat.corp.corporation_name }}</td>
+                <td class="text-center">{{ corpStat.corp.member_count }}</td>
+                <td class="text-center">{{ corpStat.n_fats }}</td>
+                <td class="text-center">{{ corpStat.avg_fat }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        {% endif %}
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+
+{% endblock content %}

fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html

@@ -0,0 +1,106 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load i18n %}
+
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}{% trans "Fatlink view" %}{% endblock page_title %}
+
+{% block content %}
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">{% trans "Participation data" %}</h1>
+        <table class="table">
+                <tr>
+                    <th class="col-md-11">
+                        <h4><b>{% trans "Most recent clicked fatlinks" %}</b>
+                        </h4>
+                    </th>
+                    <th class="col-md-1">
+                        <a href="{% url 'auth_fatlink_view_personal_statistics' %}" class="btn btn-info">
+                            {% trans "Personal statistics" %}
+                        </a>
+                    </th>
+                </tr>
+        </table>
+        {% if fats %}
+        <table class="table table-responsive">
+            <tr>
+                <th class="text-center">{% trans "fatname" %}</th>
+                <th class="text-center">{% trans "Character" %}</th>
+                <th class="text-center">{% trans "System" %}</th>
+                <th class="text-center">{% trans "Ship" %}</th>
+                <th class="text-center">{% trans "Eve Time" %}</th>
+            </tr>
+            {% for fat in fats %}
+            <tr>
+                <td class="text-center">{{ fat.fatlink.name }}</td>
+                <td class="text-center">{{ fat.character.character_name }}</td>
+                {%  if fat.station != "No Station" %}
+                <td class="text-center">Docked in {{ fat.system }}</td>
+                {% else %}
+                <td class="text-center">{{ fat.system }}</td>
+                {% endif %}
+                <td class="text-center">{{ fat.shiptype }}</td>
+                <td class="text-center">{{ fat.fatlink.fatdatetime }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        {% else %}
+        <div class="alert alert-warning text-center">No fleet activity on record.</div>
+        {% endif %}
+
+        {% if perms.auth.fleetactivitytracking%}
+            <table class="table">
+                <tr>
+                    <th class="col-md-10">
+                        <h4><b>{% trans "Most recent fatlinks" %}</b>
+                        </h4>
+                    </th>
+                    <th class="col-md-1">
+                        <a href="{% url 'auth_fatlink_view_statistics' %}" class="btn btn-info">
+                            {% trans "View statistics" %}
+                        </a>
+                    </th>
+                    <th class="col-md-1">
+                        <a href="{% url 'auth_create_fatlink_view' %}" class="btn btn-success">
+                            {% trans "Create fatlink" %}
+                        </a>
+                    </th>
+                </tr>
+            </table>
+        {% if fatlinks %}
+        <table class="table">
+            <tr>
+                <th class="text-center">{% trans "Name" %}</th>
+                <th class="text-center">{% trans "Creator" %}</th>
+                <th class="text-center">{% trans "Fleet" %}</th>
+                <th class="text-center">{% trans "Eve Time" %}</th>
+                <th class="text-center">{% trans "Duration" %}</th>
+                <th class="text-center">{% trans "Edit" %}</th>
+            </tr>
+            {% for link in fatlinks %}
+            <tr>
+                <td class="text-center"><a href="{%  url 'auth_click_fatlink_view' %}{{ link.hash }}/{{ link.name }}">{{ link.name }}</a></td>
+                <td class="text-center">{{ link.creator.username }}</td>
+                <td class="text-center">{{ link.fleet }}</td>
+                <td class="text-center">{{ link.fatdatetime }}</td>
+                <td class="text-center">{{ link.duration }}</td>
+                <td class="text-center">
+                    <a href="{%  url 'auth_modify_fatlink_view' %}{{ link.hash }}/{{ link.name }}" class="btn btn-info">
+                        <span class="glyphicon glyphicon-edit"></span>
+                    </a>
+                </td>
+            </tr>
+            {%  endfor %}
+
+        </table>
+        {% else %}
+        <div class="alert alert-warning text-center">No created fatlinks on record.</div>
+        {% endif %}
+        {% endif %}
+    </div>
+
+
+<script src="/static/js/dateformat.js"></script>
+
+{% endblock content %}

fleetactivitytracking/views.py

@@ -6,16 +6,17 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
 from django.core.exceptions import ValidationError
 from django.utils import timezone
-
+from django.contrib import messages
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from eveonline.models import EveCharacter
 from eveonline.models import EveCorporationInfo
 from eveonline.managers import EveManager
 from fleetactivitytracking.forms import FatlinkForm
 from fleetactivitytracking.models import Fatlink, Fat
 
-from slugify import slugify
+from esi.decorators import token_required
 
-from collections import OrderedDict
+from slugify import slugify
 
 import string
 import random
@@ -25,15 +26,27 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+FATS_PER_PAGE = int(getattr(settings, 'FATS_PER_PAGE', 20))
+
+def get_page(model_list, page_num):
+    p = Paginator(model_list, FATS_PER_PAGE)
+    try:
+        fats = p.page(page_num)
+    except PageNotAnInteger:
+        fatss = p.page(1)
+    except EmptyPage:
+        fatss = p.page(p.num_pages)
+    return fats
+
 
 class CorpStat(object):
-    def __init__(self, corp_id, corp=None, blue=False):
+    def __init__(self, corp_id, start_of_month, start_of_next_month, corp=None):
         if corp:
             self.corp = corp
         else:
             self.corp = EveCorporationInfo.objects.get(corporation_id=corp_id)
-        self.n_fats = 0
-        self.blue = blue
+        self.n_fats = Fat.objects.filter(character__corporation_id=self.corp.corporation_id).filter(fatlink__fatdatetime__gte=start_of_month).filter(fatlink__fatdatetime__lte=start_of_next_month).count()
+        self.blue = self.corp.is_blue
 
     def avg_fat(self):
         return "%.2f" % (float(self.n_fats) / float(self.corp.member_count))
@@ -69,7 +82,7 @@ def fatlink_view(request):
     else:
         context = {'user': user, 'fats': latest_fats}
 
-    return render(request, 'registered/fatlinkview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkview.html', context=context)
 
 
 @login_required
@@ -81,37 +94,38 @@ def fatlink_statistics_view(request, year=datetime.date.today().year, month=date
     start_of_next_month = first_day_of_next_month(year, month)
     start_of_previous_month = first_day_of_previous_month(year, month)
 
-    fatStats = OrderedDict()
+    fat_stats = {}
+    
 
-    if settings.IS_CORP:
-        fatStats[settings.CORP_NAME] = CorpStat(settings.CORP_ID)
-    else:
-        alliance_corps = EveCorporationInfo.objects.filter(alliance__alliance_id=settings.ALLIANCE_ID)
+    # get FAT stats for member corps
+    for corp_id in settings.STR_CORP_IDS:
+        fat_stats[corp_id] = CorpStat(corp_id, start_of_month, start_of_next_month)
+    for alliance_id in settings.STR_ALLIANCE_IDS:
+        alliance_corps = EveCorporationInfo.objects.filter(alliance__alliance_id=alliance_id)
         for corp in alliance_corps:
-            fatStats[corp.corporation_name] = CorpStat(corp.corporation_id, corp=corp)
+            fat_stats[corp.corporation_id] = CorpStat(corp.corporation_id, start_of_month, start_of_next_month)
 
-    fatlinks_in_span = Fatlink.objects.filter(fatdatetime__gte=start_of_month).filter(
-        fatdatetime__lt=start_of_next_month)
+    # get FAT stats for corps not in alliance
+    fats_in_span = Fat.objects.filter(fatlink__fatdatetime__gte=start_of_month).filter(
+        fatlink__fatdatetime__lt=start_of_next_month).exclude(character__corporation_id__in=fat_stats)
 
-    for fatlink in fatlinks_in_span:
-        fats_in_fatlink = Fat.objects.filter(fatlink=fatlink)
-        for fat in fats_in_fatlink:
-            fatStats.setdefault(fat.character.corporation_name,
-                                CorpStat(fat.character.corporation_id, blue=True)
-                                ).n_fats += 1
+    for fat in fats_in_span:
+        if not fat.character.corporation_id in fat_stats:
+            fat_stats[fat.character.corporation_id] = CorpStat(fat.character.corporation_id, start_of_month, start_of_next_month)
 
-    fatStatsList = [fatStat for corp_name, fatStat in fatStats.items()]
-    fatStatsList.sort(key=lambda stat: stat.corp.corporation_name)
-    fatStatsList.sort(key=lambda stat: (stat.n_fats, stat.n_fats / stat.corp.member_count), reverse=True)
+    # collect and sort stats
+    stat_list = [fat_stats[x] for x in fat_stats]
+    stat_list.sort(key=lambda stat: stat.corp.corporation_name)
+    stat_list.sort(key=lambda stat: (stat.n_fats, stat.n_fats / stat.corp.member_count), reverse=True)
 
     if datetime.datetime.now() > start_of_next_month:
-        context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year,
+        context = {'fatStats': stat_list, 'month': start_of_month.strftime("%B"), 'year': year,
                    'previous_month': start_of_previous_month, 'next_month': start_of_next_month}
     else:
-        context = {'fatStats': fatStatsList, 'month': start_of_month.strftime("%B"), 'year': year,
+        context = {'fatStats': stat_list, 'month': start_of_month.strftime("%B"), 'year': year,
                    'previous_month': start_of_previous_month}
 
-    return render(request, 'registered/fatlinkstatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkstatisticsview.html', context=context)
 
 
 @login_required
@@ -139,7 +153,7 @@ def fatlink_personal_statistics_view(request, year=datetime.date.today().year, m
     else:
         context = {'user': user, 'monthlystats': monthlystats, 'year': year, 'previous_year': year - 1}
 
-    return render(request, 'registered/fatlinkpersonalstatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkpersonalstatisticsview.html', context=context)
 
 
 @login_required
@@ -173,55 +187,58 @@ def fatlink_monthly_personal_statistics_view(request, year, month, char_id=None)
     context["created_fats"] = created_fats
     context["n_created_fats"] = len(created_fats)
 
-    return render(request, 'registered/fatlinkpersonalmonthlystatisticsview.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html', context=context)
 
 
 @login_required
-def click_fatlink_view(request, hash, fatname):
-    # Take IG-header data and register the fatlink if not existing already.
-    # use obj, created = Fat.objects.get_or_create()
-    # onload="CCPEVE.requestTrust('http://www.mywebsite.com')"
+@token_required(scopes=['esi-location.read_location.v1', 'esi-location.read_ship_type.v1', 'esi-universe.read_structures.v1'])
+def click_fatlink_view(request, token, hash, fatname):
+    try:
+        fatlink = Fatlink.objects.filter(hash=hash)[0]
 
-    if 'HTTP_EVE_TRUSTED' in request.META and request.META['HTTP_EVE_TRUSTED'] == "Yes":
-        # Retrieve the latest fatlink using the hash.
-        try:
-            fatlink = Fatlink.objects.filter(hash=hash)[0]
+        if (timezone.now() - fatlink.fatdatetime) < datetime.timedelta(seconds=(fatlink.duration * 60)):
 
-            if (timezone.now() - fatlink.fatdatetime) < datetime.timedelta(seconds=(fatlink.duration * 60)):
+            character = EveManager.get_character_by_id(token.character_id)
 
-                character = EveManager.get_character_by_id(request.META['HTTP_EVE_CHARID'])
-
-                if character:
-                    fat = Fat()
-                    fat.system = request.META['HTTP_EVE_SOLARSYSTEMNAME']
-                    if 'HTTP_EVE_STATIONNAME' in request.META:
-                        fat.station = request.META['HTTP_EVE_STATIONNAME']
-                    else:
-                        fat.station = "No Station"
-                    fat.shiptype = request.META['HTTP_EVE_SHIPTYPENAME']
-                    fat.fatlink = fatlink
-                    fat.character = character
-                    fat.user = character.user
-                    try:
-                        fat.full_clean()
-                        fat.save()
-                        context = {'trusted': True, 'registered': True}
-                    except ValidationError as e:
-                        messages = []
-                        for errorname, message in e.message_dict.items():
-                            messages.append(message[0].decode())
-                        context = {'trusted': True, 'errormessages': messages}
+            if character:
+                # get data
+                c = token.get_esi_client()
+                location = c.Location.get_characters_character_id_location(character_id=token.character_id).result()
+                ship = c.Location.get_characters_character_id_ship(character_id=token.character_id).result()
+                location['solar_system_name'] = c.Universe.get_universe_systems_system_id(system_id=location['solar_system_id']).result()['solar_system_name']
+                if location['structure_id']:
+                    location['station_name'] = c.Universe.get_universe_structures_structure_id(structure_id=location['structure_id']).result()['name']
+                elif location['station_id']:
+                    location['station_name'] = c.Universe.get_universe_stations_station_id(station_id=location['station_id']).result()['station_name']
                 else:
-                    context = {'character_id': request.META['HTTP_EVE_CHARID'],
-                               'character_name': request.META['HTTP_EVE_CHARNAME']}
-                    return render(request, 'public/characternotexisting.html', context=context)
+                    location['station_name'] = "No Station"
+                ship['ship_type_name'] = c.Universe.get_universe_types_type_id(type_id=ship['ship_type_id']).result()['type_name']
+
+                fat = Fat()
+                fat.system = location['solar_system_name']
+                fat.station = location['station_name']
+                fat.shiptype = ship['ship_type_name']
+                fat.fatlink = fatlink
+                fat.character = character
+                fat.user = character.user
+                try:
+                    fat.full_clean()
+                    fat.save()
+                    messages.success(request, 'Fleet participation registered.')
+                except ValidationError as e:
+                    err_messages = []
+                    for errorname, message in e.message_dict.items():
+                        err_messages.append(message[0].decode())
+                    messages.error(request, ' '.join(err_messages))
             else:
-                context = {'trusted': True, 'expired': True}
-        except ObjectDoesNotExist:
-            context = {'trusted': True}
-    else:
-        context = {'trusted': False, 'fatname': fatname}
-    return render(request, 'public/clickfatlinkview.html', context=context)
+                context = {'character_id': token.character_id,
+                           'character_name': token.character_name}
+                return render(request, 'fleetactivitytracking/characternotexisting.html', context=context)
+        else:
+            messages.error(request, 'FAT link has expired.')
+    except (ObjectDoesNotExist, KeyError):
+        messages.error(request, 'Invalid FAT link.')
+    return redirect('auth_fatlink_view')
 
 
 @login_required
@@ -250,7 +267,7 @@ def create_fatlink_view(request):
                     for errorname, message in e.message_dict.items():
                         messages.append(message[0].decode())
                     context = {'form': form, 'errormessages': messages}
-                    return render(request, 'registered/fatlinkformatter.html', context=context)
+                    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
             else:
                 form = FatlinkForm()
                 context = {'form': form, 'badrequest': True}
@@ -263,7 +280,7 @@ def create_fatlink_view(request):
 
     context = {'form': form}
 
-    return render(request, 'registered/fatlinkformatter.html', context=context)
+    return render(request, 'fleetactivitytracking/fatlinkformatter.html', context=context)
 
 
 @login_required
@@ -271,24 +288,26 @@ def create_fatlink_view(request):
 def modify_fatlink_view(request, hash=""):
     logger.debug("modify_fatlink_view called by user %s" % request.user)
     if not hash:
-        return redirect('/fat/')
+        return redirect('auth_fatlink_view')
 
     fatlink = Fatlink.objects.filter(hash=hash)[0]
 
-    if request.GET.get('removechar'):
+    if request.GET.get('removechar', None):
         character_id = request.GET.get('removechar')
         character = EveCharacter.objects.get(character_id=character_id)
         logger.debug("Removing character %s from fleetactivitytracking  %s" % (character.character_name, fatlink.name))
 
         Fat.objects.filter(fatlink=fatlink).filter(character=character).delete()
 
-    if request.GET.get('deletefat'):
+    if request.GET.get('deletefat', None):
         logger.debug("Removing fleetactivitytracking  %s" % fatlink.name)
         fatlink.delete()
-        return redirect('/fat/')
+        return redirect('auth_fatlink_view')
 
-    registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character')
+    registered_fats = Fat.objects.filter(fatlink=fatlink).order_by('character__character_name')
 
-    context = {'fatlink': fatlink, 'registered_fats': registered_fats}
+    fat_page = get_page(registered_fats, request.GET.get('page', 1))
 
-    return render(request, 'registered/fatlinkmodify.html', context=context)
+    context = {'fatlink': fatlink, 'registered_fats': fat_page}
+
+    return render(request, 'fleetactivitytracking/fatlinkmodify.html', context=context)