mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions
3274 commits 31 branches 100 tags 48 MiB
Commit graph

1816 commits

Author SHA1 Message Date
Bc. Petr Pecha
b19cbe6032 organizatori | admin | actions 2015-07-05 10:12:47 +02:00
Bc. Petr Pecha
09b8b7c0df organizatori | admin | list_display 2015-07-05 09:49:00 +02:00
Tomas Gavenciak
c75fe27a60 Komentare k pocitani vysledkovky 2015-07-03 17:55:39 +02:00
Tomas Gavenciak
7542adb996 Fix cislo URL 2015-07-03 17:50:35 +02:00
Bc. Petr Pecha
b5dda32fee soustredeni +action skryti soustredeni 2015-07-03 11:18:32 +02:00
Bc. Petr Pecha
82cf4c6a64 soustredeni | Neverejna soustredeni viditelna pro prihlasene 2015-07-03 11:13:46 +02:00
Bc. Petr Pecha
f2bdb970ab soustredeni +action zverejnit soustredeni 2015-07-03 10:54:13 +02:00
Bc. Petr Pecha
808351fad0 Zobrazovani e-mailu 
+ chybejici zaviraci zavorka tagu
 2015-07-03 09:01:16 +02:00
Bc. Petr Pecha
58301b8b44 Odkaz v hlavnim menu na soustredeni poradne pres {% url %} 2015-06-30 09:03:10 +02:00
Bc. Petr Pecha
f71ea2db1a Soustredeni | seznam soustredeni 
Casy se nezobrazuji cesky
 2015-06-29 17:51:18 +02:00
Bc. Petr Pecha
2f8eb74b87 Organizátoři | zobrazení, zda-li je aktivni 2015-06-29 08:52:44 +02:00
Bc. Petr Pecha
3a8f2ec35e Organizatori | ListView + template 
Nutno pak dostylovat podle vzhledu.
Zaklad zobrazovanych informaci.
Nutno rozdelit na aktivni a neaktivni
a to idealne tak, ze template bude jeden
a list se zpravne zkompetuje ve view.
 2015-06-29 08:23:41 +02:00
Tomas Gavenciak
8241a25337 Soustredeni a ucasti v testdatech 2015-06-29 00:39:40 +02:00
Tomas Gavenciak
efea781049 Export jen verejnych soustredeni 2015-06-29 00:39:11 +02:00
Tomas Gavenciak
944afc5974 Prepracovani exportu, doplneni exportu soustredek 2015-06-29 00:27:02 +02:00
Bc. Petr Pecha
fa6975d2ef Organizatori | migrace 2015-06-25 11:03:03 +02:00
Bc. Petr Pecha
e6b0efe1a7 Organizatori | admin 
+ odstraneni chyby, kdyz chybi obrazek organizatora
 2015-06-25 11:01:39 +02:00
Bc. Petr Pecha
1777656d27 Organizator | model 2015-06-25 10:48:06 +02:00
Bc. Petr Pecha
3ed0e6d6d0 Novinky | CKEditor 2015-06-23 11:46:45 +02:00
Bc. Petr Pecha
60a93713b3 Novinky | oprava chyby se zobrazovanym nazvem 2015-06-23 11:36:42 +02:00
Bc. Petr Pecha
42df6f9265 Novinky | admin 2015-06-23 11:32:16 +02:00
Bc. Petr Pecha
836905b3de Novinky | vytvoreni modelu 2015-06-23 11:30:08 +02:00
Bc. Petr Pecha
fa0c4e0fa9 Novinky | vytvoreni modelu 2015-06-23 10:50:58 +02:00
Tomas Gavenciak
81cbf39df7 Konverze bodu na decimal(8,1) 2015-06-09 22:00:21 +02:00
Tomas Gavenciak
ef9c7aa497 Merge branch 'master' of atrey:/akce/MaM/MaMweb/mamweb 
* 'master' of atrey:/akce/MaM/MaMweb/mamweb:
  Oprava popisku v autocomplete
  Oprava predchozi
 2015-06-09 00:33:26 +02:00
