Added srp program features, updated hr applications to support adding a "mark in progress"

This commit is contained in:
Raynaldo Rivera 2014-11-26 22:09:57 -07:00
parent eb723254f2
commit cce15d1667
19 changed files with 516 additions and 47 deletions

View File

@ -95,6 +95,7 @@ Special Permissions In Admin:
auth | user | blue_member ( Auto Added to people who register has a blue when adding api key)
auth | user | corp_stats (View basic corp auth stats *who is authed etc*)
auth | user | timer_management ( Access to create and remove timers)
auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data)
Beta Testers/ Bug Fixers:

View File

@ -53,6 +53,7 @@ INSTALLED_APPS = (
'groupmanagement',
'hrapplications',
'timerboard',
'srp',
)
MIDDLEWARE_CLASSES = (

View File

@ -81,6 +81,9 @@ urlpatterns = patterns('',
name="auth_hrapplication_reject"),
url(r'hr_application_search/', 'hrapplications.views.hr_application_search',
name="auth_hrapplication_search"),
url(r'hr_mark_in_progress/(\w+)', 'hrapplications.views.hr_application_mark_in_progress',
name="auth_hrapplication_mark_in_progress"),
# Service Urls
url(r'^services/', 'services.views.services_view', name='auth_services'),
@ -130,4 +133,13 @@ urlpatterns = patterns('',
url(r'^timers/$', 'timerboard.views.timer_view', name='auth_timer_view'),
url(r'^add_timer/$', 'timerboard.views.add_timer_view', name='auth_add_timer_view'),
url(r'^remove_timer/(\w+)', 'timerboard.views.remove_timer', name='auth_remove_timer'),
# SRP URLS
url(r'^srp/$', 'srp.views.srp_management', name='auth_srp_management_view'),
url(r'^srp_fleet_view/(\w+)$', 'srp.views.srp_fleet_view', name='auth_srp_fleet_view'),
url(r'^srp_fleet_add_view/$', 'srp.views.srp_fleet_add_view', name='auth_srp_fleet_add_view'),
url(r'^srp_fleet_remove/(\w+)$', 'srp.views.srp_fleet_remove', name='auth_srp_flet_remove'),
url(r'^srp_request/(\w+)', 'srp.views.srp_request_view', name='auth_srp_request_view'),
url(r'^srp_request_remove/(\w+)', 'srp.views.srp_request_remove',
name="auth_srp_request_remove"),
)

View File

@ -19,6 +19,8 @@ class HRApplication(models.Model):
approved_denied = models.NullBooleanField(blank=True, null=True)
reviewer_user = models.ForeignKey(User, blank=True, null=True, related_name="review_user")
reviewer_character = models.ForeignKey(EveCharacter, blank=True, null=True)
reviewer_inprogress_character = models.ForeignKey(EveCharacter, blank=True, null=True,
related_name="inprogress_character")
def __str__(self):
return self.character_name + " - Application"

View File

@ -178,3 +178,15 @@ def hr_application_search(request):
context, context_instance=RequestContext(request))
else:
return HttpResponseRedirect("/hr_application_management/")
@login_required
@permission_required('auth.human_resources')
def hr_application_mark_in_progress(request, app_id):
if HRApplication.objects.filter(id=app_id).exists():
auth_info = AuthServicesInfo.objects.get(user=request.user)
application = HRApplication.objects.get(id=app_id)
application.reviewer_inprogress_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
application.save()
return HttpResponseRedirect("/hr_application_view/" + str(app_id))

View File

@ -7,7 +7,6 @@ from authentication.managers import AuthServicesInfoManager
# Create your views here.
def index_view(request):
return render_to_response('public/index.html', None, context_instance=RequestContext(request))

0
srp/__init__.py Executable file
View File

8
srp/admin.py Executable file
View File

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

12
srp/form.py Executable file
View File

