diff --git a/.gitignore b/.gitignore index 36b0b565..05e728bd 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,9 @@ TODO # .htpasswd kvůli přihlášení .htpasswd + +# reversion kvůli historii objektů v reversion +**/reversion + +# pro lidi, co programují v nástrojích od JetBrains +.idea \ No newline at end of file diff --git a/flat.json b/data/flat.json similarity index 99% rename from flat.json rename to data/flat.json index 8adde103..f127d671 100644 --- a/flat.json +++ b/data/flat.json @@ -260,7 +260,7 @@ "fields": { "url": "/co-je-MaM/kontakt/", "title": "Kontakt", - "content": "

Sv\u00e1 \u0159e\u0161en\u00ed \u010di p\u0159\u00edpadn\u00e9 dotazy n\u00e1m m\u016f\u017eete pos\u00edlat bu\u010f klasickou, nebo elektronickou po\u0161tou:

\r\n\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n
\r\n\t\t\t

Adresa redakce:

\r\n\r\n\t\t\t

M&M, OPMK MFF UK
\r\n\t\t\tKe Karlovu 3
\r\n\t\t\t121 16 Praha 2

\r\n\t\t\t		\r\n\t\t\t

E-mail: mam@matfyz.cz

\r\n\r\n\t\t\t

Facebook: Koresponden\u010dn\u00ed semin\u00e1\u0159 M&M

\r\n\r\n\t\t\t

Google Kalend\u00e1\u0159: casopis.mam@gmail.com

\r\n\t\t\t
\r\n\r\n

 

\r\n\r\n

B\u011bhem \u0161koln\u00edho roku je velk\u00e1 \u010d\u00e1st organiz\u00e1tor\u016f k zasti\u017een\u00ed na koleji 17. listopadu \u010di jinde po Praze.

\r\n\r\n

Adresa koleje:

\r\n\r\n

P\u00e1tkova 3
\r\n182 00, Praha 8

", + "content": "

Sv\u00e1 \u0159e\u0161en\u00ed \u010di p\u0159\u00edpadn\u00e9 dotazy n\u00e1m m\u016f\u017eete pos\u00edlat bu\u010f klasickou, nebo elektronickou po\u0161tou:

\r\n\r\n

Adresa redakce:

\r\n\r\n

M&M, OPMK MFF UK
\r\nKe Karlovu 3
\r\n121 16 Praha 2

\r\n\r\n

E-mail: mam@matfyz.cz

\r\n\r\n

 

\r\n\r\n

Facebook: Koresponden\u010dn\u00ed semin\u00e1\u0159 M&M

\r\n\r\n

Google Kalend\u00e1\u0159: casopis.mam@gmail.com

\r\n\r\n

 

\r\n\r\n

B\u011bhem \u0161koln\u00edho roku je velk\u00e1 \u010d\u00e1st organiz\u00e1tor\u016f k zasti\u017een\u00ed na koleji 17. listopadu \u010di jinde po Praze.

\r\n\r\n

Adresa koleje:

\r\n\r\n

P\u00e1tkova 3
\r\n182 00, Praha 8