Tomas Gavenciak
3838b207f9 Prodana volitelna verejnost vysledkove listiny 2015-06-08 22:51:36 +02:00
Tomas Gavenciak
79ea541587 Indexy a unikatnost pro rocnik a cislo 2015-06-08 22:42:52 +02:00
Tomas Gavenciak
7fac56f29a Popisnejsi url pro cislo a rocnik 2015-06-08 22:38:13 +02:00
Tomas Gavenciak
4bf299bf25 Automaticke doplnovani cisla reseni u uloh 2015-06-08 22:18:15 +02:00
Tomas Gavenciak
d755295b74 Uprava razeni reseni 2015-06-08 22:03:02 +02:00
Tomas Gavenciak
e9a85083df Filtrace problemu podle cisel 2015-06-08 22:00:54 +02:00
Tomas Gavenciak
ff532b2f59 Zmena jmena rocniku na integer 2015-06-08 21:59:38 +02:00
Bc. Petr Pecha
062b1790ec Oprava popisku v autocomplete 2015-06-07 08:21:27 +02:00
Bc. Petr Pecha
21b66be1da Oprava predchozi 2015-06-07 08:10:32 +02:00
Jan Musílek
010580648a Sestupné řazení čísel a ročníků. 2015-06-06 21:38:53 +02:00
Bc. Petr Pecha
9df07538bf Oprava odkazu v submenem 2015-06-05 08:57:21 +02:00
Bc. Petr Pecha
829166322a Oprava odkazu v submenu archivu 
Stejne opravit ostatni submenu,
nebo nalest vhodnejsi zpzsob
 2015-06-04 18:34:35 +02:00
Bc. Petr Pecha
e7e608617d Premisteni templatu archivu do podadresare 2015-06-04 10:57:19 +02:00
Bc. Petr Pecha
f6ac770fe5 Aktualni zadani podle url 2015-06-04 10:18:52 +02:00
Bc. Petr Pecha
d03298fb86 Premisteni archivniho menu do archivu 2015-06-04 10:13:52 +02:00
Bc. Petr Pecha
b01f1cf232 Dodelano zobrazovani submenu 2015-06-04 09:46:15 +02:00
Bc. Petr Pecha
cf83fb0593 struktura menu + submenu Co je M&M 2015-06-03 14:16:30 +02:00
Bc. Petr Pecha
e9db158327 testovaci data | pridan FlatPage / 2015-06-02 22:37:25 +02:00
Bc. Petr Pecha
036a7f9593 Merge remote-tracking branch 'origin/master' into Petr 2015-06-02 21:11:39 +02:00
Tomas Gavenciak
688f7d6921 Odstranena nutna neprazdnost tagu v adminu 2015-06-02 01:43:50 +02:00
Tomas Gavenciak
e3a7829c44 Migrace pro proxy modely 2015-06-02 01:30:06 +02:00
Tomas Gavenciak
b4c5b3585c Odstranena nutna neprazdnost rich textu v adminu 2015-06-02 01:27:51 +02:00
Tomas Gavenciak
234203c570 Rozdeleni problemu na navrhy a zadane 2015-05-27 09:20:15 +02:00
Tomas Gavenciak
181fce9df5 Update adminu s help_text-em 2015-05-26 23:49:17 +02:00
Tomas Gavenciak
a92d3d06b2 Rozdeleni zadani / reseni u problemu 2015-05-26 23:37:54 +02:00
Tomas Gavenciak
fad81991ec Text k soustredeni 2015-05-26 23:09:37 +02:00
Bc. Petr Pecha
f1fe848818 Merge remote-tracking branch 'origin/master' into Petr 2015-05-26 17:07:33 +02:00
Tomas Gavenciak
9cbbfeaa95 Fix bug: poradi v exportu 2015-05-26 17:04:34 +02:00
Tomas Gavenciak
8bf8eb8b23 Import komentaru, unescape dat, uprava uzivatelu 2015-05-26 13:12:56 +02:00
Tomas Gavenciak
2b38042798 Added full threaded comments (to Problem for now) 2015-05-26 10:20:42 +02:00
Tomas Gavenciak
d689e3042b Uprava pudlic_url 2015-05-26 10:11:55 +02:00
Bc. Petr Pecha
0fa9bbe76e Merge remote branch 'origin/master' into Petr 
Conflicts:
	seminar/admin.py
 2015-05-22 14:19:01 +02:00