@ -0,0 +1,12 @@
from django import forms
class SrpFleetMainForm(forms.Form):
fleet_name = forms.CharField(required=True, label="Fleet Name")
fleet_time = forms.DateTimeField(required=True, label="Fleet Time")
fleet_doctrine = forms.CharField(required=True, label="Fleet Doctrine")
class SrpFleetUserRequestForm(forms.Form):
killboard_link = forms.CharField(required=True, label="Killboard Link")
additional_info = forms.CharField(required=False, label="Additional Info")

24
srp/models.py Executable file
View File

@ -0,0 +1,24 @@
from django.db import models
from eveonline.models import EveCharacter
class SrpFleetMain(models.Model):
fleet_name = models.CharField(max_length=254, default="")
fleet_doctrine = models.CharField(max_length=254, default="")
fleet_time = models.DateTimeField()
fleet_srp_code = models.CharField(max_length=254, default="", unique=True)
fleet_commander = models.ForeignKey(EveCharacter)
def __str__(self):
return self.fleet_name + " - SrpFleetMain"
class SrpUserRequest(models.Model):
killboard_link = models.CharField(max_length=254, default="")
additional_info = models.CharField(max_length=254, default="")
character = models.ForeignKey(EveCharacter)
srp_fleet_main = models.ForeignKey(SrpFleetMain)
def __str__(self):
return self.character.character_name + " - SrpUserRequest"

1
srp/tests.py Executable file
View File

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

133
srp/views.py Executable file
View File

@ -0,0 +1,133 @@
from django.template import RequestContext
from django.http import HttpResponseRedirect
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 random_string
from eveonline.managers import EveManager
from authentication.managers import AuthServicesInfoManager
from util import check_if_user_has_permission
from models import SrpFleetMain
from models import SrpUserRequest
from form import SrpFleetMainForm
from form import SrpFleetUserRequestForm
def srp_util_test(user):
return check_if_user_has_permission(user, 'alliance_member') or check_if_user_has_permission(user, 'blue_member')
@login_required
@user_passes_test(srp_util_test)
def srp_management(request):
context = {"srpfleets": SrpFleetMain.objects.all()}
return render_to_response('registered/srpmanagement.html', context, context_instance=RequestContext(request))
@login_required
@user_passes_test(srp_util_test)
def srp_fleet_view(request, fleet_id):
if SrpFleetMain.objects.filter(id=fleet_id):
fleet_main = SrpFleetMain.objects.get(id=fleet_id)
context = {"srpfleetrequests": SrpUserRequest.objects.filter(srp_fleet_main=fleet_main)}
return render_to_response('registered/srpfleetdata.html', context, context_instance=RequestContext(request))
else:
return HttpResponseRedirect("/srp")
@login_required
@permission_required('auth.srp_management')
def srp_fleet_add_view(request):
completed = False
completed_srp_code = ""
if request.method == 'POST':
form = SrpFleetMainForm(request.POST)
if form.is_valid():
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
character = EveManager.get_character_by_id(authinfo.main_char_id)
srp_fleet_main = SrpFleetMain()
srp_fleet_main.fleet_name = form.cleaned_data['fleet_name']
srp_fleet_main.fleet_doctrine = form.cleaned_data['fleet_doctrine']
srp_fleet_main.fleet_time = form.cleaned_data['fleet_time']
srp_fleet_main.fleet_srp_code = random_string(8)
srp_fleet_main.fleet_commander = character
srp_fleet_main.save()
completed = True
completed_srp_code = srp_fleet_main.fleet_srp_code
else:
form = SrpFleetMainForm()
render_items = {'form': form, "completed": completed, "completed_srp_code": completed_srp_code}
return render_to_response('registered/srpfleetadd.html', render_items, context_instance=RequestContext(request))
@login_required
@permission_required('auth.srp_management')
def srp_fleet_remove(request, fleet_id):
if SrpFleetMain.objects.filter(id=fleet_id).exists():
srpfleetmain = SrpFleetMain.objects.get(id=fleet_id)
srpfleetmain.delete()
return HttpResponseRedirect("/srp")
@login_required
@user_passes_test(srp_util_test)
def srp_request_view(request, fleet_srp):
completed = False
no_srp_code = False
srp_code = ""
if SrpFleetMain.objects.filter(fleet_srp_code=fleet_srp).exists() is False:
no_srp_code = True
if request.method == 'POST':
form = SrpFleetUserRequestForm(request.POST)
if form.is_valid():
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
character = EveManager.get_character_by_id(authinfo.main_char_id)
srp_fleet_main = SrpFleetMain.objects.get(fleet_srp_code=fleet_srp)
srp_request = SrpUserRequest()
srp_request.killboard_link = form.cleaned_data['killboard_link']
srp_request.additional_info = form.cleaned_data['additional_info']
srp_request.character = character
srp_request.srp_fleet_main = srp_fleet_main
srp_request.save()
completed = True
else:
form = SrpFleetUserRequestForm()
render_items = {'form': form, "completed": completed, "no_srp_code": no_srp_code}
return render_to_response('registered/srpfleetrequest.html', render_items, context_instance=RequestContext(request))
@login_required
@permission_required('auth.srp_management')
def srp_request_remove(request, srp_request_id):
stored_fleet_view = None
if SrpUserRequest.objects.filter(id=srp_request_id).exists():
srpuserrequest = SrpUserRequest.objects.get(id=srp_request_id)
stored_fleet_view = srpuserrequest.srp_fleet_main.id
srpuserrequest.delete()
if stored_fleet_view is None:
return HttpResponseRedirect("/srp")
else:
return HttpResponseRedirect("/srp_fleet_view/" + str(stored_fleet_view))

