From 117662c9f7c2335073e2f54e42253071e8347ef8 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 16 Jan 2022 00:10:23 +0100
Subject: [PATCH] =?UTF-8?q?Export=20=C5=A1kol=20uv=C3=A1d=C3=AD=20i=20k?=
=?UTF-8?q?=C3=B3dy=20okres=C5=AF=20a=20kraj=C5=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/org.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/mo/web/org.py b/mo/web/org.py
index 6ccb15cf..d26c5f28 100644
--- a/mo/web/org.py
+++ b/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')
--
GitLab