diff --git a/flat.json b/flat.json index 61a7a2db..db13ba78 100644 --- a/flat.json +++ b/flat.json @@ -93,7 +93,7 @@ "model": "flatpages.flatpage", "pk": 7, "fields": { - "url": "/co-je-MaM/jak-resit/", + "url": "/jak-resit/", "title": "Jak \u0159e\u0161it?", "content": "

\u010c\u00edm se n\u00e1\u0161 semin\u00e1\u0159 li\u0161\u00ed od v\u011bt\u0161iny ostatn\u00edch sout\u011b\u017e\u00ed, jsou p\u0159\u00edsp\u011bvkov\u00e1 t\u00e9mata. Jedn\u00e1 se o simulaci v\u011bdeck\u00e9 pr\u00e1ce ve smyslu, \u017ee zad\u00e1me jist\u00fd okruh probl\u00e9m\u016f, nad kter\u00fdm m\u016f\u017ee\u0161 n\u00e1sleduj\u00edc\u00ed rok b\u00e1dat. O v\u00fdsledky sv\u00e9 pr\u00e1ce se pak pod\u011bl\u00ed\u0161 s n\u00e1mi a s ostatn\u00edmi \u0159e\u0161iteli a my tvou pr\u00e1ci ohodnot\u00edme. V ka\u017ed\u00e9 s\u00e9rii b\u00fdvaj\u00ed t\u00e9mata roz\u0161i\u0159ov\u00e1na, nav\u00edc jsou n\u011bkter\u00e9 zadan\u00e9 probl\u00e9my omezeny term\u00ednem odesl\u00e1n\u00ed, proto je pot\u0159eba sv\u00e9 v\u00fdsledky pos\u00edlat u\u017e pr\u016fb\u011b\u017en\u011b. Na ka\u017ed\u00fd ro\u010dn\u00edk t\u00e9mat vypisujeme p\u011bt a\u017e \u0161est.

\r\n\r\n

\u0158e\u0161en\u00ed, kter\u00e9 n\u00e1m po\u0161le\u0161, m\u016f\u017ee b\u00fdt dvou r\u016fzn\u00fdch typ\u016f:

\r\n\r\n

\u00dalohy

\r\n\r\n

V r\u00e1mci ka\u017ed\u00e9ho t\u00e9matu b\u00fdv\u00e1 zad\u00e1na jedna nebo dv\u011b men\u0161\u00ed \u00falohy, kter\u00e9 dan\u00fd probl\u00e9m ur\u010dit\u00fdm zp\u016fsobem rozv\u00edj\u00ed. Tyto \u00falohy b\u00fdvaj\u00ed trochu t\u011b\u017e\u0161\u00ed ne\u017e obvykl\u00e9 \u0161koln\u00ed, jejich \u0159e\u0161en\u00ed \u010dasto vy\u017eaduje bu\u010f hlub\u0161\u00ed zamy\u0161len\u00ed nebo n\u011bjak\u00fd trik. St\u0159edo\u0161kolsk\u00e9 znalosti by na n\u011b ale m\u011bly sta\u010dit. Odevzd\u00e1v\u00e1n\u00ed \u00faloh se omezuje term\u00ednem odesl\u00e1n\u00ed, pot\u00e9 b\u00fdv\u00e1 zve\u0159ejn\u011bno vzorov\u00e9 \u0159e\u0161en\u00ed. U ka\u017ed\u00e9 \u00falohy je uveden po\u010det bod\u016f za spr\u00e1vn\u00e9 \u0159e\u0161en\u00ed. P\u0159im\u011b\u0159enou \u010d\u00e1st z t\u011bchto bod\u016f lze z\u00edskat i za ne\u00fapln\u00e9 \u0159e\u0161en\u00ed. A naopak za velmi zaj\u00edmav\u00e9 nebo elegantn\u00ed \u0159e\u0161en\u00ed m\u016f\u017ee\u0161 dostat i bodovou pr\u00e9mii.

\r\n\r\n

\u010cl\u00e1nky

\r\n\r\n

Syst\u00e9m t\u00e9mat poskytuje p\u0159\u00edle\u017eitost pro podrobn\u011bj\u0161\u00ed rozbor dan\u00e9ho okruhu probl\u00e9m\u016f. V\u00fdsledek takov\u00e9 pr\u00e1ce v\u0161ak vy\u017eaduje o n\u011bco v\u00edc prostoru ne\u017eli klasick\u00e9 \u0159e\u0161en\u00ed, proto je tv\u00fdm \u00fakolem napsat \u010dl\u00e1nek zab\u00fdvaj\u00edc\u00ed se probl\u00e9mem, kter\u00fd sis vybral. M\u016f\u017ee to b\u00fdt z\u00e1znam o proveden\u00e9m experimentu, teoretick\u00e9m v\u00fdpo\u010dtu \u010di \u00favaze, napsan\u00e9m programu \u010di o dal\u0161\u00edch (podle tebe zaj\u00edmav\u00fdch) ot\u00e1zk\u00e1ch z dan\u00e9ho okruhu. 

\r\n\r\n

Jak na to?

\r\n\r\n

Vy\u0159e\u0161 podprobl\u00e9m

\r\n\r\n

Vyber si n\u011bkter\u00fd z navrhovan\u00fdch podprobl\u00e9m\u016f, kter\u00fdm se chce\u0161 zab\u00fdvat, p\u0159\u00edpadn\u011b si navrhni podprobl\u00e9m vlastn\u00ed (to b\u00fdv\u00e1 ohodnoceno bodov\u00fdm bonusem). Podprobl\u00e9m pak vy\u0159e\u0161 podobn\u011b jako \u00falohu z \u010d\u00edsla. Podrobn\u00e9 \u0159e\u0161en\u00ed n\u011bkter\u00e9ho z podprobl\u00e9m\u016f bude bodov\u011b hodnoceno v\u00fdrazn\u011b l\u00e9pe ne\u017e souhrnn\u00fd \u010dl\u00e1nek kr\u00e1tce zmi\u0148uj\u00edc\u00ed kdeco. I \u010d\u00e1ste\u010dn\u00e9 \u0159e\u0161en\u00ed je lep\u0161\u00ed ne\u017e \u017e\u00e1dn\u00e9. Sv\u00e9 \u0159e\u0161en\u00ed pak hezky sepi\u0161, aby m\u011blo formu \u010dl\u00e1nku, a \u010dl\u00e1nek n\u00e1m po\u0161li. Vedouc\u00ed t\u00e9matu ho pak ohodnot\u00ed, p\u0159\u00edpadn\u011b zkoriguje a publikuje na webu \u010di dokonce v \u010d\u00edsle. \u010c\u00edm bl\u00ed\u017ee bude forma tv\u00e9ho p\u0159\u00edsp\u011bvku publikovateln\u00e9mu \u010dl\u00e1nku, t\u00edm lep\u0161\u00edho bodov\u00e9ho ohodnocen\u00ed dos\u00e1hne\u0161. Moder\u00e1tor t\u00e9matu ho pak ohodnot\u00ed, p\u0159\u00edpadn\u011b zkoriguje a publikuje na webu \u010di dokonce v \u010d\u00edsle. \u010c\u00edm bl\u00ed\u017ee bude forma tv\u00e9ho p\u0159\u00edsp\u011bvku publikovateln\u00e9mu \u010dl\u00e1nku, t\u00edm lep\u0161\u00edho bodov\u00e9ho ohodnocen\u00ed dos\u00e1hne\u0161.

\r\n\r\n

Inspiruj se

\r\n\r\n

Velmi d\u016fle\u017eitou vlastnost\u00ed t\u00e9mat je, \u017ee m\u016f\u017ee\u0161 na \u010dl\u00e1nky ostatn\u00edch reagovat \u2013 rozv\u00edjet je, nebo naopak bo\u0159it jejich p\u0159edstavy. Proto se hod\u00ed poslat tak\u00e9 \u010d\u00e1ste\u010dn\u00e1 \u0159e\u0161en\u00ed, post\u0159ehy, nebo n\u00e1pady na dal\u0161\u00ed podprobl\u00e9my, kter\u00e9 t\u0159eba nezvl\u00e1dne\u0161 vy\u0159e\u0161it s\u00e1m. Takov\u00e9to p\u0159\u00edsp\u011bvky d\u00e1vaj\u00ed prostor ostatn\u00edm a mohou je d\u00e1l inspirovat \u2013 ostatn\u00ed zase sv\u00fdmi p\u0159\u00edsp\u011bvky mohou inspirovat tebe.

\r\n\r\n

Proto\u017ee v\u00edc hlav v\u00edc v\u00ed, m\u016f\u017eete na t\u00e9matech pracovat i ve skupin\u00e1ch.

\r\n\r\n\r\n

Nad n\u00e1pady k t\u00e9mat\u016fm m\u016f\u017ee\u0161 p\u0159em\u00fd\u0161let cel\u00fd rok a\u017e do term\u00ednu odevzd\u00e1n\u00ed posledn\u00ed s\u00e9rie \u00faloh. Samoz\u0159ejm\u011b, \u010d\u00edm d\u0159\u00edve n\u00e1m \u010dl\u00e1nek po\u0161le\u0161, t\u00edm d\u0159\u00edve na n\u011bj ostatn\u00ed budou moci zareagovat.

\r\n\r\n

Pi\u0161 hezk\u00e9 \u010dl\u00e1nky

\r\n\r\n

\u010cl\u00e1nek k t\u00e9matu by m\u011bl po obsahov\u00e9 a form\u00e1ln\u00ed str\u00e1nce odpov\u00eddat v\u011bdeck\u00e9mu \u010dl\u00e1nku. M\u016f\u017ee\u0161 se pod\u00edvat na stru\u010dn\u00fd p\u0159ehled toho, jak by m\u011bl takov\u00fd v\u011bdeck\u00fd \u010dl\u00e1nek vypadat.

\r\n\r\n

Pro\u010d t\u00e9mata?

\r\n\r\n

T\u00e9mata vytv\u00e1\u0159ej\u00ed prostor pro vlastn\u00ed tv\u016fr\u010d\u00ed (\u010dasto v\u011bdeckou) \u010dinnost, jej\u00edm\u017e smyslem je krom jin\u00e9ho p\u0159in\u00e9st ostatn\u00edm \u0159e\u0161itel\u016fm nov\u00e9 podn\u011bty a inspirovat je k dal\u0161\u00edm n\u00e1pad\u016fm. Krom\u011b samotn\u00e9ho b\u00e1d\u00e1n\u00ed je d\u016fle\u017eit\u00e1 i komunikace mezi lidmi, kter\u00e1 je obvykle zprost\u0159edkov\u00e1na odborn\u00fdmi \u010dasopisy a v\u011bdeck\u00fdmi konferencemi. \u010casopis M&M je ur\u010den pr\u00e1v\u011b pro p\u00edsemnou komunikaci. \u00dastn\u00ed formu prezentace si m\u016f\u017ee\u0161 vyzkou\u0161et na na\u0161em soust\u0159ed\u011bn\u00ed, kde se tradi\u010dn\u011b kon\u00e1 mal\u00e1 v\u011bdeck\u00e1 konference.

\r\n\r\n

Jak poslat \u0159e\u0161en\u00ed

\r\n\r\n

Sv\u00e1 \u0159e\u0161en\u00ed m\u016f\u017ee\u0161 poslat bu\u010f elektronicky na n\u00e1\u0161 e-mail mam@matfyz.cz, nebo po\u0161tou na na\u0161i adresu. Pokud pot\u0159ebuje\u0161 k \u0159e\u0161en\u00ed p\u0159ilo\u017eit n\u011bjak\u00fd hodn\u011b velk\u00fd soubor, pou\u017eij n\u011bkterou voln\u011b dostupnou slu\u017ebu pro sd\u00edlen\u00ed soubor\u016f (DropboxGoogle Drive, \u2026) nebo n\u00e1s kontaktuj na e-mailu mam@matfyz.cz a p\u0159ed\u00e1n\u00ed domluv\u00edme.

\r\n\r\n

Pokud pos\u00edl\u00e1\u0161 \u0159e\u0161en\u00ed elektronicky, v\u011bz, \u017ee n\u00e1s daleko v\u00edce pot\u011b\u0161\u00ed pdfko s textem ne\u017e vyfocen\u00e9 ru\u010dn\u011b psan\u00e9 \u0159e\u0161en\u00ed. Ka\u017edou \u00falohu pros\u00edm po\u0161li v samostatn\u00e9m souboru resp. na samostatn\u00e9m list\u011b A4, aby si \u00falohy mohli rozd\u011blit r\u016fzn\u00ed opravuj\u00edc\u00ed. Na ka\u017ed\u00fd list uve\u010f svoje jm\u00e9no a \u010d\u00edslo \u00falohy \u010di t\u00e9matu. Na tvou po\u0161tovn\u00ed adresu ti pak budou zdarma chodit dal\u0161\u00ed \u010d\u00edsla na\u0161eho \u010dasopisu.

\r\n\r\n

Ke sv\u00e9mu prvn\u00edmu \u0159e\u0161en\u00ed p\u0159ilo\u017e pros\u00edm tak\u00e9 sv\u00e9 jm\u00e9no, adresu, e-mail, \u0161kolu a rok maturity. Pokud chce\u0161 jet na soust\u0159ed\u011bn\u00ed, uve\u010f pros\u00edm i telefon. A neboj, tyto \u00fadaje budeme vyu\u017e\u00edvat pouze pro pot\u0159eby M&M. Mimo \u00fadaj\u016f na v\u00fdsledkov\u00e9 listin\u011b (jm\u00e9no, \u0161kola, ro\u010dn\u00edk) je nebudeme nikde zve\u0159ej\u0148ovat.

\r\n", "enable_comments": false, diff --git a/seminar/templates/seminar/archiv/temata.html b/seminar/templates/seminar/archiv/temata.html index fc7d87e8..53e8699c 100644 --- a/seminar/templates/seminar/archiv/temata.html +++ b/seminar/templates/seminar/archiv/temata.html @@ -11,7 +11,7 @@

Ročník {{ rocnik }}

{% endfor %} diff --git a/seminar/templates/seminar/profil/edit.html b/seminar/templates/seminar/profil/edit.html index bc78312c..175f3859 100644 --- a/seminar/templates/seminar/profil/edit.html +++ b/seminar/templates/seminar/profil/edit.html @@ -22,7 +22,7 @@ Přihlašovací údaje - {% include "seminar/prihlaska_field.html" with field=form.username %} + {% include "seminar/profil/prihlaska_field.html" with field=form.username %}

@@ -31,12 +31,12 @@ Osobní údaje - {% include "seminar/prihlaska_field.html" with field=form.jmeno %} - {% include "seminar/prihlaska_field.html" with field=form.prijmeni %} - {% include "seminar/prihlaska_field.html" with field=form.pohlavi_muz%} - {% include "seminar/prihlaska_field.html" with field=form.email %} - {% include "seminar/prihlaska_field.html" with field=form.telefon %} - {% include "seminar/prihlaska_field.html" with field=form.datum_narozeni %} + {% include "seminar/profil/prihlaska_field.html" with field=form.jmeno %} + {% include "seminar/profil/prihlaska_field.html" with field=form.prijmeni %} + {% include "seminar/profil/prihlaska_field.html" with field=form.pohlavi_muz%} + {% include "seminar/profil/prihlaska_field.html" with field=form.email %} + {% include "seminar/profil/prihlaska_field.html" with field=form.telefon %} + {% include "seminar/profil/prihlaska_field.html" with field=form.datum_narozeni %}

@@ -45,11 +45,11 @@ Bydliště - {% include "seminar/prihlaska_field.html" with field=form.ulice %} - {% include "seminar/prihlaska_field.html" with field=form.mesto %} - {% include "seminar/prihlaska_field.html" with field=form.psc %} - {% include "seminar/prihlaska_field.html" with field=form.stat %} - {% include "seminar/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} + {% include "seminar/profil/prihlaska_field.html" with field=form.ulice %} + {% include "seminar/profil/prihlaska_field.html" with field=form.mesto %} + {% include "seminar/profil/prihlaska_field.html" with field=form.psc %} + {% include "seminar/profil/prihlaska_field.html" with field=form.stat %} + {% include "seminar/profil/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%}

@@ -58,12 +58,12 @@ Škola - {% include "seminar/prihlaska_field.html" with field=form.skola %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola %} - {% include "seminar/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} - {% include "seminar/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} - {% include "seminar/prihlaska_field.html" with field=form.rok_maturity %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} + {% include "seminar/profil/prihlaska_field.html" with field=form.rok_maturity %}
Vyplň prosím celý název a adresu školy.

@@ -72,7 +72,7 @@ Pošta - {% include "seminar/prihlaska_field.html" with field=form.zasilat %} + {% include "seminar/profil/prihlaska_field.html" with field=form.zasilat %}

@@ -81,7 +81,7 @@ Zasílání propagačních materiálů - {% include "seminar/prihlaska_field.html" with field=form.spam %} + {% include "seminar/profil/prihlaska_field.html" with field=form.spam %}

diff --git a/seminar/templates/seminar/profil/prihlaska.html b/seminar/templates/seminar/profil/prihlaska.html index baf4ec47..d2f23016 100644 --- a/seminar/templates/seminar/profil/prihlaska.html +++ b/seminar/templates/seminar/profil/prihlaska.html @@ -24,9 +24,9 @@ Přihlašovací údaje - {% include "seminar/prihlaska_field.html" with field=form.username %} - {% include "seminar/prihlaska_field.html" with field=form.password %} - {% include "seminar/prihlaska_field.html" with field=form.password_check %} + {% include "seminar/profil/prihlaska_field.html" with field=form.username %} + {% include "seminar/profil/prihlaska_field.html" with field=form.password %} + {% include "seminar/profil/prihlaska_field.html" with field=form.password_check %}

@@ -35,12 +35,12 @@ Osobní údaje - {% include "seminar/prihlaska_field.html" with field=form.jmeno %} - {% include "seminar/prihlaska_field.html" with field=form.prijmeni %} - {% include "seminar/prihlaska_field.html" with field=form.pohlavi_muz%} - {% include "seminar/prihlaska_field.html" with field=form.email %} - {% include "seminar/prihlaska_field.html" with field=form.telefon %} - {% include "seminar/prihlaska_field.html" with field=form.datum_narozeni %} + {% include "seminar/profil/prihlaska_field.html" with field=form.jmeno %} + {% include "seminar/profil/prihlaska_field.html" with field=form.prijmeni %} + {% include "seminar/profil/prihlaska_field.html" with field=form.pohlavi_muz%} + {% include "seminar/profil/prihlaska_field.html" with field=form.email %} + {% include "seminar/profil/prihlaska_field.html" with field=form.telefon %} + {% include "seminar/profil/prihlaska_field.html" with field=form.datum_narozeni %}

@@ -49,11 +49,11 @@ Bydliště - {% include "seminar/prihlaska_field.html" with field=form.ulice %} - {% include "seminar/prihlaska_field.html" with field=form.mesto %} - {% include "seminar/prihlaska_field.html" with field=form.psc %} - {% include "seminar/prihlaska_field.html" with field=form.stat %} - {% include "seminar/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%} + {% include "seminar/profil/prihlaska_field.html" with field=form.ulice %} + {% include "seminar/profil/prihlaska_field.html" with field=form.mesto %} + {% include "seminar/profil/prihlaska_field.html" with field=form.psc %} + {% include "seminar/profil/prihlaska_field.html" with field=form.stat %} + {% include "seminar/profil/prihlaska_field.html" with field=form.stat_text id="id_li_stat_text"%}

@@ -62,12 +62,12 @@ Škola - {% include "seminar/prihlaska_field.html" with field=form.skola %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola %} - {% include "seminar/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} - {% include "seminar/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} - {% include "seminar/prihlaska_field.html" with field=form.rok_maturity %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola_nazev id="id_li_skola_nazev" %} + {% include "seminar/profil/prihlaska_field.html" with field=form.skola_adresa id="id_li_skola_adresa" %} + {% include "seminar/profil/prihlaska_field.html" with field=form.rok_maturity %}
Vyplň prosím celý název a adresu školy.

@@ -76,16 +76,16 @@ Pošta - {% include "seminar/prihlaska_field.html" with field=form.zasilat %} + {% include "seminar/profil/prihlaska_field.html" with field=form.zasilat %}

GDPR

- {% include "seminar/gdpr.html" %} + {% include "seminar/profil/gdpr.html" %} - {% include "seminar/prihlaska_field.html" with field=form.gdpr %} + {% include "seminar/profil/prihlaska_field.html" with field=form.gdpr %}

@@ -94,7 +94,7 @@ Zasílání propagačních materiálů - {% include "seminar/prihlaska_field.html" with field=form.spam %} + {% include "seminar/profil/prihlaska_field.html" with field=form.spam %}
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 2db28247..9fa25953 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -1009,7 +1009,7 @@ def StavDatabazeView(request): class ResitelView(LoginRequiredMixin,generic.DetailView): model = Resitel - template_name = 'seminar/resitel.html' + template_name = 'seminar/profil/resitel.html' def get_object(self, queryset=None): print(self.request.user) @@ -1024,7 +1024,7 @@ class AddSolutionView(LoginRequiredMixin, FormView): class NahrajReseniView(LoginRequiredMixin, CreateView): model = s.Reseni - template_name = 'seminar/nahraj_reseni.html' + template_name = 'seminar/profil/nahraj_reseni.html' form_class = f.NahrajReseniForm success_url = '/' @@ -1071,19 +1071,19 @@ def loginView(request): return HttpResponseRedirect('/') else: return render(request, - 'seminar/login.html', + 'seminar/profil/login.html', {'form': form, 'login_error': 'Neplatné jméno nebo heslo'}) else: form = LoginForm() - return render(request, 'seminar/login.html', {'form': form}) + return render(request, 'seminar/profil/login.html', {'form': form}) def logoutView(request): form = LoginForm() if request.user.is_authenticated: logout(request) - return render(request, 'seminar/login.html', {'form': form, 'login_error': 'Byli jste úspěšně odhlášeni'}) - return render(request, 'seminar/login.html', {'form': form}) + return render(request, 'seminar/profil/login.html', {'form': form, 'login_error': 'Byli jste úspěšně odhlášeni'}) + return render(request, 'seminar/profil/login.html', {'form': form}) def prihlaska_log_gdpr_safe(logger, gdpr_logger, msg, form_data): @@ -1143,7 +1143,7 @@ def resitelEditView(request): return HttpResponseRedirect('/thanks/') else: ## Stránka před odeslaním formuláře = předvyplněný formulář - return render(request, 'seminar/edit.html', {'form': form}) + return render(request, 'seminar/profil/edit.html', {'form': form}) def prihlaskaView(request): generic_logger = logging.getLogger('seminar.prihlaska') @@ -1214,12 +1214,12 @@ def prihlaskaView(request): else: form = PrihlaskaForm() - return render(request, 'seminar/prihlaska.html', {'form': form}) + return render(request, 'seminar/profil/prihlaska.html', {'form': form}) # FIXME: Tohle asi vlastně vůbec nepatří do aplikace 'seminar' class LoginView(auth_views.LoginView): # Jen vezmeme vestavěný a dáme mu vhodný template a přesměrovací URL - template_name = 'seminar/login.html' + template_name = 'seminar/profil/login.html' # Přesměrovací URL má být v kontextu: def get_context_data(self, **kwargs): @@ -1229,7 +1229,7 @@ class LoginView(auth_views.LoginView): class LogoutView(auth_views.LogoutView): # Jen vezmeme vestavěný a dáme mu vhodný template a přesměrovací URL - template_name = 'seminar/logout.html' + template_name = 'seminar/profil/logout.html' # Pavel: Vůbec nevím, proč to s _lazy funguje, ale bez toho to bylo rozbité. next_page = reverse_lazy('titulni_strana')