1
0

Compare commits

..

No commits in common. "205aa6437c58f99a3b6f201405fb1d0da2d48c00" and "3cb26194e841cb7ab93eda25b1b0b3c5aac0220a" have entirely different histories.

2 changed files with 4 additions and 8 deletions

View File

@ -1 +1 @@
__version__ = '0.1.8' __version__ = '0.1.7'

View File

@ -142,7 +142,7 @@ footer {
TODAY = datetime.datetime.now(tz=datetime.UTC).date() TODAY = datetime.datetime.now(tz=datetime.UTC).date()
def get_packages_from_parcels(): def render_tracking(with_form: bool):
tracking_entries = database.get_tracking_numbers() tracking_entries = database.get_tracking_numbers()
tracking_numbers = [e.number for e in tracking_entries] tracking_numbers = [e.number for e in tracking_entries]
@ -157,12 +157,9 @@ def get_packages_from_parcels():
result.tracking_number: result for result in tracking_results result.tracking_number: result for result in tracking_results
} }
return [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries] tracking_results_with_name = [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries]
def render_tracking(tracking_results_with_name, error_message: str | None, with_form: bool):
tracking_results_with_name = get_packages_from_parcels()
tracking_results_with_name.sort(key=lambda x: x[1].latest_state().date if x[1] else TODAY, reverse=True) tracking_results_with_name.sort(key=lambda x: x[1].latest_state().date if x[1] else TODAY, reverse=True)
return bottle.template(TEMPLATE, error_message=error_message, tracking_results=tracking_results_with_name, with_form=with_form) return bottle.template(TEMPLATE, error_message=error_message, tracking_results=tracking_results_with_name, with_form=with_form)
@bottle.route('/') @bottle.route('/')
@ -174,7 +171,6 @@ def inner():
return render_tracking(with_form=False) return render_tracking(with_form=False)
@bottle.route('/add', method='POST') @bottle.route('/add', method='POST')
def add_tracking_number(): def add_tracking_number():
number: str = bottle.request.forms.get('tracking-number') number: str = bottle.request.forms.get('tracking-number')