1
0

Compare commits

..

2 Commits

Author SHA1 Message Date
205aa6437c 🤖 Bumped version to 0.1.8
All checks were successful
Package Python / Package (push) Successful in 25s
Run Python tests (through Pytest) / Test (push) Successful in 24s
Verify Python project can be installed, loaded and have version checked / Test (push) Successful in 22s
Build Python Container / Package-Container (push) Successful in 1m34s
This commit was automatically generated by a script: https://gitfub.space/Jmaa/repo-manager
2025-02-01 00:30:51 +01:00
c584d60f37 Separate stuff 2025-01-27 00:36:30 +01:00
2 changed files with 8 additions and 4 deletions

View File

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

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')