Tomas Gavenciak
ff0aac3d57 Uprava poznamek na neomez. vel., uprava inline adminu 2015-05-22 00:10:07 +02:00
Tomas Gavenciak
93b66fe0ec Cache a zrychleni na rocniky (hodne) a tez soustredeni_resitele 2015-05-21 22:58:37 +02:00
Tomas Gavenciak
a1505485a1 Pridano pocitani reseni problemu a resitelu 2015-05-21 22:30:35 +02:00
Tomas Gavenciak
692c73c7e2 Velke optimalizace SQL pouziti v adminu, select_related() 2015-05-21 22:18:44 +02:00
Tomas Gavenciak
8e1e30e672 Priprava autocomplete tagu a pod., vzhled adminu 2015-05-21 22:17:46 +02:00
Tomas Gavenciak
a0fb80130f Boost admin to the stars!!! 2015-05-21 17:44:51 +02:00
Tomas Gavenciak
32cb4b1480 Zaklad routovani / view pro soustredeni 2015-05-21 17:44:20 +02:00
Tomas Gavenciak
57f674a51c Uprava modelu: ucast na soustredeni, poznamky u modelu 2015-05-21 17:43:38 +02:00
Bc. Petr Pecha
5fba3c30ba seminar | admin | oprava inline 
V inline potreba primo pole, neni to ve vypisu,
kde mame jen indikátor, zda je nebo neni zverejneno
 2015-05-20 20:58:41 +02:00
Tomas Gavenciak
f9ad5a799f Uprava id-scope exportu na "mam" 2015-05-18 11:21:51 +02:00
Tomas Gavenciak
09a11bdcea Update and finish admin autocompletes 2015-05-17 14:39:57 +02:00
Tomas Gavenciak
6bdb55ab98 Update exportu jména školy 2015-05-17 07:41:47 +02:00
Tomas Gavenciak
dc5d111e88 Drobna uprava vypisu Skoly (pro autocomplete) 2015-05-17 07:29:53 +02:00
Tomas Gavenciak
d55b3ad3a9 Autocomplete pro Skola (a pozdeji pro dalsi) 2015-05-17 07:28:55 +02:00
Tomas Gavenciak
f92f855b86 Metody pro dalsi/predchozi cislo v rocniku 2015-05-17 06:31:08 +02:00
Tomas Gavenciak
8cc0cf62d0 Opraveno poradi vysledkovky 2015-05-17 06:30:53 +02:00
Tomas Gavenciak
0ec8141b54 Fix url reverse v exportu 2015-05-17 02:08:12 +02:00
Tomas Gavenciak
0d6d1cb440 Uprava modelu (rok maturity, timestamp definice) 2015-05-17 02:06:37 +02:00
Tomas Gavenciak
3d6dfda6ba Utils fix and test, add decode roman numbers 2015-05-16 10:39:40 +02:00
Tomas Gavenciak
dc5d138ebf Update admin (forma), lepsi nazvy sloupcu z importu 2015-05-16 09:58:06 +02:00
Tomas Gavenciak
8117261725 Rozliseni formy reseni 2015-05-15 21:27:02 +02:00
Tomas Gavenciak
8082677655 Poznamky a zdroje k Dakos exportu a importu 2015-05-15 21:26:23 +02:00
Tomas Gavenciak
1a6000f0e2 Tagy (MFIO) k problemum 2015-05-15 15:28:00 +02:00
Tomas Gavenciak
dcdaa57401 Update modelu databáze (timestamps, autor) 2015-05-15 15:09:10 +02:00
Tomas Gavenciak
e9d4af35f6 Fix migrace s vysledkovkami views 2015-05-15 00:48:31 +02:00
Tomas Gavenciak
9cbaf696ec Utility pro DAKOS import 2015-05-15 00:19:40 +02:00
Tomas Gavenciak
2270aeea51 Pridana stara ID z dakosu (pro import a historii) 2015-05-15 00:18:39 +02:00
Tomas Gavenciak
d1c3948a6c Hotovy magic prikaz pro import a update skol z Aesopa 2015-05-14 19:53:01 +02:00
Tomas Gavenciak
29b32dadd8 Pridany atributy Skole SS a ZS 2015-05-14 19:51:44 +02:00
Tomas Gavenciak
6947131a03 Support a testy pro ovvp-format dat 2015-05-14 17:55:08 +02:00
Tomas Gavenciak
f33be6c2e9 Dalsi update adminu 2015-05-14 16:57:12 +02:00
Tomas Gavenciak
013b492f40 Vylepseni admin rozhrani 2015-05-14 16:18:43 +02:00
Tomas Gavenciak
10cfee815d Update modelu (poznamky, ...) a reset migraci (seminar) 2015-05-14 16:02:00 +02:00
Tomas Gavenciak
63bc158e54 Uprava zakladnich template - pridava se "admin bar" 2015-05-14 00:52:29 +02:00
Tomas Gavenciak
3ac2b34dd8 Cleanup po upravach routingu a testu 2015-05-14 00:49:20 +02:00
Tomas Gavenciak
5d24b33d65 Update routing, urls, verejne url, ... 2015-05-11 12:58:21 +02:00
Tomas Gavenciak
eb4aaccccb Modely: spolecny zaklad, url resolve, model Soustredeni 2015-05-11 12:56:39 +02:00
Tomas Gavenciak
05a337c6f8 Implemented full AESOP export 2015-05-06 17:07:32 +02:00
Tomas Gavenciak
997e4bcdfd Male zlepseni test. dat 2015-04-02 00:12:45 +02:00
Tomas Gavenciak
b6003c4094 Tagy pro menu 2015-04-02 00:09:54 +02:00
Tomas Gavenciak
40f43f5208 Zmena nazvu views v urlconf 2015-04-01 14:05:04 +02:00
Tomas Gavenciak
467c7c53b3 Nove sketche views pro seminar 2015-04-01 14:01:13 +02:00
Tomas Gavenciak
f56a37edfa GET tests, improve testdata generation, rename views 2015-03-29 14:52:07 +02:00
Tomas Gavenciak
15ffbbad3f Merge branch 'master' of atrey:/akce/MaM/MaMweb/mamweb 
* 'master' of atrey:/akce/MaM/MaMweb/mamweb:
  Zakladni kostra Aktualniho zadani
  Reseni prav pri nasazovani na server
 2015-03-28 15:38:43 +01:00