View File

@ -63,17 +63,19 @@
href="{% url 'auth_dashboard' %}"><i
class="fa fa-dashboard fa-fw grayiconecolor"></i> Dashboard</a>
</li>
<li>
<a {% ifequal request.path "/characters/" %} class="active" {% endifequal %}
href="{% url 'auth_characters' %}"><i
class="fa fa-users fa-fw grayiconecolor"></i> Characters</a>
</li>
<li>
<a {% ifequal request.path "/api_key_management/" %} class="active" {% endifequal %}
href="{% url 'auth_api_key_management' %}"><i
class="fa fa-key fa-fw grayiconecolor"></i> Api Keys</a>
</li>
<li>
<a {% ifequal request.path "/characters/" %} class="active" {% endifequal %}
href="{% url 'auth_characters' %}"><i
class="fa fa-users fa-fw grayiconecolor"></i> Characters</a>
</li>
{% if perms.auth.alliance_member %}
<li>
<a {% ifequal request.path "/groups/" %} class="active" {% endifequal %}
@ -81,17 +83,22 @@
class="fa fa-cogs fa-sitemap grayiconecolor"></i> Groups</a>
</li>
{% endif %}
<li>
<a {% ifequal request.path "/help/" %} class="active" {% endifequal %}
href="{% url 'auth_help' %}"><i
class="fa fa-question fa-fw grayiconecolor"></i> Help</a>
</li>
<li class="text-center divider-horizontal">
<h5>Aux Navigation</h5>
</li>
{% if perms.auth.alliance_member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/services/" %} class="active" {% endifequal %}
href="{% url 'auth_services' %}"><i
class="fa fa-cogs fa-fw grayiconecolor"></i> Services</a>
</li>
<li>
<a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}
href="{% url 'auth_timer_view' %}"><i
class="fa fa-clock-o fa-fw grayiconecolor"></i> OP Timers</a>
class="fa fa-cogs fa-fw grayiconecolor"></i> Alliance Services</a>
</li>
{% endif %}
@ -104,11 +111,39 @@
</li>
{% endif %}
{% if perms.auth.corp_stats %}
<li>
<a {% ifequal request.path "/help/" %} class="active" {% endifequal %}
href="{% url 'auth_help' %}"><i
class="fa fa-question fa-fw grayiconecolor"></i> Help</a>
<a {% ifequal request.path "/corporation_stats" %} class="active" {% endifequal %}
href="{% url 'auth_corp_stats' %}"><i
class="fa fa-share-alt fa-fw grayiconecolor"></i> Corporation Stats</a>
</li>
{% endif %}
{% if perms.auth.group_management %}
<li>
<a {% ifequal request.path "/user/group_management/" %} class="active" {% endifequal %}
href="{% url 'auth_group_management' %}"><i
class="fa fa-lock fa-sitemap grayiconecolor"></i> Group Management</a>
</li>
{% endif %}
{% if perms.auth.alliance_member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}
href="{% url 'auth_timer_view' %}"><i
class="fa fa-clock-o fa-fw grayiconecolor"></i> OP Timers</a>
</li>
<li>
<a {% ifequal request.path "/srp/" %} class="active" {% endifequal %}
href="{% url 'auth_srp_management_view' %}"><i
class="fa fa-money fa-fw grayiconecolor"></i> Ship Replacement</a>
</li>
{% endif %}
<li class="text-center divider-horizontal">
<h5>Util</h5>
@ -127,21 +162,6 @@
class="fa fa-space-shuttle fa-fw grayiconecolor"></i> Fleet Broadcast Formatter</a>
</li>
{% endif %}
{% if perms.auth.corp_stats %}
<li>
<a {% ifequal request.path "/corporation_stats" %} class="active" {% endifequal %}
href="{% url 'auth_corp_stats' %}"><i
class="fa fa-share-alt fa-fw grayiconecolor"></i> Corporation Stats</a>
</li>
{% endif %}
{% if perms.auth.group_management %}
<li>
<a {% ifequal request.path "/user/group_management/" %} class="active" {% endifequal %}
href="{% url 'auth_group_management' %}"><i
class="fa fa-lock fa-sitemap grayiconecolor"></i> Group Management</a>
</li>
{% endif %}
{% if perms.auth.jabber_broadcast %}
<li>
@ -151,6 +171,7 @@
</li>
{% endif %}
</ul>
</div>
<!-- /.sidebar-collapse -->
</div>

