Export škol uvádí i kódy okresů a krajů

mo/web/org.py

@@ -125,6 +125,8 @@ school_export_columns = (
     Column(key='name', name='nazev'),
     Column(key='town_code', name='kod_obce'),
     Column(key='town', name='obec'),
+    Column(key='okres_code', name='kod_okresu'),
+    Column(key='kraj_code', name='kod_kraje'),
     Column(key='red_izo', name='red_izo'),
     Column(key='ico', name='ico'),
     Column(key='official_name', name='ofic_nazev'),
@@ -141,11 +143,15 @@ def org_export_schools():
 
     def gen_rows():
         town = aliased(db.Place)
-        for p, s, t in (
-                sess.query(db.Place, db.School, town)
+        okres = aliased(db.Place)
+        kraj = aliased(db.Place)
+        for p, s, t, o, k in (
+                sess.query(db.Place, db.School, town, okres, kraj)
                 .filter(db.Place.type == db.PlaceType.school)
                 .filter(db.Place.place_id == db.School.place_id)
                 .filter(db.Place.parent == town.place_id)
+                .filter(town.parent == okres.place_id)
+                .filter(okres.parent == kraj.place_id)
                 .yield_per(100)):
             yield Row(keys={
                 'code': p.get_code(),
@@ -158,6 +164,8 @@ def org_export_schools():
                 'is_ss': int(s.is_ss),
                 'town_code': t.get_code(),
                 'town': t.name,
+                'okres_code': o.get_code(),
+                'kraj_code': k.get_code(),
             })
 
     table = Table(school_export_columns, gen_rows(), 'skoly')