Tomas Gavenciak
a66cdbd234 Vylepseni generovani test. dat 2015-03-28 15:38:22 +01:00
Bc. Petr Pecha
d77b5e4ff4 Zakladni kostra Aktualniho zadani 
Rozkoukani se v modelu.
Napsani velmi zakladniho aktualniho zadani
 2015-03-27 21:38:48 +01:00
Tomas Gavenciak
557c1d55e1 Testovaci view na cislo a vysledkovka s daty z VIEW 2015-03-24 01:13:34 +01:00
Tomas Gavenciak
1421438c9c Migrace pro seminar, SQL VIEW (body), nove modely 2015-03-24 01:12:55 +01:00
Tomas Gavenciak
7c077ed9d5 Update generovani testovacich dat 
- resitele uz nemuzou odevzdat vice reseni do jednoho cisla
 2015-03-24 01:10:36 +01:00
Tomas Gavenciak
cd3097ba5c Integrate reversion to seminar, add admin-tools 2015-03-16 11:36:26 +01:00
Tomas Gavenciak
4b855c6f77 Update templates (remove CMS), improve testdata gen 2015-03-14 23:31:29 +01:00
Tomas Gavenciak
3b7b236d33 Add test seminar template 2015-03-14 22:52:45 +01:00
Tomas Gavenciak
add219ccf8 Clean up gitignore, minor fix admin, update README 2015-03-14 22:42:48 +01:00
Tomas Gavenciak
0b88b8022c Add CKEditor +configure, first tests, test data generation 2015-03-14 22:27:04 +01:00
Tomas Gavenciak
065461300d Added fake/testing data generation 2015-03-14 17:25:40 +01:00
Tomas Gavenciak
b209344e87 Remove allauth, add 'make run', clean config, add Nastaveni 2015-03-14 15:41:29 +01:00
Tomas Gavenciak
8262864be9 Remove feincms, revert some experiments 2015-03-14 00:33:35 +01:00
Tomas Gavenciak
f6fde3aaa6 Flush temporary changes 2015-03-13 20:08:18 +01:00
Tomas Gavenciak
1d45e97c1a Pull seminar app from older iteration 2014-11-17 12:05:46 +01:00