Skip to content

Commit

Permalink
fix up broken datasets
Browse files Browse the repository at this point in the history
  • Loading branch information
pudo committed Nov 20, 2016
1 parent 111eff2 commit 99c1951
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 40 deletions.
38 changes: 21 additions & 17 deletions offenerhaushalt/sites.py
Expand Up @@ -116,23 +116,27 @@ def get_aggregate(self):
return aggs[0]

def to_dict(self):
data = self.data.copy()
data['slug'] = self.slug
data['api'] = self.api_base
data['aggregate'] = self.get_aggregate()

# This seems hacky.
data['keyrefs'] = {}
data['labelrefs'] = {}
for name, dim in self.model.get('dimensions').items():
data['keyrefs'][name] = dim['key_ref']
data['labelrefs'][name] = dim['label_ref']
for attr in dim.get('attributes').values():
data['keyrefs'][attr['ref']] = attr['ref']
data['labelrefs'][attr['ref']] = attr['ref']

data['filters'] = self.filters
return data
try:
data = self.data.copy()
data['slug'] = self.slug
data['api'] = self.api_base
data['aggregate'] = self.get_aggregate()

# This seems hacky.
data['keyrefs'] = {}
data['labelrefs'] = {}
for name, dim in self.model.get('dimensions').items():
data['keyrefs'][name] = dim['key_ref']
data['labelrefs'][name] = dim['label_ref']
for attr in dim.get('attributes').values():
data['keyrefs'][attr['ref']] = attr['ref']
data['labelrefs'][attr['ref']] = attr['ref']

data['filters'] = self.filters
return data
except Exception:
print 'SLUG', self.slug
raise


def load_sites():
Expand Down
2 changes: 1 addition & 1 deletion offenerhaushalt/static/js/budget.js
Expand Up @@ -88,7 +88,7 @@ $(function(){

$.each(path.hierarchy.drilldowns, function(i, drilldown) {
if (args[drilldown]) {
url += args[drilldown].replace('/','%2F') + '/';
url += encodeURIComponent(args[drilldown]) + '/';
delete args[drilldown];
}
});
Expand Down
12 changes: 6 additions & 6 deletions sites/huecksewagen.yaml
@@ -1,20 +1,20 @@
name: Stadt Hückeswagen
slug: hückeswagen
slug: hueckeswagen
tagline: "Haushalt Hueckeswagen 2016."
source: Joerg Tillmans
data_url: http://db.offenerhaushalt.de/api/3/datasets/haushalt-hueckeswagen-2016/serve/2016-09-30-huckeswagen-daten-offener-haushalt-hp-2016-final.txt
state: NW
level: kommune
dataset: haushalt_hueckeswagen_2016
dataset: haushalt-hueckeswagen-2016
default: produkte

filters:
- field: 'jahr'
name: 'Jahr'
default: '2016'
# - field: 'jahr'
# name: 'Jahr'
# default: '2016'
- field: 'fluss'
name: 'Fluss'
default: 'Aufwendung'
default: 'Aufwendung '

hierarchies:
arten:
Expand Down
22 changes: 11 additions & 11 deletions sites/krefeld.yaml
Expand Up @@ -11,22 +11,22 @@ default: produkte
filters:
- field: 'jahr'
name: 'Jahr'
default: '2015'
- field: 'plan'
name: 'Plan'
default: 'Plan'
default: '2016'
# - field: 'plan'
# name: 'Plan'
# default: 'Plan'

hierarchies:
arten:
name: Profitcenter/Kostenarten
name: Profitcenter
drilldowns:
- Profitcenter
- Kostenarten
- Auftrag
- profitcenter
- kostenarten
- auftrag

produkte:
name: Fachbereich/Produkte
name: Produkte
drilldowns:
- GB
- Fachbereich
- gb
- fachbereich
- im_hh
10 changes: 5 additions & 5 deletions sites/merzenich.yaml
Expand Up @@ -5,7 +5,7 @@ source: Sebastian Schmitz - kdvz-frechen
source_url: http://db.offenerhaushalt.de/api/3/datasets/hp-2015-merzenich/serve/haushalt-2015-final.ods
level: kommune
state: NW
dataset: HP 2015 Gemeinde Merzenich
dataset: hp-2015-merzenich
default: produkte

filters:
Expand All @@ -20,7 +20,7 @@ hierarchies:
produkte:
name: Produkt
drilldowns:
- bereichbezeichnung
- gruppen-bezeichnung
- produkt-bezeichnung
- konto-bezeichnung
- bereich
- gruppe
- produkt
- konto

0 comments on commit 99c1951

Please sign in to comment.