Skip to content

Commit

Permalink
PEP8 indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@exhuma
exhuma committed Apr 1, 2013
1 parent 871a320 commit 6fbb3a5
Showing 1 changed file with 56 additions and 57 deletions.
113 changes: 56 additions & 57 deletions lost_tracker/models.py
View file
Expand Up @@ -32,25 +32,26 @@


def get_station_score(group_id, station_id): def get_station_score(group_id, station_id):
s = select([score], s = select([score],
and_( and_(
station_scores.c.group_id == group_id, station_scores.c.group_id == group_id,
station_scores.c.station_id == station_id station_scores.c.station_id == station_id))
))
return s.execute().first() return s.execute().first()




def get_station_score_by_station(station_id): def get_station_score_by_station(station_id):
s = select([group_id, score], s = select(
[group_id, score],
and_( and_(
station_scores.c.station_id == station_id station_scores.c.station_id == station_id
)).order_by(station_scores.c.group_id) )).order_by(station_scores.c.group_id)
return s.execute() return s.execute()




def get_station_score_by_group(group_id): def get_station_score_by_group(group_id):
s = select([station_id, score], s = select(
[station_id, score],
and_( and_(
station_scores.c.group_id == group_id station_scores.c.group_id == group_id
)).order_by(station_scores.c.station_id) )).order_by(station_scores.c.station_id)
return s.execute() return s.execute()


Expand All @@ -61,26 +62,29 @@ def get_station_score_full():




def get_form_score(group_id, form_id): def get_form_score(group_id, form_id):
s = select([score], s = select(
[score],
and_( and_(
form_scores.c.group_id == group_id, form_scores.c.group_id == group_id,
form_scores.c.form_id == form_id form_scores.c.form_id == form_id
)) ))
return s.execute().first() return s.execute().first()




def get_form_score_by_group(group_id): def get_form_score_by_group(group_id):
s = select([form_id, score], s = select(
[form_id, score],
and_( and_(
form_scores.c.group_id == group_id, form_scores.c.group_id == group_id,
)).order_by(form_scores.c.form_id) )).order_by(form_scores.c.form_id)
return s.execute() return s.execute()




def get_form_score_by_form(form_id): def get_form_score_by_form(form_id):
s = select([group_id, score], s = select(
[group_id, score],
and_( and_(
form_scores.c.form_id == form_id form_scores.c.form_id == form_id
)).order_by(form_scores.c.group_id) )).order_by(form_scores.c.group_id)
return s.execute() return s.execute()


Expand All @@ -105,8 +109,7 @@ def get_state(group_id, station_id):
""" """
s = select(['state'], and_( s = select(['state'], and_(
group_station_state.c.group_id == group_id, group_station_state.c.group_id == group_id,
group_station_state.c.station_id == station_id group_station_state.c.station_id == station_id))
))
result = s.execute().first() result = s.execute().first()


if not result: if not result:
Expand All @@ -117,10 +120,11 @@ def get_state(group_id, station_id):




def set_station_score(group_id, station_id, score): def set_station_score(group_id, station_id, score):
s = select([station_scores], s = select(
[station_scores],
and_( and_(
station_scores.c.group_id == group_id, station_scores.c.group_id == group_id,
station_scores.c.station_id == station_id station_scores.c.station_id == station_id
)) ))
row = s.execute().first() row = s.execute().first()


Expand All @@ -134,30 +138,28 @@ def set_station_score(group_id, station_id, score):


def insert_station_score(group_id, station_id, score): def insert_station_score(group_id, station_id, score):
i = station_scores.inster().values( i = station_scores.inster().values(
group_id = group_id, group_id=group_id,
station_id = station_id, station_id=station_id,
score = score score=score)
)
return i return i




def update_station_score(group_id, station_id, score): def update_station_score(group_id, station_id, score):
u = station_scores.filter_by( u = station_scores.filter_by(
group_id = group_id, group_id=group_id,
station_id = station_id station_id=station_id
).update({ ).update({
'score': score 'score': score
}, }, synchronize_session=False)
synchronize_session=False return u
)
return u




def set_form_score(group_id, form_id, score): def set_form_score(group_id, form_id, score):
s = select([form_scores], s = select(
[form_scores],
and_( and_(
form_scores.c.group_id == group_id, form_scores.c.group_id == group_id,
form_scores.c.form_id == form_id form_scores.c.form_id == form_id
)) ))
row = s.execute().first() row = s.execute().first()


Expand All @@ -171,39 +173,37 @@ def set_form_score(group_id, form_id, score):


def insert_form_score(group_id, form_id, score): def insert_form_score(group_id, form_id, score):
i = form_scores.insert().values( i = form_scores.insert().values(
group_id = group_id, group_id=group_id,
form_id = form_id, form_id=form_id,
score = score score=score)
)
return i return i




def update_form_score(group_id, form_id, score): def update_form_score(group_id, form_id, score):
u = form_scores.filter_by( u = form_scores.filter_by(
group_id = group_id, group_id=group_id,
form_id = form_id form_id=form_id
).update({ ).update({
'score': score 'score': score
}, }, synchronize_session=False)
synchronize_session=False
)
return u return u




def advance(group_id, station_id): def advance(group_id, station_id):
s = select(['state'], and_( s = select(
group_station_state.c.group_id == group_id, ['state'],
group_station_state.c.station_id == station_id and_(
group_station_state.c.group_id == group_id,
group_station_state.c.station_id == station_id
)) ))
db_row = s.execute().first() db_row = s.execute().first()


# The first state to set - if there is nothing yet - is "ARRIVED" # The first state to set - if there is nothing yet - is "ARRIVED"
if not db_row: if not db_row:
i = group_station_state.insert().values( i = group_station_state.insert().values(
group_id=group_id, group_id=group_id,
station_id=station_id, station_id=station_id,
state=STATE_ARRIVED state=STATE_ARRIVED)
)
i.execute() i.execute()
return STATE_ARRIVED return STATE_ARRIVED


Expand All @@ -217,12 +217,11 @@ def advance(group_id, station_id):
else: else:
raise ValueError('%r is not a valid state!' % the_state) raise ValueError('%r is not a valid state!' % the_state)
upd = group_station_state.update().where( upd = group_station_state.update().where(
and_( and_(
group_station_state.c.group_id == group_id, group_station_state.c.group_id == group_id,
group_station_state.c.station_id == station_id) group_station_state.c.station_id == station_id)
).values( ).values(
state=new_state state=new_state)
)
upd.execute() upd.execute()
return new_state return new_state


Expand Down

0 comments on commit 6fbb3a5

Please sign in to comment.