diff --git a/optimer/form.py b/optimer/form.py index 6e476677..1edc995f 100644 --- a/optimer/form.py +++ b/optimer/form.py @@ -6,9 +6,7 @@ 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")) - location = forms.CharField(max_length=254, required=True, label=_("Location")) 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")) - details = forms.CharField(max_length=254, required=False, label=_("Extra Details")) diff --git a/optimer/migrations/0002_auto_20170413_0442.py b/optimer/migrations/0002_auto_20170413_0442.py new file mode 100644 index 00000000..1161bbe1 --- /dev/null +++ b/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', + ), + ] diff --git a/optimer/models.py b/optimer/models.py index 32670bf0..354d8dbe 100644 --- a/optimer/models.py +++ b/optimer/models.py @@ -13,12 +13,10 @@ class optimer(models.Model): doctrine = models.CharField(max_length=254, default="") system = models.CharField(max_length=254, default="") - location = 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="") - details = models.CharField(max_length=254, default="") post_time = models.DateTimeField(default=timezone.now) eve_character = models.ForeignKey(EveCharacter) diff --git a/optimer/views.py b/optimer/views.py index e10c35e7..6cf42652 100644 --- a/optimer/views.py +++ b/optimer/views.py @@ -22,7 +22,11 @@ logger = logging.getLogger(__name__) @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(), } + 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, 'registered/operationmanagement.html', context=render_items) @@ -44,12 +48,10 @@ def add_optimer_view(request): op = optimer() op.doctrine = form.cleaned_data['doctrine'] op.system = form.cleaned_data['system'] - op.location = form.cleaned_data['location'] 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.details = form.cleaned_data['details'] op.create_time = post_time op.eve_character = character op.save() @@ -93,12 +95,10 @@ def edit_optimer(request, optimer_id): character = EveManager.get_character_by_id(auth_info.main_char_id) op.doctrine = form.cleaned_data['doctrine'] op.system = form.cleaned_data['system'] - op.location = form.cleaned_data['location'] 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.details = form.cleaned_data['details'] op.eve_character = character logger.info("User %s updating optimer id %s " % (request.user, optimer_id)) op.save() @@ -108,12 +108,10 @@ def edit_optimer(request, optimer_id): data = { 'doctrine': op.doctrine, 'system': op.system, - 'location': op.location, 'start': op.start, 'duration': op.duration, 'operation_name': op.operation_name, 'fc': op.fc, - 'details': op.details, } form = opForm(initial=data) return render(request, 'registered/optimerupdate.html', context={'form': form}) diff --git a/stock/templates/registered/fleetoptable.html b/stock/templates/registered/fleetoptable.html new file mode 100644 index 00000000..954d2574 --- /dev/null +++ b/stock/templates/registered/fleetoptable.html @@ -0,0 +1,44 @@ +{% load i18n %} + +{% block content %} + + + + + + + + + + + {% if perms.auth.optimer_management %} + + + {% endif %} + + + {% for ops in timers %} + + + + + + + + + + {% if perms.auth.optimer_management %} + + + {% endif %} + + + {% endfor %} +
{% trans "Operation Name" %}{% trans "Doctrine" %}{% trans "Form Up System" %}{% trans "Start Time" %}{% trans "Local Time" %}{% trans "Duration" %}{% trans "FC" %}{% trans "Creator" %}{% trans "Action" %}
{{ ops.operation_name }}{{ ops.doctrine }} + {{ ops.system }} + {{ ops.start | date:"Y-m-d H:i" }}
{{ ops.duration }}{{ ops.fc }}{{ ops.eve_character }} + + + +
+{% endblock content %} diff --git a/stock/templates/registered/operationmanagement.html b/stock/templates/registered/operationmanagement.html index db4fa937..ae34b321 100644 --- a/stock/templates/registered/operationmanagement.html +++ b/stock/templates/registered/operationmanagement.html @@ -17,62 +17,26 @@ {% endif %} -
-
- {% trans "Current Eve Time:" %} -
-
-
- {% if optimer %} - - - - - - - - - - - - - {% if perms.auth.optimer_management %} - - - {% endif %} - - {% for ops in optimer %} - - - - - - - - - - - - {% if perms.auth.optimer_management %} - - - {% endif %} - - {% endfor %} - -
{% trans "Operation Name" %}{% trans "Doctrine" %}{% trans "Form Up System" %}{% trans "Form Up Location" %}{% trans "Start Time" %}{% trans "Local Time" %}{% trans "Duration" %}{% trans "FC" %}{% trans "Details" %}{% trans "Post Time" %}{% trans "Creator" %}{% trans "Action" %}
{{ ops.operation_name }}{{ ops.doctrine }} - {{ ops.system }} - {{ ops.location }}{{ ops.start | date:"Y-m-d H:i" }}
{{ ops.duration }}{{ ops.fc }}{{ ops.details }}{{ ops.post_time}}{{ ops.eve_character }} - - - - - - -
+
+
+ {% trans "Current Eve Time:" %} +
+
+
+ +

{% trans "Next Timers" %}

+ {% if future_timers %} + {% include "registered/fleetoptable.html" with timers=future_timers %} {% else %} -
{% trans "No fleet operations found." %}
+
{% trans "No upcoming timers." %}
+ {% endif %} + +

{% trans "Past Timers" %}

+ {% if past_timers %} + {% include "registered/fleetoptable.html" with timers=past_timers %} + {% else %} +
{% trans "No past timers." %}
{% endif %} diff --git a/timerboard/views.py b/timerboard/views.py index fe63c3c3..a2f645e4 100755 --- a/timerboard/views.py +++ b/timerboard/views.py @@ -40,14 +40,8 @@ def timer_view(request): else: corp_timers = [] timer_list = Timer.objects.filter(corp_timer=False) - closest_timer = None - if timer_list: - closest_timer = \ - sorted(list(Timer.objects.all().filter(corp_timer=False)), key=lambda d: (timezone.now()))[0] - logger.debug("Determined closest timer is %s" % closest_timer) render_items = {'timers': Timer.objects.all().filter(corp_timer=False), 'corp_timers': corp_timers, - 'closest_timer': closest_timer, 'future_timers': Timer.objects.all().filter(corp_timer=False).filter( eve_time__gte=datetime.datetime.now()), 'past_timers': Timer.objects.all().filter(corp_timer=False).filter(