", "enable_comments": false, "template_name": "", "registration_required": false, diff --git a/data/fotka_header.json b/data/fotka_header.json new file mode 100644 index 00000000..065c378a --- /dev/null +++ b/data/fotka_header.json @@ -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" + } +} +] \ No newline at end of file diff --git a/data/sitetree_new.json b/data/sitetree_new.json new file mode 100644 index 00000000..f0eb3a9c --- /dev/null +++ b/data/sitetree_new.json @@ -0,0 +1 @@ +[{"model": "sitetree.tree", "pk": 1, "fields": {"title": "Hlavn\u00ed menu", "alias": "main_menu"}}, {"model": "sitetree.treeitem", "pk": 1, "fields": {"title": "Co je M&M", "hint": "", "url": "/co-je-MaM/uvod/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 1, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 2, "fields": {"title": "Jak \u0159e\u0161it", "hint": "", "url": "/jak-resit/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 2, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 3, "fields": {"title": "Aktu\u00e1ln\u00ed
ro\u010dn\u00edk", "hint": "", "url": "/zadani/aktualni/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 3, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 4, "fields": {"title": "Soust\u0159ed\u011bn\u00ed", "hint": "", "url": "/soustredeni/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 4, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 5, "fields": {"title": "Archiv", "hint": "", "url": "/archiv/rocniky/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 5, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 6, "fields": {"title": "P\u0159ihl\u00e1sit", "hint": "", "url": "/login/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": true, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 6, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 7, "fields": {"title": "\u00davod", "hint": "", "url": "/co-je-MaM/uvod/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 1, "sort_order": 7, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 8, "fields": {"title": "Organiz\u00e1to\u0159i", "hint": "", "url": "/co-je-MaM/organizatori/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 1, "sort_order": 8, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 9, "fields": {"title": "FAQ", "hint": "", "url": "/co-je-MaM/FAQ/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 1, "sort_order": 9, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 10, "fields": {"title": "Kontakt", "hint": "", "url": "/co-je-MaM/kontakt/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 1, "sort_order": 10, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 11, "fields": {"title": "T\u00e9mata", "hint": "", "url": "/jak-resit/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 2, "sort_order": 11, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 12, "fields": {"title": "Jak ps\u00e1t p\u0159\u00edsp\u011bvek", "hint": "", "url": "/jak-resit/jak-psat-prispevek/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 2, "sort_order": 12, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 13, "fields": {"title": "Odm\u011bny", "hint": "", "url": "/co-je-MaM/odmeny/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 2, "sort_order": 13, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 16, "fields": {"title": "V\u00fdsledkov\u00e1 listina", "hint": "", "url": "zadani/vysledkova-listina/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 3, "sort_order": 33, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 17, "fields": {"title": "\u010cl\u00e1nky", "hint": "", "url": "/clanky/resitel/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 3, "sort_order": 34, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 18, "fields": {"title": "\u00davod", "hint": "", "url": "/soustredeni/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 4, "sort_order": 18, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 19, "fields": {"title": "P\u0159ipravujeme", "hint": "", "url": "/soustredeni/pripravujeme/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 4, "sort_order": 19, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 20, "fields": {"title": "Prob\u011bhlo", "hint": "", "url": "/soustredeni/probehlo/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 4, "sort_order": 20, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 21, "fields": {"title": "Profil", "hint": "", "url": "/profil/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": true, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": null, "sort_order": 21, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 22, "fields": {"title": "Osobn\u00ed \u00fadaje", "hint": "", "url": "/profil/osobni-udaje", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 21, "sort_order": 23, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 23, "fields": {"title": "Poslat \u0159e\u0161en\u00ed", "hint": "", "url": "/odeslat-reseni/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 21, "sort_order": 36, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 24, "fields": {"title": "T\u00e9mata", "hint": "", "url": "/archiv/temata/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 5, "sort_order": 35, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 28, "fields": {"title": "HIDDEN", "hint": "", "url": "/korektury/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": true, "access_perm_type": 1, "parent": null, "sort_order": 28, "access_permissions": [1]}}, {"model": "sitetree.treeitem", "pk": 30, "fields": {"title": "Aktu\u00e1ln\u00ed", "hint": "", "url": "/korektury/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 28, "sort_order": 30, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 31, "fields": {"title": "Zastaral\u00e9", "hint": "", "url": "/korektury/zastarale/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 28, "sort_order": 31, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 32, "fields": {"title": "N\u00e1pov\u011bda", "hint": "", "url": "/korektury/help/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 28, "sort_order": 32, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 33, "fields": {"title": "Aktu\u00e1ln\u00ed \u010d\u00edslo", "hint": "", "url": "/zadani/aktualni/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 3, "sort_order": 15, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 34, "fields": {"title": "T\u00e9mata", "hint": "", "url": "/zadani/temata/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 3, "sort_order": 17, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 35, "fields": {"title": "\u010c\u00edsla", "hint": "", "url": "/archiv/rocniky/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 5, "sort_order": 24, "access_permissions": []}}, {"model": "sitetree.treeitem", "pk": 36, "fields": {"title": "\u00davod", "hint": "", "url": "/profil/", "urlaspattern": false, "tree": 1, "hidden": false, "alias": null, "description": "", "inmenu": true, "inbreadcrumbs": true, "insitetree": true, "access_loggedin": false, "access_guest": false, "access_restricted": false, "access_perm_type": 1, "parent": 21, "sort_order": 22, "access_permissions": []}}] \ No newline at end of file diff --git a/galerie/templates/galerie/Base.html b/galerie/templates/galerie/Base.html deleted file mode 100644 index 61f96eb4..00000000 --- a/galerie/templates/galerie/Base.html +++ /dev/null @@ -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 %} diff --git a/galerie/templates/galerie/Galerie.html b/galerie/templates/galerie/Galerie.html index c23c6c42..b2dfe994 100644 --- a/galerie/templates/galerie/Galerie.html +++ b/galerie/templates/galerie/Galerie.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block nadpis1a %} diff --git a/galerie/templates/galerie/GalerieNahled.html b/galerie/templates/galerie/GalerieNahled.html index 7d9313fc..ec0d5f67 100644 --- a/galerie/templates/galerie/GalerieNahled.html +++ b/galerie/templates/galerie/GalerieNahled.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block nadpis1a %} Galerie {{galerie.nazev}} @@ -61,7 +61,7 @@ Galerie {{galerie.nazev}} {{ galerie|truncatechars:max_delka_nazvu }} - {% if user.is_staff and galerie.zobrazit > 0 %} + {% if user.je_org and galerie.zobrazit > 0 %}
({{galerie.poradi}}) + @@ -73,7 +73,7 @@ Galerie {{galerie.nazev}} {% endwith %} {% endif %} {% endif %} - {% if user.is_staff and galerie.zobrazit > 0 %} + {% if user.je_org and galerie.zobrazit > 0 %}
Vytvořit novou podgalerii
diff --git a/galerie/templates/galerie/GalerieNew.html b/galerie/templates/galerie/GalerieNew.html index 38237d86..2da23ece 100644 --- a/galerie/templates/galerie/GalerieNew.html +++ b/galerie/templates/galerie/GalerieNew.html @@ -1,4 +1,4 @@ -{% extends "galerie/Base.html" %} +{% extends "base.html" %} {% block title %}{% block nadpis1a %} Vytvářím novou galerii diff --git a/galerie/urls.py b/galerie/urls.py index 4d1e8f24..d299165f 100644 --- a/galerie/urls.py +++ b/galerie/urls.py @@ -1,13 +1,14 @@ # coding: utf-8 from django.urls import path +from seminar.utils import org_required from . import views urlpatterns = [ path('/', views.nahled), path('//', views.detail), - path('/new/', views.new_galerie), - path('/plus//', views.plus_galerie), - path('/minus//', views.minus_galerie), + path('/new/', org_required(views.new_galerie)), + path('/plus//', org_required(views.plus_galerie)), + path('/minus//', org_required(views.minus_galerie)), ] diff --git a/galerie/views.py b/galerie/views.py index d23e79f1..4570b8fb 100644 --- a/galerie/views.py +++ b/galerie/views.py @@ -14,7 +14,7 @@ from galerie.forms import KomentarForm, NewGalerieForm def zobrazit(galerie, request): preview = False if galerie.zobrazit >= 1: - if request.user.is_staff: + if request.user.je_org: preview = True; else: raise Http404 @@ -35,7 +35,7 @@ def nahled(request, pk, soustredeni): galerie = get_object_or_404(Galerie, pk=pk) podgalerie = Galerie.objects.filter(galerie_up = galerie).order_by('poradi') - if not request.user.is_staff: + if not request.user.je_org: podgalerie = podgalerie.filter(zobrazit__lt=1) obrazky = Obrazek.objects.filter(galerie = galerie).order_by('poradi', 'nazev') @@ -44,7 +44,7 @@ def nahled(request, pk, soustredeni): sourozenci = [] if galerie.galerie_up: sourozenci = galerie.galerie_up.galerie_set.all().order_by('poradi') - if not request.user.is_staff: + if not request.user.je_org: sourozenci = sourozenci.filter(zobrazit__lt=1) predchozi = None diff --git a/header_fotky/__init__.py b/header_fotky/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/header_fotky/admin.py b/header_fotky/admin.py new file mode 100644 index 00000000..35d3427b --- /dev/null +++ b/header_fotky/admin.py @@ -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) \ No newline at end of file diff --git a/header_fotky/apps.py b/header_fotky/apps.py new file mode 100644 index 00000000..084aa955 --- /dev/null +++ b/header_fotky/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class HeaderFotkyConfig(AppConfig): + name = 'header_fotky' diff --git a/header_fotky/context_processors.py b/header_fotky/context_processors.py new file mode 100644 index 00000000..be259cbf --- /dev/null +++ b/header_fotky/context_processors.py @@ -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} + diff --git a/header_fotky/migrations/0001_initial.py b/header_fotky/migrations/0001_initial.py new file mode 100644 index 00000000..4b90d0c6 --- /dev/null +++ b/header_fotky/migrations/0001_initial.py @@ -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), + ] diff --git a/header_fotky/migrations/__init__.py b/header_fotky/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/header_fotky/models.py b/header_fotky/models.py new file mode 100644 index 00000000..481a652c --- /dev/null +++ b/header_fotky/models.py @@ -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 diff --git a/korektury/models.py b/korektury/models.py index 88c1a5e6..37213172 100644 --- a/korektury/models.py +++ b/korektury/models.py @@ -103,7 +103,7 @@ class KorekturovanePDF(models.Model): # Změnil se počet stran, ukládáme super(KorekturovanePDF, self).save() - def save(self): + def save(self, **kwargs): # Pokud se nezmenilo PDF, tak nepregenerovavej nahledy try: original = KorekturovanePDF.objects.get(pk=self.pk) @@ -113,7 +113,7 @@ class KorekturovanePDF(models.Model): except ObjectDoesNotExist: pass # uložíme nahrávané pdf - super(KorekturovanePDF, self).save() + super(KorekturovanePDF, self).save(kwargs) # uložíme png a změněný počet stran self.convert() diff --git a/korektury/templates/korektury/base.html b/korektury/templates/korektury/base.html deleted file mode 100644 index 886a15e1..00000000 --- a/korektury/templates/korektury/base.html +++ /dev/null @@ -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 %} diff --git a/korektury/templates/korektury/help.html b/korektury/templates/korektury/help.html index f2ddafb9..3cce7a4f 100644 --- a/korektury/templates/korektury/help.html +++ b/korektury/templates/korektury/help.html @@ -1,10 +1,4 @@ -{% extends "korektury/base.html" %} - -{% block submenu %} - {% with "help" as selected %} - {% include "korektury/submenu.html" %} - {% endwith %} -{% endblock %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html index ba8898a6..00c81c2d 100644 --- a/korektury/templates/korektury/opraf.html +++ b/korektury/templates/korektury/opraf.html @@ -36,12 +36,12 @@ id="neni_chyba_checkbox" name="neni_chyba_checkbox" onchange="toggle_corrections('neni_chyba')" checked> -
+
-

Korespondenční seminář M&M organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje Jednota českých matematiků a fyziků. S obsahem webu M&M je možné nakládat dle licence Creative Commons Attribution 3.0.

+

Korespondenční seminář M&M organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje Jednota českých matematiků a fyziků. S obsahem webu M&M je možné nakládat dle licence Creative Commons Attribution 3.0.

+ diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html index b5d2d24d..0a26ca27 100644 --- a/mamweb/templates/flatpages/default.html +++ b/mamweb/templates/flatpages/default.html @@ -8,106 +8,4 @@
{{ flatpage.content }}
-{% endblock content %} - -{# nahraj spravne submenu #} -{% block submenu %} - {# co-je-MaM #} - {% if "/co-je-MaM/" in flatpage.url %} - {% if "/uvod/" in flatpage.url %} - {% with "uvod" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "jak-resit" in flatpage.url %} - {% with "jak-resit" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "odmeny" in flatpage.url %} - {% with "odmeny" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "FAQ" in flatpage.url %} - {% with "FAQ" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} - {% elif "kontakt" in flatpage.url %} - {% else %} - {% include "seminar/cojemam/submenu.html" %} - {% endif %} - {% endif %} - {# soustredeni #} - {% if "/soustredeni/" in flatpage.url %} - {% if "/pripravujeme/" in flatpage.url %} - {% with "pripravujeme" as selected %} - {% include "seminar/soustredeni/submenu.html" %} - {% endwith %} - {% else %} - {% with "uvod" as selected %} - {% include "seminar/soustredeni/submenu.html" %} - {% endwith %} - {% endif %} - {% endif %} - {# zadani #} - {% if "/zadani/" in flatpage.url %} - {% if "/aktualni-cislo/" in flatpage.url %} - {% with "aktualni-cislo" as selected %} - {% include "seminar/zadani/submenu.html" %} - {% endwith %} - {% elif "/vysledkova-listina/" in flatpage.url %} - {% with "vysledkova-listina" as selected %} - {% include "seminar/zadani/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/zadani/submenu.html" %} - {% endif %} - {% endif %} - {# clanky #} - {% if "/clanky/" in flatpage.url %} - {% if "/uvod/" in flatpage.url %} - {% with "uvod" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} - {% elif "/org/" in flatpage.url %} - {% with "org" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} - {% elif "/resitel/" in flatpage.url %} - {% with "resitel" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} - {% elif "/jak-psat-vedecky-clanek/" in flatpage.url %} - {% with "jak-psat-vedecky-clanek" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/clanky/submenu.html" %} - {% endif %} - {% endif %} - {# archiv #} - {% if "/archiv/" in flatpage.url %} - {% if "/ulohy/" in flatpage.url %} - {% with "ulohy" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} - {% elif "/vysledky/" in flatpage.url %} - {% with "vysledky" as selected %} - {% include "seminar/archiv/submenu.html" %} - {% endwith %} - {% else %} - {% include "seminar/archiv/submenu.html" %} - {% endif %} - {% endif %} -{% endblock %} - -{# zvirazneni menu #} -{% block menu_uvod %}{% if not "/kontakt/" in flatpage.url %}{% if "/co-je-MaM/" in flatpage.url %}selected{% endif %}{% endif %}{% endblock %} -{% block menu_soustredeni %}{% if "/soustredeni/" in flatpage.url %}selected{% endif %}{% endblock %} -{% block menu_zadani %}{% if "/zadani/" in flatpage.url %}selected{% endif %}{% endblock %} -{% block menu_clanky %}{% if "/clanky/" in flatpage.url %}selected{% endif %}{% endblock %} -{% block menu_archiv %}{% if "/archiv/" in flatpage.url %}selected{% endif %}{% endblock %} -{% block menu_odevzdat %}{% if "/kontakt/" in flatpage.url %}selected{% endif %}{% endblock %} - -{# zmena titulniho obrazku #} -{% block header %}{% if "/co-je-MaM/" in flatpage.url %}cojemam{% elif "/soustredeni/" in flatpage.url %}soustredeni{% elif "/zadani/" in flatpage.url %}zadani{% elif "/clanky/" in flatpage.url %}clanky{% elif "/archiv/" in flatpage.url %}archiv{% else %}odeslat{% endif %}{% endblock header %} - -{# TODO zvirazneni submenu #} +{% endblock content %} \ No newline at end of file diff --git a/mamweb/templates/logo.html b/mamweb/templates/logo.html new file mode 100644 index 00000000..c5113d0c --- /dev/null +++ b/mamweb/templates/logo.html @@ -0,0 +1,26 @@ +{% load staticfiles %} + \ No newline at end of file diff --git a/mamweb/templates/menu.html b/mamweb/templates/menu.html index c7c0e8f5..e948785a 100644 --- a/mamweb/templates/menu.html +++ b/mamweb/templates/menu.html @@ -3,7 +3,9 @@ {% autoescape off %}
    {% for item in sitetree_items %} -
  • +
  • {{ item.title_resolved }} diff --git a/mamweb/templates/menu_mobile.html b/mamweb/templates/menu_mobile.html index 362e61f1..aed04cd5 100644 --- a/mamweb/templates/menu_mobile.html +++ b/mamweb/templates/menu_mobile.html @@ -3,7 +3,9 @@ {% autoescape off %}
      {% for item in sitetree_items %} -
    • +
    • {{ item.title_resolved }} diff --git a/prednasky/templates/prednasky/base.html b/prednasky/templates/prednasky/base.html index e23d7355..eea79ad2 100644 --- a/prednasky/templates/prednasky/base.html +++ b/prednasky/templates/prednasky/base.html @@ -17,19 +17,17 @@ Jak moc by ses chtěl(a) zúčastnit následujících přednášek?
      {% csrf_token %} - {{form.as_table}} -
      - {% for p in prednasky.prednaska_set.all %} + {% for p, h in prednasky %} {% if p.klicova %}{% endif%} {% endfor %} diff --git a/prednasky/templates/prednasky/metaseznam_prednasek.html b/prednasky/templates/prednasky/metaseznam_prednasek.html index eab1eeef..ed25abe2 100644 --- a/prednasky/templates/prednasky/metaseznam_prednasek.html +++ b/prednasky/templates/prednasky/metaseznam_prednasek.html @@ -1,9 +1,5 @@ {% extends "prednasky/base.html" %} - -{% block header %}hlasovani{% endblock %} - - {% block content %}

      {% block nadpis1a %}{% block nadpis1b %}Hlasování o přednáškách{% endblock %}{% endblock %}

      {# Projdi vsechny seznamy #} @@ -19,6 +15,8 @@ Export {% endfor %} + + {% endblock %} diff --git a/prednasky/templates/prednasky/seznam_prednasek.html b/prednasky/templates/prednasky/seznam_prednasek.html index a019c000..9a78c0b6 100644 --- a/prednasky/templates/prednasky/seznam_prednasek.html +++ b/prednasky/templates/prednasky/seznam_prednasek.html @@ -1,9 +1,5 @@ {% extends "prednasky/base.html" %} - -{% block header %}seznam_prednasek{% endblock %} - - {% block content %}

      {% block nadpis1a %}Průběžné výsledky hlasování{% endblock %}

      @@ -15,5 +11,7 @@ {{ prednaska.body }} b) – {{ prednaska.org }} {% endfor %} + +
      {% endblock %} diff --git a/prednasky/urls.py b/prednasky/urls.py index e7890745..b55de7c3 100644 --- a/prednasky/urls.py +++ b/prednasky/urls.py @@ -1,14 +1,25 @@ 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 -staff_member_required = user_passes_test(lambda u: u.is_staff) - urlpatterns = [ - path('prednasky/', views.newPrednaska), + path( + 'prednasky/', + resitel_required(views.newPrednaska) + ), path('prednasky/hotovo', views.Prednaska_hotovo), - path('prednasky/metaseznam_prednasek', staff_member_required(views.MetaSeznamListView.as_view()), name='metaseznam-list'), - path('prednasky/seznam_prednasek//export', staff_member_required(views.SeznamExportView), name='seznam-export'), - path('prednasky/seznam_prednasek//', staff_member_required(views.SeznamListView.as_view()), name='seznam-list'), -# path('korektury/help/', staff_member_required(views.KorekturyHelpView.as_view()), name='korektury-help'), + path( + 'prednasky/metaseznam_prednasek', + org_required(views.MetaSeznamListView.as_view()), + name='metaseznam-list'), + path( + 'prednasky/seznam_prednasek//export', + org_required(views.SeznamExportView), + name='seznam-export' + ), + path( + 'prednasky/seznam_prednasek//', + org_required(views.SeznamListView.as_view()), + name='seznam-list' + ), ] diff --git a/prednasky/views.py b/prednasky/views.py index 93cccf1b..2c370b7a 100644 --- a/prednasky/views.py +++ b/prednasky/views.py @@ -4,41 +4,52 @@ from django.views import generic from django.shortcuts import HttpResponseRedirect from django.core.exceptions import ObjectDoesNotExist from django.db.models import Sum +from django.forms import Form from prednasky.models import Prednaska, Hlasovani, Seznam, STAV_NAVRH -from seminar.models import Soustredeni -from prednasky.forms import NewPrednaskyForm +from seminar.models import Soustredeni, Osoba def newPrednaska(request): # hlasovani se vztahuje k nejnovejsimu soustredeni sous = Soustredeni.objects.first() seznam = Seznam.objects.filter(soustredeni = sous, stav = STAV_NAVRH).first() - print(seznam) + osoba = Osoba.objects.filter(user=request.user).first() + ucastnik = osoba.plne_jmeno() + ' ' + str(osoba.id) # obsluha formulare if request.method == 'POST': - form = NewPrednaskyForm(request.POST, request.FILES) + form = Form(request.POST, request.FILES) if form.is_valid(): - jmeno = form.cleaned_data['ucastnik'] + # id z důvodu duplicitních jmen (přechod z jména na objekt Osoby nějak kape na tom, + # že všechna předchozí hlasování zde mají náhodný string…) + # TODO Změnit to na Osobu + + # TODO v následujících řádcích je zbytečně mnoho dotazů na QuerySet (pokud účastník hlasoval, hlasoval u všech) for i in request.POST: if i[0] == 'q': - hlasovani = Hlasovani() - print("q:"+i[1:]) - hlasovani.prednaska = Prednaska.objects.filter(pk = int(i[1:]))[0] + prednaska = Prednaska.objects.filter(pk=int(i[1:]))[0] + hlasovani = Hlasovani.objects.filter(ucastnik=ucastnik, prednaska=prednaska).first() + if not hlasovani: + hlasovani = Hlasovani() + hlasovani.prednaska = prednaska + hlasovani.ucastnik = ucastnik + hlasovani.seznam = seznam hlasovani.body = int(request.POST[i]) - hlasovani.ucastnik = jmeno - hlasovani.seznam = seznam hlasovani.save() # presmerovani na prave vzniklou galerii return HttpResponseRedirect('./hotovo') - else: - form = NewPrednaskyForm() + def prednaska_hodnoceni(prednaska): + h = Hlasovani.objects.filter(ucastnik=ucastnik, prednaska=prednaska).first() + if h: + return prednaska, h.body + else: + return prednaska, 0 return render( request, 'prednasky/base.html', - {'form': form, 'prednasky': seznam} + {'prednasky': map(prednaska_hodnoceni, seznam.prednaska_set.all())} ) diff --git a/seminar/migrations/0001_squashed_0067_auto_20190814_0805.py b/seminar/migrations/0001_squashed_0067_auto_20190814_0805.py index 5eb3e452..f9a8b5eb 100644 --- a/seminar/migrations/0001_squashed_0067_auto_20190814_0805.py +++ b/seminar/migrations/0001_squashed_0067_auto_20190814_0805.py @@ -877,6 +877,7 @@ class Migration(migrations.Migration): ), migrations.RunSQL( sql='update seminar_rocniky set rocnik_n = cast (rocnik as integer)', + reverse_sql='update seminar_rocniky set rocnik_n = cast (rocnik as nvarchar(16))', ), migrations.RemoveField( model_name='rocnik', @@ -1733,15 +1734,19 @@ class Migration(migrations.Migration): # migr 0052 migrations.RunPython( spoj_k_organizatorum_osoby, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( fix_problem, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( fix_pohadka, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( fix_novinka, + reverse_code=migrations.RunPython.noop, ), # migr 0053 @@ -1795,25 +1800,31 @@ class Migration(migrations.Migration): # migr 0056 migrations.RunPython( generuj_RocnikNody_a_CisloNody, + reverse_code=migrations.RunPython.noop, ), # migr 0057 migrations.RunPython( reseni_to_Reseni, + reverse_code=migrations.RunPython.noop, ), # migr 0058 migrations.RunPython( uloha_to_Uloha, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( tema_to_Tema, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( clanek_to_Clanek, + reverse_code=migrations.RunPython.noop, ), migrations.RunPython( konfery_rucne, + reverse_code=migrations.RunPython.noop, ), # migr "fix 0058" @@ -1825,11 +1836,13 @@ class Migration(migrations.Migration): # migr 0059 migrations.RunPython( vytvor_pohadkanode, + reverse_code=migrations.RunPython.noop, ), # migr 0060 migrations.RunPython( pokacej_les, + reverse_code=migrations.RunPython.noop, ), migrations.RemoveField( diff --git a/seminar/migrations/0019_rocnik_ciselne.py b/seminar/migrations/0019_rocnik_ciselne.py index 42308b2f..da9591aa 100644 --- a/seminar/migrations/0019_rocnik_ciselne.py +++ b/seminar/migrations/0019_rocnik_ciselne.py @@ -18,7 +18,8 @@ class Migration(migrations.Migration): preserve_default=False, ), migrations.RunSQL( - sql="update seminar_rocniky set rocnik_n = cast (rocnik as integer)" + sql="update seminar_rocniky set rocnik_n = cast (rocnik as integer)", + reverse_sql='update seminar_rocniky set rocnik_n = cast (rocnik as nvarchar(16))', ), migrations.RemoveField( model_name='rocnik', diff --git a/seminar/migrations/0052_user_to_organizator.py b/seminar/migrations/0052_user_to_organizator.py index d52e29ca..db3827ce 100644 --- a/seminar/migrations/0052_user_to_organizator.py +++ b/seminar/migrations/0052_user_to_organizator.py @@ -75,8 +75,8 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(spoj_k_organizatorum_osoby), - migrations.RunPython(fix_problem), - migrations.RunPython(fix_pohadka), - migrations.RunPython(fix_novinka), + migrations.RunPython(spoj_k_organizatorum_osoby, migrations.RunPython.noop), + migrations.RunPython(fix_problem, migrations.RunPython.noop), + migrations.RunPython(fix_pohadka, migrations.RunPython.noop), + migrations.RunPython(fix_novinka, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0056_vrcholy_pro_rocniky_a_cisla.py b/seminar/migrations/0056_vrcholy_pro_rocniky_a_cisla.py index 024400a4..56146261 100644 --- a/seminar/migrations/0056_vrcholy_pro_rocniky_a_cisla.py +++ b/seminar/migrations/0056_vrcholy_pro_rocniky_a_cisla.py @@ -43,5 +43,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(generuj_RocnikNody_a_CisloNody), + migrations.RunPython(generuj_RocnikNody_a_CisloNody, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py b/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py index b3f0405b..a11d99ae 100644 --- a/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py +++ b/seminar/migrations/0057_reseni_to_reseni_hodnoceni.py @@ -30,5 +30,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(reseni_to_Reseni) + migrations.RunPython(reseni_to_Reseni, migrations.RunPython.noop) ] diff --git a/seminar/migrations/0058_problem_to_uloha_tema_clanek.py b/seminar/migrations/0058_problem_to_uloha_tema_clanek.py index 333f5453..7d651edb 100644 --- a/seminar/migrations/0058_problem_to_uloha_tema_clanek.py +++ b/seminar/migrations/0058_problem_to_uloha_tema_clanek.py @@ -154,8 +154,8 @@ class Migration(migrations.Migration): operations = [ # ashes to Ashes, dust to Dust.... - migrations.RunPython(uloha_to_Uloha), - migrations.RunPython(tema_to_Tema), - migrations.RunPython(clanek_to_Clanek), - migrations.RunPython(konfery_rucne), + migrations.RunPython(uloha_to_Uloha, migrations.RunPython.noop), + migrations.RunPython(tema_to_Tema, migrations.RunPython.noop), + migrations.RunPython(clanek_to_Clanek, migrations.RunPython.noop), + migrations.RunPython(konfery_rucne, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0059_vytvorit_pohadkanode.py b/seminar/migrations/0059_vytvorit_pohadkanode.py index d0edd677..2a78c7ee 100644 --- a/seminar/migrations/0059_vytvorit_pohadkanode.py +++ b/seminar/migrations/0059_vytvorit_pohadkanode.py @@ -25,5 +25,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(vytvor_pohadkanode), + migrations.RunPython(vytvor_pohadkanode, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0060_spoj_stromy.py b/seminar/migrations/0060_spoj_stromy.py index a94caf48..c02b8d12 100644 --- a/seminar/migrations/0060_spoj_stromy.py +++ b/seminar/migrations/0060_spoj_stromy.py @@ -108,5 +108,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(pokacej_les), + migrations.RunPython(pokacej_les, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0068_treenode_nazev.py b/seminar/migrations/0068_treenode_nazev.py index bead85d3..c0024c8d 100644 --- a/seminar/migrations/0068_treenode_nazev.py +++ b/seminar/migrations/0068_treenode_nazev.py @@ -103,5 +103,5 @@ class Migration(migrations.Migration): name='nazev', field=models.TextField(help_text='Tento název se zobrazuje v nabídkách pro výběr vhodného TreeNode', null=True, verbose_name='název tohoto node'), ), - migrations.RunPython(fix_all_names), + migrations.RunPython(fix_all_names, migrations.RunPython.noop), ] diff --git a/seminar/migrations/0080_zruseni_claneknode_a_konferanode.py b/seminar/migrations/0080_zruseni_claneknode_a_konferanode.py index 13d083f9..34c22249 100644 --- a/seminar/migrations/0080_zruseni_claneknode_a_konferanode.py +++ b/seminar/migrations/0080_zruseni_claneknode_a_konferanode.py @@ -65,6 +65,9 @@ class Migration(migrations.Migration): model_name='reseni', name='text_zkraceny', ), + migrations.DeleteModel( # nejdříve musím smazat objekt ukazující na konferu, + name='KonferaNode', # pak až změnit klíč konferám (viz další operace) + ), migrations.AddField( model_name='konfera', name='problem_ptr', @@ -95,9 +98,6 @@ class Migration(migrations.Migration): migrations.DeleteModel( name='ClanekNode', ), - migrations.DeleteModel( - name='KonferaNode', - ), migrations.CreateModel( name='Konfery_Ucastnici', fields=[ diff --git a/seminar/migrations/0088_perm_org_a_ucastnik.py b/seminar/migrations/0088_perm_org_a_ucastnik.py new file mode 100644 index 00000000..ca6190dd --- /dev/null +++ b/seminar/migrations/0088_perm_org_a_ucastnik.py @@ -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), + ] diff --git a/seminar/migrations/0089_cislo_datum_preddeadline.py b/seminar/migrations/0089_cislo_datum_preddeadline.py new file mode 100644 index 00000000..0771991b --- /dev/null +++ b/seminar/migrations/0089_cislo_datum_preddeadline.py @@ -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'), + ), + ] diff --git a/seminar/models.py b/seminar/models.py index d706db0d..310ce573 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -443,6 +443,9 @@ class Cislo(SeminarModelBase): datum_deadline = models.DateField('datum deadline', blank=True, null=True, help_text='Datum pro příjem řešení úloh zadaných v tomto čísle') + datum_preddeadline = models.DateField('datum předdeadline', blank=True, null=True, + help_text='Datum pro příjem řešení, která se otisknou v dalším čísle') + datum_deadline_soustredeni = models.DateField( 'datum deadline soustředění', blank=True, null=True, @@ -703,6 +706,7 @@ class Problem(SeminarModelBase,PolymorphicModel): (STAV_SMAZANY, 'Smazaný'), ] stav = models.CharField('stav problému', max_length=32, choices=STAV_CHOICES, blank=False, default=STAV_NAVRH) + # Téma je taky Problém, takže má stavy, "zadané" témátko je aktuálně otevřené a dá se k němu něco poslat (řešení nebo článek) zamereni = TaggableManager(verbose_name='zaměření', help_text='Zaměření M/F/I/O problému, příp. další tagy', blank=True) diff --git a/seminar/templates/seminar/archiv/base.html b/seminar/templates/seminar/archiv/base.html deleted file mode 100644 index d1401d28..00000000 --- a/seminar/templates/seminar/archiv/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block menu_archiv %}selected{% endblock %} - -{# zmena fotky #}{% block header %}archiv{% endblock %} - diff --git a/seminar/templates/seminar/archiv/cisla.html b/seminar/templates/seminar/archiv/cisla.html index f931ee49..b9a8242c 100644 --- a/seminar/templates/seminar/archiv/cisla.html +++ b/seminar/templates/seminar/archiv/cisla.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block content %}
      @@ -8,10 +8,6 @@ {% endblock %}{% endblock %} - - {% for rocnik, url_png in object_list.items %}
      @@ -33,7 +29,7 @@
      -
      +
      Jednotlivá čísla:

      {{p.anotace}}

      {{p.obor}}
      {{p.obtiznost}}
      {{p.klicova}}
      Hodnocení: - rozhodně nechci - je mi to jedno - rozhodně chci + rozhodně nechci + je mi to jedno + rozhodně chci
       
      # @@ -66,7 +66,7 @@ {% for p in problemy %} {{ p.kod_v_rocniku }} {% endfor %} - Za číslo + Za číslo Za ročník Odjakživa {% for rv in radky_vysledkovky %} @@ -88,7 +88,7 @@
      {% endif %} - {% if not cislo.verejna_vysledkovka and user.is_staff %} + {% if not cislo.verejna_vysledkovka and user.je_org %} {% endif %} diff --git a/seminar/templates/seminar/archiv/cislo_obalkovani.html b/seminar/templates/seminar/archiv/cislo_obalkovani.html index dd0b0796..e830a23e 100644 --- a/seminar/templates/seminar/archiv/cislo_obalkovani.html +++ b/seminar/templates/seminar/archiv/cislo_obalkovani.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block content %}

      diff --git a/seminar/templates/seminar/archiv/prispevek.html b/seminar/templates/seminar/archiv/prispevek.html index 998eb4e3..141ae709 100644 --- a/seminar/templates/seminar/archiv/prispevek.html +++ b/seminar/templates/seminar/archiv/prispevek.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block title %} {{prispevek.nazev}} diff --git a/seminar/templates/seminar/archiv/problem.html b/seminar/templates/seminar/archiv/problem.html index 91c67c77..1aa94219 100644 --- a/seminar/templates/seminar/archiv/problem.html +++ b/seminar/templates/seminar/archiv/problem.html @@ -1,13 +1,13 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% load comments %} {% block content %} -
      +
      {% block problem %} {% endblock %} - {% if user.is_staff %} + {% if user.je_org %}

      Text - org

      diff --git a/seminar/templates/seminar/archiv/rocnik.html b/seminar/templates/seminar/archiv/rocnik.html index 0f48b30c..1c039063 100644 --- a/seminar/templates/seminar/archiv/rocnik.html +++ b/seminar/templates/seminar/archiv/rocnik.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block content %}
      @@ -62,7 +62,7 @@
      {% if vysledkovka %} - {% if user.is_staff %} + {% if user.je_org %}
      Výsledkovka ročníku (LaTeX)
      @@ -72,7 +72,7 @@ {% include "seminar/vysledkovka_rocnik.html" %} {% endif %} - {% if user.is_staff and vysledkovka_s_neverejnymi %} + {% if user.je_org and vysledkovka_s_neverejnymi %}

      Výsledková listina včetně neveřejných bodů

      {% with radky_vyledkovky_s_neverejnymi as radky_vysledkovky %} diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html index 53e8699c..4c25d78b 100644 --- a/seminar/templates/seminar/archiv/temata.html +++ b/seminar/templates/seminar/archiv/temata.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% block content %}

      diff --git a/seminar/templates/seminar/clanky/base.html b/seminar/templates/seminar/clanky/base.html deleted file mode 100644 index 844a99d5..00000000 --- a/seminar/templates/seminar/clanky/base.html +++ /dev/null @@ -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 %} - diff --git a/seminar/templates/seminar/clanky/organizatorske_clanky.html b/seminar/templates/seminar/clanky/organizatorske_clanky.html index 53f74009..f2e00104 100644 --- a/seminar/templates/seminar/clanky/organizatorske_clanky.html +++ b/seminar/templates/seminar/clanky/organizatorske_clanky.html @@ -1,11 +1,5 @@ {% extends 'seminar/clanky/resitelske_clanky.html' %} -{% block submenu %} - {% with "org" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} -{% endblock submenu %} - {% block nadpis1a %}{% block nadpis1b %} Organizátorské články {% endblock %}{% endblock %} diff --git a/seminar/templates/seminar/clanky/resitelske_clanky.html b/seminar/templates/seminar/clanky/resitelske_clanky.html index 84089753..94fb27cc 100644 --- a/seminar/templates/seminar/clanky/resitelske_clanky.html +++ b/seminar/templates/seminar/clanky/resitelske_clanky.html @@ -1,13 +1,5 @@ {% extends 'base.html' %} -{% block menu_clanky %}selected{% endblock %} - -{% block submenu %} - {% with "resitel" as selected %} - {% include "seminar/clanky/submenu.html" %} - {% endwith %} -{% endblock submenu %} - {% block content %}

      diff --git a/seminar/templates/seminar/cojemam/base.html b/seminar/templates/seminar/cojemam/base.html deleted file mode 100644 index 9a9c01c0..00000000 --- a/seminar/templates/seminar/cojemam/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block submenu %} - {% include "seminar/cojemam/submenu.html" %} -{% endblock %} - diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 5b147aa5..8f6ffc66 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -1,4 +1,4 @@ -{% extends "seminar/cojemam/base.html" %} +{% extends "base.html" %} {% block nadpis1a %}{% block nadpis1b %} {% if aktivni %} Organizátoři @@ -7,15 +7,6 @@ {% endif %} {% endblock%}{% endblock%} -{# podbarveni menu a submenu #} -{% block menu_uvod %}selected{% endblock %} -{% block submenu %} - {% with "org" as selected %} - {% include "seminar/cojemam/submenu.html" %} - {% endwith %} -{% endblock %} - -{# zmena fotky #}{% block header %}cojemam{% endblock %} {% block content %} diff --git a/seminar/templates/seminar/jak-resit.html b/seminar/templates/seminar/jak-resit.html new file mode 100644 index 00000000..eb7b7259 --- /dev/null +++ b/seminar/templates/seminar/jak-resit.html @@ -0,0 +1,16 @@ +{% extends 'base.html' %} + +{% load humanize %} +{% load staticfiles %} + + +{% block content %} + +
      + + + + + +
      +{% endblock %} diff --git a/seminar/templates/seminar/novinky.html b/seminar/templates/seminar/novinky.html index ccf40831..c1e5b663 100644 --- a/seminar/templates/seminar/novinky.html +++ b/seminar/templates/seminar/novinky.html @@ -1,15 +1,15 @@ {% for novinka in object_list %} {# pripravene div-y na stylovani#}
      - {% if not novinka.zverejneno and user.is_staff %} + {% if not novinka.zverejneno and user.je_org %}
      {% endif %} - {% if novinka.zverejneno or user.is_staff %} + {% if novinka.zverejneno or user.je_org %} {# datum #} -
      {{novinka.datum}}
      +
      {{novinka.datum}}
      {# text #} {{ novinka.text | safe }} {# obrazek #} @@ -25,15 +25,15 @@
      {% endif %} {# autor #} -

      {{novinka.autor.first_name}} - {% if novinka.autor.organizator.prezdivka%} - „{{novinka.autor.organizator.prezdivka}}“ +

      + {{novinka.autor.osoba.jmeno}} + {% if novinka.autor.osoba.prezdivka%} + „{{novinka.autor.osoba.prezdivka}}“ {% endif %} - {{novinka.autor.last_name}} -

      + {{novinka.autor.osoba.prijmeni}}
      {% endif %} - {% if not novinka.zverejneno and user.is_staff %} + {% if not novinka.zverejneno and user.je_org %}
      {% endif %}
      diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html index 175f3859..827e26f1 100644 --- a/seminar/templates/seminar/profil/edit.html +++ b/seminar/templates/seminar/profil/edit.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} {% block script %} diff --git a/seminar/templates/seminar/profil/gdpr.html b/seminar/templates/seminar/profil/gdpr.html index 74e253f5..3e85de78 100644 --- a/seminar/templates/seminar/profil/gdpr.html +++ b/seminar/templates/seminar/profil/gdpr.html @@ -36,13 +36,14 @@ Tento souhlas uděluji ze své vlastní a svobodné vůle a beru na vědomí, ž

      Dále máte právo: +

      • požádat o informaci, jaké osobní údaje jsou o vás zpracovávány,
      • požadovat opravu osobních údajů, pokud jsou neplatné nebo zastaralé,
      • požadovat, aby nebyly vaše osobní údaje zpracovávány do doby, než bude vyřešena oprávněnost výše uvedených požadavků,
      • požadovat, aby byly vaše osobní údaje předány jinému správci,
      • podat stížnost u dozorového úřadu. -

        +

      V případě jakéhokoliv dotazu nebo uplatnění svých práv můžete kontaktovat pověřence pro ochranu osobních údajů na e-mailové adrese gdpr@cuni.cz.

      diff --git a/seminar/templates/seminar/profil/login.html b/seminar/templates/seminar/profil/login.html index 0263b9a6..63d16eed 100644 --- a/seminar/templates/seminar/profil/login.html +++ b/seminar/templates/seminar/profil/login.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/seminar/templates/seminar/profil/logout.html b/seminar/templates/seminar/profil/logout.html index ab41a8c8..d845dc3a 100644 --- a/seminar/templates/seminar/profil/logout.html +++ b/seminar/templates/seminar/profil/logout.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} diff --git a/seminar/templates/seminar/profil/nahraj_reseni.html b/seminar/templates/seminar/profil/nahraj_reseni.html index 861d7bdd..9dfda710 100644 --- a/seminar/templates/seminar/profil/nahraj_reseni.html +++ b/seminar/templates/seminar/profil/nahraj_reseni.html @@ -1,4 +1,4 @@ -{% extends "seminar/zadani/base.html" %} +{% extends "base.html" %} {% load staticfiles %} {% block script %} @@ -53,7 +53,7 @@ {{ field }} - {{ field.help_text|safe }} + {{ field.help_text|safe }}> {{ field.errors }} @@ -74,7 +74,7 @@

    diff --git a/seminar/templates/seminar/titulnistrana.html b/seminar/templates/seminar/titulnistrana.html index 8f6057bf..1fd96a85 100644 --- a/seminar/templates/seminar/titulnistrana.html +++ b/seminar/templates/seminar/titulnistrana.html @@ -5,32 +5,53 @@ {% block content %} - {# Uvitaci text #} + +{% if nejblizsi_deadline %} +
    +

    Do konce odeslání řešení {% if typ_deadline == 'soustredeni' %}(pro účast na soustředění) {% elif typ_deadline == 'preddeadline' %}(pro otištění došlých řešení) {% endif %}zbývá: + {{nejblizsi_deadline|timeuntil}}

    +
    +{% endif %} + +
    + +
    + +
    +

    - {% block nadpis1a %}{% block nadpis1b %} - Vítej! - {% endblock %}{% endblock %} + {% block nadpis1a %} + Vítej + {% endblock %} + mezi námi

    -

    -M&M je korespondenční seminář. Několikrát do roka zdarma vydáváme časopis a v něm zajímavé podněty k přemýšlení. Ty na ně můžeš reagovat.
    - M&M je taky soutěž. Můžeš vyhrát knížky, deskovky nebo dokonce dort. Můžeš se dostat na matfyz bez přijímaček. A především s námi můžeš jet na skvělé soustředění. -

    - -
    - {% if dead %} -
    -

    Do konce odeslání řešení {% if deadline_soustredeni %}(pro účast na soustředění) {% endif %}zbývá:
    - {{ted|timesince:dead}}

    +
    + M&M je korespondenční seminář. Vydáváme časopis a v něm zajímavé podněty k přemýšlení. Ty na ně můžeš reagovat, + experimentovat a objevovat s námi fascinující zákoutí matiky, fyziky a informatiky. +
    Zaregistruj se!
    {# FIXME odkaz #} + M&M je taky soutěž. Za svá řešení dostaneš body a můžeš vyhrát zajímavé ceny, dostat se + na Matfyz bez přijímaček a především, můžeš s námi jet na skvělé soustředění. +
    Co můžeš vyhrát?
    {# FIXME odkaz #}
    - {% endif %} + +
    - {# Novinky #} -

    Novinky

    - {% include 'seminar/novinky.html' %} +
    - Archiv novinek +

    + Řeš témata! +

    + +
    + Přidej se k nám! Pusť se do řešení témát. + {% for tema in aktualni_temata %} +
    {{ tema.nazev }}
    + {% endfor %} +
    +
    +
    @@ -38,8 +59,24 @@ M&M je korespondenční seminář. Několikrát do roka zdarma vydáváme č
    -

    Zjistit víc!

    +

    Zjisti víc!

    +
    + +
    + +
    + + {# Novinky #} +

    Co je nového?

    + {% include 'seminar/novinky.html' %} + + Archiv novinek + +
    + +
    + {% endblock %} diff --git a/seminar/templates/seminar/treenode.html b/seminar/templates/seminar/treenode.html index ca4df002..9da13c17 100644 --- a/seminar/templates/seminar/treenode.html +++ b/seminar/templates/seminar/treenode.html @@ -1,4 +1,4 @@ -{% extends "seminar/archiv/base.html" %} +{% extends "base.html" %} {% load comments %} diff --git a/seminar/templates/seminar/zadani/AktualniVysledkovka.html b/seminar/templates/seminar/zadani/AktualniVysledkovka.html index 00ace94c..387ad949 100644 --- a/seminar/templates/seminar/zadani/AktualniVysledkovka.html +++ b/seminar/templates/seminar/zadani/AktualniVysledkovka.html @@ -1,11 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "vysledkova-listina" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} - +{% extends "base.html" %} {% block content %} {% with nastaveni.aktualni_rocnik as rocnik %} @@ -27,7 +20,7 @@ v archivu.

    - {% if user.is_staff and vysledkovka_s_neverejnymi %} + {% if user.je_org and vysledkovka_s_neverejnymi %}

    Výsledky včetně neveřejných

    {% with vysledkovka_s_neverejnymi as vysledkovka %} diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index 93fac9a4..770ac603 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -1,10 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "aktualni" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} +{% extends "base.html" %} {% block nadpis1a %}{% block nadpis1b %} Aktuální zadání @@ -16,8 +10,8 @@ {% with nastaveni.aktualni_cislo as ac %} {# Zobrazovani neverejnych zadani jen organizatorum #} -{% if user.is_staff or verejne %} -{% if user.is_staff and not verejne %}
    {% endif %} +{% if user.je_org or verejne %} +{% if user.je_org and not verejne %}
    {% endif %} {% if ac.zadane_problemy.all %} {% if ac.datum_deadline_soustredeni %} @@ -60,7 +54,7 @@ {% endfor %} {% endif %} -{% if user.is_staff and not verejne%}
    {% endif %} +{% if user.je_org and not verejne%}
    {% endif %} {% else %}

    Aktuálně nejsou zveřejněny žádné úlohy

    {% endif %} diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html index 9b4e0156..0fcd3350 100644 --- a/seminar/templates/seminar/zadani/Temata.html +++ b/seminar/templates/seminar/zadani/Temata.html @@ -1,11 +1,4 @@ -{% extends "seminar/zadani/base.html" %} - -{% block submenu %} - {% with "temata" as selected %} - {% include 'seminar/zadani/submenu.html' %} - {% endwith %} -{% endblock submenu %} - +{% extends "base.html" %} {% block content %} {% with nastaveni.aktualni_rocnik as ar %} diff --git a/seminar/templates/seminar/zadani/base.html b/seminar/templates/seminar/zadani/base.html deleted file mode 100644 index a1f223cd..00000000 --- a/seminar/templates/seminar/zadani/base.html +++ /dev/null @@ -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 %} - diff --git a/seminar/testutils.py b/seminar/testutils.py index c7ed79c7..7189dfcf 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- import datetime + +from django.contrib.auth.models import Permission from pytz import timezone import random import lorem @@ -9,6 +11,7 @@ from django.db import transaction import unidecode import logging +from korektury.testutils import create_test_pdf from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode import seminar.models as m @@ -70,7 +73,7 @@ def gen_osoby(rnd, size): if pokusy >= max_pokusy: print("Chyba, na danou velikost testovacích dat příliš málo možných" " jmen a příjmení") - exit + exit() prezdivka = rnd.choice(prezdivky) email = "@".join([unidecode.unidecode(jmeno), rnd.choice(domain)]) telefon = "".join([str(rnd.choice([k for k in range(10)])) for i in range(9)]) @@ -124,9 +127,20 @@ def gen_resitele(rnd, osoby, skoly): logger.info('Generuji řešitele...') resitele = [] + x = 0 + resitel_perm = Permission.objects.filter(codename__exact='resitel').first() for os in osoby: rand = rnd.randint(0, 8) if not (rand % 8 == 0): + if not os.user: + if x: + user = User.objects.create_user(username='r'+str(x), email=os.email, password='r') + else: + user = User.objects.create_user(username='r', email=os.email, password='r') + x += 1 + os.user = user + os.save() + os.user.user_permissions.add(resitel_perm) resitele.append(Resitel.objects.create(osoba=os, skola=rnd.choice(skoly), rok_maturity=rnd.randint(2019, 2029), zasilat=rnd.choice(Resitel.ZASILAT_CHOICES)[0])) @@ -139,7 +153,7 @@ def gen_prijemci(rnd, osoby, kolik=10): prijemci.append(Prijemce.objects.create(osoba=i)) return prijemci -def gen_organizatori(rnd, osoby, last_rocnik, users): +def gen_organizatori(rnd, osoby, last_rocnik): logger.info('Generuji organizátory...') organizatori = [] @@ -149,6 +163,8 @@ def gen_organizatori(rnd, osoby, last_rocnik, users): seznam_oboru = ["matematiku", "matematiku", "matematiku", "fyziku", "literaturu", "informatiku", "informatiku", "běhání dokolečka"] + x = 0 + org_perm = Permission.objects.filter(codename__exact='org').first() for os in osoby: rand = rnd.randint(0, 8) if (rand % 8 == 0): @@ -175,6 +191,15 @@ def gen_organizatori(rnd, osoby, last_rocnik, users): if do.year > datetime.datetime.now().year: do = None + if not os.user: + if x: + user = User.objects.create_user(username='o'+str(x), email=os.email, password='o') + else: + user = User.objects.create_user(username='o', email=os.email, password='o') + x += 1 + os.user = user + os.save() + os.user.user_permissions.add(org_perm) organizatori.append(Organizator.objects.create(osoba=os, organizuje_od=od, organizuje_do=do, strucny_popis_organizatora = popis_orga)) return organizatori @@ -681,14 +706,14 @@ def otec_syn(otec, syn): syn.save() otec.save() -def gen_clanek(rnd): +def gen_clanek(rnd, organizatori, resitele): logger.info("Generuji článek do čísla 22.2") clanek = m.Clanek.objects.create( nazev="Článek o Lorem ipsum", nadproblem=None, stav='vyreseny', zamereni=['I'], - garant=rnd.choice(m.Organizator.objects.all()), + garant=rnd.choice(organizatori), kod='cl', ) clanek.save() @@ -696,7 +721,7 @@ def gen_clanek(rnd): reseni = m.Reseni.objects.create( zverejneno=True, ) - reseni.resitele.add(rnd.choice(m.Resitel.objects.all())) + reseni.resitele.add(rnd.choice(resitele)) reseni.save() cislo = m.Cislo.objects.get(rocnik__rocnik=22, poradi=2) @@ -771,11 +796,22 @@ def create_test_data(size = 6, rnd = None): # users admin = User.objects.create_superuser(username='admin', email='', password='admin') + os_admin = Osoba.objects.create( + user=admin, jmeno='admin', prijmeni='admin', + prezdivka='admin', pohlavi_muz=1, email='admin@admin.admin', + telefon='123 456 789', datum_narozeni=datetime.date(2000, 1, 1), + ulice='admin', mesto='admin', psc='100 00', + datum_registrace=datetime.date(2020, 9, 6) + ) + or_admin = Organizator.objects.create( + osoba=os_admin, organizuje_od=None, organizuje_do=None, + strucny_popis_organizatora="Organizátor k uživateli Admin" + ) usernames = ['anet', 'bara', 'cyril', 'david', 'eva', 'filip'] users = [] for usr in usernames[:size]: - u = User.objects.create(username=usr, password=usr) + u = User.objects.create_user(username=usr, password=usr) u.first_name = usr.capitalize() u.save() users.append(u) @@ -789,8 +825,8 @@ def create_test_data(size = 6, rnd = None): # resitele a organizatori last_rocnik = 25 + organizatori = gen_organizatori(rnd, osoby, last_rocnik) resitele = gen_resitele(rnd, osoby, skoly) - organizatori = gen_organizatori(rnd, osoby, last_rocnik, users) #generování novinek novinky = gen_novinky(rnd, organizatori) @@ -830,6 +866,9 @@ def create_test_data(size = 6, rnd = None): #generování konfer konfery = gen_konfery(size, rnd, organizatori, resitele, soustredeni) + # vytvoreni pdf ke korekturam + create_test_pdf(rnd, organizatori) + # TODO: nastavi správně, kolik se čeho generuje, aby rozsahy přibližně odpovídaly # FIXME: misto typu ruzne typy objektu a vnoreni do sebe (Tom nechápe, co je tímto fixme míněno) # TODO: vytvorit temata s ruznymi vlakny @@ -840,7 +879,7 @@ def create_test_data(size = 6, rnd = None): # TODO: přidat ke konferám řešení a dát je do čísel # Dohackované vytvoření jednoho článku - gen_clanek(rnd) + gen_clanek(rnd, organizatori, resitele) # obecné nastavení semináře, musí být už přidané ročníky a čísla, jinak se nastaví divně diff --git a/seminar/urls.py b/seminar/urls.py index e5fed60e..ba74dc04 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -1,11 +1,8 @@ from django.urls import path, include -from django.contrib.auth.decorators import user_passes_test +from django.contrib.auth.decorators import login_required from . import views, export -from .utils import staff_member_required +from .utils import org_required, resitel_required from django.views.generic.base import RedirectView -from django.contrib.auth import views as auth_views - -staff_member_required = user_passes_test(lambda u: u.is_staff) urlpatterns = [ # path('aktualni/temata/', views.TemataRozcestnikView), @@ -20,7 +17,7 @@ urlpatterns = [ path('archiv/temata/', views.ArchivTemataView.as_view()), path('rocnik//', views.RocnikView.as_view(), name='seminar_rocnik'), - path('cislo/./', views.CisloView.as_view(), name='seminar_cislo'), # odkomentované jenom kvůli testování archivu + path('cislo/./', views.CisloView.as_view(), name='seminar_cislo'), path('problem//', views.ProblemView.as_view(), name='seminar_problem'), path('treenode//', views.TreeNodeView.as_view(), name='seminar_treenode'), #path('problem/(?P\d+)/(?P\d+)/', views.PrispevekView.as_view(), name='seminar_problem_prispevek'), @@ -33,17 +30,17 @@ urlpatterns = [ ), path( 'soustredeni//seznam_ucastniku', - staff_member_required(views.SoustredeniUcastniciView.as_view()), + org_required(views.SoustredeniUcastniciView.as_view()), name='soustredeni_ucastnici' ), path( 'soustredeni//maily_ucastniku', - staff_member_required(views.SoustredeniMailyUcastnikuView.as_view()), + org_required(views.SoustredeniMailyUcastnikuView.as_view()), name='maily_ucastniku' ), path( 'soustredeni//export_ucastniku', - staff_member_required(views.soustredeniUcastniciExportView), + org_required(views.soustredeniUcastniciExportView), name='soustredeni_ucastnici_export' ), path( @@ -62,64 +59,102 @@ urlpatterns = [ #path('clanky/org/', views.ClankyOrganizatorView.as_view(), name='clanky_organizator'), # Aesop - path('aesop-export/mam-rocnik-.csv', export.ExportRocnikView.as_view(), name='seminar_export_rocnik'), - path('aesop-export/mam-sous-.csv', export.ExportSousView.as_view(), name='seminar_export_sous'), - path('aesop-export/index.csv', export.ExportIndexView.as_view(), name='seminar_export_index'), + path( + 'aesop-export/mam-rocnik-.csv', + org_required(export.ExportRocnikView.as_view()), + name='seminar_export_rocnik' + ), + path( + 'aesop-export/mam-sous-.csv', + org_required(export.ExportSousView.as_view()), + name='seminar_export_sous' + ), + path( + 'aesop-export/index.csv', + org_required(export.ExportIndexView.as_view()), + name='seminar_export_index' + ), # Stranky viditelne pouze pro orgy: path( - 'rocnik//vysledkovka.tex', - staff_member_required(views.RocnikVysledkovkaView.as_view()), - name='seminar_rocnik_vysledkovka' + 'rocnik//vysledkovka.tex', + org_required(views.RocnikVysledkovkaView.as_view()), + name='seminar_rocnik_vysledkovka' ), - path('cislo/./vysledkovka.tex', - staff_member_required(views.CisloVysledkovkaView.as_view()), - name='seminar_cislo_vysledkovka' + path( + 'cislo/./vysledkovka.tex', + org_required(views.CisloVysledkovkaView.as_view()), + name='seminar_cislo_vysledkovka' + ), + path( + 'cislo/./obalky.pdf', + org_required(views.cisloObalkyView), + name='seminar_cislo_obalky' + ), + path( + 'cislo/./tituly.tex', + org_required(views.TitulyView), + name='seminar_cislo_titul' + ), + path( + 'stav', + org_required(views.StavDatabazeView), + name='stav_databaze' + ), + path( + 'cislo/./obalkovani', + org_required(views.ObalkovaniView.as_view()), + name='seminar_cislo_resitel_obalkovani' + ), + path( + 'soustredeni//obalky.pdf', + org_required(views.soustredeniObalkyView), + name='seminar_soustredeni_obalky' + ), + path( + 'org/vloz_body//', + org_required(views.VlozBodyView.as_view()), + name='seminar_org_vlozbody' ), - path('cislo/./obalky.pdf', - staff_member_required(views.cisloObalkyView), name='seminar_cislo_obalky'), - - path('cislo/./tituly.tex', - staff_member_required(views.TitulyView), name='seminar_cislo_titul'), - path('stav', - staff_member_required(views.StavDatabazeView), name='stav_databaze'), - path('cislo/./obalkovani', - staff_member_required(views.ObalkovaniView.as_view()), name='seminar_cislo_resitel_obalkovani'), - path('soustredeni//obalky.pdf', - staff_member_required(views.soustredeniObalkyView), name='seminar_soustredeni_obalky'), - - path('org/vloz_body//', - staff_member_required(views.VlozBodyView.as_view()),name='seminar_org_vlozbody'), # příprava na nestatický orgorozcestník - path('org/rozcestnik/', - staff_member_required(views.OrgoRozcestnikView.as_view()),name='seminar_org_rozcestnik'), + path( + 'org/rozcestnik/', + org_required(views.OrgoRozcestnikView.as_view()), + name='seminar_org_rozcestnik' + ), + path('prihlaska/',views.prihlaskaView, name='seminar_prihlaska'), path('login/', views.LoginView.as_view(), name='login'), path('logout/', views.LogoutView.as_view(), name='logout'), - path('resitel/', views.ResitelView.as_view(), name='seminar_resitel'), + path('resitel/', resitel_required(views.ResitelView.as_view()), name='seminar_resitel'), path('reset_password/', views.PasswordResetView.as_view(), name='reset_password'), path('change_password/', views.PasswordChangeView.as_view(), name='change_password'), path('reset_password_done/', views.PasswordResetDoneView.as_view(), name='reset_password_done'), path('reset_password_confirm///', views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'), path('reset_password_complete/', views.PasswordResetCompleteView.as_view(), name='reset_password_complete'), - path('resitel_edit', views.resitelEditView, name='seminar_resitel_edit'), + path( + 'resitel_edit', + login_required(views.resitelEditView, login_url='/login/'), + name='seminar_resitel_edit' + ), # Obecný view na profil -- orgům dá rozcestník, řešitelům jejich stránku path('profil/', views.profilView, name='profil'), # Autocomplete path('autocomplete/skola/',views.SkolaAutocomplete.as_view(), name='autocomplete_skola'), - path('autocomplete/resitel/',views.ResitelAutocomplete.as_view(), name='autocomplete_resitel'), + path('autocomplete/resitel/', org_required(views.ResitelAutocomplete.as_view()), name='autocomplete_resitel'), path('autocomplete/problem/odevzdatelny',views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'), - path('temp/add_solution', views.AddSolutionView.as_view(),name='seminar_vloz_reseni'), - path('temp/nahraj_reseni', views.NahrajReseniView.as_view(),name='seminar_nahraj_reseni'), + path('temp/add_solution', org_required(views.AddSolutionView.as_view()), name='seminar_vloz_reseni'), + path('temp/nahraj_reseni', resitel_required(views.NahrajReseniView.as_view()), name='seminar_nahraj_reseni'), path('', views.TitulniStranaView.as_view(), name='titulni_strana'), + path('jak-resit/', views.JakResitView.as_view(), name='jak-resit'), # Ceka na autocomplete v3 # path('autocomplete/organizatori/', - # staff_member_required(views.OrganizatorAutocomplete.as_view()), + # org_member_required(views.OrganizatorAutocomplete.as_view()), # name='seminar_autocomplete_organizator') diff --git a/seminar/utils.py b/seminar/utils.py index 9a442127..ad9be95e 100644 --- a/seminar/utils.py +++ b/seminar/utils.py @@ -1,15 +1,25 @@ # -*- coding: utf-8 -*- import datetime -from django.contrib.auth.decorators import user_passes_test + +from django.contrib.auth import get_user_model +from django.contrib.auth.decorators import permission_required from html.parser import HTMLParser + +from django.contrib.auth.models import AnonymousUser from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist import seminar.models as m import seminar.treelib as t -staff_member_required = user_passes_test(lambda u: u.is_staff) +org_required = permission_required('auth.org', raise_exception=True) +resitel_required = permission_required('auth.resitel', raise_exception=True) +User = get_user_model() +User.je_org = lambda self: self.has_perm('auth.org') +User.je_resitel = lambda self: self.has_perm('auth.resitel') +AnonymousUser.je_org = lambda self: False +AnonymousUser.je_resitel = lambda self: False class FirstTagParser(HTMLParser): diff --git a/seminar/views/utils.py b/seminar/views/utils.py index 3869ffd4..1fa28827 100644 --- a/seminar/views/utils.py +++ b/seminar/views/utils.py @@ -6,8 +6,6 @@ from html.parser import HTMLParser import seminar.models as m -staff_member_required = user_passes_test(lambda u: u.is_staff) - class FirstTagParser(HTMLParser): def __init__(self, *args, **kwargs): self.firstTag = None diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index cae17b77..0c47946e 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1,6 +1,6 @@ # coding:utf-8 -from django.shortcuts import get_object_or_404, render +from django.shortcuts import get_object_or_404, render, redirect from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, JsonResponse from django.urls import reverse,reverse_lazy from django.core.exceptions import PermissionDenied, ObjectDoesNotExist @@ -13,7 +13,7 @@ from django.views.generic.edit import FormView, CreateView from django.views.generic.base import TemplateView from django.contrib.auth import authenticate, login, get_user_model, logout from django.contrib.auth import views as auth_views -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Permission from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction @@ -24,7 +24,7 @@ from seminar import utils, treelib from seminar.forms import PrihlaskaForm, LoginForm, ProfileEditForm import seminar.forms as f -from datetime import timedelta, date, datetime +from datetime import timedelta, date, datetime, MAXYEAR from django.utils import timezone from itertools import groupby from collections import OrderedDict @@ -44,14 +44,15 @@ import time from seminar.utils import aktivniResitele, resi_v_rocniku - -def verejna_temata(rocnik): - """Vrací queryset zveřejněných témat v daném ročníku. - """ - return Problem.objects.filter(typ=Problem.TYP_TEMA, cislo_zadani__rocnik=rocnik, cislo_zadani__verejne_db=True).order_by('kod') - -def temata_v_rocniku(rocnik): - return Problem.objects.filter(typ=Problem.TYP_TEMA, rocnik=rocnik) +# ze starého modelu +#def verejna_temata(rocnik): +# """ +# Vrací queryset zveřejněných témat v daném ročníku. +# """ +# return Problem.objects.filter(typ=Problem.TYP_TEMA, cislo_zadani__rocnik=rocnik, cislo_zadani__verejne_db=True).order_by('kod') +# +#def temata_v_rocniku(rocnik): +# return Problem.objects.filter(typ=Problem.TYP_TEMA, rocnik=rocnik) def get_problemy_k_tematu(tema): return Problem.objects.filter(nadproblem = tema) @@ -238,50 +239,55 @@ def spravne_novinky(request): user = request.user # Využíváme líné vyhodnocování QuerySetů qs = Novinky.objects.all() - # TODO: Tohle by mělo spíš kontrolovat, že je/není někdo org, než že může do Adminu. - if not user.is_staff: + if not user.je_org: qs = qs.filter(zverejneno=True) return qs.order_by('-datum') +def aktualni_temata(rocnik): + """ + Vrací PolymorphicQuerySet témat v daném ročníku, ke kterým se aktuálně dá něco odevzdat. + """ + return Tema.objects.filter(rocnik=rocnik, stav='zadany').order_by('kod') + class TitulniStranaView(generic.ListView): template_name='seminar/titulnistrana.html' def get_queryset(self): - return spravne_novinky(self.request)[:5] + return spravne_novinky(self.request)[:3] def get_context_data(self, **kwargs): context = super(TitulniStranaView, self).get_context_data(**kwargs) nastaveni = get_object_or_404(Nastaveni) + + deadline_soustredeni = (nastaveni.aktualni_cislo.datum_deadline_soustredeni, "soustredeni") + preddeadline = (nastaveni.aktualni_cislo.datum_preddeadline, "preddeadline") + deadline = (nastaveni.aktualni_cislo.datum_deadline, "deadline") - # zjisteni spravneho terminu - if nastaveni.aktualni_cislo.datum_deadline_soustredeni: - cas_deadline_soustredeni = nastaveni.aktualni_cislo.\ - datum_deadline_soustredeni - if (datetime.now().date() <= cas_deadline_soustredeni): - cas_deadline = cas_deadline_soustredeni - deadline_soustredeni = True - else: - cas_deadline = nastaveni.aktualni_cislo.datum_deadline - deadline_soustredeni = False - else: - cas_deadline = nastaveni.aktualni_cislo.datum_deadline - deadline_soustredeni = False - - # Pokud neni zverejnene cislo nezverejnuj odpocet - if nastaveni.aktualni_cislo.verejne(): - # pokus se zjistit termin odeslani a pokud neni zadany, - # nezverejnuj odpocet - context['deadline_soustredeni'] = deadline_soustredeni - try: - context['dead'] = datetime.combine(cas_deadline, - datetime.max.time()) - context['ted'] = datetime.now() - except: - context['dead'] = None + try: + nejblizsi_deadline = sorted(filter(lambda dl: dl[0] is not None and dl[0] >= date.today(), [deadline_soustredeni, preddeadline, deadline]))[0] + except IndexError: + nejblizsi_deadline = (None, None) # neni zadna aktualni deadline + + if nejblizsi_deadline[0] is not None: + context['nejblizsi_deadline'] = datetime.combine(nejblizsi_deadline[0], datetime.max.time()) else: - context['dead'] = None - context['deadline_soustredeni'] = deadline_soustredeni + context['nejblizsi_deadline'] = None + + context['typ_deadline'] = nejblizsi_deadline[1] + + # Aktuální témata + nazvy_a_odkazy_na_aktualni_temata = [] + akt_temata = aktualni_temata(nastaveni.aktualni_rocnik) + + for tema in akt_temata: + # FIXME: netuším, jestli funguje tema.verejne_url(), nemáme testdata na témátka - je to asi url vzhledem k ročníku + nazvy_a_odkazy_na_aktualni_temata.append({'nazev':tema.nazev,'url':tema.verejne_url()}) + + context['aktualni_temata'] = nazvy_a_odkazy_na_aktualni_temata + + print(context) + return context class StareNovinkyView(generic.ListView): @@ -344,7 +350,8 @@ class ArchivView(generic.ListView): ### Výsledky def sloupec_s_poradim(setrizene_body): - """ Ze seznamu obsahujícího sestupně setřízené body řešitelů za daný ročník + """ + Ze seznamu obsahujícího sestupně setřízené body řešitelů za daný ročník vytvoří seznam s pořadími (včetně 3.-5. a pak 2 volná místa atp.), podle toho, jak jdou za sebou ve výsledkovce. Parametr: @@ -384,7 +391,8 @@ def sloupec_s_poradim(setrizene_body): return sloupec_s_poradim def cisla_rocniku(rocnik, jen_verejne=True): - """ Vrátí všechna čísla daného ročníku. + """ + Vrátí všechna čísla daného ročníku. Parametry: rocnik (Rocnik): ročník semináře jen_verejne (bool): zda se mají vrátit jen veřejná, nebo všechna čísla @@ -539,7 +547,7 @@ def vysledkovka_rocniku(rocnik, jen_verejne=True): # získáme body za ročník, seznam obsahuje dvojice (řešitel_id, body) setřízené sestupně resitel_rocnikbody_sezn = secti_body_za_rocnik(rocnik, aktivni_resitele) - + # setřídíme řešitele podle počtu bodů a získáme seznam s body od nejvyšších po nenižší setrizeni_resitele_id, setrizeni_resitele, setrizene_body = setrid_resitele_a_body(resitel_rocnikbody_sezn) poradi = sloupec_s_poradim(setrizene_body) @@ -623,7 +631,7 @@ class ProblemView(generic.DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) # Musí se používat context['object'], protože nevíme, jestli dostaneme úložku, téma, článek, .... a tyhle věci vyrábějí různé klíče. - if not context['object'].verejne() and not self.request.user.is_staff: + if not context['object'].verejne() and not self.request.user.je_org: raise PermissionDenied() if isinstance(context['object'], Clanek): context['reseni'] = Reseni.objects.filter(problem=context['object']).select_related('resitel').order_by('resitel__prijmeni') @@ -774,6 +782,7 @@ def vysledkovka_cisla(cislo, context=None): return context class CisloView(generic.DetailView): + # FIXME zobrazování témátek a vůbec, teď je tam jen odkaz na číslo v pdf model = Cislo template_name = 'seminar/archiv/cislo.html' @@ -1212,6 +1221,8 @@ def prihlaskaView(request): password=fcd['password'], email = fcd['email']) u.save() + resitel_perm = Permission.objects.filter(codename__exact='resitel').first() + u.user_permissions.add(resitel_perm) o = Osoba( jmeno = fcd['jmeno'], @@ -1311,10 +1322,9 @@ class PasswordChangeView(auth_views.PasswordChangeView): # Jen hloupé rozhazovátko def profilView(request): user = request.user - # FIXME: správná oprávnění - if user.has_perm('org'): + if user.has_perm('auth.org'): return OrgoRozcestnikView.as_view()(request) - if user.has_perm('ucastnik'): + if user.has_perm('auth.resitel'): return ResitelView.as_view()(request) else: return LoginView.as_view()(request) @@ -1332,3 +1342,10 @@ def formularOKView(request): } return render(request, template_name, context) +#------------------ Jak řešit - možná má být udělané úplně jinak + +class JakResitView(generic.ListView): + template_name = 'seminar/jak-resit.html' + + def get_queryset(self): + return None diff --git a/sitetree_new.json b/sitetree_new.json deleted file mode 100644 index e66f9bc7..00000000 --- a/sitetree_new.json +++ /dev/null @@ -1,562 +0,0 @@ -[ -{ - "model": "sitetree.tree", - "pk": 1, - "fields": { - "title": "Hlavn\u00ed menu", - "alias": "main_menu" - } -}, -{ - "model": "sitetree.treeitem", - "pk": 1, - "fields": { - "title": "Co je M&M", - "hint": "", - "url": "/co-je-MaM/uvod/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 1, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 2, - "fields": { - "title": "Jak \u0159e\u0161it", - "hint": "", - "url": "/jak-resit/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 2, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 3, - "fields": { - "title": "Aktu\u00e1ln\u00ed
    ro\u010dn\u00edk", - "hint": "", - "url": "/zadani/aktualni/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 3, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 4, - "fields": { - "title": "Soust\u0159ed\u011bn\u00ed", - "hint": "", - "url": "/soustredeni/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 4, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 5, - "fields": { - "title": "Archiv", - "hint": "", - "url": "/archiv/rocniky/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 5, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 6, - "fields": { - "title": "P\u0159ihl\u00e1sit", - "hint": "", - "url": "/login/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": true, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 6, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 7, - "fields": { - "title": "\u00davod", - "hint": "", - "url": "/co-je-MaM/uvod/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 1, - "sort_order": 7, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 8, - "fields": { - "title": "Organiz\u00e1to\u0159i", - "hint": "", - "url": "/co-je-MaM/organizatori/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 1, - "sort_order": 8, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 9, - "fields": { - "title": "FAQ", - "hint": "", - "url": "/co-je-MaM/FAQ/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 1, - "sort_order": 9, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 10, - "fields": { - "title": "Kontakt", - "hint": "", - "url": "/co-je-MaM/kontakt/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 1, - "sort_order": 10, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 11, - "fields": { - "title": "T\u00e9mata", - "hint": "", - "url": "/jak-resit/temata/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 2, - "sort_order": 11, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 12, - "fields": { - "title": "Jak ps\u00e1t p\u0159\u00edsp\u011bvek", - "hint": "", - "url": "/jak-resit/jak-psat-prispevek/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 2, - "sort_order": 12, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 13, - "fields": { - "title": "Odm\u011bny", - "hint": "", - "url": "/co-je-MaM/odmeny/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 2, - "sort_order": 13, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 15, - "fields": { - "title": "Aktu\u00e1ln\u00ed t\u00e9mata", - "hint": "", - "url": "/zadani/temata/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 3, - "sort_order": 15, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 16, - "fields": { - "title": "V\u00fdsledkov\u00e1 listina", - "hint": "", - "url": "zadani/vysledkova-listina/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 3, - "sort_order": 16, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 17, - "fields": { - "title": "\u010cl\u00e1nky", - "hint": "", - "url": "/clanky/resitel/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 3, - "sort_order": 17, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 18, - "fields": { - "title": "\u00davod", - "hint": "", - "url": "/soustredeni/uvod/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 4, - "sort_order": 18, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 19, - "fields": { - "title": "P\u0159ipravujeme", - "hint": "", - "url": "/soustredeni/pripravujeme/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 4, - "sort_order": 19, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 20, - "fields": { - "title": "Prob\u011bhlo", - "hint": "", - "url": "/soustredeni/probehlo/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 4, - "sort_order": 20, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 21, - "fields": { - "title": "Profil", - "hint": "", - "url": "/profil/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": true, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": null, - "sort_order": 21, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 22, - "fields": { - "title": "Osobn\u00ed \u00fadaje", - "hint": "", - "url": "/profil/osobni-udaje", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 21, - "sort_order": 22, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 23, - "fields": { - "title": "Poslat \u0159e\u0161en\u00ed", - "hint": "", - "url": "/odeslat-reseni/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 21, - "sort_order": 23, - "access_permissions": [] - } -}, -{ - "model": "sitetree.treeitem", - "pk": 24, - "fields": { - "title": "T\u00e9mata", - "hint": "", - "url": "/archiv/temata/", - "urlaspattern": false, - "tree": 1, - "hidden": false, - "alias": null, - "description": "", - "inmenu": true, - "inbreadcrumbs": true, - "insitetree": true, - "access_loggedin": false, - "access_guest": false, - "access_restricted": false, - "access_perm_type": 1, - "parent": 5, - "sort_order": 24, - "access_permissions": [] - } -} -]