View File

@ -28,15 +28,16 @@
{% endif %}
</div>
</div>
<div class="form-group">
<label class="control-label " for="id_extra">Reviewer</label>
<div class=" ">
{% if application.reviewer_character == None %}
{% if application.reviewer_inprogress_character == None %}
<div class="alert alert-info" role="alert">pending</div>
{% else %}
<div class="alert alert-info"
role="alert">{{ application.reviewer_character.character_name }}</div>
role="alert">{{ application.reviewer_inprogress_character.character_name }}</div>
{% endif %}
</div>
</div>
@ -110,7 +111,9 @@
<label class="control-label text-center" for="id_extra">Actions</label>
<div class="container-fluid well">
<div class="row text-center">
{% if application.reviewer_inprogress_character != None %}
<a href="/hr_application_approve/{{ application.id }}">
<button type="button" class="btn btn-lg btn-success">Approve</button>
</a>
@ -122,6 +125,13 @@
<a href="/hr_application_remove/{{ application.id }}">
<button type="button" class="btn btn-lg btn-danger">Delete</button>
</a>
{% else %}
<a href="/hr_mark_in_progress/{{ application.id }}">
<button type="button" class="btn btn-lg btn-warning">Mark In Progress
</button>
</a>
{% endif %}
</div>
<br/>

View File

@ -0,0 +1,49 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth - SRP Fleet Create{% endblock %}
{% block page_title %}SRP Fleet Create{% 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 SRP Fleet</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if completed == False %}
<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 SRP Fleet</button>
</form>
{% else %}
<div class="alert alert-success" role="alert">Fleet Created Successfully!</div>
<div class="alert alert-info" role="alert">Give this <a
href="/srp_request/{{ completed_srp_code }}">Link</a> to the line members
</div>
<div class="alert alert-info" role="alert">
http://{{ request.get_host }}/srp_request/{{ completed_srp_code }}</div>
{% endif %}
</div>
</div>
</div>
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

View File

