Jmaa/package-tracking
1
0
Fork 0
Code Actions Packages

Separate stuff

Browse Source
This commit is contained in:
Jon Michael Aanes 2025-01-27 00:36:30 +01:00
parent 3cb26194e8
commit c584d60f37
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package_tracking/http.py
View File

@ -142,7 +142,7 @@ footer {
TODAY = datetime.datetime.now(tz=datetime.UTC).date() TODAY = datetime.datetime.now(tz=datetime.UTC).date()
def render_tracking(with_form: bool): def get_packages_from_parcels():
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,9 +157,12 @@ def render_tracking(with_form: bool):
result.tracking_number: result for result in tracking_results result.tracking_number: result for result in tracking_results
} }
tracking_results_with_name = [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries] return [(e, tracking_results_by_id.get(e.number)) for e in tracking_entries]
tracking_results_with_name.sort(key=lambda x: x[1].latest_state().date if x[1] else TODAY, reverse=True)
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)
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('/')
@ -171,6 +174,7 @@ 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')