diff --git a/allianceauth/optimer/auth_hooks.py b/allianceauth/optimer/auth_hooks.py index 686bd4d4..e04fa524 100644 --- a/allianceauth/optimer/auth_hooks.py +++ b/allianceauth/optimer/auth_hooks.py @@ -32,7 +32,7 @@ def register_url(): class NextOpsHook(hooks.DashboardItemHook): - def __init__(self): #TODO add the view permms so if they cant see it is not rendered + def __init__(self): #TODO add the view perms so if they cant see it is not rendered hooks.DashboardItemHook.__init__( self, dashboard_ops, diff --git a/allianceauth/optimer/templates/optimer/dashboard.ops.html b/allianceauth/optimer/templates/optimer/dashboard.ops.html index b271c591..ddcd3cdd 100644 --- a/allianceauth/optimer/templates/optimer/dashboard.ops.html +++ b/allianceauth/optimer/templates/optimer/dashboard.ops.html @@ -16,22 +16,23 @@ {% translate "Start Time" %} + - {% for ops in timers %} - - - {{ ops.operation_name }} - - - ({{ ops.type }}) - - - {{ ops.system }} - - {{ ops.start | date:"Y-m-d H:i" }} - - {% endfor %} - + {% for ops in timers %} + + + {{ ops.operation_name }} + + + ({{ ops.type }}) + + + {{ ops.system }} + + {{ ops.start | date:"Y-m-d H:i" }} + + {% endfor %} + diff --git a/allianceauth/optimer/templates/optimer/fleetoptable.html b/allianceauth/optimer/templates/optimer/fleetoptable.html index 35f15244..ef145092 100644 --- a/allianceauth/optimer/templates/optimer/fleetoptable.html +++ b/allianceauth/optimer/templates/optimer/fleetoptable.html @@ -14,6 +14,7 @@ {% translate "Local Time" %} {% translate "Duration" %} {% translate "FC" %} + {% if perms.auth.optimer_management %} {# {% translate "Creator" %}#} {% translate "Action" %} @@ -26,6 +27,7 @@ {{ ops.operation_name }} + {% if ops.type %}
({{ ops.type }}) {% endif %} diff --git a/allianceauth/optimer/templates/optimer/management.html b/allianceauth/optimer/templates/optimer/management.html index 5673cc48..9a3ecde9 100644 --- a/allianceauth/optimer/templates/optimer/management.html +++ b/allianceauth/optimer/templates/optimer/management.html @@ -35,7 +35,7 @@
{% if future_timers %} - {% include "optimer/fleetoptable.html" with timers=next_timers %} + {% include "optimer/fleetoptable.html" with timers=future_timers %} {% else %}
{% translate "No upcoming timers." %}
{% endif %} @@ -108,9 +108,7 @@ * @param timer Timer information */ const setLocalTime = (timer) => { - document.getElementById( - "localtime" + timer.id).innerHTML = timer.start.format("ddd @ LT") - ; + document.getElementById("localtime" + timer.id).innerHTML = timer.start.format("ddd @ LT"); }; /** diff --git a/allianceauth/optimer/views.py b/allianceauth/optimer/views.py index 3ebcf863..f3627e89 100644 --- a/allianceauth/optimer/views.py +++ b/allianceauth/optimer/views.py @@ -18,6 +18,15 @@ logger = logging.getLogger(__name__) @login_required @permission_required('auth.optimer_view') def optimer_view(request): + """ + View for the optimer management page + + :param request: + :type request: + :return: + :rtype: + """ + logger.debug("optimer_view called by user %s" % request.user) base_query = OpTimer.objects.select_related('eve_character', 'type') render_items = {'optimer': base_query.all(), @@ -32,7 +41,17 @@ def optimer_view(request): @login_required @permission_required('auth.optimer_management') def add_optimer_view(request): + """ + View for the add optimer page + + :param request: + :type request: + :return: + :rtype: + """ + logger.debug("add_optimer_view called by user %s" % request.user) + if request.method == 'POST': form = OpForm(request.POST, data_list=OpTimerType.objects.all()) logger.debug("Request type POST contains form valid: %s" % form.is_valid()) @@ -81,19 +100,43 @@ def add_optimer_view(request): @login_required @permission_required('auth.optimer_management') def remove_optimer(request, optimer_id): + """ + Remove optimer + + :param request: + :type request: + :param optimer_id: + :type optimer_id: + :return: + :rtype: + """ + logger.debug(f"remove_optimer called by user {request.user} for operation id {optimer_id}") op = get_object_or_404(OpTimer, id=optimer_id) op.delete() logger.info(f"Deleting optimer id {optimer_id} by user {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): + """ + Edit optimer + + :param request: + :type request: + :param optimer_id: + :type optimer_id: + :return: + :rtype: + """ + logger.debug(f"edit_optimer called by user {request.user} for optimer id {optimer_id}") op = get_object_or_404(OpTimer, id=optimer_id) + if request.method == 'POST': form = OpForm(request.POST, data_list=OpTimerType.objects.all()) logger.debug("Received POST request containing update optimer form, is valid: %s" % form.is_valid()) @@ -141,8 +184,18 @@ def edit_optimer(request, optimer_id): def dashboard_ops(request): + """ + Returns the next five upcoming ops for the dashboard + + :param request: + :type request: + :return: + :rtype: + """ + base_query = OpTimer.objects.select_related('eve_character', 'type') timers = base_query.filter(start__gte=timezone.now())[:5] + if timers.count(): context = { 'timers': timers,