Commit b29eae2

committed

adding yaml loading for grid order

1 parent 8f460c5 commit b29eae2Copy full SHA for b29eae2

File tree

1 file changed

-26

lines changed

mpeds_coder.py

1 file changed

-26

lines changed

`‎mpeds_coder.py‎`

Lines changed: 8 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,12 @@ def construct_mapping(loader, node):`
`114`	`114`	`key += '-text'`
`115`	`115`	`event_creator_vars.append( (key, var) )`
`116`	`116`
	`117`	`+## load adj grid order`
	`118`	`+adj_grid_order = []`
	`119`	`+if os.path.isfile(app.config['WD'] + '/adj-grid-order.yaml'):`
	`120`	`+ adj_grid_order = yaml.load(open(app.config['WD'] + '/adj-grid-order.yaml', 'r'),`
	`121`	`+ Loader = yaml.Loader)`
	`122`	`+`
`117`	`123`	`## load preset variables`
`118`	`124`	`preset_vars = yaml.load(open(app.config['WD'] + '/presets.yaml', 'r'))`
`119`	`125`	`v1 = [(x, str.title(x).replace('-', ' ')) for x in sorted(preset_vars.keys())]`
`@@ -634,7 +640,7 @@ def adj():`
`634`	`640`	`search_events = search_events,`
`635`	`641`	`filter_fields = filter_fields,`
`636`	`642`	`cand_events = cand_events,`
`637`		`- grid_vars = _make_grid_vars(),`
	`643`	`+ grid_vars = adj_grid_order,`
`638`	`644`	`links = links,`
`639`	`645`	`flags = _load_event_flags(cand_event_ids),`
`640`	`646`	`recent_events = recent_events,`
`@@ -663,7 +669,7 @@ def load_adj_grid():`
`663`	`669`	`cand_events = cand_events,`
`664`	`670`	`links = links,`
`665`	`671`	`flags = _load_event_flags(cand_event_ids),`
`666`		`- grid_vars = _make_grid_vars())`
	`672`	`+ grid_vars = adj_grid_order)`
`667`	`673`
`668`	`674`
`669`	`675`	`@app.route('/add_canonical_link', methods = ['POST'])`
`@@ -1073,30 +1079,6 @@ def _load_event_flags(events):`
`1073`	`1079`	`return {x.event_id: x.flag for x in efs}`
`1074`	`1080`
`1075`	`1081`
`1076`		`-# @app.route('/_load_links')`
`1077`		`-# @login_required`
`1078`		`-# def _load_links(canonical_event_key):`
`1079`		`-# """Load links for a given canonical event."""`
`1080`		`-`
`1081`		`-`
`1082`		`-@app.route('/_make_grid_vars')`
`1083`		`-@login_required`
`1084`		`-def _make_grid_vars():`
`1085`		`- """Helper function which returns grid variables."""`
`1086`		`- grid_vars = []`
`1087`		`- for i in event_creator_single_value:`
`1088`		`- if type(i) == list:`
`1089`		`- for j in i:`
`1090`		`- grid_vars.append(j)`
`1091`		`- else:`
`1092`		`- grid_vars.append(i)`
`1093`		`-`
`1094`		`- grid_vars.extend([x[0] for x in event_creator_vars])`
`1095`		`- grid_vars.extend(['form', 'issue', 'racial-issue', 'target'])`
`1096`		`-`
`1097`		`- return grid_vars`
`1098`		`-`
`1099`		`-`
`1100`	`1082`	`class Pagination(object):`
`1101`	`1083`	`"""`
`1102`	`1084`	`Extracted from flask-sqlalchemy`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit b29eae2

File tree

1 file changed

1 file changed

`‎mpeds_coder.py‎`

0 commit comments