Pavel "LEdoian" Turinsky
4 years ago
101 changed files with 86885 additions and 1196 deletions
@ -0,0 +1,207 @@ |
|||||
|
[ |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "baliky.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/baliky.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "beh.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/beh.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "kryptografie.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/kryptografie.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "mam_cernobile.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/mam_cernobile.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "noc.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/noc.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "ohen.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/ohen.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "snih.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/snih.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "spolecna.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/spolecna.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "stiny.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/stiny.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "vikendovka.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/vikendovka.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaheader", |
||||
|
"pk": "vylet.jpg", |
||||
|
"fields": { |
||||
|
"cas": "2020-09-20T09:18:34.562Z", |
||||
|
"fotka": "header/vylet.jpg" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 1, |
||||
|
"fields": { |
||||
|
"url": "/archiv/", |
||||
|
"fotka": "stiny.jpg", |
||||
|
"denni_doba": "oboji" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 2, |
||||
|
"fields": { |
||||
|
"url": "/clanky/", |
||||
|
"fotka": "kryptografie.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 3, |
||||
|
"fields": { |
||||
|
"url": "/clanky/", |
||||
|
"fotka": "ohen.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 4, |
||||
|
"fields": { |
||||
|
"url": "/zadani/", |
||||
|
"fotka": "baliky.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 5, |
||||
|
"fields": { |
||||
|
"url": "/zadani/", |
||||
|
"fotka": "stiny.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 6, |
||||
|
"fields": { |
||||
|
"url": "/co-je-MaM/", |
||||
|
"fotka": "vikendovka.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 7, |
||||
|
"fields": { |
||||
|
"url": "/co-je-MaM/", |
||||
|
"fotka": "noc.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 8, |
||||
|
"fields": { |
||||
|
"url": "/soustredeni/", |
||||
|
"fotka": "beh.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 9, |
||||
|
"fields": { |
||||
|
"url": "/soustredeni/", |
||||
|
"fotka": "vylet.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 10, |
||||
|
"fields": { |
||||
|
"url": "/login/", |
||||
|
"fotka": "baliky.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 11, |
||||
|
"fields": { |
||||
|
"url": "/login/", |
||||
|
"fotka": "stiny.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 12, |
||||
|
"fields": { |
||||
|
"url": "/profil/", |
||||
|
"fotka": "baliky.jpg", |
||||
|
"denni_doba": "den" |
||||
|
} |
||||
|
}, |
||||
|
{ |
||||
|
"model": "header_fotky.fotkaurlvazba", |
||||
|
"pk": 13, |
||||
|
"fields": { |
||||
|
"url": "/profil/", |
||||
|
"fotka": "stiny.jpg", |
||||
|
"denni_doba": "noc" |
||||
|
} |
||||
|
} |
||||
|
] |
||||
File diff suppressed because one or more lines are too long
@ -1,6 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{# TODO predelat pres context processor #} |
|
||||
{% block header %}soustredeni{% endblock %} |
|
||||
{% block menu_soustredeni %}selected{% endblock %} |
|
||||
{% block submenu %}{% include 'seminar/soustredeni/submenu.html' %}{% endblock %} |
|
||||
@ -1,13 +1,14 @@ |
|||||
# coding: utf-8 |
# coding: utf-8 |
||||
|
|
||||
from django.urls import path |
from django.urls import path |
||||
|
from seminar.utils import org_required |
||||
from . import views |
from . import views |
||||
|
|
||||
urlpatterns = [ |
urlpatterns = [ |
||||
path('<int:pk>/', views.nahled), |
path('<int:pk>/', views.nahled), |
||||
path('<int:pk>/<int:fotka>/', views.detail), |
path('<int:pk>/<int:fotka>/', views.detail), |
||||
path('<int:galerie>/new/', views.new_galerie), |
path('<int:galerie>/new/', org_required(views.new_galerie)), |
||||
path('<int:galerie>/plus/<int:subgalerie>/', views.plus_galerie), |
path('<int:galerie>/plus/<int:subgalerie>/', org_required(views.plus_galerie)), |
||||
path('<int:galerie>/minus/<int:subgalerie>/', views.minus_galerie), |
path('<int:galerie>/minus/<int:subgalerie>/', org_required(views.minus_galerie)), |
||||
] |
] |
||||
|
|
||||
|
|||||
@ -0,0 +1,10 @@ |
|||||
|
from django.contrib import admin |
||||
|
from django.contrib.admin import ModelAdmin |
||||
|
import header_fotky.models as m |
||||
|
|
||||
|
|
||||
|
class FotkaPozadiAdmin(ModelAdmin): |
||||
|
readonly_fields = ['cas'] |
||||
|
|
||||
|
admin.site.register(m.FotkaHeader, FotkaPozadiAdmin) |
||||
|
admin.site.register(m.FotkaUrlVazba) |
||||
@ -0,0 +1,5 @@ |
|||||
|
from django.apps import AppConfig |
||||
|
|
||||
|
|
||||
|
class HeaderFotkyConfig(AppConfig): |
||||
|
name = 'header_fotky' |
||||
@ -0,0 +1,45 @@ |
|||||
|
|
||||
|
from datetime import datetime, date |
||||
|
import random |
||||
|
|
||||
|
from django.conf import settings |
||||
|
|
||||
|
from header_fotky.models import FotkaUrlVazba |
||||
|
|
||||
|
|
||||
|
def vzhled(request): |
||||
|
''' Podle casu prida do templatu, zdali je nebo neni noc ''' |
||||
|
hodin = datetime.now().hour |
||||
|
if (hodin <= 6) or (hodin >= 20): |
||||
|
noc = True |
||||
|
nedoba = 'den' |
||||
|
doba = 'noc' |
||||
|
else: |
||||
|
noc = False |
||||
|
nedoba = 'noc' |
||||
|
doba = 'den' |
||||
|
url = request.path |
||||
|
|
||||
|
fotky = FotkaUrlVazba.objects.exclude(denni_doba=nedoba) |
||||
|
fotka = None |
||||
|
|
||||
|
# TODO rychlejší patternmatch? |
||||
|
while (fotka is None) and (url != ''): |
||||
|
presne = fotky.filter(url__exact=url) |
||||
|
if presne.count() > 0: |
||||
|
presne_doba = presne.filter(denni_doba=doba) |
||||
|
if presne_doba.count() > 0: |
||||
|
fotka = random.choice(presne_doba).url_fotky() |
||||
|
else: |
||||
|
fotka = random.choice(presne).url_fotky() |
||||
|
|
||||
|
url = url[:-1] |
||||
|
index = url.rfind('/') |
||||
|
if index != -1: |
||||
|
url = url[:index+1] |
||||
|
|
||||
|
if fotka is None: |
||||
|
fotka = settings.STATIC_URL + "images/header/vikendovka.jpg" |
||||
|
|
||||
|
return {'noc': noc, 'fotka': fotka} |
||||
|
|
||||
@ -0,0 +1,63 @@ |
|||||
|
# Generated by Django 2.2.15 on 2020-09-20 09:14 |
||||
|
|
||||
|
from django.db import migrations, models |
||||
|
import django.db.models.deletion |
||||
|
import django.utils.timezone |
||||
|
|
||||
|
from shutil import copytree |
||||
|
|
||||
|
|
||||
|
def zkopiruj_fotky(apps, schema_editor): |
||||
|
try: |
||||
|
copytree("mamweb/static/images/header/", "media/header/") # FIXME: bylo tu dirs_exists_ok=True, nekompatibilní s Py 3.7 |
||||
|
except FileExistsError: |
||||
|
pass |
||||
|
|
||||
|
|
||||
|
class Migration(migrations.Migration): |
||||
|
initial = True |
||||
|
|
||||
|
dependencies = [ |
||||
|
] |
||||
|
|
||||
|
operations = [ |
||||
|
migrations.CreateModel( |
||||
|
name='FotkaHeader', |
||||
|
fields=[ |
||||
|
('cas', models.DateTimeField(default=django.utils.timezone.now, help_text='Čas vložení fotky', |
||||
|
verbose_name='čas vložení fotky')), |
||||
|
('nazev', |
||||
|
models.CharField(help_text='Název např. archiv_noc', max_length=50, primary_key=True, serialize=False, |
||||
|
unique=True, verbose_name='název fotky')), |
||||
|
('fotka', models.ImageField(upload_to='header')), |
||||
|
], |
||||
|
options={ |
||||
|
'verbose_name': 'fotka do pozadí menu', |
||||
|
'verbose_name_plural': 'fotky do pozadí menu', |
||||
|
'db_table': 'fotky_header', |
||||
|
'ordering': ['-cas'], |
||||
|
}, |
||||
|
), |
||||
|
migrations.CreateModel( |
||||
|
name='FotkaUrlVazba', |
||||
|
fields=[ |
||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
|
('url', |
||||
|
models.CharField(blank=True, help_text='url prefix stránek např: /archiv/ nebo /', max_length=100, |
||||
|
verbose_name='URL')), |
||||
|
('denni_doba', models.CharField(choices=[('den', 'Zobrazit jen ve dne'), ('noc', 'Zobrazit jen v noci'), |
||||
|
('oboji', 'Zobrazovat pořád')], default='oboji', max_length=16, |
||||
|
verbose_name='denní doba')), |
||||
|
('fotka', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='header_fotky.FotkaHeader', |
||||
|
verbose_name='fotka')), |
||||
|
], |
||||
|
options={ |
||||
|
'verbose_name': 'vazba url a fotky do pozadí menu', |
||||
|
'verbose_name_plural': 'vazby url a fotek do pozadí menu', |
||||
|
'db_table': 'fotky_url_vazby', |
||||
|
'ordering': ['url'], |
||||
|
}, |
||||
|
|
||||
|
), |
||||
|
migrations.RunPython(zkopiruj_fotky, migrations.RunPython.noop), |
||||
|
] |
||||
@ -0,0 +1,65 @@ |
|||||
|
from django.core.exceptions import ValidationError |
||||
|
from django.db import models |
||||
|
from django.utils import timezone |
||||
|
|
||||
|
|
||||
|
class FotkaHeader(models.Model): |
||||
|
class Meta: |
||||
|
ordering = ['-cas'] |
||||
|
db_table = 'fotky_header' |
||||
|
verbose_name = u'fotka do pozadí menu' |
||||
|
verbose_name_plural = u'fotky do pozadí menu' |
||||
|
|
||||
|
cas = models.DateTimeField(u'čas vložení fotky', default=timezone.now, help_text='Čas vložení fotky') |
||||
|
|
||||
|
nazev = models.CharField( |
||||
|
u'název fotky', null=False, blank=False, unique=True, primary_key=True, |
||||
|
max_length=50, help_text='Název např. archiv_noc' |
||||
|
) |
||||
|
|
||||
|
fotka = models.ImageField(upload_to='header', null=False, blank=False) |
||||
|
|
||||
|
def __str__(self): |
||||
|
return self.nazev |
||||
|
|
||||
|
def clean(self): |
||||
|
if not self.fotka: |
||||
|
raise ValidationError("Chybí obrázek") |
||||
|
""" Kontroluje, zda sedí poměr stran """ |
||||
|
if abs(self.fotka.width - (self.fotka.height * 970 / 350)) > 2: |
||||
|
raise ValidationError("Obrázek by měl mít rozměry 970w na 350h, nebo alespoň podobný poměr stran.") |
||||
|
super().clean() |
||||
|
|
||||
|
|
||||
|
class FotkaUrlVazba(models.Model): |
||||
|
class Meta: |
||||
|
ordering = ['url'] |
||||
|
db_table = 'fotky_url_vazby' |
||||
|
verbose_name = u'vazba url a fotky do pozadí menu' |
||||
|
verbose_name_plural = u'vazby url a fotek do pozadí menu' |
||||
|
|
||||
|
url = models.CharField( |
||||
|
u'URL', blank=True, null=False, max_length=100, |
||||
|
help_text='url prefix stránek např: /archiv/ nebo /' |
||||
|
) |
||||
|
|
||||
|
fotka = models.ForeignKey( |
||||
|
FotkaHeader, blank=False, null=False, verbose_name='fotka', |
||||
|
on_delete=models.CASCADE |
||||
|
) |
||||
|
|
||||
|
DOBA_DEN = 'den' |
||||
|
DOBA_NOC = 'noc' |
||||
|
DOBA_OBOJI = 'oboji' |
||||
|
DOBA_CHOICES = [ |
||||
|
(DOBA_DEN, 'Zobrazit jen ve dne'), |
||||
|
(DOBA_NOC, 'Zobrazit jen v noci'), |
||||
|
(DOBA_OBOJI, 'Zobrazovat pořád')] |
||||
|
|
||||
|
denni_doba = models.CharField('denní doba', max_length=16, choices=DOBA_CHOICES, blank=False, default=DOBA_OBOJI) |
||||
|
|
||||
|
def __str__(self): |
||||
|
return self.url |
||||
|
|
||||
|
def url_fotky(self): |
||||
|
return self.fotka.fotka.url |
||||
@ -1,13 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block submenu %} |
|
||||
{% include "korektury/submenu.html" %} |
|
||||
{% endblock %} |
|
||||
|
|
||||
{% block content %} |
|
||||
{# blok do kterého se nacita text, v pripade jinyhc templatu obalit vlastnim blokem #} |
|
||||
{% endblock %} |
|
||||
|
|
||||
{% block title %} |
|
||||
{# blok pro titulek stranky #} |
|
||||
{% endblock %} |
|
||||
@ -1,13 +0,0 @@ |
|||||
{% with "/korektury" as cesta %} |
|
||||
|
|
||||
<div id='submenu'> |
|
||||
<ul> |
|
||||
<li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/">Aktuální</a> |
|
||||
<li class="{% if selected == "zastarale" %}selected{% endif %}"><a href="{{cesta}}/zastarale/">Zastaralé</a> |
|
||||
<li class="{% if selected == "help" %}selected{% endif %}"><a href="{{cesta}}/help/">Nápověda</a> |
|
||||
</ul> |
|
||||
</div> |
|
||||
|
|
||||
{% endwith %} |
|
||||
|
|
||||
|
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -0,0 +1,69 @@ |
|||||
|
import logging |
||||
|
import os |
||||
|
from shutil import copyfile, rmtree |
||||
|
|
||||
|
from django.db import transaction |
||||
|
from django.conf import settings |
||||
|
|
||||
|
from korektury.models import KorekturovanePDF, generate_filename |
||||
|
|
||||
|
logger = logging.getLogger(__name__) |
||||
|
|
||||
|
@transaction.atomic |
||||
|
def create_test_pdf(rnd, organizatori): |
||||
|
logger.info('Vyrábím testovací pdf ke korekturovani') |
||||
|
try: |
||||
|
testpdfs = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'testpdfs') |
||||
|
|
||||
|
# smaže minulé pdfka a obrázky k nim a vytvoří (znovu) jejich složky |
||||
|
pdf_dir = os.path.join(settings.BASE_DIR, os.path.join('media', settings.KOREKTURY_PDF_DIR)) |
||||
|
img_dir = os.path.join(settings.BASE_DIR, os.path.join('media', settings.KOREKTURY_IMG_DIR)) |
||||
|
rmtree(pdf_dir, ignore_errors=True) |
||||
|
os.makedirs(pdf_dir) |
||||
|
rmtree(img_dir, ignore_errors=True) |
||||
|
os.makedirs(img_dir) |
||||
|
|
||||
|
def gen_filename(filename): |
||||
|
name = generate_filename(None, filename) |
||||
|
print(name) |
||||
|
copyfile(os.path.join(testpdfs, filename), os.path.join(settings.BASE_DIR, os.path.join('media', name))) |
||||
|
return name |
||||
|
|
||||
|
# TODO silent ghostscript (vypisuje odstavec za každou stránku…) |
||||
|
|
||||
|
KorekturovanePDF.objects.create( |
||||
|
nazev='B', komentar='Neuronové sítě', org=rnd.choice(organizatori), pdf=gen_filename(filename='B.pdf') |
||||
|
) |
||||
|
|
||||
|
KorekturovanePDF.objects.create( |
||||
|
nazev='A', komentar='M&M: Jak řešit?', org=rnd.choice(organizatori), pdf=gen_filename(filename='A.pdf') |
||||
|
) |
||||
|
|
||||
|
korekturovane_pdf = KorekturovanePDF.objects.create( |
||||
|
nazev='A', komentar='M&M: Jak řešit?', org=rnd.choice(organizatori), pdf=gen_filename(filename='A.pdf'), |
||||
|
status='zanaseni' |
||||
|
) |
||||
|
|
||||
|
KorekturovanePDF.objects.create( |
||||
|
nazev='A', komentar='M&M: Jak řešit?', org=rnd.choice(organizatori), pdf=gen_filename(filename='A.pdf'), |
||||
|
status='zastarale' |
||||
|
) |
||||
|
except (FileNotFoundError, Exception) as e: |
||||
|
# TODO najít správné chyby, které vyhazují různé systémy při neexistenci ImageMagick, nebo knihoven |
||||
|
logger.error(str(e)) |
||||
|
logger.error( |
||||
|
'Chyba vytváření testovacích korektur, pravděpodobně není nainstalován ImageMagick nebo některá z knihoven' |
||||
|
'pro práci se soubory pdf (ghostscript) nebo png (libpng?).\n' |
||||
|
''' |
||||
|
Instalaci na linux provedete např. příkazy: |
||||
|
sudo apt-get build-dep imagemagick |
||||
|
git clone https://github.com/ImageMagick/ImageMagick.git |
||||
|
cd ImageMagick/ |
||||
|
./configure |
||||
|
make |
||||
|
sudo make install |
||||
|
sudo ldconfig /usr/local/lib |
||||
|
cd .. |
||||
|
rm -r ImageMagick/ |
||||
|
''' |
||||
|
) |
||||
@ -1,12 +1,10 @@ |
|||||
from django.urls import path |
from django.urls import path |
||||
from django.contrib.auth.decorators import user_passes_test |
from seminar.utils import org_required |
||||
from . import views |
from . import views |
||||
|
|
||||
staff_member_required = user_passes_test(lambda u: u.is_staff) |
|
||||
|
|
||||
urlpatterns = [ |
urlpatterns = [ |
||||
path('korektury/', staff_member_required(views.KorekturyAktualniListView.as_view()), name='korektury-list'), |
path('korektury/', org_required(views.KorekturyAktualniListView.as_view()), name='korektury-list'), |
||||
path('korektury/zastarale/', staff_member_required(views.KorekturyZastaraleListView.as_view()), name='korektury-list'), |
path('korektury/zastarale/', org_required(views.KorekturyZastaraleListView.as_view()), name='korektury-list'), |
||||
path('korektury/<int:pdf>/', staff_member_required(views.KorekturyView.as_view()), name='korektury'), |
path('korektury/<int:pdf>/', org_required(views.KorekturyView.as_view()), name='korektury'), |
||||
path('korektury/help/', staff_member_required(views.KorekturyHelpView.as_view()), name='korektury-help'), |
path('korektury/help/', org_required(views.KorekturyHelpView.as_view()), name='korektury-help'), |
||||
] |
] |
||||
|
|||||
@ -1,12 +0,0 @@ |
|||||
|
|
||||
from datetime import datetime, date |
|
||||
|
|
||||
def vzhled(request): |
|
||||
''' Podle casu prida do templatu, zdali je nebo neni noc ''' |
|
||||
hodin = datetime.now().hour |
|
||||
if (hodin <= 6) or (hodin >= 20): |
|
||||
noc = True |
|
||||
else: |
|
||||
noc = False |
|
||||
return {'noc' : noc} |
|
||||
|
|
||||
|
After Width: | Height: | Size: 1.8 MiB |
|
After Width: | Height: | Size: 1.8 MiB |
|
After Width: | Height: | Size: 1.8 MiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
@ -0,0 +1,26 @@ |
|||||
|
{% load staticfiles %} |
||||
|
<img class="logo" |
||||
|
{% for item in sitetree_items %} |
||||
|
{% if item.is_active or item.in_current_branch %} |
||||
|
{% if forloop.counter == 1 %} |
||||
|
src="{% static 'images/logo_1.svg' %}" |
||||
|
{% endif %} |
||||
|
{% if forloop.counter == 2 %} |
||||
|
src="{% static 'images/logo_2.svg' %}" |
||||
|
{% endif %} |
||||
|
{% if forloop.counter == 3 %} |
||||
|
src="{% static 'images/logo_3.svg' %}" |
||||
|
{% endif %} |
||||
|
{% if forloop.counter == 4 %} |
||||
|
src="{% static 'images/logo_4.svg' %}" |
||||
|
{% endif %} |
||||
|
{% if forloop.counter == 5 %} |
||||
|
src="{% static 'images/logo_5.svg' %}" |
||||
|
{% endif %} |
||||
|
{% if forloop.counter == 6 %} |
||||
|
src="{% static 'images/logo_6.svg' %}" |
||||
|
{% endif %} |
||||
|
{% endif %} |
||||
|
{% endfor %} |
||||
|
src="{% static 'images/logo.svg' %}" |
||||
|
/> |
||||
@ -1,14 +1,25 @@ |
|||||
from django.urls import path |
from django.urls import path |
||||
from django.contrib.auth.decorators import user_passes_test |
from seminar.utils import org_required, resitel_required |
||||
from . import views |
from . import views |
||||
|
|
||||
staff_member_required = user_passes_test(lambda u: u.is_staff) |
|
||||
|
|
||||
urlpatterns = [ |
urlpatterns = [ |
||||
path('prednasky/', views.newPrednaska), |
path( |
||||
|
'prednasky/', |
||||
|
resitel_required(views.newPrednaska) |
||||
|
), |
||||
path('prednasky/hotovo', views.Prednaska_hotovo), |
path('prednasky/hotovo', views.Prednaska_hotovo), |
||||
path('prednasky/metaseznam_prednasek', staff_member_required(views.MetaSeznamListView.as_view()), name='metaseznam-list'), |
path( |
||||
path('prednasky/seznam_prednasek/<int:seznam>/export', staff_member_required(views.SeznamExportView), name='seznam-export'), |
'prednasky/metaseznam_prednasek', |
||||
path('prednasky/seznam_prednasek/<int:seznam>/', staff_member_required(views.SeznamListView.as_view()), name='seznam-list'), |
org_required(views.MetaSeznamListView.as_view()), |
||||
# path('korektury/help/', staff_member_required(views.KorekturyHelpView.as_view()), name='korektury-help'), |
name='metaseznam-list'), |
||||
|
path( |
||||
|
'prednasky/seznam_prednasek/<int:seznam>/export', |
||||
|
org_required(views.SeznamExportView), |
||||
|
name='seznam-export' |
||||
|
), |
||||
|
path( |
||||
|
'prednasky/seznam_prednasek/<int:seznam>/', |
||||
|
org_required(views.SeznamListView.as_view()), |
||||
|
name='seznam-list' |
||||
|
), |
||||
] |
] |
||||
|
|||||
@ -0,0 +1,35 @@ |
|||||
|
# Generated by Django 2.2.15 on 2020-09-05 10:10 |
||||
|
from django.db import migrations |
||||
|
|
||||
|
|
||||
|
def add_perms(apps, schema_editor): |
||||
|
ContentType = apps.get_model('contenttypes', 'ContentType') |
||||
|
User = apps.get_model('auth', 'User') |
||||
|
Permission = apps.get_model('auth', 'Permission') |
||||
|
Resitel = apps.get_model('seminar', 'Resitel') |
||||
|
|
||||
|
c = ContentType.objects.get_for_model(User) |
||||
|
org_perm = Permission.objects.filter(codename__exact='org').first() |
||||
|
if not org_perm: |
||||
|
org_perm = Permission.objects.create(codename='org', name='org', content_type=c) |
||||
|
resitel_perm = Permission.objects.filter(codename__exact='resitel').first() |
||||
|
if not resitel_perm: |
||||
|
resitel_perm = Permission.objects.create(codename='resitel', name='resitel', content_type=c) |
||||
|
for r in Resitel.objects.all(): |
||||
|
u = r.osoba.user |
||||
|
if u: |
||||
|
u.user_permissions.add(resitel_perm) |
||||
|
for org in User.objects.all(): |
||||
|
if org and org.is_staff: |
||||
|
org.user_permissions.add(org_perm) |
||||
|
|
||||
|
|
||||
|
class Migration(migrations.Migration): |
||||
|
|
||||
|
dependencies = [ |
||||
|
('seminar', '0087_fix_polymorphism'), |
||||
|
] |
||||
|
|
||||
|
operations = [ |
||||
|
migrations.RunPython(add_perms, migrations.RunPython.noop), |
||||
|
] |
||||
@ -0,0 +1,18 @@ |
|||||
|
# Generated by Django 2.2.16 on 2020-10-13 19:40 |
||||
|
|
||||
|
from django.db import migrations, models |
||||
|
|
||||
|
|
||||
|
class Migration(migrations.Migration): |
||||
|
|
||||
|
dependencies = [ |
||||
|
('seminar', '0088_perm_org_a_ucastnik'), |
||||
|
] |
||||
|
|
||||
|
operations = [ |
||||
|
migrations.AddField( |
||||
|
model_name='cislo', |
||||
|
name='datum_preddeadline', |
||||
|
field=models.DateField(blank=True, help_text='Datum pro příjem řešení, která se otisknou v dalším čísle', null=True, verbose_name='datum předdeadline'), |
||||
|
), |
||||
|
] |
||||
@ -1,6 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block menu_archiv %}selected{% endblock %} |
|
||||
|
|
||||
{# zmena fotky #}{% block header %}archiv{% endblock %} |
|
||||
|
|
||||
@ -1,10 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block menu_clanky %}selected{% endblock %} |
|
||||
|
|
||||
{# zmena fotky #}{% block header %}clanky{% endblock %} |
|
||||
|
|
||||
{% block submenu %} |
|
||||
{% include "seminar/clanky/submenu.html" %} |
|
||||
{% endblock %} |
|
||||
|
|
||||
@ -1,11 +1,5 @@ |
|||||
{% extends 'seminar/clanky/resitelske_clanky.html' %} |
{% extends 'seminar/clanky/resitelske_clanky.html' %} |
||||
|
|
||||
{% block submenu %} |
|
||||
{% with "org" as selected %} |
|
||||
{% include "seminar/clanky/submenu.html" %} |
|
||||
{% endwith %} |
|
||||
{% endblock submenu %} |
|
||||
|
|
||||
{% block nadpis1a %}{% block nadpis1b %} |
{% block nadpis1a %}{% block nadpis1b %} |
||||
Organizátorské články |
Organizátorské články |
||||
{% endblock %}{% endblock %} |
{% endblock %}{% endblock %} |
||||
|
|||||
@ -1,6 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block submenu %} |
|
||||
{% include "seminar/cojemam/submenu.html" %} |
|
||||
{% endblock %} |
|
||||
|
|
||||
@ -0,0 +1,16 @@ |
|||||
|
{% extends 'base.html' %} |
||||
|
|
||||
|
{% load humanize %} |
||||
|
{% load staticfiles %} |
||||
|
|
||||
|
|
||||
|
{% block content %} |
||||
|
|
||||
|
<div class=jakresit> |
||||
|
|
||||
|
<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_1.svg' %}" /> |
||||
|
<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_2.svg' %}" /> |
||||
|
<img class="jakresit_obrazek" alt="" src="{% static 'images/jakresit_3.svg' %}" /> |
||||
|
|
||||
|
</div> |
||||
|
{% endblock %} |
||||
@ -1,6 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block submenu %} |
|
||||
{% include "seminar/soustredeni/submenu.html" %} |
|
||||
{% endblock %} |
|
||||
|
|
||||
@ -1,10 +0,0 @@ |
|||||
{% extends "base.html" %} |
|
||||
|
|
||||
{% block menu_zadani %}selected{% endblock %} |
|
||||
|
|
||||
{# zmena fotky #}{% block header %}zadani{% endblock %} |
|
||||
|
|
||||
{% block submenu %} |
|
||||
{% include 'seminar/zadani/submenu.html' %} |
|
||||
{% endblock submenu %} |
|
||||
|
|
||||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue