mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 20:40:17 +02:00
Added Fleet Operations Timer
This commit is contained in:
parent
69fb154d1a
commit
6fb70b3160
@ -170,6 +170,10 @@ urlpatterns = patterns('',
|
|||||||
url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'),
|
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'^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'),
|
url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
|
||||||
|
|
||||||
|
|
||||||
|
# Fleet Operations Timers
|
||||||
|
url(r'^optimer/$', 'optimer.views.optimer_view', name='auth_optimer_view'),
|
||||||
|
url(r'^add_optimer/$', 'optimer.views.add_optimer_view', name='auth_add_optimer_view'),
|
||||||
|
url(r'^remove_optimer/(\w+)', 'optimer.views.remove_optimer', name='auth_remove_optimer'),
|
||||||
|
|
||||||
)
|
)
|
||||||
|
0
optimer/__init__.py
Normal file
0
optimer/__init__.py
Normal file
6
optimer/admin.py
Normal file
6
optimer/admin.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
from models import optimer
|
||||||
|
|
||||||
|
admin.site.register(optimer)
|
||||||
|
# Register your models here.
|
20
optimer/form.py
Normal file
20
optimer/form.py
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
from django import forms
|
||||||
|
from django.core.validators import MaxValueValidator, MinValueValidator
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class opForm(forms.Form):
|
||||||
|
|
||||||
|
doctrine = forms.CharField(max_length=254, required=True, label='Doctrine')
|
||||||
|
system = forms.CharField(max_length=254, required=True, label="System")
|
||||||
|
location = forms.CharField(max_length=254, required=True, label="Location")
|
||||||
|
start_time = forms.CharField(max_length=254, required=True, label="Start Time")
|
||||||
|
end_time = forms.CharField(max_length=254, required=True, label="End Time")
|
||||||
|
operation_name = forms.CharField(max_length=254, required=True, label="Operation Name")
|
||||||
|
fc = forms.CharField(max_length=254, required=True, label="Fleet Commander")
|
||||||
|
details = forms.CharField(max_length=254, required=False, label="Extra Details")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
21
optimer/models.py
Normal file
21
optimer/models.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
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 optimer(models.Model):
|
||||||
|
class Meta:
|
||||||
|
ordering = ['start_time']
|
||||||
|
doctrine = models.CharField(max_length=254, default="")
|
||||||
|
system = models.CharField(max_length=254, default="")
|
||||||
|
location = models.CharField(max_length=254, default="")
|
||||||
|
start_time = models.CharField(max_length=254, default="")
|
||||||
|
end_time = models.CharField(max_length=254, default="")
|
||||||
|
operation_name = models.CharField(max_length=254, default="")
|
||||||
|
fc = models.CharField(max_length=254, default="")
|
||||||
|
details = models.CharField(max_length=254, default="")
|
||||||
|
post_time = models.DateTimeField(default=timezone.now)
|
||||||
|
eve_character = models.ForeignKey(EveCharacter)
|
||||||
|
|
1
optimer/tests.py
Normal file
1
optimer/tests.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# Create your tests here.
|
82
optimer/views.py
Normal file
82
optimer/views.py
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
|
||||||
|
|
||||||
|
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 opForm
|
||||||
|
from models import optimer
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def optimer_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(optimer_util_test)
|
||||||
|
@permission_required('auth.optimer_view')
|
||||||
|
def optimer_view(request):
|
||||||
|
logger.info("optimer_view called by user %s" % request.user)
|
||||||
|
optimer_list = optimer.objects.all()
|
||||||
|
render_items = {'optimer': optimer.objects.all(),}
|
||||||
|
|
||||||
|
return render_to_response('registered/operationmanagement.html', render_items, context_instance=RequestContext(request))
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
@permission_required('auth.optimer_management')
|
||||||
|
def add_optimer_view(request):
|
||||||
|
logger.info("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())
|
||||||
|
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
|
||||||
|
op = optimer()
|
||||||
|
op.doctrine = form.cleaned_data['doctrine']
|
||||||
|
op.system = form.cleaned_data['system']
|
||||||
|
op.location = form.cleaned_data['location']
|
||||||
|
op.start_time = form.cleaned_data['start_time']
|
||||||
|
op.end_time = form.cleaned_data['end_time']
|
||||||
|
op.operation_name = form.cleaned_data['operation_name']
|
||||||
|
op.fc = form.cleaned_data['fc']
|
||||||
|
op.details = form.cleaned_data['details']
|
||||||
|
op.create_time = post_time
|
||||||
|
op.eve_character = character
|
||||||
|
op.save()
|
||||||
|
return HttpResponseRedirect("/optimer/")
|
||||||
|
else:
|
||||||
|
logger.info("Returning new opForm")
|
||||||
|
form = opForm()
|
||||||
|
|
||||||
|
render_items = {'form': form}
|
||||||
|
|
||||||
|
return render_to_response('registered/addoperation.html', render_items, context_instance=RequestContext(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))
|
||||||
|
if optimer.objects.filter(id=optimer_id).exists():
|
||||||
|
op = optimer.objects.get(id=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))
|
||||||
|
return HttpResponseRedirect("/optimer/")
|
@ -140,11 +140,17 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if perms.auth.member or perms.auth.blue_member %}
|
{% if perms.auth.member or perms.auth.blue_member %}
|
||||||
<li>
|
<li>
|
||||||
<a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
|
<a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
|
||||||
href="{% url 'auth_signature_view' %}"><i
|
href="{% url 'auth_signature_view' %}"><i
|
||||||
class="fa fa-compass fa-fw grayiconecolor"></i> Signature Tracker</a>
|
class="fa fa-compass fa-fw grayiconecolor"></i> Signature Tracker</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<a {% ifequal request.path "/optimer" %} class="active" {% endifequal %}
|
||||||
|
href="{% url 'auth_optimer_view' %}"><i
|
||||||
|
class="fa fa-compass fa-fw grayiconecolor"></i> Fleet Operations</a>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
|
||||||
{% if perms.auth.timer_view %}
|
{% if perms.auth.timer_view %}
|
||||||
|
38
stock/templates/registered/addoperation.html
Normal file
38
stock/templates/registered/addoperation.html
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
{% extends "public/base.html" %}
|
||||||
|
{% load bootstrap %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
|
{% block title %}Alliance Auth - Fleet Operation Create{% endblock %}
|
||||||
|
|
||||||
|
{% block page_title %}Create Operation{% 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 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">Create Fleet Operation</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 %}
|
70
stock/templates/registered/operationmanagement.html
Normal file
70
stock/templates/registered/operationmanagement.html
Normal file
@ -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 %}
|
||||||
|
<div class="col-lg-12">
|
||||||
|
<h1 class="page-header text-center">Fleet Operation Timers
|
||||||
|
<div class="text-right">
|
||||||
|
<a href="{% url 'auth_add_optimer_view' %}">
|
||||||
|
{% if perms.auth.optimer_management %}
|
||||||
|
<button type="button" class="btn btn-success">Create Operation</button>
|
||||||
|
{% endif %}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</h1>
|
||||||
|
<table class="table table-responsive table-bordered">
|
||||||
|
<tr>
|
||||||
|
<th class="text-center">Operation Name</th>
|
||||||
|
<th class="text-center">System</th>
|
||||||
|
<th class="text-center">Form Up Location</th>
|
||||||
|
<th class="text-center">Start Time</th>
|
||||||
|
<th class="text-center">End Time</th>
|
||||||
|
<th class="text-center">FC</th>
|
||||||
|
<th class="text-center">Details</th>
|
||||||
|
<th class="text-center">Post Time</th>
|
||||||
|
{% if perms.auth.optimer_management %}
|
||||||
|
<th class="text-center">Creator</th>
|
||||||
|
<th class="text-center">Action</th>
|
||||||
|
{% endif %}
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
{% for ops in optimer %}
|
||||||
|
<tr>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.operation_name }}</td>
|
||||||
|
|
||||||
|
<td class="text-center">
|
||||||
|
<a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
|
||||||
|
</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.location }}</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.start_time }}</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.end_time }}</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.fc }}</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.details }}</td>
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.post_time}}</td>
|
||||||
|
{% if perms.auth.optimer_management %}
|
||||||
|
<td style="width:150px" class="text-center">{{ ops.eve_character }}</td>
|
||||||
|
<td class="text-center">
|
||||||
|
<a href="/remove_optimer/{{ 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 %}
|
@ -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="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_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="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_AUTH_GROUP)
|
||||||
Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
|
Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
|
||||||
logger.info("Bootstrapped permissions for auth and created default groups.")
|
logger.info("Bootstrapped permissions for auth and created default groups.")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user