diff --git a/systemd_units/djing.timer b/systemd_units/djing.timer index 7e02420..ec8b50b 100644 --- a/systemd_units/djing.timer +++ b/systemd_units/djing.timer @@ -1,10 +1,9 @@ [Unit] -Description=Run every 30 minutes a job for djing +Description=Run every night a job for djing [Timer] -OnCalendar=*-*-* *:30:00 +OnCalendar=*-*-* 01:59:00 Persistent=true -RandomizedDelaySec=300 Unit=djing.service [Install] diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po index 54014a5..24e999a 100644 --- a/taskapp/locale/ru/LC_MESSAGES/django.po +++ b/taskapp/locale/ru/LC_MESSAGES/django.po @@ -387,3 +387,10 @@ msgstr "Нет интернета" msgid "Expired timeout -%(time_left)s" msgstr "Время ожидания истекло -%(time_left)s" + +msgid "Yesterday" +msgstr "Вчера" + +msgid "Today" +msgstr "Сегодня" + diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html index 40bec8b..6236cbd 100644 --- a/taskapp/templates/taskapp/tasklist.html +++ b/taskapp/templates/taskapp/tasklist.html @@ -1,18 +1,19 @@ {% extends request.is_ajax|yesno:'nullcont.htm,taskapp/ext.htm' %} {% load i18n %} +{% load tasktags %} {% block content %}
| # | +# | {% trans 'Name' %} | {% trans 'Address' %} | {% trans 'The nature of the damage' %} | {% trans 'Description' %} | {% trans 'Task author' %} | - +{% trans 'Date of create' %} | {% trans 'Actions' %} |
|---|---|---|---|---|---|---|---|---|
| {{ task.pk }} | ++ + {% if not task.is_relevant %} + {% if task.priority == 'E' %} + + {% elif task.priority == 'A' %} + + {% endif %} + {% endif %} + {{ task.pk }} + + | {% if task.abon and task.abon.group %}{{ task.abon.get_full_name }} | @@ -52,7 +56,18 @@ {% trans 'Author does not exist' %} {% endif %} -{{ task.time_of_create|date:'d E H:i' }} | + ++ {% is_today task.time_of_create as is_timecreate_is_today %} + {% is_yesterday task.time_of_create as is_timecreate_is_yesterday %} + {% if is_timecreate_is_today %} + {% trans 'Today' %} {{ task.time_of_create|date:'H:i' }} + {% elif is_timecreate_is_yesterday %} + {% trans 'Yesterday' %} {{ task.time_of_create|date:'H:i' }} + {% else %} + {{ task.time_of_create|date:'d E H:i' }} + {% endif %} + | diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html index 2cc601e..6ee089e 100644 --- a/taskapp/templates/taskapp/tasklist_all.html +++ b/taskapp/templates/taskapp/tasklist_all.html @@ -1,5 +1,6 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% load tasktags %} {% block main %} |