@ -0,0 +1,51 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Srp Fleet Data{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<div class="row">
<h1 class="page-header text-center">SRP Fleet Data
</h1>
<table class="table table-bordered">
<tr>
<th class="text-center">Pilot Name</th>
<th class="text-center">Killboard Link</th>
<th class="text-center">Additional Info</th>
{% if perms.auth.timer_management %}
<th class="text-center">Actions</th>
{% endif %}
</tr>
{% for srpfleetrequest in srpfleetrequests %}
<tr>
<td class="text-center">
<div class="label label-info">
{{ srpfleetrequest.character.character_name }}
</div>
</td>
<td class="text-center">
<a href="{{ srpfleetrequest.killboard_link }}"
target="_blank">{{ srpfleetrequest.killboard_link }}</a>
</td>
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
{% if perms.auth.timer_management %}
<td class="text-center">
<a href="/srp_request_remove/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
</td>
{% endif %}
</tr>
{% endfor %}
</table>
</div>
</div>
{% endblock content %}

View File

@ -0,0 +1,49 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth - SRP Request{% endblock %}
{% block page_title %}SRP Request{% 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 SRP Request</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if no_srp_code %}
<div class="alert alert-danger" role="alert">SRP Code Does Not Exist</div>
{% else %}
{% if completed == False %}
<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 SRP Request
</button>
</form>
{% else %}
<div class="alert alert-success" role="alert">SRP Request Successfully Submitted</div>
{% endif %}
{% endif %}
</div>
</div>
</div>
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

View File

@ -0,0 +1,73 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Srp Management{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<div class="row">
<h1 class="page-header text-center">SRP Management
<div class="text-right">
{% if perms.auth.timer_management %}
<a href="{% url 'auth_srp_fleet_add_view' %}">
<button type="button" class="btn btn-success">Add SRP Fleet</button>
</a>
{% endif %}
</div>
</h1>
<table class="table table-bordered">
<tr>
<th class="text-center">Fleet Name</th>
<th class="text-center">Fleet Time</th>
<th class="text-center">Fleet Doctrine</th>
<th class="text-center">Fleet Commander</th>
{% if perms.auth.timer_management %}
<th class="text-center">Fleet SRP Code</th>
{% endif %}
<th class="text-center">Actions</th>
</tr>
{% for srpfleet in srpfleets %}
<tr>
<td class="text-center">
<div class="label label-info">
{{ srpfleet.fleet_name }}
</div>
</td>
<td class="text-center">{{ srpfleet.fleet_time }}</td>
<td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
<td class="text-center">
<div class="label label-success">
{{ srpfleet.fleet_commander.character_name }}
</div>
</td>
{% if perms.auth.timer_management %}
<th class="text-center">
<div class="label label-danger">
{{ srpfleet.fleet_srp_code }}
</div>
</th>
{% endif %}
<td class="text-center">
<a href="/srp_fleet_view/{{ srpfleet.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
</a>
{% if perms.auth.timer_management %}
<a href="/srp_fleet_remove/{{ srpfleet.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endif %}
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
{% endblock content %}

View File

@ -1,3 +1,5 @@
import uuid
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import User
from django.contrib.auth.models import Group
@ -14,6 +16,7 @@ def bootstrap_permissions():
Permission.objects.get_or_create(codename="blue_member", content_type=ct, name="blue_member")
Permission.objects.get_or_create(codename="corp_stats", content_type=ct, name="corp_stats")
Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management")
Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management")
Group.objects.get_or_create(name=settings.DEFAULT_ALLIANCE_GROUP)
Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
@ -44,3 +47,11 @@ def check_if_user_has_permission(user, permission):
stored_permission, created = Permission.objects.get_or_create(codename=permission,
content_type=ct, name=permission)
return user.has_perm('auth.' + permission)
def random_string(string_length=10):
"""Returns a random string of length string_length."""
random = str(uuid.uuid4()) # Convert UUID format to a Python string.
random = random.upper() # Make all characters uppercase.
random = random.replace("-", "") # Remove the UUID '-'.
return random[0:string_length] # Return the random string.